Date: Tuesday, March 7, 2017 @ 21:49:30 Author: heftig Revision: 290109
2.5.12-1 Modified: libgphoto2/trunk/PKGBUILD ----------+ PKGBUILD | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-03-07 21:11:38 UTC (rev 290108) +++ PKGBUILD 2017-03-07 21:49:30 UTC (rev 290109) @@ -5,7 +5,7 @@ # Contributor: Damir Perisa <damir.per...@bluewin.ch> pkgname=libgphoto2 -pkgver=2.5.11 +pkgver=2.5.12 pkgrel=1 pkgdesc="The core library of gphoto2, designed to allow access to digital camera by external programs." arch=(i686 x86_64) @@ -13,10 +13,10 @@ license=(LGPL) depends=(libexif libjpeg gd libltdl libusb libxml2) makedepends=(autoconf-archive git) -_commit=00113c93678cd42d3ac768abc152a07b1c650a53 # tags/libgphoto2-2_5_11-release^0 +_commit=1719ba76c7ad5b934f113fcd6e433999fe99b92e # tags/libgphoto2-2_5_12-release source=("git+https://github.com/gphoto/libgphoto2#commit=$_commit") sha256sums=('SKIP') -validpgpkeys=('7C4AFD61D8AAE7570796A5172209D6902F969C95') # Marcus Meissner +validpgpkeys=('7C4AFD61D8AAE7570796A5172209D6902F969C95') # Marcus Meissner pkgver() { cd $pkgname @@ -39,24 +39,23 @@ package() { cd $pkgname - make DESTDIR="${pkgdir}" install + make DESTDIR="$pkgdir" install # Remove unused udev helper - rm -rf "${pkgdir}/usr/lib/udev" + rm -r "$pkgdir/usr/lib/udev" - install -m755 -d "${pkgdir}/usr/lib/udev/hwdb.d" - install -m755 -d "${pkgdir}/usr/lib/udev/rules.d" + # Remove recursive symlink + rm "$pkgdir/usr/include/gphoto2/gphoto2" - 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" hwdb > \ - "${pkgdir}/usr/lib/udev/hwdb.d/20-gphoto.hwdb" + ( + cd "$pkgdir/usr/lib/libgphoto2" - 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 201 > \ - "${pkgdir}/usr/lib/udev/rules.d/40-gphoto.rules" + export LD_LIBRARY_PATH="$pkgdir/usr/lib${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" + export CAMLIBS="$PWD/$pkgver" - # Remove recursive symlink - rm -fv "${pkgdir}/usr/include/gphoto2/gphoto2" + ./print-camera-list hwdb \ + | install -Dm644 /dev/stdin "$pkgdir/usr/lib/udev/hwdb.d/20-gphoto.hwdb" + ./print-camera-list udev-rules version 201 \ + | install -Dm644 /dev/stdin "$pkgdir/usr/lib/udev/rules.d/40-gphoto.rules" + ) }