diff options
| author | root <root@rshg054.dnsready.net> | 2012-03-12 00:01:32 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-03-12 00:01:32 +0000 |
| commit | a6cb3ddef295c5feb4e03ee198dbb31cdf62d518 (patch) | |
| tree | 4ea0c57a9a347779a3d69ebee2dc54d994a30235 /extra/libgphoto2 | |
| parent | 4640048ddd1331c9f6fc14b8921ccecdb6b1ea11 (diff) | |
Mon Mar 12 00:01:32 UTC 2012
Diffstat (limited to 'extra/libgphoto2')
| -rw-r--r-- | extra/libgphoto2/PKGBUILD | 21 | ||||
| -rw-r--r-- | extra/libgphoto2/libgphoto2.install | 18 |
2 files changed, 17 insertions, 22 deletions
diff --git a/extra/libgphoto2/PKGBUILD b/extra/libgphoto2/PKGBUILD index b2fe27b17..629bea861 100644 --- a/extra/libgphoto2/PKGBUILD +++ b/extra/libgphoto2/PKGBUILD @@ -1,23 +1,26 @@ -# $Id: PKGBUILD 145711 2011-12-28 14:52:22Z jgc $ -# Maintainer: Eduardo Romero <eduardo@archlinux.org> +# $Id: PKGBUILD 152973 2012-03-10 23:27:06Z tomegun $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Contributor: Tom Gundersen <teg@jklm.no> +# Contributor: Eduardo Romero <eduardo@archlinux.org> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> pkgname=libgphoto2 -pkgver=2.4.11 +pkgver=2.4.13 pkgrel=1 pkgdesc="The core library of gphoto2, designed to allow access to digital camera by external programs." arch=(i686 x86_64) url="http://www.gphoto.org" license=(LGPL) -depends=('libexif' 'libjpeg>=8' 'gd' 'libltdl' 'libusb-compat') +depends=('libexif' 'libjpeg>=8' 'gd' 'libltdl' 'libusb-compat' 'libusb') install=libgphoto2.install options=('libtool') source=(http://downloads.sourceforge.net/gphoto/${pkgname}-${pkgver}.tar.gz) -md5sums=('a2230c31e320acb7ececd90bc02fe515') build() { cd "${srcdir}/${pkgname}-${pkgver}" - udevscriptdir=/lib/udev ./configure --prefix=/usr --with-drivers=all --disable-static --disable-rpath + ./configure \ + --prefix=/usr \ + --disable-rpath make } @@ -25,14 +28,16 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - rm -f ${pkgdir}/usr/lib/libgphoto2/${pkgver}/*.a + # Remove unused udev helper + rm -rf "${pkgdir}/usr/lib/udev" install -m755 -d "${pkgdir}/lib/udev/rules.d" LD_LIBRARY_PATH="${pkgdir}/usr/lib${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" \ CAMLIBS="${pkgdir}/usr/lib/libgphoto2/${pkgver}" \ - "${pkgdir}/usr/lib/libgphoto2/print-camera-list" udev-rules version 136 group camera mode 0660 > \ + "${pkgdir}/usr/lib/libgphoto2/print-camera-list" udev-rules version 136 > \ "${pkgdir}/lib/udev/rules.d/40-gphoto.rules" # Remove recursive symlink rm -f "${pkgdir}/usr/include/gphoto2/gphoto2" } +md5sums=('7d8a1d3ae02069af381f07a0bb4bfc15') diff --git a/extra/libgphoto2/libgphoto2.install b/extra/libgphoto2/libgphoto2.install index 3aee9ff8a..c7944414f 100644 --- a/extra/libgphoto2/libgphoto2.install +++ b/extra/libgphoto2/libgphoto2.install @@ -1,16 +1,6 @@ -post_install() { - getent group camera >/dev/null || usr/sbin/groupadd -g 97 camera - /bin/cat <<THEEND -NOTE ----- -Add your user to group 'camera' to use camera devices. -THEEND -} - post_upgrade() { - getent group camera >/dev/null || usr/sbin/groupadd -g 97 camera -} - -post_remove() { - usr/sbin/groupdel camera &>/dev/null +if [ "$(vercmp $2 2.14.13)" -lt 0 ]; then + groupdel camera &>/dev/null + echo "Users no longer need to be in the 'camera' group to use camera devices" +fi } |