[arch-commits] Commit in libavg/repos (extra-i686 extra-i686/PKGBUILD)

[Eric Belanger]

    Date: Tuesday, April 22, 2008 @ 23:34:04
  Author: eric
Revision: 772

Merged revisions 2-771 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/libavg/trunk

........
  r211 | eric | 2008-04-13 18:36:47 -0400 (Sun, 13 Apr 2008) | 2 lines
  
  upgpkg: libavg 0.7.0-4
      rebuild for imagemagick 6.4.0.2
........
  r356 | aaron | 2008-04-18 18:56:27 -0400 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........

Modified:
  libavg/repos/extra-i686/	(properties)
  libavg/repos/extra-i686/PKGBUILD

----------+
 PKGBUILD |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)


Property changes on: libavg/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /libavg/trunk:1
   + /libavg/trunk:1-771

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-04-23 03:32:47 UTC (rev 771)
+++ extra-i686/PKGBUILD	2008-04-23 03:34:04 UTC (rev 772)
@@ -2,11 +2,11 @@
 # Maintainer: Alexander Baldeck <alexander at archlinux.org>
 pkgname=libavg
 pkgver=0.7.0
-pkgrel=3
+pkgrel=4
 pkgdesc="High-level multimedia platform with a focus on interactive art installations"
 arch=('i686' 'x86_64')
 url="http://www.libavg.de"
-depends=('imagemagick' 'ffmpeg>=20071204-1' 'boost>=1.34.1-2' 'python>=2.5'
+depends=('imagemagick>=6.4.0.2' 'ffmpeg>=20071204-1' 'boost>=1.34.1-2' 'python>=2.5'
 	 'libdc1394>=2.0.1')
 makedepends=('pkgconfig' 'diffutils' 'libtool' 'autoconf' 'automake')
 options=('!libtool' '!emptydirs')
@@ -14,8 +14,7 @@
 source=(http://www.libavg.de/${pkgname}-${pkgver}.tar.gz
 	gcc-4.3.patch
 	dc1394-2.0.patch)
-md5sums=('2aedc1ea3cc4a14e98e0c891f217fa03'
-         '50b41c612a64aedbc14958baa2e67355'
+md5sums=('2aedc1ea3cc4a14e98e0c891f217fa03' '50b41c612a64aedbc14958baa2e67355'\
          '35fa2846381016c612d6b68b400b89a1')
 
 build() {
@@ -33,7 +32,7 @@
   aclocal -I ./m4 || return 1
   autoconf || return 1
   automake || return 1
-  ./configure --prefix=/usr \
+  CXXFLAGS="${CXXFLAGS} -I/usr/include/ImageMagick" ./configure --prefix=/usr \
               --disable-DFB \
               --enable-GL \
               --enable-v4l2 \