diff --git a/.abf.yml b/.abf.yml index 3b0a587..93b666c 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,2 @@ sources: - "libprojectM-2.0.0-Source.tar.gz": 50c45b060c3b00fd574f4f092594f18b43669cff + projectM-complete-2.1.0-Source.tar.gz: a1a966a410360926fee88ff253f929f0290a2405 diff --git a/libprojectM-2.0.0-fix-linking.patch b/libprojectM-2.0.0-fix-linking.patch deleted file mode 100644 index 0a8a752..0000000 --- a/libprojectM-2.0.0-fix-linking.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- CMakeLists.txt.link 2010-02-18 09:50:09.000000000 +0100 -+++ CMakeLists.txt 2010-02-18 09:54:35.000000000 +0100 -@@ -186,10 +186,10 @@ - LINK_DIRECTORIES(${FTGL_LINK_DIRS} ${Renderer_BINARY_DIR} ${PRESET_FACTORY_BINARY_DIR}) - - if(BUILD_PROJECTM_STATIC) -- TARGET_LINK_LIBRARIES(projectM ${GLEW_LINK_TARGETS} m ${FTGL_LINK_TARGETS} ${OPENGL_LIBRARIES} ${IMAGE_LINK_TARGETS} ${CG_LINK_TARGETS} ${PRESET_FACTORY_LINK_TARGETS}) -+ TARGET_LINK_LIBRARIES(projectM Renderer ${IMAGE_LINK_TARGETS} ${CG_LINK_TARGETS} ${PRESET_FACTORY_LINK_TARGETS} ${GLEW_LINK_TARGETS} ${FTGL_LINK_TARGETS} m dl ${OPENGL_LIBRARIES}) - else(BUILD_PROJECTM_STATIC) - --TARGET_LINK_LIBRARIES(projectM ${GLEW_LINK_TARGETS} m ${FTGL_LINK_TARGETS} ${OPENGL_LIBRARIES} ${IMAGE_LINK_TARGETS} ${CG_LINK_TARGETS} ${PRESET_FACTORY_LINK_TARGETS}) -+ TARGET_LINK_LIBRARIES(projectM Renderer ${IMAGE_LINK_TARGETS} ${CG_LINK_TARGETS} ${PRESET_FACTORY_LINK_TARGETS} ${GLEW_LINK_TARGETS} ${FTGL_LINK_TARGETS} m dl ${OPENGL_LIBRARIES} ) - - endif(BUILD_PROJECTM_STATIC) - ---- Renderer/CMakeLists.txt.link 2010-02-18 10:22:15.000000000 +0100 -+++ Renderer/CMakeLists.txt 2010-02-18 10:22:30.000000000 +0100 -@@ -13,4 +13,4 @@ - INCLUDE_DIRECTORIES(${projectM_SOURCE_DIR}) - ADD_LIBRARY(Renderer STATIC ${Renderer_SOURCES}) - SET_TARGET_PROPERTIES(Renderer PROPERTIES VERSION 2.00 SOVERSION 2) --TARGET_LINK_LIBRARIES(Renderer m) -+TARGET_LINK_LIBRARIES(Renderer m ${OPENGL_LIBRARIES} ${FREETYPE2_LIBRARIES}) diff --git a/libprojectm-2.1.0-libsuffix.patch b/libprojectm-2.1.0-libsuffix.patch new file mode 100644 index 0000000..99e6d4d --- /dev/null +++ b/libprojectm-2.1.0-libsuffix.patch @@ -0,0 +1,19 @@ +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 +@@ -35,7 +35,7 @@ set(PROJECTM_ABI_LEVEL 2) + + 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) + +@@ -237,4 +237,4 @@ INSTALL(FILES ${Renderer_SOURCE_DIR}/pro + INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libprojectM.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/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-2.1.0-path.patch b/libprojectm-2.1.0-path.patch new file mode 100644 index 0000000..39fa7e3 --- /dev/null +++ b/libprojectm-2.1.0-path.patch @@ -0,0 +1,13 @@ +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,7 +33,7 @@ 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${LIB_SUFFIX}" + CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is /lib)" diff --git a/libprojectm.spec b/libprojectm.spec index 1c3a6d5..181a2cd 100644 --- a/libprojectm.spec +++ b/libprojectm.spec @@ -1,192 +1,88 @@ -%define name libprojectm -%define version 2.0.0 -%define release 6 %define oname libprojectM %define major 2 -%define libname %mklibname projectm %major -%define develname %mklibname -d projectm -%define oldlibname %mklibname projectm +%define libname %mklibname projectm %{major} +%define devname %mklibname projectm -d -Summary: Visualization library for OpenGL based on Milkdrop -Name: %{name} -Version: %{version} -Release: %{release} -Epoch: 1 -Source0: %{oname}-%{version}-Source.tar.gz -Patch1: libprojectM-2.0.0-fix-linking.patch -License: LGPLv2+ -Group: System/Libraries -Url: http://xmms-projectm.sourceforge.net/ -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot -BuildRequires: libftgl-devel -BuildRequires: cmake -BuildRequires: libglew-devel -BuildRequires: libgomp-devel -Requires: %name-data >= %epoch:%version +Summary: Visualization library for OpenGL based on Milkdrop +Name: libprojectm +Epoch: 1 +Version: 2.1.0 +Release: 11 +License: LGPLv2.1+ +Group: System/Libraries +Url: http://projectm.sourceforge.net +Source0: http://downloads.sourceforge.net/project/projectm/2.1.0/projectM-complete-%{version}-Source.tar.gz +Patch0: libprojectm-2.1.0-libsuffix.patch +Patch1: libprojectm-2.1.0-path.patch +Patch2: projectm-libsuffix-pkgconf.patch + +BuildRequires: cmake +BuildRequires: gomp-devel +BuildRequires: pkgconfig(ftgl) +BuildRequires: pkgconfig(glew) +BuildRequires: pkgconfig(libpulse) %description projectM is a reimplementation of Milkdrop under OpenGL. -%package -n %libname -Summary: Visualization library for OpenGL based on Milkdrop -Group: System/Libraries -Requires: %name-data >= %epoch:%version - -%description -n %libname -projectM is a reimplementation of Milkdrop under OpenGL. - +#---------------------------------------------------------------------------- %package data -Summary: Visualization library for OpenGL based on Milkdrop -Group: Graphics +Summary: Visualization library for OpenGL based on Milkdrop +Group: Graphics Requires: fonts-ttf-bitstream-vera %description data projectM is a reimplementation of Milkdrop under OpenGL. This contains data files and presets. -%package -n %develname -Summary: Visualization library for OpenGL based on Milkdrop -Group: Development/C -Requires: %libname = %epoch:%version -Provides: libprojectm-devel = %epoch:%version-%release -Obsoletes: %mklibname -d projectm 0 -Requires: libglew-devel -Conflicts: %oldlibname +%files data +%{_datadir}/projectM/ -%description -n %develname +#---------------------------------------------------------------------------- + +%package -n %{libname} +Summary: Visualization library for OpenGL based on Milkdrop +Group: System/Libraries +Requires: %{name}-data >= %{EVRD} + +%description -n %{libname} projectM is a reimplementation of Milkdrop under OpenGL. +%files -n %{libname} +%{_libdir}/libprojectM.so.%{major}* + +#---------------------------------------------------------------------------- + +%package -n %{devname} +Summary: Visualization library for OpenGL based on Milkdrop +Group: Development/C +Requires: %{libname} = %{EVRD} +Provides: libprojectm-devel = %{EVRD} + +%description -n %{devname} +projectM is a reimplementation of Milkdrop under OpenGL. + +%files -n %{devname} +%{_includedir}/libprojectM +%{_libdir}/libprojectM.so +%{_libdir}/pkgconfig/*.pc + +#---------------------------------------------------------------------------- %prep -%setup -q -n projectM-%{version}-Source -rm -fr build CMakeCache.txt -#patch0 -p1 -b .ftgl -%patch1 -p0 -b .link +%setup -qn projectM-complete-%{version}-Source +%apply_patches %build +cd src/libprojectM/ %cmake %make %install -rm -rf $RPM_BUILD_ROOT +cd src/libprojectM/ %makeinstall_std -C build #replace by symlink -ln -sf %_datadir/fonts/TTF/{Vera.ttf,VeraMono.ttf} %buildroot%_datadir/projectM/fonts/ - - -%if %mdkversion < 200900 -%post -n %libname -p /sbin/ldconfig -%endif -%if %mdkversion < 200900 -%postun -n %libname -p /sbin/ldconfig -%endif - -%clean -rm -rf $RPM_BUILD_ROOT - -%files data -%defattr(-,root,root) -%doc ChangeLog -%_datadir/projectM/ - -%files -n %libname -%defattr(-,root,root) -%_libdir/libprojectM.so.%{major}* - -%files -n %develname -%defattr(-,root,root) -%_libdir/pkgconfig/*.pc -%_includedir/libprojectM/ -%_libdir/libprojectM.so - - - -%changelog -* Mon May 02 2011 Oden Eriksson 1:2.0.0-3mdv2011.0 -+ Revision: 661516 -- mass rebuild - -* Sun Dec 05 2010 Oden Eriksson 1:2.0.0-2mdv2011.0 -+ Revision: 609774 -- rebuild - -* Thu Feb 18 2010 Funda Wang 1:2.0.0-1mdv2010.1 -+ Revision: 507413 -- should be libgomp-devel -- BR gmp-devel for -fopenmp -- New version 2.0.0 - -* Thu Feb 18 2010 Götz Waschk 1:1.2.0-4mdv2010.1 -+ Revision: 507404 -- fix build - - + Thierry Vignaud - - rebuild - -* Tue Feb 17 2009 Götz Waschk 1:1.2.0-3mdv2009.1 -+ Revision: 341702 -- symlink duplicated fonts - -* Tue Dec 09 2008 Adam Williamson 1:1.2.0-2mdv2009.1 -+ Revision: 312132 -- add ftgl.patch: adjust includes for new libftgl -- rebuild for new ftgl major - -* Fri Jul 18 2008 Götz Waschk 1:1.2.0-1mdv2009.0 -+ Revision: 238023 -- new version -- drop patch -- fix build -- add conflict with old library package - - + Pixel - - do not call ldconfig in %%post/%%postun, it is now handled by filetriggers - -* Sun May 25 2008 Götz Waschk 1:1.1-1mdv2009.0 -+ Revision: 211182 -- add epoch -- new version -- rediff patch 0 -- drop patches 1,2,3 -- new major - -* Tue Feb 19 2008 Götz Waschk 1.01-5mdv2008.1 -+ Revision: 173068 -- add debian fixes for some crashes - -* Mon Feb 11 2008 Götz Waschk 1.01-4mdv2008.1 -+ Revision: 165343 -- rebuild for new libglew - -* Sat Jan 05 2008 Götz Waschk 1.01-3mdv2008.1 -+ Revision: 145761 -- rebuild for new libglew - - + Olivier Blin - - restore BuildRoot - - + Thierry Vignaud - - kill re-definition of %%buildroot on Pixel's request - -* Sat Oct 20 2007 Götz Waschk 1.01-2mdv2008.1 -+ Revision: 100674 -- fix deps - -* Sat Oct 20 2007 Götz Waschk 1.01-1mdv2008.1 -+ Revision: 100604 -- new version -- build with cmake -- update file list -- NO major - - -* Fri Jan 26 2007 Götz Waschk 0.99-2mdv2007.0 -+ Revision: 113965 -- bump -- Import libprojectm - -* Fri Jan 26 2007 Götz Waschk 0.99-1mdv2007.1 -- initial package +ln -sf %{_datadir}/fonts/TTF/{Vera.ttf,VeraMono.ttf} %{buildroot}%{_datadir}/projectM/fonts/ diff --git a/projectm-libsuffix-pkgconf.patch b/projectm-libsuffix-pkgconf.patch new file mode 100644 index 0000000..5fed306 --- /dev/null +++ b/projectm-libsuffix-pkgconf.patch @@ -0,0 +1,13 @@ +diff --git a/src/libprojectM/CMakeLists.txt b/src/libprojectM/CMakeLists.txt +index 81b0ca2..dd11c0d 100644 +--- a/src/libprojectM/CMakeLists.txt ++++ b/src/libprojectM/CMakeLists.txt +@@ -234,7 +234,7 @@ ENDIF(projectM_FONT_MENU MATCHES "${CMAKE_INSTALL_PREFIX}/${RESOURCE_PREFIX}/fon + 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${LIB_SUFFIX})