diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-22 23:09:46 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-22 23:09:46 -0300 |
commit | f87cdf22eb712b5b1c118f768d4ff710fc839403 (patch) | |
tree | 023ff68dc2d6efdb25a8ab8b182a14b8d6a55889 /community/projectm | |
parent | 290a8b0dd73569b6b2d9855be9638d3338c566e0 (diff) | |
parent | 1d9fb21dff6df1679e536ab672edcbbdb4cf3a15 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/arp-scan/PKGBUILD
community/curlftpfs/PKGBUILD
community/dtach/PKGBUILD
community/espeakup/PKGBUILD
community/g2sc/PKGBUILD
community/judy/PKGBUILD
community/python-fuse/PKGBUILD
community/sisctrl/PKGBUILD
extra/avahi/PKGBUILD
extra/kdesdk/PKGBUILD
extra/nasm/PKGBUILD
multilib/lib32-p11-kit/PKGBUILD
multilib/lib32-pixman/PKGBUILD
testing/xf86-input-synaptics/PKGBUILD
Diffstat (limited to 'community/projectm')
-rw-r--r-- | community/projectm/PKGBUILD | 8 | ||||
-rw-r--r-- | community/projectm/libprojectM-2.0.1-pkg-config.patch | 18 |
2 files changed, 13 insertions, 13 deletions
diff --git a/community/projectm/PKGBUILD b/community/projectm/PKGBUILD index 68b20f4b9..d52ddf8a8 100644 --- a/community/projectm/PKGBUILD +++ b/community/projectm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 48148 2011-05-29 00:07:23Z lfleischer $ +# $Id: PKGBUILD 65637 2012-02-21 16:08:20Z giovanni $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=projectm pkgver=2.0.1 -pkgrel=3 +pkgrel=4 pkgdesc='A music visualizer which uses 3D accelerated iterative image based rendering.' arch=('i686' 'x86_64' 'mips64el') url='http://projectm.sourceforge.net/' @@ -14,12 +14,12 @@ makedepends=('pkgconfig' 'cmake') source=("http://downloads.sourceforge.net/${pkgname}/projectM-${pkgver}-Source.tar.gz" 'libprojectM-2.0.1-pkg-config.patch') md5sums=('f8bf795878cdbbef54784cf2390b4c89' - 'c271ec8c541eb281f1294287bdbc3488') + '4f258f4e7c2ab612931936bfd7f1f0fb') build() { cd "${srcdir}/projectM-${pkgver}-Source" - patch -p0 -i ../libprojectM-2.0.1-pkg-config.patch + patch -Np1 -i "${srcdir}/libprojectM-2.0.1-pkg-config.patch" cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release make diff --git a/community/projectm/libprojectM-2.0.1-pkg-config.patch b/community/projectm/libprojectM-2.0.1-pkg-config.patch index 415e92fd7..b5e38205a 100644 --- a/community/projectm/libprojectM-2.0.1-pkg-config.patch +++ b/community/projectm/libprojectM-2.0.1-pkg-config.patch @@ -1,10 +1,10 @@ ---- libprojectM.pc.orig 2011-05-29 01:52:53.869288700 +0200 -+++ libprojectM.pc 2011-05-29 01:53:08.604851407 +0200 +--- a/libprojectM.pc.in 2009-12-06 02:42:51.000000000 +0100 ++++ b/libprojectM.pc.in 2012-02-21 16:48:36.000000000 +0100 @@ -1,6 +1,6 @@ - prefix=/usr/local - exec_prefix=/usr/local --libdir= -+libdir=${exec_prefix}/lib - includedir=/usr/local/include - pkgdatadir=/usr/local/share/projectM - sysconfdir=/usr/local/share/projectM + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=@CMAKE_INSTALL_PREFIX@ +-libdir=@LIB_INSTALL_DIR@ ++libdir=@CMAKE_INSTALL_PREFIX@/lib + includedir=@CMAKE_INSTALL_PREFIX@/include + pkgdatadir=@CMAKE_INSTALL_PREFIX@/@RESOURCE_PREFIX@ + sysconfdir=@CMAKE_INSTALL_PREFIX@/@RESOURCE_PREFIX@ |