Date: Thursday, July 28, 2016 @ 19:07:43 Author: heftig Revision: 272650
archrelease: copy trunk to extra-i686, extra-x86_64 Added: libgphoto2/repos/extra-i686/PKGBUILD (from rev 272649, libgphoto2/trunk/PKGBUILD) libgphoto2/repos/extra-i686/jpeg.patch (from rev 272649, libgphoto2/trunk/jpeg.patch) libgphoto2/repos/extra-x86_64/PKGBUILD (from rev 272649, libgphoto2/trunk/PKGBUILD) libgphoto2/repos/extra-x86_64/jpeg.patch (from rev 272649, libgphoto2/trunk/jpeg.patch) Deleted: libgphoto2/repos/extra-i686/PKGBUILD libgphoto2/repos/extra-i686/libgphoto2.install libgphoto2/repos/extra-x86_64/PKGBUILD libgphoto2/repos/extra-x86_64/libgphoto2.install ---------------------------------+ /PKGBUILD | 118 ++++++++++++++++++++++++++++++++++++++ extra-i686/PKGBUILD | 54 ----------------- extra-i686/jpeg.patch | 92 +++++++++++++++++++++++++++++ extra-i686/libgphoto2.install | 10 --- extra-x86_64/PKGBUILD | 54 ----------------- extra-x86_64/jpeg.patch | 92 +++++++++++++++++++++++++++++ extra-x86_64/libgphoto2.install | 10 --- 7 files changed, 302 insertions(+), 128 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2016-07-28 19:07:23 UTC (rev 272649) +++ extra-i686/PKGBUILD 2016-07-28 19:07:43 UTC (rev 272650) @@ -1,54 +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.10 -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') -install=libgphoto2.install -source=(http://downloads.sourceforge.net/gphoto/$pkgname-$pkgver.tar.bz2{,.asc}) -sha1sums=('dc1a1ed203d52360c10dc126f70e4f433a9f174e' - 'SKIP') -validpgpkeys=('7C4AFD61D8AAE7570796A5172209D6902F969C95') # Marcus Meissner - -build() { - cd $pkgname-$pkgver - ./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-$pkgver - 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 272649, libgphoto2/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2016-07-28 19:07:43 UTC (rev 272650) @@ -0,0 +1,59 @@ +# $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.10 +pkgrel=2 +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=('gtk-doc') +source=(http://downloads.sourceforge.net/gphoto/$pkgname-$pkgver.tar.bz2{,.asc} + jpeg.patch) +sha1sums=('dc1a1ed203d52360c10dc126f70e4f433a9f174e' + 'SKIP' + '3039b2986b1aac8be30416f6659322c7de09e426') +validpgpkeys=('7C4AFD61D8AAE7570796A5172209D6902F969C95') # Marcus Meissner + +prepare() { + cd $pkgname-$pkgver + patch -Np1 -i ../jpeg.patch +} + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --disable-rpath --enable-gtk-doc + + 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-$pkgver + 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/jpeg.patch (from rev 272649, libgphoto2/trunk/jpeg.patch) =================================================================== --- extra-i686/jpeg.patch (rev 0) +++ extra-i686/jpeg.patch 2016-07-28 19:07:43 UTC (rev 272650) @@ -0,0 +1,92 @@ +From 0df14db3eda1b780a27b1c54bc8f251d15afebbc Mon Sep 17 00:00:00 2001 +From: Patrick Ohly <patrick.o...@intel.com> +Date: Wed, 15 Jun 2016 10:33:24 +0200 +Subject: [PATCH] jpeg_memsrcdest: extend feature check + +libjpeg.h in OpenEmbedded master (from libjpeg-turbo 1.5.0) provides +these methods if "JPEG_LIB_VERSION >= 80 || +defined(MEM_SRCDST_SUPPORTED)". + +The support for the jpeg_mem functions was added even when not +emulating the libjpeg8 API, controlled via the MEM_SRCDST_SUPPORTED +define, so checking for the version alone is not enough anymore. + +See https://github.com/libjpeg-turbo/libjpeg-turbo/commit/ab70623eb29e09e67222be5b9e1ea320fe5aa0e9 + +This fixes errors about conflicting declarations (signed vs. unsigned +char). + +Signed-off-by: Patrick Ohly <patrick.o...@intel.com> +--- + camlibs/ax203/jpeg_memsrcdest.c | 4 ++-- + camlibs/ax203/jpeg_memsrcdest.h | 4 ++++ + camlibs/jl2005c/jpeg_memsrcdest.c | 4 ++-- + camlibs/jl2005c/jpeg_memsrcdest.h | 4 ++++ + 4 files changed, 12 insertions(+), 4 deletions(-) + +diff --git a/camlibs/ax203/jpeg_memsrcdest.c b/camlibs/ax203/jpeg_memsrcdest.c +index 0ed83b1..5614573 100644 +--- a/camlibs/ax203/jpeg_memsrcdest.c ++++ b/camlibs/ax203/jpeg_memsrcdest.c +@@ -25,8 +25,8 @@ + #include "jpeg_memsrcdest.h" + + /* libjpeg8 and later come with their own (API compatible) memory source +- and dest */ +-#if JPEG_LIB_VERSION < 80 ++ and dest, and older versions may have it backported */ ++#if JPEG_LIB_VERSION < 80 && !defined(MEM_SRCDST_SUPPORTED) + + /* Expanded data source object for memory input */ + +diff --git a/camlibs/ax203/jpeg_memsrcdest.h b/camlibs/ax203/jpeg_memsrcdest.h +index e971182..b13bf3f 100644 +--- a/camlibs/ax203/jpeg_memsrcdest.h ++++ b/camlibs/ax203/jpeg_memsrcdest.h +@@ -1,5 +1,7 @@ + #include <jpeglib.h> + ++#if JPEG_LIB_VERSION < 80 && !defined(MEM_SRCDST_SUPPORTED) ++ + void + jpeg_mem_src (j_decompress_ptr cinfo, unsigned char * buffer, + unsigned long bufsize); +@@ -7,3 +9,5 @@ jpeg_mem_src (j_decompress_ptr cinfo, unsigned char * buffer, + void + jpeg_mem_dest (j_compress_ptr cinfo, unsigned char ** outbuffer, + unsigned long * outsize); ++ ++#endif +diff --git a/camlibs/jl2005c/jpeg_memsrcdest.c b/camlibs/jl2005c/jpeg_memsrcdest.c +index 321f926..b65310e 100644 +--- a/camlibs/jl2005c/jpeg_memsrcdest.c ++++ b/camlibs/jl2005c/jpeg_memsrcdest.c +@@ -25,8 +25,8 @@ + #include "jpeg_memsrcdest.h" + + /* libjpeg8 and later come with their own (API compatible) memory source +- and dest */ +-#if JPEG_LIB_VERSION < 80 ++ and dest, and older versions may have it backported */ ++#if JPEG_LIB_VERSION < 80 && !defined(MEM_SRCDST_SUPPORTED) + + /* Expanded data source object for memory input */ + +diff --git a/camlibs/jl2005c/jpeg_memsrcdest.h b/camlibs/jl2005c/jpeg_memsrcdest.h +index e971182..b13bf3f 100644 +--- a/camlibs/jl2005c/jpeg_memsrcdest.h ++++ b/camlibs/jl2005c/jpeg_memsrcdest.h +@@ -1,5 +1,7 @@ + #include <jpeglib.h> + ++#if JPEG_LIB_VERSION < 80 && !defined(MEM_SRCDST_SUPPORTED) ++ + void + jpeg_mem_src (j_decompress_ptr cinfo, unsigned char * buffer, + unsigned long bufsize); +@@ -7,3 +9,5 @@ jpeg_mem_src (j_decompress_ptr cinfo, unsigned char * buffer, + void + jpeg_mem_dest (j_compress_ptr cinfo, unsigned char ** outbuffer, + unsigned long * outsize); ++ ++#endif Deleted: extra-i686/libgphoto2.install =================================================================== --- extra-i686/libgphoto2.install 2016-07-28 19:07:23 UTC (rev 272649) +++ extra-i686/libgphoto2.install 2016-07-28 19:07:43 UTC (rev 272650) @@ -1,10 +0,0 @@ -post_install() { - udevadm hwdb --update -} -post_upgrade() { - post_install -} - -post_remove() { - post_install -} Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2016-07-28 19:07:23 UTC (rev 272649) +++ extra-x86_64/PKGBUILD 2016-07-28 19:07:43 UTC (rev 272650) @@ -1,54 +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.10 -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') -install=libgphoto2.install -source=(http://downloads.sourceforge.net/gphoto/$pkgname-$pkgver.tar.bz2{,.asc}) -sha1sums=('dc1a1ed203d52360c10dc126f70e4f433a9f174e' - 'SKIP') -validpgpkeys=('7C4AFD61D8AAE7570796A5172209D6902F969C95') # Marcus Meissner - -build() { - cd $pkgname-$pkgver - ./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-$pkgver - 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 272649, libgphoto2/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2016-07-28 19:07:43 UTC (rev 272650) @@ -0,0 +1,59 @@ +# $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.10 +pkgrel=2 +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=('gtk-doc') +source=(http://downloads.sourceforge.net/gphoto/$pkgname-$pkgver.tar.bz2{,.asc} + jpeg.patch) +sha1sums=('dc1a1ed203d52360c10dc126f70e4f433a9f174e' + 'SKIP' + '3039b2986b1aac8be30416f6659322c7de09e426') +validpgpkeys=('7C4AFD61D8AAE7570796A5172209D6902F969C95') # Marcus Meissner + +prepare() { + cd $pkgname-$pkgver + patch -Np1 -i ../jpeg.patch +} + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --disable-rpath --enable-gtk-doc + + 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-$pkgver + 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/jpeg.patch (from rev 272649, libgphoto2/trunk/jpeg.patch) =================================================================== --- extra-x86_64/jpeg.patch (rev 0) +++ extra-x86_64/jpeg.patch 2016-07-28 19:07:43 UTC (rev 272650) @@ -0,0 +1,92 @@ +From 0df14db3eda1b780a27b1c54bc8f251d15afebbc Mon Sep 17 00:00:00 2001 +From: Patrick Ohly <patrick.o...@intel.com> +Date: Wed, 15 Jun 2016 10:33:24 +0200 +Subject: [PATCH] jpeg_memsrcdest: extend feature check + +libjpeg.h in OpenEmbedded master (from libjpeg-turbo 1.5.0) provides +these methods if "JPEG_LIB_VERSION >= 80 || +defined(MEM_SRCDST_SUPPORTED)". + +The support for the jpeg_mem functions was added even when not +emulating the libjpeg8 API, controlled via the MEM_SRCDST_SUPPORTED +define, so checking for the version alone is not enough anymore. + +See https://github.com/libjpeg-turbo/libjpeg-turbo/commit/ab70623eb29e09e67222be5b9e1ea320fe5aa0e9 + +This fixes errors about conflicting declarations (signed vs. unsigned +char). + +Signed-off-by: Patrick Ohly <patrick.o...@intel.com> +--- + camlibs/ax203/jpeg_memsrcdest.c | 4 ++-- + camlibs/ax203/jpeg_memsrcdest.h | 4 ++++ + camlibs/jl2005c/jpeg_memsrcdest.c | 4 ++-- + camlibs/jl2005c/jpeg_memsrcdest.h | 4 ++++ + 4 files changed, 12 insertions(+), 4 deletions(-) + +diff --git a/camlibs/ax203/jpeg_memsrcdest.c b/camlibs/ax203/jpeg_memsrcdest.c +index 0ed83b1..5614573 100644 +--- a/camlibs/ax203/jpeg_memsrcdest.c ++++ b/camlibs/ax203/jpeg_memsrcdest.c +@@ -25,8 +25,8 @@ + #include "jpeg_memsrcdest.h" + + /* libjpeg8 and later come with their own (API compatible) memory source +- and dest */ +-#if JPEG_LIB_VERSION < 80 ++ and dest, and older versions may have it backported */ ++#if JPEG_LIB_VERSION < 80 && !defined(MEM_SRCDST_SUPPORTED) + + /* Expanded data source object for memory input */ + +diff --git a/camlibs/ax203/jpeg_memsrcdest.h b/camlibs/ax203/jpeg_memsrcdest.h +index e971182..b13bf3f 100644 +--- a/camlibs/ax203/jpeg_memsrcdest.h ++++ b/camlibs/ax203/jpeg_memsrcdest.h +@@ -1,5 +1,7 @@ + #include <jpeglib.h> + ++#if JPEG_LIB_VERSION < 80 && !defined(MEM_SRCDST_SUPPORTED) ++ + void + jpeg_mem_src (j_decompress_ptr cinfo, unsigned char * buffer, + unsigned long bufsize); +@@ -7,3 +9,5 @@ jpeg_mem_src (j_decompress_ptr cinfo, unsigned char * buffer, + void + jpeg_mem_dest (j_compress_ptr cinfo, unsigned char ** outbuffer, + unsigned long * outsize); ++ ++#endif +diff --git a/camlibs/jl2005c/jpeg_memsrcdest.c b/camlibs/jl2005c/jpeg_memsrcdest.c +index 321f926..b65310e 100644 +--- a/camlibs/jl2005c/jpeg_memsrcdest.c ++++ b/camlibs/jl2005c/jpeg_memsrcdest.c +@@ -25,8 +25,8 @@ + #include "jpeg_memsrcdest.h" + + /* libjpeg8 and later come with their own (API compatible) memory source +- and dest */ +-#if JPEG_LIB_VERSION < 80 ++ and dest, and older versions may have it backported */ ++#if JPEG_LIB_VERSION < 80 && !defined(MEM_SRCDST_SUPPORTED) + + /* Expanded data source object for memory input */ + +diff --git a/camlibs/jl2005c/jpeg_memsrcdest.h b/camlibs/jl2005c/jpeg_memsrcdest.h +index e971182..b13bf3f 100644 +--- a/camlibs/jl2005c/jpeg_memsrcdest.h ++++ b/camlibs/jl2005c/jpeg_memsrcdest.h +@@ -1,5 +1,7 @@ + #include <jpeglib.h> + ++#if JPEG_LIB_VERSION < 80 && !defined(MEM_SRCDST_SUPPORTED) ++ + void + jpeg_mem_src (j_decompress_ptr cinfo, unsigned char * buffer, + unsigned long bufsize); +@@ -7,3 +9,5 @@ jpeg_mem_src (j_decompress_ptr cinfo, unsigned char * buffer, + void + jpeg_mem_dest (j_compress_ptr cinfo, unsigned char ** outbuffer, + unsigned long * outsize); ++ ++#endif Deleted: extra-x86_64/libgphoto2.install =================================================================== --- extra-x86_64/libgphoto2.install 2016-07-28 19:07:23 UTC (rev 272649) +++ extra-x86_64/libgphoto2.install 2016-07-28 19:07:43 UTC (rev 272650) @@ -1,10 +0,0 @@ -post_install() { - udevadm hwdb --update -} -post_upgrade() { - post_install -} - -post_remove() { - post_install -}