[packages/libprojectM] - patch cleanup - added libvisual plugin subpackage

[baggins]

commit 45737e80bca59b057047d28a1ad2d75f43ca332e
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Mar 12 11:33:58 2017 +0100

    - patch cleanup
    - added libvisual plugin subpackage

 libprojectM.spec | 21 +++++++++++++++++++++
 paths.patch      | 20 +++++++++++---------
 pkgconfig.patch  |  2 +-
 3 files changed, 33 insertions(+), 10 deletions(-)
---
diff --git a/libprojectM.spec b/libprojectM.spec
index b01ff3c..30d9f11 100644
--- a/libprojectM.spec
+++ b/libprojectM.spec
@@ -28,6 +28,7 @@ Patch2:		c++14.patch
 Patch3:		test-link.patch
 URL:		http://projectm.sourceforge.net/
 BuildRequires:	OpenGL-devel
+BuildRequires:	SDL-devel
 BuildRequires:	cmake >= 2.6.0
 BuildRequires:	freetype-devel >= 2.0
 BuildRequires:	ftgl-devel >= 2.1.3
@@ -35,6 +36,7 @@ BuildRequires:	gcc-c++ >= 6:4.2
 BuildRequires:	glew-devel
 BuildRequires:	libgomp-devel
 BuildRequires:	libstdc++-devel
+BuildRequires:	libvisual-devel >= 0.4.0
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.577
 BuildRequires:	sed >= 4.0
@@ -66,6 +68,20 @@ Header files for projectM library.
 %description devel -l pl.UTF-8
 Pliki nagłówkowe biblioteki projectM.
 
+%package -n libvisual-projectM
+Summary:	ProjectM plugin for libvisual
+Summary(pl.UTF-8):	Wtyczka ProjectM dla libvisual
+Group:		Libraries
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+
+%description -n libvisual-projectM
+projectM is a reimplementation of Milkdrop under OpenGL. This is a
+plugin for libvisual visualization library.
+
+%description -n libvisual-projectM -l pl.UTF-8
+projectM jest reimplementacją projektu Milkdrop na OpenGL. Ten pakiet
+zawiera wtyczkę dla biblioteki wizualizacji libvisual.
+
 %prep
 %setup -q -n projectM-complete-%{version}-Source
 %patch0 -p1
@@ -114,3 +130,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libprojectM.so
 %{_includedir}/%{name}
 %{_pkgconfigdir}/libprojectM.pc
+
+%files -n libvisual-projectM
+%defattr(644,root,root,755)
+%doc ChangeLog AUTHORS
+%attr(755,root,root) %{_libdir}/libvisual-0.4/actor/libprojectM_libvisual.so
diff --git a/paths.patch b/paths.patch
index 72e4ebb..b6755c7 100644
--- a/paths.patch
+++ b/paths.patch
@@ -12,15 +12,6 @@
    CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is /lib)"
    FORCE)
  
-@@ -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)
 @@ -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)
@@ -31,3 +22,14 @@
  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})
+--- projectM-complete-2.1.0-Source/src/projectM-qt/CMakeLists.txt~	2012-05-20 05:43:25.000000000 +0200
++++ projectM-complete-2.1.0-Source/src/projectM-qt/CMakeLists.txt	2017-03-12 11:25:54.393062080 +0100
+@@ -131,6 +131,6 @@
+ 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/pkgconfig.patch b/pkgconfig.patch
index 2dbe791..09c0d99 100644
--- a/pkgconfig.patch
+++ b/pkgconfig.patch
@@ -14,7 +14,7 @@
  prefix=@CMAKE_INSTALL_PREFIX@
  exec_prefix=@CMAKE_INSTALL_PREFIX@
 -libdir=@LIB_INSTALL_DIR@
-++libdir=@CMAKE_LIB_DIR@
++libdir=@CMAKE_LIB_DIR@
  includedir=@CMAKE_INSTALL_PREFIX@/include
  pkgdatadir=@CMAKE_INSTALL_PREFIX@/@RESOURCE_PREFIX@
  sysconfdir=@CMAKE_INSTALL_PREFIX@/@RESOURCE_PREFIX@
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libprojectM.git/commitdiff/08c2ceb387d984e5173d4afcb88c7bba2788f00e