packages: libprojectM/libprojectM-static.patch, libprojectM/libprojectM.spe...

glen glen at pld-linux.org
Wed Jul 7 08:32:38 CEST 2010 

Author: glen                         Date: Wed Jul  7 06:32:38 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 2.0.1

---- Files affected:
packages/libprojectM:
   libprojectM-static.patch (1.3 -> 1.4) , libprojectM.spec (1.13 -> 1.14) , libprojectM-fonts.patch (NONE -> 1.1)  (NEW), libprojectM-soname.patch (NONE -> 1.1)  (NEW), libprojectM-ftgl.patch (1.1 -> NONE)  (REMOVED), libprojectM-gcc4.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/libprojectM/libprojectM-static.patch
diff -u packages/libprojectM/libprojectM-static.patch:1.3 packages/libprojectM/libprojectM-static.patch:1.4
--- packages/libprojectM/libprojectM-static.patch:1.3	Tue Sep 22 08:38:28 2009
+++ packages/libprojectM/libprojectM-static.patch	Wed Jul  7 08:32:33 2010
@@ -1,5 +1,14 @@
---- libprojectM-1.2.0/CMakeLists.txt~	2008-06-12 05:39:28.000000000 +0200
-+++ libprojectM-1.2.0/CMakeLists.txt	2009-09-22 08:30:24.713992689 +0200
+--- projectM-2.0.1-Source/CMakeLists.txt~	2010-07-07 09:10:35.000000000 +0300
++++ projectM-2.0.1-Source/CMakeLists.txt	2010-07-07 09:13:39.657686690 +0300
+@@ -29,7 +29,7 @@
+ 
+ OPTION (USE_CG "Use Cg for Pixel Shader support" OFF)
+ 
+-OPTION (BUILD_PROJECTM_STATIC "Build the projectM target library in the platform's native static (NOT shared) format." OFF)
++OPTION (BUILD_PROJECTM_STATIC "Build the projectM target library in the platform's native static format." OFF)
+ 
+ OPTION (DISABLE_NATIVE_PRESETS "Turn off support for native (C++ style) presets" OFF)
+ OPTION (DISABLE_MILKDROP_PRESETS "Turn off support for Milkdrop (.milk / .prjm) presets"  OFF)
 @@ -48,12 +48,12 @@
  endif(USE_FBO)
  
@@ -7,33 +16,36 @@
 -ADD_LIBRARY(projectM STATIC ${projectM_SOURCES})
 -else(BUILD_PROJECTM_STATIC)
 -ADD_LIBRARY(projectM SHARED ${projectM_SOURCES})
-+ADD_LIBRARY(projectM-static STATIC ${projectM_SOURCES})
-+SET_TARGET_PROPERTIES(projectM-static PROPERTIES VERSION 2.00 SOVERSION 2 OUTPUT_NAME projectM)
++	ADD_LIBRARY(projectM-static STATIC ${projectM_SOURCES})
++	SET_TARGET_PROPERTIES(projectM-static PROPERTIES OUTPUT_NAME projectM)
  endif(BUILD_PROJECTM_STATIC)
 +ADD_LIBRARY(projectM-shared SHARED ${projectM_SOURCES})
  
--SET_TARGET_PROPERTIES(projectM PROPERTIES VERSION 2.00 SOVERSION 2)
-+SET_TARGET_PROPERTIES(projectM-shared PROPERTIES VERSION 2.00 SOVERSION 2 OUTPUT_NAME projectM)
+-SET_TARGET_PROPERTIES(projectM PROPERTIES VERSION 2.0.1 SOVERSION 2)
++SET_TARGET_PROPERTIES(projectM-shared PROPERTIES VERSION 2.0.1 SOVERSION 2 OUTPUT_NAME projectM)
  
  if (APPLE)
  ADD_DEFINITIONS(-DMACOS -DSTBI_NO_DDS -DUSE_THREADS)
-@@ -118,10 +118,9 @@
- LINK_DIRECTORIES(${FTGL_LINK_DIRS} "./")
+@@ -177,13 +177,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})
+-		TARGET_LINK_LIBRARIES(projectM ${GLEW_LINK_TARGETS} m ${FTGL_LINK_TARGETS} ${OPENGL_LIBRARIES} ${IMAGE_LINK_TARGETS} ${CG_LINK_TARGETS} ${PRESET_FACTORY_LINK_TARGETS})
 -else(BUILD_PROJECTM_STATIC)
--		TARGET_LINK_LIBRARIES(projectM ${GLEW_LINK_TARGETS} m ${FTGL_LINK_TARGETS} ${OPENGL_LIBRARIES}  ${IMAGE_LINK_TARGETS})
-+		TARGET_LINK_LIBRARIES(projectM-static ${GLEW_LINK_TARGETS} m ${FTGL_LINK_TARGETS} ${OPENGL_LIBRARIES} ${IMAGE_LINK_TARGETS})
+-
+-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-static ${GLEW_LINK_TARGETS} m ${FTGL_LINK_TARGETS} ${OPENGL_LIBRARIES} ${IMAGE_LINK_TARGETS} ${CG_LINK_TARGETS} ${PRESET_FACTORY_LINK_TARGETS})
  endif(BUILD_PROJECTM_STATIC)
-+TARGET_LINK_LIBRARIES(projectM-shared ${GLEW_LINK_TARGETS} m ${FTGL_LINK_TARGETS} ${OPENGL_LIBRARIES}  ${IMAGE_LINK_TARGETS})
  
++TARGET_LINK_LIBRARIES(projectM-shared ${GLEW_LINK_TARGETS} m ${FTGL_LINK_TARGETS} ${OPENGL_LIBRARIES}  ${IMAGE_LINK_TARGETS} ${CG_LINK_TARGETS} ${PRESET_FACTORY_LINK_TARGETS})
  
  CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/libprojectM.pc.in" "${CMAKE_CURRENT_SOURCE_DIR}/libprojectM.pc" @ONLY)
-@@ -134,4 +133,7 @@
- INSTALL(FILES "${CMAKE_CURRENT_SOURCE_DIR}/libprojectM.pc" DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig)
+ CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/config.inp.in" "${CMAKE_CURRENT_SOURCE_DIR}/config.inp" @ONLY)
+@@ -196,4 +193,7 @@
+ 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)
- INSTALL(FILES projectM.hpp event.h dlldefs.h fatal.h PresetFrameIO.hpp PCM.hpp  DESTINATION include/libprojectM)
+ INSTALL(FILES projectM.hpp event.h dlldefs.h fatal.h PCM.hpp Common.hpp DESTINATION include/libprojectM)
 -INSTALL(TARGETS projectM DESTINATION lib${LIB_SUFFIX})
 +if (BUILD_PROJECTM_STATIC)
 +	INSTALL(TARGETS projectM-static DESTINATION lib${LIB_SUFFIX})

================================================================
Index: packages/libprojectM/libprojectM.spec
diff -u packages/libprojectM/libprojectM.spec:1.13 packages/libprojectM/libprojectM.spec:1.14
--- packages/libprojectM/libprojectM.spec:1.13	Sat Feb 27 22:11:19 2010
+++ packages/libprojectM/libprojectM.spec	Wed Jul  7 08:32:33 2010
@@ -1,25 +1,26 @@
 # $Revision$, $Date$
-#
-%define		_name	projectM
-#
+%define		pkgname	projectM
 Summary:	Awesome music visualizer
 Summary(pl.UTF-8):	Imponujący wizualizator muzyki
 Name:		libprojectM
-Version:	1.2.0
+Version:	2.0.1
 Release:	1
 Epoch:		1
 License:	LGPL
 Group:		Libraries
-Source0:	http://dl.sourceforge.net/projectm/%{name}-%{version}.tar.bz2
-# Source0-md5:	3bb7abb0f2d929780851bad1ca4fd045
-Patch0:		%{name}-static.patch
-Patch1:		%{name}-ftgl.patch
-Patch2:		%{name}-gcc4.patch
+Source0:	http://downloads.sourceforge.net/project/projectm/%{version}/projectM-%{version}-Source.tar.gz
+# Source0-md5:	f8bf795878cdbbef54784cf2390b4c89
+Patch0:		%{name}-soname.patch
+Patch1:		%{name}-fonts.patch
+Patch2:		%{name}-static.patch
 URL:		http://projectm.sourceforge.net/
 BuildRequires:	cmake
 BuildRequires:	ftgl-devel >= 2.1.3
 BuildRequires:	glew-devel
 BuildRequires:	pkgconfig
+BuildRequires:	rpmbuild(macros) >= 1.566
+BuildRequires:	sed >= 4.0
+Requires:	fonts-TTF-bitstream-vera
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -57,7 +58,8 @@
 Statyczna biblioteka projectM.
 
 %prep
-%setup -q
+%setup -q -n projectM-%{version}-Source
+%undos config.inp.in
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -88,15 +90,15 @@
 %defattr(644,root,root,755)
 %doc ChangeLog
 %attr(755,root,root) %{_libdir}/libprojectM.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/libprojectM.so.?
-%dir %{_datadir}/%{_name}
-%{_datadir}/%{_name}/config.inp
-%dir %{_datadir}/%{_name}/fonts
-%{_datadir}/%{_name}/fonts/*.ttf
-%dir %{_datadir}/%{_name}/presets
-%{_datadir}/%{_name}/presets/*.milk
-%{_datadir}/%{_name}/presets/*.prjm
-%{_datadir}/%{_name}/presets/*.tga
+%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
 
 %files devel
 %defattr(644,root,root,755)
@@ -114,6 +116,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.14  2010/07/07 06:32:33  glen
+- up to 2.0.1
+
 Revision 1.13  2010/02/27 21:11:19  sparky
 - unify %attr() %ghost order
 

================================================================
Index: packages/libprojectM/libprojectM-fonts.patch
diff -u /dev/null packages/libprojectM/libprojectM-fonts.patch:1.1
--- /dev/null	Wed Jul  7 08:32:38 2010
+++ packages/libprojectM/libprojectM-fonts.patch	Wed Jul  7 08:32:33 2010
@@ -0,0 +1,22 @@
+--- libprojectM-1.2.0SVN12092008-orig/CMakeLists.txt	2008-12-09 00:39:53.000000000 -0500
++++ libprojectM-1.2.0SVN12092008/CMakeLists.txt	2008-12-09 00:40:13.000000000 -0500
+@@ -169,8 +169,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)
+--- libprojectM-2.0.1-orig/config.inp.in	2010-01-16 17:23:11.000000000 -0500
++++ libprojectM-2.0.1/config.inp.in	2010-04-05 14:53:21.000000000 -0400
+@@ -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@/share/fonts/TTF/Vera.ttf
++Menu Font = @CMAKE_INSTALL_PREFIX@/share/fonts/TTF/VeraMono.ttf
+  

================================================================
Index: packages/libprojectM/libprojectM-soname.patch
diff -u /dev/null packages/libprojectM/libprojectM-soname.patch:1.1
--- /dev/null	Wed Jul  7 08:32:38 2010
+++ packages/libprojectM/libprojectM-soname.patch	Wed Jul  7 08:32:33 2010
@@ -0,0 +1,12 @@
+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)
+ 
+ ADD_DEFINITIONS(-DUSE_THREADS)
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libprojectM/libprojectM-static.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libprojectM/libprojectM.spec?r1=1.13&r2=1.14&f=u

More information about the pld-cvs-commit mailing list