[packages/libprojectM] Up to 4.1.6.

arekm arekm at pld-linux.org
Sun Mar 15 16:07:28 CET 2026


commit 9a8f95746b661ae031bba6ea2231cfd5e516ee18
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Sun Mar 15 16:00:37 2026 +0100

    Up to 4.1.6.

 c++14.patch             |  61 -----------
 libprojectM.spec        | 269 +++++++++++++++---------------------------------
 paths.patch             |  35 -------
 pkgconfig-install.patch |  23 +++++
 pkgconfig.patch         |  20 ----
 test-link.patch         |  15 ---
 6 files changed, 105 insertions(+), 318 deletions(-)
---
diff --git a/libprojectM.spec b/libprojectM.spec
index 1f85b16..fcd2103 100644
--- a/libprojectM.spec
+++ b/libprojectM.spec
@@ -1,52 +1,26 @@
 #
 # Conditional build:
-%bcond_with	cg	# CG for Pixel Shader support
-%bcond_with	devil	# DevIL instead of builtin SOIL for image loading
-%bcond_without	jack	# JACK plugin
-%bcond_without	openmp	# OpenMP for multi-core parallelization
-%bcond_with	xmms	# XMMS plugin (deprecated; wants libxmms.pc, which is not provided)
+%bcond_with	gles	# OpenGL ES instead of OpenGL
 
-%define		pkgname	projectM
 Summary:	Awesome music visualizer
 Summary(pl.UTF-8):	Imponujący wizualizator muzyki
 Name:		libprojectM
-Version:	2.1.0
-Release:	3
+Version:	4.1.6
+Release:	2
 Epoch:		1
 License:	LGPL v2.1+
 Group:		Libraries
-Source0:	http://downloads.sourceforge.net/projectm/projectM-complete-%{version}-Source.tar.gz
-# Source0-md5:	debf30f7ce94ff0102f06fbb0cc4e92b
-Patch0:		paths.patch
-Patch1:		pkgconfig.patch
-Patch2:		c++14.patch
-Patch3:		test-link.patch
-URL:		http://projectm.sourceforge.net/
-%{?with_DevIL:BuildRequires:	DevIL-devel}
-%{?with_DevIL:BuildRequires:	DevIL-ILUT-devel}
+Source0:	https://github.com/projectM-visualizer/projectm/archive/refs/tags/v%{version}/projectm-%{version}.tar.gz
+# Source0-md5:	365e3c61bfbfb806a2b7100cddc69e10
+# git submodule from projectM-visualizer/projectm-eval at commit 811eea5594cc4092d0985fea9ccf0e52dec8a20a
+Source1:	https://github.com/projectM-visualizer/projectm-eval/archive/811eea5594cc4092d0985fea9ccf0e52dec8a20a/projectm-eval-811eea5.tar.gz
+# Source1-md5:	0da01ad8a338e8b84e800eef101cec41
+Patch0:		pkgconfig-install.patch
+URL:		https://github.com/projectM-visualizer/projectm
 BuildRequires:	OpenGL-devel
-BuildRequires:	QtCore-devel >= 4
-BuildRequires:	QtGui-devel >= 4
-BuildRequires:	QtOpenGL-devel >= 4
-BuildRequires:	QtXml-devel >= 4
-BuildRequires:	SDL-devel
-%{?with_cg:BuildRequires:	cg-devel}
-BuildRequires:	cmake >= 2.8.0
-BuildRequires:	desktop-file-utils
-BuildRequires:	freetype-devel >= 1:2.3.5
-BuildRequires:	ftgl-devel >= 2.1.3
-BuildRequires:	glew-devel >= 1.4.0
-%{?with_jack:BuildRequires:	jack-audio-connection-kit-devel}
-%{?with_openmp:BuildRequires:	libgomp-devel}
-BuildRequires:	libstdc++-devel
-BuildRequires:	libvisual-devel >= 0.4.0
-BuildRequires:	pkgconfig
-BuildRequires:	pulseaudio-devel >= 0.9.8
+BuildRequires:	cmake >= 3.21
+BuildRequires:	libstdc++-devel >= 6:7
 BuildRequires:	rpmbuild(macros) >= 1.605
-%{?with_xmms:BuildRequires:	xmms-devel}
-Requires:	fonts-TTF-bitstream-vera
-Requires:	ftgl-devel >= 2.1.3
-Requires:	glew-devel >= 1.4.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -64,6 +38,7 @@ Summary:	Header files for projectM library
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki projectM
 Group:		Development/Libraries
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	OpenGL-devel
 
 %description devel
 Header files for projectM library.
@@ -71,184 +46,104 @@ 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 library
-Summary(pl.UTF):	Graficzny interfejs Qt do biblioteki wizualizacyjnej projectM
-Group:		X11/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.
-
-%description qt -l pl.UTF-8
-projectM-qt to graficzny interfejs użytkownika, mający poprawić
-doznania użytkownika oraz piszącego ustawienia projectM. Daje
-możliwość przeglądania, wyszukiwania, ustawiania współczynników oraz
-predefiniowanych list odtwarzania dla wtyczek jack-projectM oraz
-pulseaudio-projectM.
-
-%package qt-devel
-Summary:	Header files for projectM Qt library
-Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki projectM Qt
-Group:		X11/Development/Libraries
-Requires:	%{name}-devel = %{epoch}:%{version}-%{release}
-Requires:	%{name}-qt = %{epoch}:%{version}-%{release}
-Requires:	QtCore-devel >= 4
-Requires:	QtGui-devel >= 4
-Requires:	QtOpenGL-devel >= 4
-Requires:	QtXml-devel >= 4
-
-%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
-Summary(pl.UTF-8):	Wtyczka wizualizacji dla JACK-a
-License:	GPLv2+ and MIT
-Group:		Applications/Multimedia
-Requires:	%{name} = %{epoch}:%{version}-%{release}
-Requires:	%{name}-qt = %{epoch}:%{version}-%{release}
-
-%description -n jack-projectM
-This package allows the use of the projectM visualization plugin
-through any JACK compatible applications.
-
-%description -n jack-projectM -l pl.UTF-8
-Ten pakiet pozwala na używanie wtyczki wizualizacji projectM we
-wszystkich aplikacjach wykorzystujących system dźwięku JACK.
-
-%package -n pulseaudio-projectM
-Summary:	The projectM visualization plugin for pulseaudio
-Summary(pl.UTF-8):	Wtyczka wizualizacji dla pulseaudio
-Group:		Applications/Multimedia
+%package -n libprojectM-playlist
+Summary:	Playlist management library for projectM
+Summary(pl.UTF-8):	Biblioteka zarządzania listami odtwarzania dla projectM
+Group:		Libraries
 Requires:	%{name} = %{epoch}:%{version}-%{release}
-Requires:	%{name}-qt = %{epoch}:%{version}-%{release}
-Requires:	pulseaudio-libs >= 0.9.8
 
-%description -n pulseaudio-projectM
-This package allows the use of the projectM visualization plugin
-through any pulseaudio compatible applications.
+%description -n libprojectM-playlist
+Playlist management library for projectM music visualizer.
 
-%description -n pulseaudio-projectM -l pl.UTF-8
-Ten pakiet pozwala na używanie wtyczki wizualizacji projectM we
-wszystkich aplikacjach wykorzystujących system dźwięku pulseaudio.
+%description -n libprojectM-playlist -l pl.UTF-8
+Biblioteka zarządzania listami odtwarzania dla wizualizatora muzyki
+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}
-Requires:	libvisual >= 0.4
+%package -n libprojectM-playlist-devel
+Summary:	Header files for projectM playlist library
+Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki projectM playlist
+Group:		Development/Libraries
+Requires:	%{name}-devel = %{epoch}:%{version}-%{release}
+Requires:	libprojectM-playlist = %{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 libprojectM-playlist-devel
+Header files for projectM playlist library.
 
-%description -n libvisual-projectM -l pl.UTF-8
-projectM jest reimplementacją projektu Milkdrop na OpenGL. Ten pakiet
-zawiera wtyczkę dla biblioteki wizualizacji libvisual.
+%description -n libprojectM-playlist-devel -l pl.UTF-8
+Pliki nagłówkowe biblioteki projectM playlist.
 
 %prep
-%setup -q -n projectM-complete-%{version}-Source
+%setup -q -n projectm-%{version}
+# Unpack projectm-eval submodule into vendor/projectm-eval
+tar xzf %{SOURCE1} -C vendor/projectm-eval --strip-components=1
 %patch -P0 -p1
-%patch -P1 -p1
-%patch -P2 -p1
-%patch -P3 -p1
 
 %build
-install -d build
-cd build
-%cmake \
-	-DCMAKE_LIB_DIR=%{_libdir} \
-	-DprojectM_FONT_MENU="/usr/share/fonts/TTF/Vera.ttf" \
-	-DprojectM_FONT_TITLE="/usr/share/fonts/TTF/VeraMono.ttf" \
-	%{?with_jack:-DINCLUDE-PROJECTM-JACK=ON} \
-	-DINCLUDE-PROJECTM-LIBVISUAL-ALSA=ON \
-	-DINCLUDE-PROJECTM-TEST=OFF \
-	%{?with_xmms:-DINCLUDE-PROJECTM-XMMS=ON} \
-	%{?with_cg:-DUSE_CG=ON} \
-	%{?with_devil:-DUSE_DEVIL=ON} \
-	%{!?with_openmp:-DUSE_OPENMP=OFF} \
-	..
-%{__make}
+%cmake -B build \
+	-DENABLE_PLAYLIST=ON \
+	-DENABLE_SDL_UI=OFF \
+	-DENABLE_SYSTEM_GLM=OFF \
+	-DENABLE_SYSTEM_PROJECTM_EVAL=OFF \
+	-DENABLE_DEBUG_POSTFIX=OFF \
+	%{?with_gles:-DENABLE_GLES=ON}
+
+%{__make} -C build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 %{__make} -C build install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-# omitted by CMakeLists.txt
-install -d $RPM_BUILD_ROOT%{_mandir}/man1
-cp -p src/projectM-jack/*.1 $RPM_BUILD_ROOT%{_mandir}/man1
-cp -p src/projectM-pulseaudio/*.1 $RPM_BUILD_ROOT%{_mandir}/man1
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post	-p /sbin/ldconfig
 %postun	-p /sbin/ldconfig
 
-%post	qt -p /sbin/ldconfig
-%postun	qt -p /sbin/ldconfig
+%post	-n libprojectM-playlist -p /sbin/ldconfig
+%postun	-n libprojectM-playlist -p /sbin/ldconfig
 
 %files
 %defattr(644,root,root,755)
-# COPYING is just license information, not actual LGPL text
-%doc AUTHORS.txt FAQ.txt TODO.txt src/README src/libprojectM/{COPYING,ChangeLog}
-%attr(755,root,root) %{_libdir}/libprojectM.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/libprojectM.so.2
-%dir %{_datadir}/%{pkgname}
-%{_datadir}/%{pkgname}/config.inp
-%dir %{_datadir}/%{pkgname}/presets
-%{_datadir}/%{pkgname}/presets/*.milk
-%{_datadir}/%{pkgname}/presets/*.prjm
-%{_datadir}/%{pkgname}/presets/*.tga
-%dir %{_datadir}/%{pkgname}/shaders
-%{_datadir}/%{pkgname}/shaders/*.cg
+%doc AUTHORS.txt COPYING LICENSE.txt README.md
+%attr(755,root,root) %{_libdir}/libprojectM-4.so.*.*.*
+%ghost %{_libdir}/libprojectM-4.so.4
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libprojectM.so
-%{_includedir}/%{name}
-%{_pkgconfigdir}/libprojectM.pc
-
-%files qt
-%defattr(644,root,root,755)
-%doc src/projectM-qt/ReadMe
-%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
-%attr(755,root,root) %{_libdir}/libprojectM-qt.so
-%{_includedir}/%{name}-qt
-%{_pkgconfigdir}/libprojectM-qt.pc
-
-%if %{with jack}
-%files -n jack-projectM
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/projectM-jack
-%{_desktopdir}/projectM-jack.desktop
-%{_mandir}/man1/projectM-jack.1*
-%endif
-
-%files -n pulseaudio-projectM
+%{_libdir}/libprojectM-4.so
+%dir %{_includedir}/projectM-4
+%{_includedir}/projectM-4/audio.h
+%{_includedir}/projectM-4/callbacks.h
+%{_includedir}/projectM-4/core.h
+%{_includedir}/projectM-4/debug.h
+%{_includedir}/projectM-4/memory.h
+%{_includedir}/projectM-4/parameters.h
+%{_includedir}/projectM-4/projectM.h
+%{_includedir}/projectM-4/projectM_export.h
+%{_includedir}/projectM-4/render_opengl.h
+%{_includedir}/projectM-4/touch.h
+%{_includedir}/projectM-4/types.h
+%{_includedir}/projectM-4/version.h
+%{_pkgconfigdir}/projectM-4.pc
+%{_libdir}/cmake/projectM4
+
+%files -n libprojectM-playlist
 %defattr(644,root,root,755)
-%doc src/projectM-pulseaudio/AUTHORS
-%attr(755,root,root) %{_bindir}/projectM-pulseaudio
-%{_desktopdir}/projectM-pulseaudio.desktop
-%{_mandir}/man1/projectM-pulseaudio.1*
+%attr(755,root,root) %{_libdir}/libprojectM-4-playlist.so.*.*.*
+%ghost %{_libdir}/libprojectM-4-playlist.so.4
 
-%files -n libvisual-projectM
+%files -n libprojectM-playlist-devel
 %defattr(644,root,root,755)
-%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
+%{_libdir}/libprojectM-4-playlist.so
+%{_includedir}/projectM-4/playlist.h
+%{_includedir}/projectM-4/playlist_callbacks.h
+%{_includedir}/projectM-4/playlist_core.h
+%{_includedir}/projectM-4/playlist_filter.h
+%{_includedir}/projectM-4/playlist_items.h
+%{_includedir}/projectM-4/playlist_memory.h
+%{_includedir}/projectM-4/playlist_playback.h
+%{_includedir}/projectM-4/playlist_types.h
+%{_includedir}/projectM-4/projectM_playlist_export.h
+%{_pkgconfigdir}/projectM-4-playlist.pc
+%{_libdir}/cmake/projectM4Playlist
diff --git a/c++14.patch b/c++14.patch
deleted file mode 100644
index 8cb409a..0000000
--- a/c++14.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-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 <cstdlib>
--#define projectM_isnan isnan
-+#include <cmath>
-+#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/paths.patch b/paths.patch
deleted file mode 100644
index b6755c7..0000000
--- a/paths.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- 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})
---- 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-install.patch b/pkgconfig-install.patch
new file mode 100644
index 0000000..9d7286f
--- /dev/null
+++ b/pkgconfig-install.patch
@@ -0,0 +1,23 @@
+Install pkgconfig files unconditionally regardless of cmake build type.
+Without this, .pc files are only installed for Release/RelWithDebInfo/MinSizeRel
+configurations, but PLD uses a custom build type.
+
+--- a/cmake/GeneratePkgConfigFiles.cmake.orig	2024-11-28 00:00:00.000000000 +0000
++++ b/cmake/GeneratePkgConfigFiles.cmake	2024-11-28 00:00:01.000000000 +0000
+@@ -32,16 +32,6 @@
+         set(PKGCONFIG_PACKAGE_REQUIREMENTS "${PKGCONFIG_PACKAGE_REQUIREMENTS_ALL} ${PKGCONFIG_PACKAGE_REQUIREMENTS_RELEASE}")
+         configure_file(${PROJECTM_SOURCE_DIR}/cmake/pkgconfig-file.in "${CMAKE_CURRENT_BINARY_DIR}/${package_name}.pc" @ONLY)
+         install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${package_name}.pc"
+-                CONFIGURATIONS Release;RelWithDebInfo;MinSizeRel
+-                DESTINATION "${PROJECTM_LIB_DIR}/pkgconfig"
+-                COMPONENT Devel
+-                )
+-
+-        set(PKGCONFIG_PROJECTM_LIBRARY "${_lib_name}${CMAKE_DEBUG_POSTFIX}")
+-        set(PKGCONFIG_PACKAGE_REQUIREMENTS "${PKGCONFIG_PACKAGE_REQUIREMENTS_ALL} ${PKGCONFIG_PACKAGE_REQUIREMENTS_DEBUG}")
+-        configure_file(${PROJECTM_SOURCE_DIR}/cmake/pkgconfig-file.in "${CMAKE_CURRENT_BINARY_DIR}/${package_name}-debug.pc" @ONLY)
+-        install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${package_name}-debug.pc"
+-                CONFIGURATIONS Debug
+                 DESTINATION "${PROJECTM_LIB_DIR}/pkgconfig"
+                 COMPONENT Devel
+                 )
diff --git a/pkgconfig.patch b/pkgconfig.patch
deleted file mode 100644
index 09c0d99..0000000
--- a/pkgconfig.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- projectM-complete-2.1.0-Source/src/libprojectM/CMakeLists.txt~	2012-05-20 05:43:26.000000000 +0200
-+++ projectM-complete-2.1.0-Source/src/libprojectM/CMakeLists.txt	2017-03-12 00:27:28.921676820 +0100
-@@ -34,6 +34,7 @@
- #
- 
- ADD_DEFINITIONS(-DCMAKE_INSTALL_PREFIX="${CMAKE_INSTALL_PREFIX}")
-+ADD_DEFINITIONS(-DCMAKE_LIB_DIR="${CMAKE_LIB_DIR}")
- 
- SET(LIB_INSTALL_DIR "\${exec_prefix}/lib"
-   CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is /lib)"
---- projectM-complete-2.1.0-Source/src/libprojectM/libprojectM.pc.in~	2012-05-20 05:43:26.000000000 +0200
-+++ projectM-complete-2.1.0-Source/src/libprojectM/libprojectM.pc.in	2017-03-12 00:28:04.319482765 +0100
-@@ -1,6 +1,6 @@
- prefix=@CMAKE_INSTALL_PREFIX@
- exec_prefix=@CMAKE_INSTALL_PREFIX@
--libdir=@LIB_INSTALL_DIR@
-+libdir=@CMAKE_LIB_DIR@
- includedir=@CMAKE_INSTALL_PREFIX@/include
- pkgdatadir=@CMAKE_INSTALL_PREFIX@/@RESOURCE_PREFIX@
- sysconfdir=@CMAKE_INSTALL_PREFIX@/@RESOURCE_PREFIX@
diff --git a/test-link.patch b/test-link.patch
deleted file mode 100644
index f7a69c5..0000000
--- a/test-link.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -ur projectM-complete-2.1.0-Source/src/projectM-test/CMakeLists.txt projectM-complete-2.1.0-Source-gl/src/projectM-test/CMakeLists.txt
---- projectM-complete-2.1.0-Source/src/projectM-test/CMakeLists.txt	2012-05-20 05:43:26.000000000 +0200
-+++ projectM-complete-2.1.0-Source-gl/src/projectM-test/CMakeLists.txt	2017-03-11 23:16:53.922207194 +0100
-@@ -38,8 +38,8 @@
- INCLUDE_DIRECTORIES(${PROJECTM_INCLUDE} ${SDL_INCLUDE_DIR} ${GTK_INCLUDE_DIR})
- LINK_DIRECTORIES(${PROJECTM_LINK})
- 
--TARGET_LINK_LIBRARIES(projectM-test projectM  ${SDL_LIBRARY})
--TARGET_LINK_LIBRARIES(projectM-test-memleak projectM  ${SDL_LIBRARY} )
--TARGET_LINK_LIBRARIES(projectM-test-texture projectM  ${SDL_LIBRARY} )
-+TARGET_LINK_LIBRARIES(projectM-test projectM  ${SDL_LIBRARY} ${OPENGL_LIBRARIES} )
-+TARGET_LINK_LIBRARIES(projectM-test-memleak projectM  ${SDL_LIBRARY} ${OPENGL_LIBRARIES} )
-+TARGET_LINK_LIBRARIES(projectM-test-texture projectM  ${SDL_LIBRARY} ${OPENGL_LIBRARIES} )
- 
- INSTALL(TARGETS projectM-test projectM-test-texture DESTINATION ${CMAKE_INSTALL_PREFIX}/bin )
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libprojectM.git/commitdiff/9a8f95746b661ae031bba6ea2231cfd5e516ee18



More information about the pld-cvs-commit mailing list