gphoto2: Update to 2.5.20

Signed-off-by: Rosen Penev <rosenp@gmail.com>

diff --git a/multimedia/gphoto2/Makefile b/multimedia/gphoto2/Makefile
index e0515f673deb1f074570b6ff3d8511ef38f42b3a..16887854257cc1571d58ad2256df3bfc7dcc814b 100644 (file)
--- a/multimedia/gphoto2/Makefile
+++ b/multimedia/gphoto2/Makefile
@@ -9,13 +9,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gphoto2
-PKG_VERSION:=2.5.17
+PKG_VERSION:=2.5.20
 PKG_RELEASE:=1
 PKG_MAINTAINER:=Leonardo Medici <leonardo_medici@me.com>
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/gphoto
-PKG_HASH:=aa571039240c68a053be710ca41645aed0239fa2f0b737b8ec767fef29e3544f
+PKG_HASH:=a36f03b50a8f040f185cbc757f957f03dc05a9210907199e6919ef3f970248f6
 PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=COPYING
 

diff --git a/multimedia/gphoto2/patches/001-automake-compat.patch b/multimedia/gphoto2/patches/001-automake-compat.patch
index 3b24ffd52adc41d204ee9c401044ef058fafcaf7..3462749ce5100b1ffe1d3d31d062ff8be9f804d3 100644 (file)
--- a/multimedia/gphoto2/patches/001-automake-compat.patch
+++ b/multimedia/gphoto2/patches/001-automake-compat.patch
@@ -1,17 +1,13 @@
-Index: gphoto2-2.5.17/Makefile.am
-===================================================================
---- gphoto2-2.5.17.orig/Makefile.am
-+++ gphoto2-2.5.17/Makefile.am
+--- a/Makefile.am
++++ b/Makefile.am
 @@ -1,4 +1,4 @@
 -SUBDIRS = gphoto-m4 contrib doc gphoto2 packaging po tests
 +SUBDIRS = gphoto-m4 contrib doc gphoto2 packaging tests
  
  ACLOCAL_AMFLAGS = -I auto-m4 -I gphoto-m4
  EXTRA_DIST = README.md
-Index: gphoto2-2.5.17/Makefile.in
-===================================================================
---- gphoto2-2.5.17.orig/Makefile.in
-+++ gphoto2-2.5.17/Makefile.in
+--- a/Makefile.in
++++ b/Makefile.in
 @@ -389,7 +389,7 @@ target_alias = @target_alias@
  top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
@@ -21,11 +17,9 @@ Index: gphoto2-2.5.17/Makefile.in
  ACLOCAL_AMFLAGS = -I auto-m4 -I gphoto-m4
  EXTRA_DIST = README.md
  all: config.h
-Index: gphoto2-2.5.17/configure.ac
-===================================================================
---- gphoto2-2.5.17.orig/configure.ac
-+++ gphoto2-2.5.17/configure.ac
-@@ -58,10 +58,7 @@ dnl ------------------------------------
+--- a/configure.ac
++++ b/configure.ac
+@@ -58,10 +58,7 @@ dnl ---------------------------------------------------------------------------
  GP_GETTEXT_HACK([],[Lutz Müller and others],[${MAIL_GPHOTO_TRANSLATION}])
  ALL_LINGUAS="az cs da de en_GB es eu fi fr hu id is it ja nl pa pl pt_BR ro ru rw sk sr sv uk vi zh_CN zh_TW"
  AM_GNU_GETTEXT_VERSION([0.14.1])

diff --git a/multimedia/gphoto2/patches/002-no-docs-test.patch b/multimedia/gphoto2/patches/002-no-docs-test.patch
index df874163b89ef6b5aeb3574e0b169fd9e00f4e9d..7ede8c928c42b718f8daaf1af39f7a28a474dce7 100644 (file)
--- a/multimedia/gphoto2/patches/002-no-docs-test.patch
+++ b/multimedia/gphoto2/patches/002-no-docs-test.patch
@@ -1,17 +1,13 @@
-Index: gphoto2-2.5.17/Makefile.am
-===================================================================
---- gphoto2-2.5.17.orig/Makefile.am
-+++ gphoto2-2.5.17/Makefile.am
+--- a/Makefile.am
++++ b/Makefile.am
 @@ -1,4 +1,4 @@
 -SUBDIRS = gphoto-m4 contrib doc gphoto2 packaging tests
 +SUBDIRS = gphoto-m4 contrib gphoto2 packaging
  
  ACLOCAL_AMFLAGS = -I auto-m4 -I gphoto-m4
  EXTRA_DIST = README.md
-Index: gphoto2-2.5.17/Makefile.in
-===================================================================
---- gphoto2-2.5.17.orig/Makefile.in
-+++ gphoto2-2.5.17/Makefile.in
+--- a/Makefile.in
++++ b/Makefile.in
 @@ -389,7 +389,7 @@ target_alias = @target_alias@
  top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
@@ -21,10 +17,8 @@ Index: gphoto2-2.5.17/Makefile.in
  ACLOCAL_AMFLAGS = -I auto-m4 -I gphoto-m4
  EXTRA_DIST = README.md
  all: config.h
-Index: gphoto2-2.5.17/configure.ac
-===================================================================
---- gphoto2-2.5.17.orig/configure.ac
-+++ gphoto2-2.5.17/configure.ac
+--- a/configure.ac
++++ b/configure.ac
 @@ -407,16 +407,10 @@ AC_CONFIG_FILES([
  Makefile
  gphoto2/Makefile