[arch-commits] CVS update of extra/lib/libgphoto2 (PKGBUILD)

[Jan de Groot]

    Date: Thursday, March 13, 2008 @ 19:18:12
  Author: jgc
    Path: /home/cvs-extra/extra/lib/libgphoto2

Modified: PKGBUILD (1.30 -> 1.31)

upgpkg: libgphoto2 2.4.0-5
    Fix build with new libtool


----------+
 PKGBUILD |   45 +++++++++++++++++++++++++++------------------
 1 file changed, 27 insertions(+), 18 deletions(-)


Index: extra/lib/libgphoto2/PKGBUILD
diff -u extra/lib/libgphoto2/PKGBUILD:1.30 extra/lib/libgphoto2/PKGBUILD:1.31
--- extra/lib/libgphoto2/PKGBUILD:1.30	Mon Nov 19 01:49:42 2007
+++ extra/lib/libgphoto2/PKGBUILD	Thu Mar 13 19:18:12 2008
@@ -1,52 +1,61 @@
-# $Id: PKGBUILD,v 1.30 2007/11/19 06:49:42 tpowa Exp $
+# $Id: PKGBUILD,v 1.31 2008/03/13 23:18:12 jgc Exp $
 # Maintainer: Jason Chu <jason at archlinux.org>
 # Contributor: Damir Perisa <damir.perisa at bluewin.ch>
 
 pkgname=libgphoto2
 pkgver=2.4.0
-pkgrel=4
+pkgrel=5
 pkgdesc="The core of gphoto2 software. It is a portable library to gives access to more than 400 digital cameras."
 arch=(i686 x86_64)
 url="http://www.gphoto.org"
-depends=('libexif' 'libjpeg' 'libtool' 'hal>=0.5.8-5')
+depends=('libexif' 'libjpeg' 'libtool' 'hal>=0.5.10')
 license=(LGPL)
 install=(libgphoto2.install)
-source=(http://heanet.dl.sourceforge.net/gphoto/${pkgname}-${pkgver}.tar.gz
+source=(http://downloads.sourceforge.net/gphoto/${pkgname}-${pkgver}.tar.gz
 	no-mdns.patch fix-udev.patch)
+md5sums=('adef1a564d3d1a48e1c13ece34b111b6'
+         '28f57616cbba6f12ca113b87c8123993'
+         'e5f3b19f7cdca8d72190170da995dfec')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
+  # Remove check for deprecated libtool call,
+  # replace with function that is present
+  sed -i -e 's/lt_dlcaller_register/lt_dlinterface_register/g' \
+    m4m/gp-libltdl.m4 libgphoto2_port/m4/gp-libltdl.m4 || return 1
 
   #Remove dns_sd dependency
   patch -Np0 -i ${startdir}/src/no-mdns.patch || return 1
-  cd libgphoto2_port
-  autoconf
-  cd ..
 
-  ./configure --prefix=/usr --with-exif --disable-static
+  # Relibtoolize, doesn't compile without it.
+  libtoolize --force --copy || return 1
+  AT_M4DIR=". m4m" autoreconf || return 1
+  pushd libgphoto2_port || return 1
+  libtoolize --force --copy || return 1
+  autoreconf || return 1
+  popd 
+
+  ./configure --prefix=/usr --with-exif --disable-static || return 1
   make || return 1
-  make DESTDIR=${startdir}/pkg install
+  make DESTDIR=${startdir}/pkg install || return 1
 
   rm -f ${startdir}/pkg/usr/lib/*.la
   rm -f ${startdir}/pkg/usr/lib/libgphoto2/${pkgver}/*.a
   
-  mkdir -p ${startdir}/pkg/usr/share/hal/fdi/information/20thirdparty
-  mkdir -p ${startdir}/pkg/etc/udev/rules.d
+  install -m755 -d ${startdir}/pkg/usr/share/hal/fdi/information/20thirdparty
+  install -m755 -d ${startdir}/pkg/etc/udev/rules.d
   LD_LIBRARY_PATH="${startdir}/pkg/usr/lib" \
   CAMLIBS="${startdir}/pkg/usr/lib/libgphoto2/${pkgver}" \
       ${startdir}/pkg/usr/lib/libgphoto2/print-camera-list hal-fdi > \
-      ${startdir}/pkg/usr/share/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi
+      ${startdir}/pkg/usr/share/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi || return 1
 
   LD_LIBRARY_PATH="${startdir}/pkg/usr/lib" \
   CAMLIBS="${startdir}/pkg/usr/lib/libgphoto2/${pkgver}" \
       ${startdir}/pkg/usr/lib/libgphoto2/print-camera-list udev-rules version 0.98 group camera mode 0660 > \
-      ${startdir}/pkg/etc/udev/rules.d/54-gphoto.rules
-  mkdir ${startdir}/pkg/lib
-  mv ${startdir}/pkg/usr/lib/udev ${startdir}/pkg/lib/
+      ${startdir}/pkg/etc/udev/rules.d/54-gphoto.rules || return 1
+  install -m755 -d ${startdir}/pkg/lib
+  mv ${startdir}/pkg/usr/lib/udev ${startdir}/pkg/lib/ || return 1
   # fix usb and usb_device subsystems
   cd ${startdir}/pkg/etc/udev/rules.d/
   patch -Np0 -i ${startdir}/src/fix-udev.patch || return 1
 }
-md5sums=('adef1a564d3d1a48e1c13ece34b111b6'
-         '28f57616cbba6f12ca113b87c8123993'
-         'e5f3b19f7cdca8d72190170da995dfec')