Hello community, here is the log from the commit of package projectM for openSUSE:Factory checked in at 2017-07-30 11:22:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/projectM (Old) and /work/SRC/openSUSE:Factory/.projectM.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "projectM" Sun Jul 30 11:22:15 2017 rev:13 rq:512665 version:2.1.0 Changes: -------- New Changes file: --- /dev/null 2017-07-20 07:30:00.335470106 +0200 +++ /work/SRC/openSUSE:Factory/.projectM.new/projectM-qt5.changes 2017-07-30 11:22:20.568042215 +0200 @@ -0,0 +1,72 @@ +------------------------------------------------------------------- +Wed Jul 26 12:11:29 UTC 2017 - aloi...@gmx.com + +- Spec cleanup (use %cmake macros) +- Added projectM-2.1.0-no-return-in-nonvoid.patch and + projectM-2.1.0-SUSE_misc.patch +- Obtain official tarball from sourceforge +- Dropped FindGLEW.cmake (no current target needs it) +- Added separate -qt5 version of the package and + projectM-2.1.0-Qt5.patch and pre_checkin.sh to support the + latter + +------------------------------------------------------------------- +Mon May 23 19:30:03 UTC 2016 - antoine.belv...@laposte.net + +- Fix build with GCC6: + * Add projectM-2.1.0-fix-isnan-gcc6.patch + +------------------------------------------------------------------- +Thu Dec 11 07:19:08 UTC 2014 - o...@aepfle.de + +- Correct usage of fdupes macro + +------------------------------------------------------------------- +Tue Jun 25 01:30:24 UTC 2013 - i...@marguerite.su + +- fix bnc#825162: Error in standard configuration File causes projectM not to start + +------------------------------------------------------------------- +Sun Mar 24 16:50:14 UTC 2013 - sch...@suse.de + +- Properly determine list of lib64 platforms + +------------------------------------------------------------------- +Thu May 24 22:31:29 UTC 2012 - i...@marguerite.su + +- update version 2.1.0 + * Fixed several memory leaks (when projectM gets destroyed, or when a preset gets destroyed) + * Resolved some parser errors and an embarrasing evaluation bug (in particular, 2^x does not equal x^2) + * +/- keys support to edit the ratings + * libvisual / gstreamer compatible + * Various cmake build fixes and improvements +- drop two patches. upstream fixed. + +------------------------------------------------------------------- +Sat May 12 15:33:06 UTC 2012 - reddw...@opensuse.org + +- fix the version in the pkg-config file + +------------------------------------------------------------------- +Tue Mar 27 19:18:42 UTC 2012 - dval...@suse.com + +- fix ppc64 build + +------------------------------------------------------------------- +Tue Jan 3 14:57:12 UTC 2012 - sasc...@suse.de + +- Remove licenses from subpackages (inherited anyways) +- Remove src/WinLibs tree (bnc#738417) + +------------------------------------------------------------------- +Sat Dec 31 01:11:29 UTC 2011 - prus...@opensuse.org + +- spec cleanup +- fix font locations in config.inp + +------------------------------------------------------------------- +Sat Dec 10 06:40:58 UTC 2011 - i...@marguerite.su + +- initial package 2.0.1+ from git +- split libraries and data + --- /work/SRC/openSUSE:Factory/projectM/projectM.changes 2016-05-31 12:09:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.projectM.new/projectM.changes 2017-07-30 11:22:22.387785433 +0200 @@ -1,0 +2,12 @@ +Wed Jul 26 12:11:29 UTC 2017 - aloi...@gmx.com + +- Spec cleanup (use %cmake macros) +- Added projectM-2.1.0-no-return-in-nonvoid.patch and + projectM-2.1.0-SUSE_misc.patch +- Obtain official tarball from sourceforge +- Dropped FindGLEW.cmake (no current target needs it) +- Added separate -qt5 version of the package and + projectM-2.1.0-Qt5.patch and pre_checkin.sh to support the + latter + +------------------------------------------------------------------- Old: ---- FindGLEW.cmake projectM-2.1.0.tar.bz2 New: ---- pre_checkin.sh projectM-2.1.0-Qt5.patch projectM-2.1.0-SUSE_misc.patch projectM-2.1.0-no-return-in-nonvoid.patch projectM-complete-2.1.0-Source.tar.gz projectM-qt5.changes projectM-qt5.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ projectM-qt5.spec ++++++ # # spec file for package projectM-qt5 # # Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # %define _isqt5 1 %define _oname projectM # Do not edit this auto generated file! Edit projectM.spec Name: projectM-qt5 Version: 2.1.0 Release: 0 Summary: An Awesome Music Visualizer License: LGPL-2.1+ Group: Productivity/Multimedia/Sound/Visualization Url: http://projectm.sourceforge.net Source0: https://sourceforge.net/projects/projectm/files/%{version}/%{_oname}-complete-%{version}-Source.tar.gz # PATCH-FIX-UPSTREAM projectM-2.1.0-fix-isnan-gcc6.patch -- fix build with GCC6 (patch from upstream development branch) Patch0: projectM-2.1.0-fix-isnan-gcc6.patch # PATCH-FIX-OPENSUSE projectM-2.1.0-no-return-in-nonvoid.patch -- fix rpmlint warning Patch1: projectM-2.1.0-no-return-in-nonvoid.patch # PATCH-FIX-OPENSUSE projectM-2.1.0-SUSE_misc.patch -- address a few SUSE-specific issues Patch2: projectM-2.1.0-SUSE_misc.patch %if 0%{?_isqt5} # PATCH-FIX-OPENSUSE projectM-2.1.0-Qt5.patch -- build against Qt5 libraries Patch3: projectM-2.1.0-Qt5.patch %endif BuildRequires: cmake BuildRequires: fdupes BuildRequires: ftgl-devel BuildRequires: glew-devel BuildRequires: libSDL-devel BuildRequires: libpulse-devel BuildRequires: libsndfile-devel BuildRequires: libvisual-devel BuildRequires: pkgconfig %if 0%{?_isqt5} BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5OpenGL) BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(Qt5Xml) %else BuildRequires: libqt4-devel %endif Recommends: %{name}-data = %{version} %description projectM%{?_isqt5:-qt5} is an awesome music visualizer. %package -n lib%{_oname}%{?_isqt5:-qt5-}2 Summary: Run-time Libraries for ProjectM%{?_isqt5:-qt5} Group: System/Libraries %description -n lib%{_oname}%{?_isqt5:-qt5-}2 projectM%{?_isqt5:-qt5} is an awesome music visualizer. This package contains its runtime libraries. %package -n lib%{_oname}-qt%{?_isqt5:-qt5-}1 Summary: Qt Run-time Libraries for ProjectM%{?_isqt5:-qt5} Group: System/Libraries %description -n lib%{_oname}-qt%{?_isqt5:-qt5-}1 projectM%{?_isqt5:-qt5} is an awesome music visualizer. This package contains its qt runtime libraries. %package -n lib%{_oname}-libvisual%{?_isqt5:-qt5} Summary: Libvisual Collaboration for ProjectM%{?_isqt5:-qt5} Group: System/Libraries %description -n lib%{_oname}-libvisual%{?_isqt5:-qt5} projectM%{?_isqt5:-qt5} is an awesome music visualizer. This package contains its libvisual collaboration libraries. %package data Summary: Data files for ProjectM%{?_isqt5:-qt5} Group: Productivity/Multimedia/Sound/Visualization Requires: %{name} = %{version} Requires: dejavu %description data projectM%{?_isqt5:-qt5} is an awesome music visualizer. This package contains its data: config, presets, shaders. %package devel Summary: Development Files for ProjectM%{?_isqt5:-qt5} Group: Development/Libraries/C and C++ Requires: %{name} = %{version} Requires: %{name}-data = %{version} Requires: lib%{_oname}%{?_isqt5:-qt5-}2 = %{version} Requires: lib%{_oname}-qt%{?_isqt5:-qt5-}1 = %{version} %description devel projectM%{?_isqt5:-qt5} is an awesome music visualizer. This package contains its development files. %prep %setup -q -n %{_oname}-complete-%{version}-Source %patch0 -p1 %patch1 -p1 %patch2 -p1 %if 0%{?_isqt5} %patch3 -p1 %endif rm -r src/WinLibs # legal issues, see bnc#738417, we don't need that whole tree %build #projectM-test has runtime problems, I don't know how to fix it, so I disable it %cmake -DINCLUDE-PROJECTM-TEST=OFF make %{?_smp_mflags} %install %cmake_install find %{buildroot} -name *.la -delete %fdupes %{buildroot} %post -n lib%{_oname}%{?_isqt5:-qt5-}2 -p /sbin/ldconfig %post -n lib%{_oname}-qt%{?_isqt5:-qt5-}1 -p /sbin/ldconfig %post -n lib%{_oname}-libvisual%{?_isqt5:-qt5} -p /sbin/ldconfig %postun -n lib%{_oname}%{?_isqt5:-qt5-}2 -p /sbin/ldconfig %postun -n lib%{_oname}-qt%{?_isqt5:-qt5-}1 -p /sbin/ldconfig %postun -n lib%{_oname}-libvisual%{?_isqt5:-qt5} -p /sbin/ldconfig %files %defattr(-,root,root) %{_bindir}/%{_oname}-pulseaudio%{?_isqt5:-qt5} %{_datadir}/applications/%{_oname}-pulseaudio%{?_isqt5:-qt5}.desktop %{_datadir}/pixmaps/* %files -n lib%{_oname}%{?_isqt5:-qt5-}2 %defattr(-,root,root) %{_libdir}/lib%{_oname}%{?_isqt5:-qt5}.so.%{version} %files -n lib%{_oname}-qt%{?_isqt5:-qt5-}1 %defattr(-,root,root) %{_libdir}/lib%{_oname}-qt%{?_isqt5:-qt5}.so.1.10 %files -n lib%{_oname}-libvisual%{?_isqt5:-qt5} %defattr(-,root,root) %{_libdir}/libvisual-0.4%{?_isqt5:-qt5}/ %files data %defattr(-,root,root) %{_datadir}/%{name}/ %files devel %defattr(-,root,root) %{_includedir}/lib%{_oname}%{?_isqt5:-qt5} %{_includedir}/lib%{_oname}-qt%{?_isqt5:-qt5} %{_libdir}/lib%{_oname}%{?_isqt5:-qt5}.so %{_libdir}/lib%{_oname}%{?_isqt5:-qt5}.so.2 %{_libdir}/lib%{_oname}-qt%{?_isqt5:-qt5}.so %{_libdir}/lib%{_oname}-qt%{?_isqt5:-qt5}.so.1 %{_libdir}/pkgconfig/* %changelog ++++++ projectM.spec ++++++ --- /var/tmp/diff_new_pack.egfnxh/_old 2017-07-30 11:22:24.771449078 +0200 +++ /var/tmp/diff_new_pack.egfnxh/_new 2017-07-30 11:22:24.779447950 +0200 @@ -1,7 +1,7 @@ # # spec file for package projectM # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,6 +16,8 @@ # +%undefine _isqt5 +%define _oname projectM Name: projectM Version: 2.1.0 Release: 0 @@ -23,137 +25,130 @@ License: LGPL-2.1+ Group: Productivity/Multimedia/Sound/Visualization Url: http://projectm.sourceforge.net -Source0: %{name}-%{version}.tar.bz2 -Source1: FindGLEW.cmake +Source0: https://sourceforge.net/projects/projectm/files/%{version}/%{_oname}-complete-%{version}-Source.tar.gz # PATCH-FIX-UPSTREAM projectM-2.1.0-fix-isnan-gcc6.patch -- fix build with GCC6 (patch from upstream development branch) Patch0: projectM-2.1.0-fix-isnan-gcc6.patch +# PATCH-FIX-OPENSUSE projectM-2.1.0-no-return-in-nonvoid.patch -- fix rpmlint warning +Patch1: projectM-2.1.0-no-return-in-nonvoid.patch +# PATCH-FIX-OPENSUSE projectM-2.1.0-SUSE_misc.patch -- address a few SUSE-specific issues +Patch2: projectM-2.1.0-SUSE_misc.patch +%if 0%{?_isqt5} +# PATCH-FIX-OPENSUSE projectM-2.1.0-Qt5.patch -- build against Qt5 libraries +Patch3: projectM-2.1.0-Qt5.patch +%endif BuildRequires: cmake BuildRequires: fdupes BuildRequires: ftgl-devel BuildRequires: glew-devel BuildRequires: libSDL-devel BuildRequires: libpulse-devel -BuildRequires: libqt4-devel BuildRequires: libsndfile-devel BuildRequires: libvisual-devel -BuildRequires: update-desktop-files +BuildRequires: pkgconfig +%if 0%{?_isqt5} +BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5OpenGL) +BuildRequires: pkgconfig(Qt5Widgets) +BuildRequires: pkgconfig(Qt5Xml) +%else +BuildRequires: libqt4-devel +%endif Recommends: %{name}-data = %{version} -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -projectM is an awesome music visualizer. +projectM%{?_isqt5:-qt5} is an awesome music visualizer. -%package -n lib%{name}2 -Summary: Run-time Libraries for ProjectM +%package -n lib%{_oname}%{?_isqt5:-qt5-}2 +Summary: Run-time Libraries for ProjectM%{?_isqt5:-qt5} Group: System/Libraries -%description -n lib%{name}2 -projectM is an awesome music visualizer. +%description -n lib%{_oname}%{?_isqt5:-qt5-}2 +projectM%{?_isqt5:-qt5} is an awesome music visualizer. This package contains its runtime libraries. -%package -n lib%{name}-qt1 -Summary: Qt Run-time Libraries for ProjectM +%package -n lib%{_oname}-qt%{?_isqt5:-qt5-}1 +Summary: Qt Run-time Libraries for ProjectM%{?_isqt5:-qt5} Group: System/Libraries -%description -n lib%{name}-qt1 -projectM is an awesome music visualizer. +%description -n lib%{_oname}-qt%{?_isqt5:-qt5-}1 +projectM%{?_isqt5:-qt5} is an awesome music visualizer. This package contains its qt runtime libraries. -%package -n lib%{name}-libvisual -Summary: Libvisual Collaboration for ProjectM +%package -n lib%{_oname}-libvisual%{?_isqt5:-qt5} +Summary: Libvisual Collaboration for ProjectM%{?_isqt5:-qt5} Group: System/Libraries -%description -n lib%{name}-libvisual -projectM is an awesome music visualizer. +%description -n lib%{_oname}-libvisual%{?_isqt5:-qt5} +projectM%{?_isqt5:-qt5} is an awesome music visualizer. This package contains its libvisual collaboration libraries. %package data -Summary: Data files for ProjectM +Summary: Data files for ProjectM%{?_isqt5:-qt5} Group: Productivity/Multimedia/Sound/Visualization Requires: %{name} = %{version} Requires: dejavu %description data -projectM is an awesome music visualizer. +projectM%{?_isqt5:-qt5} is an awesome music visualizer. This package contains its data: config, presets, shaders. %package devel -Summary: Development Files for ProjectM +Summary: Development Files for ProjectM%{?_isqt5:-qt5} Group: Development/Libraries/C and C++ Requires: %{name} = %{version} Requires: %{name}-data = %{version} -Requires: lib%{name}-qt1 = %{version} -Requires: lib%{name}2 = %{version} +Requires: lib%{_oname}%{?_isqt5:-qt5-}2 = %{version} +Requires: lib%{_oname}-qt%{?_isqt5:-qt5-}1 = %{version} %description devel -projectM is an awesome music visualizer. +projectM%{?_isqt5:-qt5} is an awesome music visualizer. This package contains its development files. %prep -%setup -q +%setup -q -n %{_oname}-complete-%{version}-Source %patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%if 0%{?_isqt5} +%patch3 -p1 +%endif rm -r src/WinLibs # legal issues, see bnc#738417, we don't need that whole tree %build -mkdir -pv src/build -cp -r %{SOURCE1} src/projectM-pulseaudio/ -pushd src/build - -if [ %{_lib} = lib64 ]; then - EXTRA_FLAGS="$EXTRA_FLAGS -DLIB_SUFFIX=64" -fi - -#projectM-test has link problems, I don't know how to fix, so disable it -cmake -DCMAKE_INSTALL_PREFIX=/usr $EXTRA_FLAGS \ - -DINCLUDE-PROJECTM-TEST=OFF \ - .. - +#projectM-test has runtime problems, I don't know how to fix it, so I disable it +%cmake -DINCLUDE-PROJECTM-TEST=OFF make %{?_smp_mflags} %install -pushd src/build -%make_install -popd +%cmake_install +find %{buildroot} -name *.la -delete %fdupes %{buildroot} -%suse_update_desktop_file -n %{buildroot}%{_datadir}/applications/%{name}-pulseaudio.desktop Mixer - -%if "%{_lib}" == "lib64" -mv %{buildroot}%{_prefix}/lib/* %{buildroot}%{_libdir} -%endif - -sed -i 's:^Title Font.*$:Title Font = /usr/share/fonts/truetype/DejaVuSans.ttf:' %{buildroot}%{_datadir}/projectM/config.inp -sed -i 's:^Menu Font.*$:Menu Font = /usr/share/fonts/truetype/DejaVuSansMono.ttf:' %{buildroot}%{_datadir}/projectM/config.inp - -%clean -rm -rf %{buildroot} -%post -n lib%{name}2 -p /sbin/ldconfig -%post -n lib%{name}-qt1 -p /sbin/ldconfig -%post -n lib%{name}-libvisual -p /sbin/ldconfig -%postun -n lib%{name}2 -p /sbin/ldconfig -%postun -n lib%{name}-qt1 -p /sbin/ldconfig -%postun -n lib%{name}-libvisual -p /sbin/ldconfig +%post -n lib%{_oname}%{?_isqt5:-qt5-}2 -p /sbin/ldconfig +%post -n lib%{_oname}-qt%{?_isqt5:-qt5-}1 -p /sbin/ldconfig +%post -n lib%{_oname}-libvisual%{?_isqt5:-qt5} -p /sbin/ldconfig +%postun -n lib%{_oname}%{?_isqt5:-qt5-}2 -p /sbin/ldconfig +%postun -n lib%{_oname}-qt%{?_isqt5:-qt5-}1 -p /sbin/ldconfig +%postun -n lib%{_oname}-libvisual%{?_isqt5:-qt5} -p /sbin/ldconfig %files %defattr(-,root,root) -%{_bindir}/%{name}-pulseaudio -#%{_bindir}/%{name}-test -#%{_bindir}/%{name}-test-texture -%{_datadir}/applications/%{name}-pulseaudio.desktop +%{_bindir}/%{_oname}-pulseaudio%{?_isqt5:-qt5} +%{_datadir}/applications/%{_oname}-pulseaudio%{?_isqt5:-qt5}.desktop %{_datadir}/pixmaps/* -%files -n lib%{name}2 +%files -n lib%{_oname}%{?_isqt5:-qt5-}2 %defattr(-,root,root) -%{_libdir}/lib%{name}.so.%{version} +%{_libdir}/lib%{_oname}%{?_isqt5:-qt5}.so.%{version} -%files -n lib%{name}-qt1 +%files -n lib%{_oname}-qt%{?_isqt5:-qt5-}1 %defattr(-,root,root) -%{_libdir}/lib%{name}-qt.so.1.10 +%{_libdir}/lib%{_oname}-qt%{?_isqt5:-qt5}.so.1.10 -%files -n lib%{name}-libvisual +%files -n lib%{_oname}-libvisual%{?_isqt5:-qt5} %defattr(-,root,root) -%{_libdir}/libvisual-0.4/ +%{_libdir}/libvisual-0.4%{?_isqt5:-qt5}/ %files data %defattr(-,root,root) @@ -161,12 +156,12 @@ %files devel %defattr(-,root,root) -%{_includedir}/lib%{name} -%{_includedir}/lib%{name}-qt/ -%{_libdir}/lib%{name}.so -%{_libdir}/lib%{name}.so.2 -%{_libdir}/lib%{name}-qt.so -%{_libdir}/lib%{name}-qt.so.1 +%{_includedir}/lib%{_oname}%{?_isqt5:-qt5} +%{_includedir}/lib%{_oname}-qt%{?_isqt5:-qt5} +%{_libdir}/lib%{_oname}%{?_isqt5:-qt5}.so +%{_libdir}/lib%{_oname}%{?_isqt5:-qt5}.so.2 +%{_libdir}/lib%{_oname}-qt%{?_isqt5:-qt5}.so +%{_libdir}/lib%{_oname}-qt%{?_isqt5:-qt5}.so.1 %{_libdir}/pkgconfig/* %changelog ++++++ pre_checkin.sh ++++++ #! /bin/sh cp projectM.changes projectM-qt5.changes sed -e '/^%undefine *_isqt5/c%define _isqt5 1' -e '/^# spec/s/projectM/projectM-qt5/' \ -e 's/\(^Name: *\)projectM.*/\1projectM-qt5/' \ projectM.spec > projectM-qt5.spec sed -e '/^Name:/i # Do not edit this auto generated file! Edit projectM.spec' \ -i projectM-qt5.spec ++++++ projectM-2.1.0-Qt5.patch ++++++ ++++ 714 lines (skipped) ++++++ projectM-2.1.0-SUSE_misc.patch ++++++ From: Luigi Baldoni <aloi...@gmx.com> Date: 2017-07-23 08:16:42 +0200 Subject: Fix a number of SUSE-specific quirks Set correct paths, fonts, desktop categories and remove warnings Index: projectM-complete-2.1.0-Source/src/libprojectM/CMakeLists.txt =================================================================== --- projectM-complete-2.1.0-Source.orig/src/libprojectM/CMakeLists.txt +++ projectM-complete-2.1.0-Source/src/libprojectM/CMakeLists.txt @@ -33,9 +33,9 @@ set(PROJECTM_VERSION 2.1.0) set(PROJECTM_ABI_LEVEL 2) # -ADD_DEFINITIONS(-DCMAKE_INSTALL_PREFIX="\\\"${CMAKE_INSTALL_PREFIX}\\\"") +ADD_DEFINITIONS(-DCMAKE_INSTALL_PREFIX="${CMAKE_INSTALL_PREFIX}") -SET(LIB_INSTALL_DIR "\${exec_prefix}/lib" +SET(LIB_INSTALL_DIR "\${exec_prefix}/lib${LIB_SUFFIX}" CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is /lib)" FORCE) @@ -109,7 +109,6 @@ else(BUILD_PROJECTM_STATIC) ADD_LIBRARY(projectM SHARED ${projectM_SOURCES}) endif(BUILD_PROJECTM_STATIC) -set_property(TARGET projectM PROPERTY LINK_INTERFACE_LIBRARIES "") set_property(TARGET projectM PROPERTY IMPORTED_LINK_DEPENDENT_LIBRARIES "") SET_TARGET_PROPERTIES(projectM PROPERTIES VERSION ${PROJECTM_VERSION} SOVERSION ${PROJECTM_ABI_LEVEL}) @@ -215,10 +214,10 @@ else(BUILD_PROJECTM_STATIC) ) endif(BUILD_PROJECTM_STATIC) -SET(projectM_FONT_MENU "${CMAKE_INSTALL_PREFIX}/${RESOURCE_PREFIX}/fonts/VeraMono.ttf" CACHE FILEPATH "Path to the default menu TrueType font") -SET(projectM_FONT_TITLE "${CMAKE_INSTALL_PREFIX}/${RESOURCE_PREFIX}/fonts/Vera.ttf" CACHE FILEPATH "Path to the default title TrueType font") -ADD_DEFINITIONS(-DprojectM_FONT_MENU="\\\"${projectM_FONT_MENU}\\\"") -ADD_DEFINITIONS(-DprojectM_FONT_TITLE="\\\"${projectM_FONT_TITLE}\\\"") +SET(projectM_FONT_MENU "/usr/share/fonts/truetype/DejaVuSansMono.ttf") +SET(projectM_FONT_TITLE "/usr/share/fonts/truetype/DejaVuSans.ttf") +ADD_DEFINITIONS(-DprojectM_FONT_MENU="${projectM_FONT_MENU}") +ADD_DEFINITIONS(-DprojectM_FONT_TITLE="${projectM_FONT_TITLE}") CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/libprojectM.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/libprojectM.pc" @ONLY) CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/config.inp.in" "${CMAKE_CURRENT_BINARY_DIR}/config.inp" @ONLY) @@ -234,7 +233,7 @@ ENDIF(projectM_FONT_MENU MATCHES "${CMAK FILE(GLOB presets "presets/*.milk" "presets/*.prjm" "presets/*.tga") INSTALL(FILES ${presets} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM/presets) INSTALL(FILES ${Renderer_SOURCE_DIR}/projectM.cg ${Renderer_SOURCE_DIR}/blur.cg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM/shaders) -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libprojectM.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig) +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libprojectM.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig) INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/config.inp DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM) INSTALL(FILES projectM.hpp event.h dlldefs.h fatal.h PCM.hpp Common.hpp DESTINATION include/libprojectM) -INSTALL(TARGETS projectM DESTINATION lib) +INSTALL(TARGETS projectM DESTINATION lib${LIB_SUFFIX}) Index: projectM-complete-2.1.0-Source/src/projectM-qt/CMakeLists.txt =================================================================== --- projectM-complete-2.1.0-Source.orig/src/projectM-qt/CMakeLists.txt +++ projectM-complete-2.1.0-Source/src/projectM-qt/CMakeLists.txt @@ -111,7 +111,6 @@ else(BUILD_PROJECTM_QT_STATIC) ADD_LIBRARY(projectM-qt SHARED ${projectM-qt_SRCS} ${projectM-qt_RC_SRCS} ${projectM-qt_MOC_SRCS} ${projectM-qt_UIS_H}) endif(BUILD_PROJECTM_QT_STATIC) -set_property(TARGET projectM-qt PROPERTY LINK_INTERFACE_LIBRARIES "") set_property(TARGET projectM-qt PROPERTY IMPORTED_LINK_DEPENDENT_LIBRARIES "") SET_TARGET_PROPERTIES(projectM-qt PROPERTIES VERSION ${PROJECTM_QT_VERSION} SOVERSION ${PROJECTM_QT_ABI_LEVEL}) @@ -131,6 +130,6 @@ include_directories(${PROJECTM_INCLUDE} target_link_libraries(projectM-qt projectM GLEW GL ${QT_QTGUI_LIBRARIES} ${QT_QTOPENGL_LIBRARIES} ${QT_QTXML_LIBRARIES} ${QT_LIBRARIES}) install(FILES qprojectm_mainwindow.hpp DESTINATION include/libprojectM-qt) -install(TARGETS projectM-qt DESTINATION lib) -install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libprojectM-qt.pc" DESTINATION lib/pkgconfig) +install(TARGETS projectM-qt DESTINATION lib${LIB_SUFFIX}) +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libprojectM-qt.pc" DESTINATION lib${LIB_SUFFIX}/pkgconfig) install(FILES "images/icons/prjm16-transparent.svg" DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps) Index: projectM-complete-2.1.0-Source/src/projectM-pulseaudio/projectM-pulseaudio.desktop =================================================================== --- projectM-complete-2.1.0-Source.orig/src/projectM-pulseaudio/projectM-pulseaudio.desktop +++ projectM-complete-2.1.0-Source/src/projectM-pulseaudio/projectM-pulseaudio.desktop @@ -6,4 +6,4 @@ Exec=projectM-pulseaudio Icon=prjm16-transparent Terminal=false Type=Application -Categories=AudioVideo;Audio; +Categories=AudioVideo;Audio;Mixer; Index: projectM-complete-2.1.0-Source/src/projectM-libvisual/CMakeLists.txt =================================================================== --- projectM-complete-2.1.0-Source.orig/src/projectM-libvisual/CMakeLists.txt +++ projectM-complete-2.1.0-Source/src/projectM-libvisual/CMakeLists.txt @@ -3,6 +3,10 @@ cmake_minimum_required(VERSION 2.4.0) INCLUDE(cmake/CPack-projectM.cmake) +if(COMMAND cmake_policy) + cmake_policy(SET CMP0003 NEW) +endif(COMMAND cmake_policy) + ADD_LIBRARY(projectM_libvisual SHARED actor_projectM.cpp lvtoprojectM.h ConfigFile.h ConfigFile.cpp) INCLUDE(FindPkgConfig.cmake) Index: projectM-complete-2.1.0-Source/src/libprojectM/libprojectM.pc.in =================================================================== --- projectM-complete-2.1.0-Source.orig/src/libprojectM/libprojectM.pc.in +++ projectM-complete-2.1.0-Source/src/libprojectM/libprojectM.pc.in @@ -10,4 +10,4 @@ Version: @PROJECTM_VERSION@ Description: projectM - OpenGL Milkdrop Requires: Libs: -L${libdir} -lprojectM -Cflags: -I${includedir} +Cflags: -I${includedir}/libprojectM Index: projectM-complete-2.1.0-Source/src/projectM-qt/libprojectM-qt.pc.in =================================================================== --- projectM-complete-2.1.0-Source.orig/src/projectM-qt/libprojectM-qt.pc.in +++ projectM-complete-2.1.0-Source/src/projectM-qt/libprojectM-qt.pc.in @@ -9,5 +9,5 @@ Name: libprojectM-qt Version: 1.2.0 Description: projectM-qt provides a full featured Qt4 graphical user interface to projectM Requires: libprojectM QtCore QtGui QtXml QtOpenGL -+Libs: -L${libdir} -lprojectM-qt -+Cflags: -I${includedir} +Libs: -L${libdir} -lprojectM-qt +Cflags: -I${includedir}/libprojectM-qt ++++++ projectM-2.1.0-no-return-in-nonvoid.patch ++++++ From: Luigi Baldoni <aloi...@gmx.com> Date: 2017-07-23 08:14:18 +0200 Subject: Fix rpmlint warning Add return value to non-void function template Index: projectM-complete-2.1.0-Source/src/projectM-qt/nullable.hpp =================================================================== --- projectM-complete-2.1.0-Source.orig/src/projectM-qt/nullable.hpp +++ projectM-complete-2.1.0-Source/src/projectM-qt/nullable.hpp @@ -31,6 +31,8 @@ class Nullable { Nullable & operator=(const Value & value) { m_value = value; m_hasValue = true; + static Nullable tmp = 0; + return tmp; } void nullify() {
