From 3cad037c34417016e9c3116edd4ce8f3d2a78fd8 Mon Sep 17 00:00:00 2001 From: Sérgio M. Basto Date: Mar 19 2016 00:23:11 +0000 Subject: Update to 2.0.1 . - deleted: 01-change-texture-size.patch, upstreamed. - deleted: 04-change-preset-duration.patch, upstreamed. - deleted: libprojectM-USE_THREADS.patch, configurable. - deleted: libprojectM-soname.patch, configurable. - deleted: libprojectM-fonts.patch, configurable. - deleted: libprojectM-freetype25.patch, it is build well with freetype. - Add patch to fix FTBFS with GCC6, courtesy of Ralf Corsepius. - Add as sub packages: libprojectM-qt, libprojectM-qt-devel, projectM-jack, projectM-libvisual and projectM-pulseaudio. - Also checked that remove_pulse_browser_h.patch, projectM-pulseaudio-stat.patch and projectM-libvisual-gcc46.patch are upstreamed. - Add libprojectM-2.1.0-paths.patch and libprojectM-qt-2.1.0-paths.patch, to fix _libdir paths - Using fedora-review fixed: mix tabs and spaces, unused-direct-shlib-dependency, wrong-script-end-of-line-encoding and spurious-executable-perm. --- diff --git a/.gitignore b/.gitignore index 22e126a..af2b776 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ libprojectM-2.0.1.tar.bz2 +/projectM-complete-2.1.0-Source.tar.gz diff --git a/01-change-texture-size.patch b/01-change-texture-size.patch deleted file mode 100644 index a56cc09..0000000 --- a/01-change-texture-size.patch +++ /dev/null @@ -1,33 +0,0 @@ -Index: projectM.cpp -=================================================================== ---- projectM.cpp (revision 1048) -+++ projectM.cpp (revision 1049) -@@ -907,3 +907,13 @@ - } - - -+void projectM::changeTextureSize(int size) { -+ _settings.textureSize = size; -+ -+ delete renderer; -+ renderer = new Renderer(_settings.windowWidth, _settings.windowHeight, -+ _settings.meshX, _settings.meshY, -+ _settings.textureSize, beatDetect, _settings.presetURL, -+ _settings.titleFontURL, _settings.menuFontURL); -+} -+ -Index: projectM.hpp -=================================================================== ---- projectM.hpp (revision 1048) -+++ projectM.hpp (revision 1049) -@@ -153,9 +153,9 @@ - virtual ~projectM(); - - -+ void changeTextureSize(int size); - - -- - const Settings & settings() const { - return _settings; - } diff --git a/04-change-preset-duration.patch b/04-change-preset-duration.patch deleted file mode 100644 index 4df146b..0000000 --- a/04-change-preset-duration.patch +++ /dev/null @@ -1,37 +0,0 @@ -Index: TimeKeeper.hpp -=================================================================== ---- TimeKeeper.hpp (revision 1063) -+++ TimeKeeper.hpp (revision 1064) -@@ -37,6 +37,8 @@ - - double sampledPresetDuration(); - -+ void ChangePresetDuration(int seconds) { _presetDuration = seconds; } -+ - #ifndef WIN32 - /* The first ticks value of the application */ - struct timeval startTime; -Index: projectM.cpp -=================================================================== ---- projectM.cpp (revision 1063) -+++ projectM.cpp (revision 1064) -@@ -917,3 +917,7 @@ - _settings.titleFontURL, _settings.menuFontURL); - } - -+void projectM::changePresetDuration(int seconds) { -+ timeKeeper->ChangePresetDuration(seconds); -+} -+ -Index: projectM.hpp -=================================================================== ---- projectM.hpp (revision 1063) -+++ projectM.hpp (revision 1064) -@@ -154,6 +154,7 @@ - - - void changeTextureSize(int size); -+ void changePresetDuration(int seconds); - - - const Settings & settings() const { diff --git a/libprojectM-2.1.0-paths.patch b/libprojectM-2.1.0-paths.patch new file mode 100644 index 0000000..a1dd3ba --- /dev/null +++ b/libprojectM-2.1.0-paths.patch @@ -0,0 +1,24 @@ +--- projectM-complete-2.1.0-Source/src/libprojectM/CMakeLists.txt.orig 2012-05-19 23:43:26.000000000 -0400 ++++ projectM-complete-2.1.0-Source/src/libprojectM/CMakeLists.txt 2014-05-21 15:52:59.847413848 -0400 +@@ -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) + +@@ -234,7 +234,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}) diff --git a/libprojectM-USE_THREADS.patch b/libprojectM-USE_THREADS.patch deleted file mode 100644 index e83fff3..0000000 --- a/libprojectM-USE_THREADS.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Naur libprojectM-2.0.1-orig/CMakeLists.txt libprojectM-2.0.1/CMakeLists.txt ---- libprojectM-2.0.1-orig/CMakeLists.txt 2010-02-08 09:11:11.000000000 -0500 -+++ libprojectM-2.0.1/CMakeLists.txt 2010-02-08 09:20:37.000000000 -0500 -@@ -112,7 +112,7 @@ - - SET_TARGET_PROPERTIES(projectM PROPERTIES VERSION 2.0.1 SOVERSION 2.0.1) - --ADD_DEFINITIONS(-DUSE_THREADS) -+#ADD_DEFINITIONS(-DUSE_THREADS) - - if (APPLE) - ADD_DEFINITIONS(-DMACOS -DSTBI_NO_DDS -DUSE_THREADS) -@@ -123,7 +123,7 @@ - ADD_DEFINITIONS(-DWIN32 -DSTBI_NO_DDS -DUSE_THREADS) - else(WIN32) - set (RESOURCE_PREFIX "share/projectM") --ADD_DEFINITIONS(-DLINUX -DSTBI_NO_DDS -DUSE_THREADS) -+ADD_DEFINITIONS(-DLINUX -DSTBI_NO_DDS) - endif(WIN32) - endif(APPLE) - diff --git a/libprojectM-c++14.patch b/libprojectM-c++14.patch new file mode 100644 index 0000000..8cb409a --- /dev/null +++ b/libprojectM-c++14.patch @@ -0,0 +1,61 @@ +diff -x '*orig' -rup projectM-complete-2.1.0-Source/src/libprojectM/Common.hpp projectM-complete-2.1.0-Source.new/src/libprojectM/Common.hpp +--- projectM-complete-2.1.0-Source/src/libprojectM/Common.hpp 2012-05-20 04:43:26.000000000 +0100 ++++ projectM-complete-2.1.0-Source.new/src/libprojectM/Common.hpp 2016-03-17 05:00:14.176905540 +0000 +@@ -63,7 +63,8 @@ extern FILE *fmemopen(void *buf, size_t + + #ifdef LINUX + #include +-#define projectM_isnan isnan ++#include ++#define projectM_isnan std::isnan + + #endif + +diff -x '*orig' -rup projectM-complete-2.1.0-Source/src/libprojectM/MilkdropPresetFactory/Parser.cpp projectM-complete-2.1.0-Source.new/src/libprojectM/MilkdropPresetFactory/Parser.cpp +--- projectM-complete-2.1.0-Source/src/libprojectM/MilkdropPresetFactory/Parser.cpp 2012-05-20 04:43:26.000000000 +0100 ++++ projectM-complete-2.1.0-Source.new/src/libprojectM/MilkdropPresetFactory/Parser.cpp 2016-03-17 05:00:14.177905556 +0000 +@@ -1406,7 +1406,7 @@ PerFrameEqn * Parser::parse_implicit_per + PerFrameEqn * per_frame_eqn; + GenExpr * gen_expr; + +- if (fs == NULL) ++ if (!fs) + return NULL; + if (param_string == NULL) + return NULL; +@@ -1561,7 +1561,7 @@ InitCond * Parser::parse_per_frame_init_ + + if (preset == NULL) + return NULL; +- if (fs == NULL) ++ if (!fs) + return NULL; + + if ((token = parseToken(fs, name)) != tEq) +@@ -1875,7 +1875,7 @@ int Parser::parse_shapecode(char * token + /* Null argument checks */ + if (preset == NULL) + return PROJECTM_FAILURE; +- if (fs == NULL) ++ if (!fs) + return PROJECTM_FAILURE; + if (token == NULL) + return PROJECTM_FAILURE; +@@ -2166,7 +2166,7 @@ int Parser::parse_wave(char * token, std + + if (token == NULL) + return PROJECTM_FAILURE; +- if (fs == NULL) ++ if (!fs) + return PROJECTM_FAILURE; + if (preset == NULL) + return PROJECTM_FAILURE; +@@ -2348,7 +2348,7 @@ int Parser::parse_shape(char * token, st + if (token == NULL) + + return PROJECTM_FAILURE; +- if (fs == NULL) ++ if (!fs) + return PROJECTM_FAILURE; + if (preset == NULL) + return PROJECTM_FAILURE; diff --git a/libprojectM-fonts.patch b/libprojectM-fonts.patch deleted file mode 100644 index f8c7800..0000000 --- a/libprojectM-fonts.patch +++ /dev/null @@ -1,90 +0,0 @@ -diff -Nur libprojectM-2.0.1-orig/CMakeLists.txt libprojectM-2.0.1/CMakeLists.txt ---- libprojectM-2.0.1-orig/CMakeLists.txt 2009-12-06 02:42:51.000000000 +0100 -+++ libprojectM-2.0.1/CMakeLists.txt 2012-06-01 12:47:47.280267225 +0200 -@@ -190,8 +190,6 @@ - - FILE(GLOB presets "presets/*.milk" "presets/*.prjm" "presets/*.tga") - INSTALL(FILES ${presets} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM/presets) --FILE(GLOB fonts "fonts/*.ttf") --INSTALL(FILES ${fonts} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM/fonts) - INSTALL(FILES ${Renderer_SOURCE_DIR}/projectM.cg ${Renderer_SOURCE_DIR}/blur.cg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM/shaders) - INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/libprojectM.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig) - INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/config.inp DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM) -diff -Nur libprojectM-2.0.1-orig/config.inp.in libprojectM-2.0.1/config.inp.in ---- libprojectM-2.0.1-orig/config.inp.in 2009-12-06 02:42:51.000000000 +0100 -+++ libprojectM-2.0.1/config.inp.in 2012-06-01 12:47:47.281267174 +0200 -@@ -17,6 +17,6 @@ - Aspect Correction = true # Custom Shape Aspect Correction - - Preset Path = @CMAKE_INSTALL_PREFIX@/@RESOURCE_PREFIX@/presets # preset location --Title Font = @CMAKE_INSTALL_PREFIX@/@RESOURCE_PREFIX@/fonts/Vera.ttf --Menu Font = @CMAKE_INSTALL_PREFIX@/@RESOURCE_PREFIX@/fonts/VeraMono.ttf -+Title Font = @CMAKE_INSTALL_PREFIX@__FEDORA_TITLE_FONT__ -+Menu Font = @CMAKE_INSTALL_PREFIX@__FEDORA_MENU_FONT__ - -diff -Nur libprojectM-2.0.1-orig/projectM.cpp libprojectM-2.0.1/projectM.cpp ---- libprojectM-2.0.1-orig/projectM.cpp 2009-12-06 02:42:51.000000000 +0100 -+++ libprojectM-2.0.1/projectM.cpp 2012-06-01 12:48:18.322584982 +0200 -@@ -30,6 +30,7 @@ - - #include "timer.h" - #include -+#include - #ifdef LINUX - #include "time.h" - #endif -@@ -163,6 +164,13 @@ - - - -+bool _fileExists(const std::string& path) { -+ std::ifstream f(path.c_str()); -+ return f; -+} -+ -+ -+ - void projectM::readConfig (const std::string & configFile ) - { - std::cout << "[projectM] config file: " << configFile << std::endl; -@@ -199,10 +207,20 @@ - #endif - - #ifdef LINUX -+ string titleFont = CMAKE_INSTALL_PREFIX "__FEDORA_TITLE_FONT__"; -+ string menuFont = CMAKE_INSTALL_PREFIX "__FEDORA_MENU_FONT__"; - _settings.titleFontURL = config.read -- ( "Title Font", CMAKE_INSTALL_PREFIX "/share/projectM/fonts/Vera.ttf" ); -+ ( "Title Font", titleFont ); - _settings.menuFontURL = config.read -- ( "Menu Font", CMAKE_INSTALL_PREFIX "/share/projectM/fonts/VeraMono.ttf" ); -+ ( "Menu Font", menuFont ); -+ if ( !_fileExists(_settings.titleFontURL) ) { -+ std::cerr << "NOT FOUND: " << _settings.titleFontURL << std::endl; -+ _settings.titleFontURL = titleFont; -+ } -+ if ( !_fileExists(_settings.menuFontURL) ) { -+ std::cerr << "NOT FOUND: " << _settings.menuFontURL << std::endl; -+ _settings.menuFontURL = menuFont; -+ } - #endif - - #ifdef WIN32 -@@ -251,6 +269,17 @@ - _settings.menuFontURL = settings.menuFontURL; - _settings.shuffleEnabled = settings.shuffleEnabled; - -+ string titleFont = CMAKE_INSTALL_PREFIX "__FEDORA_TITLE_FONT__"; -+ string menuFont = CMAKE_INSTALL_PREFIX "__FEDORA_MENU_FONT__"; -+ if ( !_fileExists(_settings.titleFontURL) ) { -+ std::cerr << "NOT FOUND: " << _settings.titleFontURL << std::endl; -+ _settings.titleFontURL = titleFont; -+ } -+ if ( !_fileExists(_settings.menuFontURL) ) { -+ std::cerr << "NOT FOUND: " << _settings.menuFontURL << std::endl; -+ _settings.menuFontURL = menuFont; -+ } -+ - _settings.easterEgg = settings.easterEgg; - - projectM_init ( _settings.meshX, _settings.meshY, _settings.fps, diff --git a/libprojectM-freetype25.patch b/libprojectM-freetype25.patch deleted file mode 100644 index 75fab00..0000000 --- a/libprojectM-freetype25.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- a/cmake/FindFreetype2.cmake -+++ b/cmake/FindFreetype2.cmake -@@ -67,13 +67,30 @@ FIND_PATH(FREETYPE2_INCLUDE_DIR freetype/config/ftheader.h - NO_DEFAULT_PATH - ) - -+if(NOT FREETYPE2_INCLUDE_DIR) -+ FIND_PATH(FREETYPE2_INCLUDE_DIR config/ftheader.h -+ ${ADDITIONAL_INCLUDE_PATH} -+ /usr/include/freetype2 -+ /usr/X11/include/freetype2 -+ /usr/X11R6/include/freetype2 -+ /sw/include/freetype2 -+ ${VISUS_INCLUDE}/freetype2 -+ NO_DEFAULT_PATH -+) -+endif() -+ - FIND_PATH(FREETYPE2_FT2BUILD ft2build.h - ${ADDITIONAL_INCLUDE_PATH} - /usr/include -+ /usr/include/freetype2 - /usr/X11/include -+ /usr/X11/include/freetype2 - /usr/X11R6/include -+ /usr/X11R6/include/freetype2 - /sw/include -+ /sw/include/freetype2 - ${VISUS_INCLUDE} -+ ${VISUS_INCLUDE}/freetype2 - NO_DEFAULT_PATH - ) - diff --git a/libprojectM-qt-2.1.0-paths.patch b/libprojectM-qt-2.1.0-paths.patch new file mode 100644 index 0000000..ee9d849 --- /dev/null +++ b/libprojectM-qt-2.1.0-paths.patch @@ -0,0 +1,11 @@ +--- projectM-complete-2.1.0-Source/src/projectM-qt/CMakeLists.txt.orig 2016-03-18 20:10:22.015232517 +0000 ++++ projectM-complete-2.1.0-Source/src/projectM-qt/CMakeLists.txt 2016-03-18 20:11:32.038950704 +0000 +@@ -131,6 +131,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) diff --git a/libprojectM-soname.patch b/libprojectM-soname.patch deleted file mode 100644 index 4e8228c..0000000 --- a/libprojectM-soname.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur libprojectM-2.0.1-orig/CMakeLists.txt libprojectM-2.0.1/CMakeLists.txt ---- libprojectM-2.0.1-orig/CMakeLists.txt 2010-01-16 17:23:11.000000000 -0500 -+++ libprojectM-2.0.1/CMakeLists.txt 2010-01-16 17:23:40.000000000 -0500 -@@ -110,7 +110,7 @@ - ADD_LIBRARY(projectM SHARED ${projectM_SOURCES}) - endif(BUILD_PROJECTM_STATIC) - --SET_TARGET_PROPERTIES(projectM PROPERTIES VERSION 2.00 SOVERSION 2) -+SET_TARGET_PROPERTIES(projectM PROPERTIES VERSION 2.0.1 SOVERSION 2.0.1) - - ADD_DEFINITIONS(-DUSE_THREADS) - diff --git a/libprojectM.spec b/libprojectM.spec index 74bb0a8..8e4fcf6 100644 --- a/libprojectM.spec +++ b/libprojectM.spec @@ -1,31 +1,29 @@ -Name: libprojectM -Version: 2.0.1 -Release: 28%{?dist} -Summary: The libraries for the projectM music visualization plugin -Group: Applications/Multimedia -License: LGPLv2+ -URL: http://projectm.sourceforge.net/ -Source0: http://downloads.sourceforge.net/projectm/%{name}-%{version}.tar.bz2 -#Remove fonts from package -#Change default fonts -Patch0: libprojectM-fonts.patch -#Bump soname -Patch1: libprojectM-soname.patch -#Turn off USE_THREADS until the bug is fixed upstream -Patch2: libprojectM-USE_THREADS.patch -#Patches for clementine -Patch3: 01-change-texture-size.patch -Patch4: 04-change-preset-duration.patch -#Fix FTBFS with freetype-2.5 -Patch5: libprojectM-freetype25.patch - -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: ftgl-devel, cmake, glew-devel - -BuildRequires: dejavu-sans-mono-fonts, dejavu-sans-fonts -Requires: dejavu-sans-mono-fonts, dejavu-sans-fonts -%global titlefont /share/fonts/dejavu/DejaVuSans.ttf -%global menufont /share/fonts/dejavu/DejaVuSansMono.ttf +Name: libprojectM +Version: 2.1.0 +Release: 1%{?dist} +Summary: The libraries for the projectM music visualization plugin +Group: Applications/Multimedia +License: LGPLv2+ +URL: http://projectm.sourceforge.net/ +Source0: http://downloads.sourceforge.net/projectm/%{version}/projectM-complete-%{version}-Source.tar.gz +Patch1: libprojectM-2.1.0-paths.patch +Patch2: libprojectM-qt-2.1.0-paths.patch +#Fix FTBFS with GCC6 +Patch10: libprojectM-c++14.patch + +BuildRequires: ftgl-devel cmake glew-devel +BuildRequires: libgomp pulseaudio-libs-devel +# libprojectM-qt +BuildRequires: qt4-devel +#projectM-jack +BuildRequires: jack-audio-connection-kit-devel desktop-file-utils +#projectM-libvisual +BuildRequires: libvisual-devel = 1:0.4.0, SDL-devel +#projectM-pulseaudio +BuildRequires: pulseaudio-libs-devel + +BuildRequires: dejavu-sans-mono-fonts, dejavu-sans-fonts +Requires: dejavu-sans-mono-fonts, dejavu-sans-fonts %description @@ -35,66 +33,159 @@ like you can create presets that connect music with incredible visuals. projectM is an LGPL'ed reimplementation of Milkdrop under OpenGL. All projectM requires is a video card with 3D acceleration and your favorite music. -%package devel -Summary: Development files for %{name} -Group: Development/Libraries -Requires: %{name}%{?_isa} = %{version}-%{release}, pkgconfig +%package devel +Summary: Development files for %{name} +Group: Development/Libraries +Requires: %{name}%{?_isa} = %{version}-%{release}, pkgconfig -%description devel +%description devel The %{name}-devel package contains libraries and header files for developing applications that use %{name}. +%package qt +Summary: The Qt frontend to the projectM visualization plugin +Group: Applications/Multimedia +License: GPLv2+ + +%description qt +projectM-qt is a GUI designed to enhance the projectM user and preset writer +experience. It provides a way to browse, search, rate presets and setup +preset playlists for projectM-jack and projectM-pulseaudio. + +%package qt-devel +Summary: Development files for %{name}-qt +Group: Development/Libraries +Requires: %{name}-qt = %{version}-%{release} +Requires: pkgconfig libprojectM-devel qt-devel + +%description qt-devel +The %{name}-qt-devel package contains libraries and header files for +developing applications that use %{name}-qt. + +%package -n projectM-jack +Summary: The projectM visualization plugin for jack +Group: Applications/Multimedia +License: GPLv2+ and MIT + +%description -n projectM-jack +This package allows the use of the projectM visualization plugin through any +JACK compatible applications. + +%package -n projectM-pulseaudio +Summary: The projectM visualization plugin for pulseaudio +Group: Applications/Multimedia +License: GPLv2+ and MIT + +%description -n projectM-pulseaudio +This package allows the use of the projectM visualization plugin through any +pulseaudio compatible applications. + +%package -n projectM-libvisual +Summary: The projectM visualization plugin for libvisual +Group: Applications/Multimedia +License: GPLv2+ and LGPLv2+ and MIT + +%description -n projectM-libvisual +This package allows the use of the projectM visualization plugin through any +libvisual compatible applications. + %prep -%setup -q - -%patch0 -p1 -b .font-changes -for f in config.inp.in projectM.cpp -do - sed -i -e 's!__FEDORA_TITLE_FONT__!%{titlefont}!g' $f - sed -i -e 's!__FEDORA_MENU_FONT__!%{menufont}!g' $f - grep -q -s __FEDORA_ $f && exit 1 -done -[ -e %{_prefix}%{titlefont} ] || exit 1 -[ -e %{_prefix}%{menufont} ] || exit 1 +%setup -q -n projectM-complete-%{version}-Source + +sed -i 's/\r//' src/libprojectM/ChangeLog +sed -i 's/\r//' src/libprojectM/fftsg.h +sed -i 's/\r//' src/libprojectM/event.h +find -name "*.?pp" -exec chmod -x {} ';' +find -name "*.h" -exec chmod -x {} ';' %patch1 -p1 %patch2 -p1 -%patch3 -p0 -%patch4 -p0 -%patch5 -p1 -sed -i 's/\r//' ChangeLog +%patch10 -p1 %build -%cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} -DLIB_INSTALL_DIR=%{_libdir} . +export CXXFLAGS="%{optflags} -Wl,--as-needed" +%cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} -DLIB_INSTALL_DIR=%{_libdir} \ + -DprojectM_FONT_TITLE=/usr/share/fonts/dejavu/DejaVuSans.ttf \ + -DprojectM_FONT_MENU=/usr/share/fonts/dejavu/DejaVuSansMono.ttf \ + -DINCLUDE-PROJECTM-TEST=OFF -DINCLUDE-PROJECTM-JACK=ON . + make %{?_smp_mflags} VERBOSE=1 %install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT -find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' - -%clean -rm -rf $RPM_BUILD_ROOT +make install DESTDIR=%{buildroot} +find %{buildroot} -name '*.la' -exec rm -f {} ';' +desktop-file-install --dir=%{buildroot}%{_datadir}/applications src/projectM-jack/projectM-jack.desktop +desktop-file-install --dir=%{buildroot}%{_datadir}/applications src/projectM-pulseaudio/projectM-pulseaudio.desktop %post -p /sbin/ldconfig %postun -p /sbin/ldconfig +%post qt -p /sbin/ldconfig + +%postun qt -p /sbin/ldconfig + %files -%defattr(-,root,root,-) -%doc ChangeLog COPYING -%{_libdir}/*.so.* +%doc src/libprojectM/ChangeLog +%license src/libprojectM/COPYING +%{_libdir}/libprojectM.so.* %{_datadir}/projectM/ %files devel -%defattr(-,root,root,-) -%{_includedir}/%{name}/ -%{_libdir}/*.so -%{_libdir}/pkgconfig/*.pc +%{_includedir}/%{name} +%{_libdir}/libprojectM.so +%{_libdir}/pkgconfig/libprojectM.pc + +%files qt +%license src/projectM-qt/COPYING +%{_libdir}/libprojectM-qt*.so.* +%{_datadir}/pixmaps/prjm16-transparent.svg + +%files qt-devel +%doc src/projectM-qt/ReadMe +%{_includedir}/%{name}-qt +%{_libdir}/libprojectM-qt*.so +%{_libdir}/pkgconfig/libprojectM-qt*.pc + +%files -n projectM-jack +%doc src/projectM-jack/ChangeLog +%license src/projectM-jack/COPYING +%{_bindir}/projectM-jack +%{_datadir}/applications/projectM-jack.desktop + +%files -n projectM-pulseaudio +%doc src/projectM-pulseaudio/ChangeLog +%license src/projectM-pulseaudio/COPYING +%{_bindir}/projectM-pulseaudio +%{_datadir}/applications/projectM-pulseaudio.desktop + +%files -n projectM-libvisual +%doc src/projectM-libvisual/AUTHORS src/projectM-libvisual/ChangeLog +%license src/projectM-libvisual/COPYING +%{_libdir}/libvisual-0.4/ %changelog +* Wed Mar 16 2016 Sérgio Basto - 2.1.0-1 +- Update to 2.0.1 . +- deleted: 01-change-texture-size.patch, upstreamed. +- deleted: 04-change-preset-duration.patch, upstreamed. +- deleted: libprojectM-USE_THREADS.patch, configurable. +- deleted: libprojectM-soname.patch, configurable. +- deleted: libprojectM-fonts.patch, configurable. +- deleted: libprojectM-freetype25.patch, it is build well with freetype. +- Add patch to fix FTBFS with GCC6, courtesy of Ralf Corsepius. +- Add as sub packages: libprojectM-qt, libprojectM-qt-devel, projectM-jack, + projectM-libvisual and projectM-pulseaudio. +- Also checked that remove_pulse_browser_h.patch, projectM-pulseaudio-stat.patch + and projectM-libvisual-gcc46.patch are upstreamed. +- Add libprojectM-2.1.0-paths.patch and libprojectM-qt-2.1.0-paths.patch, to fix + _libdir paths +- Using fedora-review fixed: mix tabs and spaces, + unused-direct-shlib-dependency, wrong-script-end-of-line-encoding and + spurious-executable-perm. + * Thu Feb 04 2016 Fedora Release Engineering - 2.0.1-28 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild @@ -196,7 +287,7 @@ rm -rf $RPM_BUILD_ROOT * Tue Feb 24 2009 Jameson Pugh (imntreal@gmail.com) - 1.2.0-8 - Font packages renamed -* Fri Jan 01 2009 Jameson Pugh (imntreal@gmail.com) - 1.2.0-7 +* Fri Jan 02 2009 Jameson Pugh (imntreal@gmail.com) - 1.2.0-7 - Per recommendation, switched font packages from bitstream to dejavu * Mon Dec 22 2008 Jameson Pugh (imntreal@gmail.com) - 1.2.0-6 diff --git a/sources b/sources index 7ea4828..f5d4b7e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -30065f98c336a342c76ee448a513a718 libprojectM-2.0.1.tar.bz2 +debf30f7ce94ff0102f06fbb0cc4e92b projectM-complete-2.1.0-Source.tar.gz