Date: Tuesday, March 7, 2017 @ 21:50:53 Author: heftig Revision: 290110
archrelease: copy trunk to extra-i686, extra-x86_64 Added: libgphoto2/repos/extra-i686/PKGBUILD (from rev 290109, libgphoto2/trunk/PKGBUILD) libgphoto2/repos/extra-x86_64/PKGBUILD (from rev 290109, libgphoto2/trunk/PKGBUILD) Deleted: libgphoto2/repos/extra-i686/PKGBUILD libgphoto2/repos/extra-x86_64/PKGBUILD -----------------------+ /PKGBUILD | 122 ++++++++++++++++++++++++++++++++++++++++++++++++ extra-i686/PKGBUILD | 62 ------------------------ extra-x86_64/PKGBUILD | 62 ------------------------ 3 files changed, 122 insertions(+), 124 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2017-03-07 21:49:30 UTC (rev 290109) +++ extra-i686/PKGBUILD 2017-03-07 21:50:53 UTC (rev 290110) @@ -1,62 +0,0 @@ -# $Id$ -# Maintainer: Jan de Groot <j...@archlinux.org> -# Contributor: Tom Gundersen <t...@jklm.no> -# Contributor: Eduardo Romero <edua...@archlinux.org> -# Contributor: Damir Perisa <damir.per...@bluewin.ch> - -pkgname=libgphoto2 -pkgver=2.5.11 -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 gd libltdl libusb libxml2) -makedepends=(autoconf-archive git) -_commit=00113c93678cd42d3ac768abc152a07b1c650a53 # tags/libgphoto2-2_5_11-release^0 -source=("git+https://github.com/gphoto/libgphoto2#commit=$_commit") -sha256sums=('SKIP') -validpgpkeys=('7C4AFD61D8AAE7570796A5172209D6902F969C95') # Marcus Meissner - -pkgver() { - cd $pkgname - git describe --tags | sed 's/^libgphoto2-//;s/-release//;s/_/./g;s/-/+/g' -} - -prepare() { - cd $pkgname - autoreconf -fvi -} - -build() { - cd $pkgname - ./configure --prefix=/usr --disable-rpath - - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool - - make -} - -package() { - cd $pkgname - make DESTDIR="${pkgdir}" install - - # Remove unused udev helper - rm -rf "${pkgdir}/usr/lib/udev" - - install -m755 -d "${pkgdir}/usr/lib/udev/hwdb.d" - install -m755 -d "${pkgdir}/usr/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" hwdb > \ - "${pkgdir}/usr/lib/udev/hwdb.d/20-gphoto.hwdb" - - 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" - - # Remove recursive symlink - rm -fv "${pkgdir}/usr/include/gphoto2/gphoto2" -} Copied: libgphoto2/repos/extra-i686/PKGBUILD (from rev 290109, libgphoto2/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2017-03-07 21:50:53 UTC (rev 290110) @@ -0,0 +1,61 @@ +# $Id$ +# Maintainer: Jan de Groot <j...@archlinux.org> +# Contributor: Tom Gundersen <t...@jklm.no> +# Contributor: Eduardo Romero <edua...@archlinux.org> +# Contributor: Damir Perisa <damir.per...@bluewin.ch> + +pkgname=libgphoto2 +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) +url="http://www.gphoto.org/" +license=(LGPL) +depends=(libexif libjpeg gd libltdl libusb libxml2) +makedepends=(autoconf-archive git) +_commit=1719ba76c7ad5b934f113fcd6e433999fe99b92e # tags/libgphoto2-2_5_12-release +source=("git+https://github.com/gphoto/libgphoto2#commit=$_commit") +sha256sums=('SKIP') +validpgpkeys=('7C4AFD61D8AAE7570796A5172209D6902F969C95') # Marcus Meissner + +pkgver() { + cd $pkgname + git describe --tags | sed 's/^libgphoto2-//;s/-release//;s/_/./g;s/-/+/g' +} + +prepare() { + cd $pkgname + autoreconf -fvi +} + +build() { + cd $pkgname + ./configure --prefix=/usr --disable-rpath + + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool + + make +} + +package() { + cd $pkgname + make DESTDIR="$pkgdir" install + + # Remove unused udev helper + rm -r "$pkgdir/usr/lib/udev" + + # Remove recursive symlink + rm "$pkgdir/usr/include/gphoto2/gphoto2" + + ( + cd "$pkgdir/usr/lib/libgphoto2" + + export LD_LIBRARY_PATH="$pkgdir/usr/lib${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" + export CAMLIBS="$PWD/$pkgver" + + ./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" + ) +} Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2017-03-07 21:49:30 UTC (rev 290109) +++ extra-x86_64/PKGBUILD 2017-03-07 21:50:53 UTC (rev 290110) @@ -1,62 +0,0 @@ -# $Id$ -# Maintainer: Jan de Groot <j...@archlinux.org> -# Contributor: Tom Gundersen <t...@jklm.no> -# Contributor: Eduardo Romero <edua...@archlinux.org> -# Contributor: Damir Perisa <damir.per...@bluewin.ch> - -pkgname=libgphoto2 -pkgver=2.5.11 -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 gd libltdl libusb libxml2) -makedepends=(autoconf-archive git) -_commit=00113c93678cd42d3ac768abc152a07b1c650a53 # tags/libgphoto2-2_5_11-release^0 -source=("git+https://github.com/gphoto/libgphoto2#commit=$_commit") -sha256sums=('SKIP') -validpgpkeys=('7C4AFD61D8AAE7570796A5172209D6902F969C95') # Marcus Meissner - -pkgver() { - cd $pkgname - git describe --tags | sed 's/^libgphoto2-//;s/-release//;s/_/./g;s/-/+/g' -} - -prepare() { - cd $pkgname - autoreconf -fvi -} - -build() { - cd $pkgname - ./configure --prefix=/usr --disable-rpath - - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool - - make -} - -package() { - cd $pkgname - make DESTDIR="${pkgdir}" install - - # Remove unused udev helper - rm -rf "${pkgdir}/usr/lib/udev" - - install -m755 -d "${pkgdir}/usr/lib/udev/hwdb.d" - install -m755 -d "${pkgdir}/usr/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" hwdb > \ - "${pkgdir}/usr/lib/udev/hwdb.d/20-gphoto.hwdb" - - 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" - - # Remove recursive symlink - rm -fv "${pkgdir}/usr/include/gphoto2/gphoto2" -} Copied: libgphoto2/repos/extra-x86_64/PKGBUILD (from rev 290109, libgphoto2/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2017-03-07 21:50:53 UTC (rev 290110) @@ -0,0 +1,61 @@ +# $Id$ +# Maintainer: Jan de Groot <j...@archlinux.org> +# Contributor: Tom Gundersen <t...@jklm.no> +# Contributor: Eduardo Romero <edua...@archlinux.org> +# Contributor: Damir Perisa <damir.per...@bluewin.ch> + +pkgname=libgphoto2 +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) +url="http://www.gphoto.org/" +license=(LGPL) +depends=(libexif libjpeg gd libltdl libusb libxml2) +makedepends=(autoconf-archive git) +_commit=1719ba76c7ad5b934f113fcd6e433999fe99b92e # tags/libgphoto2-2_5_12-release +source=("git+https://github.com/gphoto/libgphoto2#commit=$_commit") +sha256sums=('SKIP') +validpgpkeys=('7C4AFD61D8AAE7570796A5172209D6902F969C95') # Marcus Meissner + +pkgver() { + cd $pkgname + git describe --tags | sed 's/^libgphoto2-//;s/-release//;s/_/./g;s/-/+/g' +} + +prepare() { + cd $pkgname + autoreconf -fvi +} + +build() { + cd $pkgname + ./configure --prefix=/usr --disable-rpath + + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool + + make +} + +package() { + cd $pkgname + make DESTDIR="$pkgdir" install + + # Remove unused udev helper + rm -r "$pkgdir/usr/lib/udev" + + # Remove recursive symlink + rm "$pkgdir/usr/include/gphoto2/gphoto2" + + ( + cd "$pkgdir/usr/lib/libgphoto2" + + export LD_LIBRARY_PATH="$pkgdir/usr/lib${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" + export CAMLIBS="$PWD/$pkgver" + + ./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" + ) +}