git » projectm.git » commit 0accc93

Added patch for fix linking against glew library

author Giovanni Scafora
2012-02-23 10:51:07 UTC
committer Giovanni Scafora
2012-02-23 10:51:07 UTC
parent b32e65c5d6f9a974cdf6629d4d504dc145e9519c

Added patch for fix linking against glew library

PKGBUILD +7 -4
libprojectM-2.0.1-fix-linking.patch +23 -0

diff --git a/PKGBUILD b/PKGBUILD
index e76f084..6df0119 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,22 +3,25 @@
 
 pkgname=projectm
 pkgver=2.0.1
-pkgrel=4
+pkgrel=5
 pkgdesc='A music visualizer which uses 3D accelerated iterative image based rendering.'
 arch=('i686' 'x86_64')
 url='http://projectm.sourceforge.net/'
 license=('LGPL')
 depends=('gcc-libs' 'ftgl' 'glew' 'gtkglext')
-makedepends=('pkgconfig' 'cmake')
+makedepends=('pkg-config' 'cmake')
 source=("http://downloads.sourceforge.net/${pkgname}/projectM-${pkgver}-Source.tar.gz"
-        'libprojectM-2.0.1-pkg-config.patch')
+        'libprojectM-2.0.1-pkg-config.patch'
+        'libprojectM-2.0.1-fix-linking.patch')
 md5sums=('f8bf795878cdbbef54784cf2390b4c89'
-         '4f258f4e7c2ab612931936bfd7f1f0fb')
+         '4f258f4e7c2ab612931936bfd7f1f0fb'
+         '5c178cadf1e00ee4baf32cd9ccbc818c')
 
 build() {
   cd "${srcdir}/projectM-${pkgver}-Source"
 
   patch -Np1 -i "${srcdir}/libprojectM-2.0.1-pkg-config.patch"
+  patch -Np1 -i "${srcdir}/libprojectM-2.0.1-fix-linking.patch"
 
   cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release
   make
diff --git a/libprojectM-2.0.1-fix-linking.patch b/libprojectM-2.0.1-fix-linking.patch
new file mode 100644
index 0000000..23d8a7b
--- /dev/null
+++ b/libprojectM-2.0.1-fix-linking.patch
@@ -0,0 +1,23 @@
+--- a/CMakeLists.txt	2009-12-06 02:42:51.000000000 +0100
++++ b/CMakeLists.txt	2012-02-23 04:30:51.000000000 +0100
+@@ -177,10 +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} ${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)
+ 
+--- a/Renderer/CMakeLists.txt	2009-12-06 02:42:51.000000000 +0100
++++ b/Renderer/CMakeLists.txt	2012-02-23 04:31:58.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})