gphoto2: update to 2.5.28

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry picked from commit dc3ab606d561e47f1469f97242919ee241885056)

diff --git a/multimedia/gphoto2/Makefile b/multimedia/gphoto2/Makefile
index a4990a71eaa61ef2546a520ec8e8e92ff7a8762d..42c49a99ff2817e6437f9f0756ab16718f700e9c 100644 (file)
--- a/multimedia/gphoto2/Makefile
+++ b/multimedia/gphoto2/Makefile
@@ -9,12 +9,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gphoto2
-PKG_VERSION:=2.5.26
+PKG_VERSION:=2.5.28
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/gphoto
-PKG_HASH:=7653213b05329c1dc2779efea3eff00504e12011436587aedc9aaa1e8665ab2f
+PKG_HASH:=2a648dcdf12da19e208255df4ebed3e7d2a02f905be4165f2443c984cf887375
 
 PKG_MAINTAINER:=Leonardo Medici <leonardo_medici@me.com>
 PKG_LICENSE:=GPL-2.0

diff --git a/multimedia/gphoto2/patches/001-automake-compat.patch b/multimedia/gphoto2/patches/001-automake-compat.patch
deleted file mode 100644 (file)
index c2930c6..0000000
--- a/multimedia/gphoto2/patches/001-automake-compat.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- 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
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -389,7 +389,7 @@ target_alias = @target_alias@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--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
- all: config.h
---- 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])
--AM_GNU_GETTEXT([external])
--AM_PO_SUBDIRS()
- AM_ICONV()
--GP_GETTEXT_FLAGS()
- 
- dnl We cannot use AC_DEFINE_UNQUOTED() for these definitions, as
- dnl we require make to do insert the proper $(datadir) value
-@@ -406,7 +403,6 @@ AC_SUBST([AM_LDFLAGS])
- # Create output files
- # ---------------------------------------------------------------------------
- AC_CONFIG_FILES([
--po/Makefile.in 
- Makefile
- gphoto2/Makefile
- gphoto-m4/Makefile

diff --git a/multimedia/gphoto2/patches/002-no-docs-test.patch b/multimedia/gphoto2/patches/002-no-docs-test.patch
deleted file mode 100644 (file)
index 92d13af..0000000
--- a/multimedia/gphoto2/patches/002-no-docs-test.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- 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
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -389,7 +389,7 @@ target_alias = @target_alias@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--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
- all: config.h
---- a/configure.ac
-+++ b/configure.ac
-@@ -406,16 +406,10 @@ AC_CONFIG_FILES([
- Makefile
- gphoto2/Makefile
- gphoto-m4/Makefile
--doc/Makefile
- contrib/Makefile
- packaging/Makefile
- packaging/rpm/Makefile
- packaging/rpm/package.spec
--tests/data/Makefile
--tests/staging/subdir1/Makefile
--tests/staging/subdir2/Makefile
--tests/staging/Makefile
--tests/Makefile
- ])
- AC_OUTPUT()dnl
-