diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-02-25 10:25:19 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-02-25 10:25:19 +0100 |
| commit | d8eb584da3a24a7b4cccf1b4b39b19ca8fc19495 (patch) | |
| tree | 8e5ea3b068852a348646a0543fdacbd7de7a937e /community/projectm | |
| parent | 82e1a8e4caf3318dbb60adda8c2649ae7ac15661 (diff) | |
| parent | 299e917c17619f800f0c21cf43209065b608223f (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/pigeonhole/PKGBUILD
community/mingw32-pthreads/PKGBUILD
community/openbsd-netcat/PKGBUILD
community/remmina/PKGBUILD
core/crda/PKGBUILD
core/libnl/PKGBUILD
core/wpa_supplicant/PKGBUILD
extra/fontconfig/PKGBUILD
extra/gnome-python-extras/PKGBUILD
extra/gstreamer0.10-ugly/PKGBUILD
extra/gvfs/PKGBUILD
extra/libcdio/PKGBUILD
extra/maxima/PKGBUILD
extra/vcdimager/PKGBUILD
extra/vlc/PKGBUILD
extra/xfdesktop/PKGBUILD
multilib/lib32-glibc/PKGBUILD
multilib/q4wine/PKGBUILD
testing/dovecot/PKGBUILD
Diffstat (limited to 'community/projectm')
| -rw-r--r-- | community/projectm/PKGBUILD | 13 | ||||
| -rw-r--r-- | community/projectm/libprojectM-2.0.1-fix-linking.patch | 23 |
2 files changed, 31 insertions, 5 deletions
diff --git a/community/projectm/PKGBUILD b/community/projectm/PKGBUILD index d52ddf8a8..6fbf605a3 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' 'mips64el') 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}) |