[arch-commits] Commit in libgphoto2/trunk (PKGBUILD jpeg.patch)

[Jan Steffens]

    Date: Sunday, November 27, 2016 @ 17:42:22
  Author: heftig
Revision: 282130

2.5.11-1

Modified:
  libgphoto2/trunk/PKGBUILD
Deleted:
  libgphoto2/trunk/jpeg.patch

------------+
 PKGBUILD   |   33 +++++++++++----------
 jpeg.patch |   92 -----------------------------------------------------------
 2 files changed, 18 insertions(+), 107 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-11-27 17:25:49 UTC (rev 282129)
+++ PKGBUILD	2016-11-27 17:42:22 UTC (rev 282130)
@@ -5,29 +5,32 @@
 # Contributor: Damir Perisa <damir.perisa at bluewin.ch>
 
 pkgname=libgphoto2
-pkgver=2.5.10
-pkgrel=2
+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"
+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')
+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-$pkgver
-  patch -Np1 -i ../jpeg.patch
+  cd $pkgname
+  autoreconf -fvi
 }
 
 build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --disable-rpath --enable-gtk-doc
+  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
 
@@ -35,7 +38,7 @@
 }
 
 package() {
-  cd $pkgname-$pkgver
+  cd $pkgname
   make DESTDIR="${pkgdir}" install
 
   # Remove unused udev helper

Deleted: jpeg.patch
===================================================================
--- jpeg.patch	2016-11-27 17:25:49 UTC (rev 282129)
+++ jpeg.patch	2016-11-27 17:42:22 UTC (rev 282130)
@@ -1,92 +0,0 @@
-From 0df14db3eda1b780a27b1c54bc8f251d15afebbc Mon Sep 17 00:00:00 2001
-From: Patrick Ohly <patrick.ohly at 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.ohly at 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