Author: adamg Date: Tue Sep 22 06:38:33 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- updated to 1.2.0
---- Files affected:
packages/libprojectM:
libprojectM-static.patch (1.2 -> 1.3)
---- Diffs:
================================================================
Index: packages/libprojectM/libprojectM-static.patch
diff -u packages/libprojectM/libprojectM-static.patch:1.2
packages/libprojectM/libprojectM-static.patch:1.3
--- packages/libprojectM/libprojectM-static.patch:1.2 Mon Mar 31 22:27:54 2008
+++ packages/libprojectM/libprojectM-static.patch Tue Sep 22 08:38:28 2009
@@ -1,50 +1,41 @@
---- libprojectM-1.1/CMakeLists.txt 2008-03-30 19:53:59.000000000 +0000
-+++ libprojectM-1.1/CMakeLists.txt 2008-03-31 21:41:02.000000000 +0000
-@@ -1,5 +1,13 @@
- PROJECT(projectM)
--ADD_LIBRARY(projectM SHARED projectM.cpp FBO.cpp InitCond.cpp
-+ADD_LIBRARY(projectM-shared SHARED projectM.cpp FBO.cpp InitCond.cpp
-+ Expr.cpp PCM.cpp Parser.cpp Preset.cpp BeatDetect.cpp PerPixelEqn.cpp
Param.cpp CustomWave.cpp CustomShape.cpp
-+Func.cpp Eval.cpp PerFrameEqn.cpp PerPointEqn.cpp fftsg.cpp KeyHandler.cpp
-+ timer.cpp wipemalloc.cpp
-+BuiltinFuncs.cpp BuiltinParams.cpp Renderer.cpp
-+PresetLoader.cpp PresetChooser.cpp PresetFrameIO.cpp PresetMerge.cpp
-+ConfigFile.cpp IdlePreset.cpp TextureManager.cpp image_DXT.c image_helper.c
SOIL.c stb_image_aug.c TimeKeeper.cpp)
-+
-+ADD_LIBRARY(projectM-static STATIC projectM.cpp FBO.cpp InitCond.cpp
- Expr.cpp PCM.cpp Parser.cpp Preset.cpp BeatDetect.cpp PerPixelEqn.cpp
Param.cpp CustomWave.cpp CustomShape.cpp
- Func.cpp Eval.cpp PerFrameEqn.cpp PerPointEqn.cpp fftsg.cpp KeyHandler.cpp
- timer.cpp wipemalloc.cpp
-@@ -7,7 +15,7 @@
- PresetLoader.cpp PresetChooser.cpp PresetFrameIO.cpp PresetMerge.cpp
- ConfigFile.cpp IdlePreset.cpp TextureManager.cpp image_DXT.c image_helper.c
SOIL.c stb_image_aug.c TimeKeeper.cpp)
+--- 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
+@@ -48,12 +48,12 @@
+ endif(USE_FBO)
+
+ if (BUILD_PROJECTM_STATIC)
+-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)
+ 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 projectM-static PROPERTIES VERSION 2.00
SOVERSION 2 OUTPUT_NAME projectM)
++SET_TARGET_PROPERTIES(projectM-shared PROPERTIES VERSION 2.00 SOVERSION 2
OUTPUT_NAME projectM)
+
+ if (APPLE)
+ ADD_DEFINITIONS(-DMACOS -DSTBI_NO_DDS -DUSE_THREADS)
+@@ -118,10 +118,9 @@
+ LINK_DIRECTORIES(${FTGL_LINK_DIRS} "./")
+
+ if(BUILD_PROJECTM_STATIC)
+- TARGET_LINK_LIBRARIES(projectM ${GLEW_LINK_TARGETS} m
${FTGL_LINK_TARGETS} ${OPENGL_LIBRARIES} ${IMAGE_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})
+ endif(BUILD_PROJECTM_STATIC)
++TARGET_LINK_LIBRARIES(projectM-shared ${GLEW_LINK_TARGETS} m
${FTGL_LINK_TARGETS} ${OPENGL_LIBRARIES} ${IMAGE_LINK_TARGETS})
+
- ADD_DEFINITIONS(-DLINUX -DUSE_FBO -DSTBI_NO_DDS -DUSE_THREADS)
- ADD_DEFINITIONS(-DCMAKE_INSTALL_PREFIX="\\\"${CMAKE_INSTALL_PREFIX}\\\"")
-@@ -24,7 +32,7 @@
- OPTION(USE_FTGL "Use FTGL for on-screen fonts (Warning: NOT found on
your system! Turning this on will probably bust the compilation.)" OFF)
- endif(FTGL_FOUND)
-
--TARGET_LINK_LIBRARIES(projectM GLEW m)
-+TARGET_LINK_LIBRARIES(projectM-shared projectM-static GLEW m)
-
- IF(USE_FTGL)
- if (FTGL_FOUND)
-@@ -36,7 +44,7 @@
- ADD_DEFINITIONS(-DUSE_FTGL)
- INCLUDE_DIRECTORIES(${FTGL_INCLUDE_DIRS})
- LINK_DIRECTORIES(${FTGL_LIBRARY_DIRS} "./")
-- TARGET_LINK_LIBRARIES(projectM GLEW m ftgl freetype)
-+ TARGET_LINK_LIBRARIES(projectM-shared projectM-static GLEW m ftgl
freetype)
- ELSE (USE_FTGL)
- IF (FTGL_FOUND)
- MESSAGE("Warning: FTGL font support was detected but NOT
enabled. You can enable it by setting USE_FTGL=true")
-@@ -55,4 +63,4 @@
- INSTALL(FILES "${CMAKE_BINARY_DIR}/libprojectM.pc" DESTINATION
${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig)
- INSTALL(FILES config.inp DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM)
+ 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)
+ 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(TARGETS projectM DESTINATION lib)
-+INSTALL(TARGETS projectM-shared projectM-static DESTINATION lib)
+-INSTALL(TARGETS projectM DESTINATION lib${LIB_SUFFIX})
++if (BUILD_PROJECTM_STATIC)
++ INSTALL(TARGETS projectM-static DESTINATION lib${LIB_SUFFIX})
++endif(BUILD_PROJECTM_STATIC)
++INSTALL(TARGETS projectM-shared DESTINATION lib${LIB_SUFFIX})
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libprojectM/libprojectM-static.patch?r1=1.2&r2=1.3&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
