- removed outdated TODO

- added new subpackages
- updated BRs
- rel 1

diff --git a/libprojectM.spec b/libprojectM.spec
index 30d9f11e2d0b654380026632c81e33c8d7517244..1baa1f5e56bd4b77293c9909acdffe4da9435460 100644 (file)
--- a/libprojectM.spec
+++ b/libprojectM.spec
@@ -1,26 +1,13 @@
-# TODO
-# - cmake is borken and adds objects (static libs) in the middle of lists (Renderer/libRenderer.a):
-#   Linking CXX shared library libprojectM.so
-#   /usr/bin/cmake -E cmake_link_script CMakeFiles/projectM-shared.dir/link.txt --verbose=1
-#   /usr/bin/ccache  i686-pld-linux-g++ -fPIC -O2 -fno-strict-aliasing -fwrapv -march=i686 -mtune=pentium4 -gdwarf-3 -g2   -fopenmp  -Wl,--as-needed -Wl,--no-copy-dt-needed-entries -Wl,-z,relro -Wl,-z,combreloc  -shared -Wl,-soname,libprojectM.so.2 -o libprojectM.so.2.0.1 CMakeFiles/projectM-shared.dir/projectM.cpp.o CMakeFiles/projectM-shared.dir/PCM.cpp.o CMakeFiles/projectM-shared.dir/Preset.cpp.o CMakeFiles/projectM-shared.dir/fftsg.cpp.o CMakeFiles/projectM-shared.dir/KeyHandler.cpp.o CMakeFiles/projectM-shared.dir/timer.cpp.o CMakeFiles/projectM-shared.dir/wipemalloc.cpp.o CMakeFiles/projectM-shared.dir/PresetLoader.cpp.o CMakeFiles/projectM-shared.dir/PresetChooser.cpp.o CMakeFiles/projectM-shared.dir/PipelineMerger.cpp.o CMakeFiles/projectM-shared.dir/ConfigFile.cpp.o CMakeFiles/projectM-shared.dir/TimeKeeper.cpp.o CMakeFiles/projectM-shared.dir/PresetFactory.cpp.o CMakeFiles/projectM-shared.dir/PresetFactoryManager.cpp.o Renderer/libRenderer.a NativePresetFactory/libNativePresetFactory.a MilkdropPresetFactory/libMilkdropPresetFactory.a -lGLEW -lftgl -lfreetype -lGLU -lGL -lSM -lICE -lX11 -lXext Renderer/libRenderer.a -lm
-#
-#   CMakeLists.txt having:
-#   TARGET_LINK_LIBRARIES(projectM-shared ${PRESET_FACTORY_LINK_TARGETS} ${GLEW_LINK_TARGETS} m dl ${FTGL_LINK_TARGETS} ${OPENGL_LIBRARIES}  ${IMAGE_LINK_TARGETS} ${CG_LINK_TARGETS})
-#
-#   NativePresetFactory/CMakeLists.txt has:
-#   TARGET_LINK_LIBRARIES(NativePresetFactory Renderer m)
-#   which mixes .a between -l for dl
-
 %define                pkgname projectM
 Summary:       Awesome music visualizer
 Summary(pl.UTF-8):     Imponujący wizualizator muzyki
 Name:          libprojectM
 Version:       2.1.0
-Release:       0.1
+Release:       1
 Epoch:         1
 License:       LGPL v2.1+
 Group:         Libraries
-Source0:       http://downloads.sourceforge.net/project/projectm/%{version}/projectM-complete-%{version}-Source.tar.gz
+Source0:       http://downloads.sourceforge.net/projectm/projectM-complete-%{version}-Source.tar.gz
 # Source0-md5: debf30f7ce94ff0102f06fbb0cc4e92b
 Patch0:                paths.patch
 Patch1:                pkgconfig.patch
@@ -28,24 +15,27 @@ Patch2:             c++14.patch
 Patch3:                test-link.patch
 URL:           http://projectm.sourceforge.net/
 BuildRequires: OpenGL-devel
+BuildRequires: QtCore-devel
+BuildRequires: QtGui-devel
+BuildRequires: QtOpenGL-devel
+BuildRequires: QtXml-devel
 BuildRequires: SDL-devel
 BuildRequires: cmake >= 2.6.0
+BuildRequires: desktop-file-utils
 BuildRequires: freetype-devel >= 2.0
 BuildRequires: ftgl-devel >= 2.1.3
-BuildRequires: gcc-c++ >= 6:4.2
 BuildRequires: glew-devel
+BuildRequires: jack-audio-connection-kit-devel
 BuildRequires: libgomp-devel
 BuildRequires: libstdc++-devel
-BuildRequires: libvisual-devel >= 0.4.0
+BuildRequires: libvisual-devel = 0.4.0
 BuildRequires: pkgconfig
+BuildRequires: pulseaudio-devel
 BuildRequires: rpmbuild(macros) >= 1.577
 BuildRequires: sed >= 4.0
 Requires:      fonts-TTF-bitstream-vera
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-# cmake (or cmake rules) are broken, mixes .a (objects) with libs (-l)
-%define                filterout_ld    -Wl,--as-needed
-
 %description
 projectM is a reimplementation of Milkdrop under OpenGL. It is an
 awesome music visualizer. There is nothing better in the world of
@@ -68,6 +58,45 @@ Header files for projectM library.
 %description devel -l pl.UTF-8
 Pliki nagłówkowe biblioteki projectM.
 
+%package qt
+Summary:       The Qt frontend to the projectM visualization plugin
+Group:         Libraries
+Requires:      %{name} = %{epoch}:%{version}-%{release}
+
+%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 jack-projectM and pulseaudio-projectM.
+
+%package qt-devel
+Summary:       Header files for projectM QT library
+Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki projectM QT
+Group:         Development/Libraries
+Requires:      %{name}-qt = %{epoch}:%{version}-%{release}
+
+%description qt-devel
+Header files for projectM QT library.
+
+%description qt-devel -l pl.UTF-8
+Pliki nagłówkowe biblioteki projectM QT.
+
+%package -n jack-projectM
+Summary:       The projectM visualization plugin for jack
+License:       GPLv2+ and MIT
+Group:         Applications/Multimedia
+
+%description -n jack-projectM
+This package allows the use of the projectM visualization plugin
+through any JACK compatible applications.
+
+%package -n pulseaudio-projectM
+Summary:       The projectM visualization plugin for pulseaudio
+Group:         Applications/Multimedia
+
+%description -n pulseaudio-projectM
+This package allows the use of the projectM visualization plugin
+through any pulseaudio compatible applications.
+
 %package -n libvisual-projectM
 Summary:       ProjectM plugin for libvisual
 Summary(pl.UTF-8):     Wtyczka ProjectM dla libvisual
@@ -96,6 +125,9 @@ cd build
        -DCMAKE_LIB_DIR=%{_libdir} \
        -DprojectM_FONT_MENU="/usr/share/fonts/TTF/Vera.ttf" \
        -DprojectM_FONT_TITLE="/usr/share/fonts/TTF/VeraMono.ttf" \
+       -DINCLUDE-PROJECTM-TEST=OFF \
+       -DINCLUDE-PROJECTM-JACK=ON \
+       -DINCLUDE-PROJECTM-LIBVISUAL-ALSA=ON \
        ../
 %{__make}
 
@@ -107,8 +139,11 @@ rm -rf $RPM_BUILD_ROOT
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post  -p /sbin/ldconfig
-%postun        -p /sbin/ldconfig
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+%post qt -p /sbin/ldconfig
+%postun qt -p /sbin/ldconfig
 
 %files
 %defattr(644,root,root,755)
@@ -131,7 +166,32 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/%{name}
 %{_pkgconfigdir}/libprojectM.pc
 
+%files qt
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libprojectM-qt.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libprojectM-qt.so.1
+%{_pixmapsdir}/prjm16-transparent.svg
+
+%files qt-devel
+%defattr(644,root,root,755)
+%doc src/projectM-qt/ReadMe
+%{_includedir}/%{name}-qt
+%{_libdir}/libprojectM-qt*.so
+%{_pkgconfigdir}/libprojectM-qt.pc
+
+%files -n jack-projectM
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/projectM-jack
+%{_desktopdir}/projectM-jack.desktop
+
+%files -n pulseaudio-projectM
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/projectM-pulseaudio
+%{_desktopdir}/projectM-pulseaudio.desktop
+
 %files -n libvisual-projectM
 %defattr(644,root,root,755)
-%doc ChangeLog AUTHORS
+%doc src/projectM-libvisual/{ChangeLog,AUTHORS}
+%attr(755,root,root) %{_bindir}/projectM-libvisual-alsa
 %attr(755,root,root) %{_libdir}/libvisual-0.4/actor/libprojectM_libvisual.so
+%{_desktopdir}/projectM-libvisual-alsa.desktop