Update to version 2.5.19

2 files changed, 36 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6c22eceefc41..9929d4cbdbfb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = lib32-libgphoto2
 	pkgdesc = The core library of gphoto2, designed to allow access to digital camera by external programs. (32-bit)
-	pkgver = 2.5.14+6+g695b55887
-	pkgrel = 2
+	pkgver = 2.5.19
+	pkgrel = 1
 	url = http://www.gphoto.org/
 	arch = x86_64
 	license = LGPL
@@ -14,7 +14,7 @@ pkgbase = lib32-libgphoto2
 	depends = lib32-libusb
 	depends = lib32-libxml2
 	depends = libgphoto2
-	source = git+https://github.com/gphoto/libgphoto2#commit=695b558871fb5274d840647f71d42a77cfa7447f
+	source = git+https://github.com/gphoto/libgphoto2#commit=745b610ed1da36e4141fc46996e5032c627d6248
 	validpgpkeys = 7C4AFD61D8AAE7570796A5172209D6902F969C95
 	sha256sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index 9064547ef0ae..f91758aa26b4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,51 +1,61 @@
-# Maintainer: orumin <dev at orum.in>
+# Maintainer: Rodrigo Bezerra <rodrigobezerra21 at gmail dot com>
+# Contributor: orumin <dev at orum.in>
 
-pkgname=lib32-libgphoto2
 _basename=libgphoto2
-pkgver=2.5.14+6+g695b55887
-pkgrel=2
+pkgname=lib32-libgphoto2
+pkgver=2.5.19
+pkgrel=1
 pkgdesc="The core library of gphoto2, designed to allow access to digital camera by external programs. (32-bit)"
-arch=(x86_64)
 url="http://www.gphoto.org/"
+arch=(x86_64)
 license=(LGPL)
 depends=(lib32-libexif lib32-libjpeg lib32-gd lib32-libltdl lib32-libusb lib32-libxml2 libgphoto2)
 makedepends=(autoconf-archive git)
-_commit=695b558871fb5274d840647f71d42a77cfa7447f  # master
+_commit=745b610ed1da36e4141fc46996e5032c627d6248  # tags/libgphoto2-2_5_19-release
 source=("git+https://github.com/gphoto/libgphoto2#commit=$_commit")
 sha256sums=('SKIP')
 validpgpkeys=('7C4AFD61D8AAE7570796A5172209D6902F969C95') # Marcus Meissner
 
 pkgver() {
-  cd $_basename
-  git describe --tags | sed 's/^libgphoto2-//;s/-release//;s/_/./g;s/-/+/g'
+    cd $_basename
+
+    git describe --tags | sed 's/^libgphoto2-//;s/-release//;s/_/./g;s/-/+/g'
 }
 
 prepare() {
-  cd $_basename
-  autoreconf -fvi
+    cd $_basename
+
+    autoreconf -fvi
 }
 
 build() {
-  cd $_basename
+    cd $_basename
 
-  export CC='gcc -m32'
-  export CXX='g++ -m32'
-  export PKG_CONFIG_PATH='/usr/lib32/pkgconfig'
+    export CC='gcc -m32'
+    export CXX='g++ -m32'
+    export PKG_CONFIG_PATH='/usr/lib32/pkgconfig'
 
-  ./configure --prefix=/usr --disable-rpath --build=i686-pc-linux-gnu --libdir=/usr/lib32
+    ./configure \
+        --build=i686-pc-linux-gnu \
+        --prefix=/usr \
+        --libdir=/usr/lib32 \
+        --disable-rpath
 
-  make
+    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 $_basename
-  make DESTDIR="$pkgdir" install
+    cd $_basename
+
+    make DESTDIR="$pkgdir" install
 
-  rm -r "$pkgdir"/usr/bin
-  rm -r "$pkgdir"/usr/include
-  rm -r "$pkgdir"/usr/share
+    rm -r "$pkgdir"/usr/bin
+    rm -r "$pkgdir"/usr/include
+    rm -r "$pkgdir"/usr/share
 
-  # Remove unused udev helper
-  rm -r "$pkgdir/usr/lib32/udev"
+    # Remove unused udev helper
+    rm -r "$pkgdir/usr/lib32/udev"
 }