From 299e917c17619f800f0c21cf43209065b608223f Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Fri, 24 Feb 2012 23:15:21 +0000
Subject: Fri Feb 24 23:15:21 UTC 2012

---
 community/projectm/PKGBUILD                        | 13 +++++++-----
 .../projectm/libprojectM-2.0.1-fix-linking.patch   | 23 ++++++++++++++++++++++
 2 files changed, 31 insertions(+), 5 deletions(-)
 create mode 100644 community/projectm/libprojectM-2.0.1-fix-linking.patch

(limited to 'community/projectm')

diff --git a/community/projectm/PKGBUILD b/community/projectm/PKGBUILD
index 343aa89dd..122eb7e51 100644
--- a/community/projectm/PKGBUILD
+++ b/community/projectm/PKGBUILD
@@ -1,25 +1,28 @@
-# $Id: PKGBUILD 65637 2012-02-21 16:08:20Z giovanni $
+# $Id: PKGBUILD 66284 2012-02-23 10:51:41Z giovanni $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 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/community/projectm/libprojectM-2.0.1-fix-linking.patch b/community/projectm/libprojectM-2.0.1-fix-linking.patch
new file mode 100644
index 000000000..23d8a7b9a
--- /dev/null
+++ b/community/projectm/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})
-- 
cgit v1.2.3-54-g00ecf