gphoto2_2.5.6_openwrt_oldpackages.patch

gphoto2-oldpackages.patch

gphoto2: update to 2.5.6

compile tested only

Signed-off-by: Dirk Neukirchen <dirkneukirchen@web.de>
---
 multimedia/gphoto2/Makefile                        |  4 +-
 .../gphoto2/patches/001-automake-compat.patch      | 81 +++++++++++++++++++++-
 .../patches/002-disable-docs-translations.patch    | 45 ------------
 3 files changed, 81 insertions(+), 49 deletions(-)
 delete mode 100644 multimedia/gphoto2/patches/002-disable-docs-translations.patch

diff --git a/multimedia/gphoto2/Makefile b/multimedia/gphoto2/Makefile
index d1a0545..3c93ac3 100644
--- a/multimedia/gphoto2/Makefile
+++ b/multimedia/gphoto2/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gphoto2
-PKG_VERSION:=2.4.11
+PKG_VERSION:=2.5.6
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/gphoto
-PKG_MD5SUM:=2635075f702b40eb2e95a80658bd4773
+PKG_MD5SUM:=b03ab805cf8676d1520d0cfc02afdb5f
 
 PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1
diff --git a/multimedia/gphoto2/patches/001-automake-compat.patch b/multimedia/gphoto2/patches/001-automake-compat.patch
index 89cad74..3e90311 100644
--- a/multimedia/gphoto2/patches/001-automake-compat.patch
+++ b/multimedia/gphoto2/patches/001-automake-compat.patch
@@ -1,10 +1,87 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -66,7 +66,6 @@ GP_GETTEXT_HACK([],[Lutz Müller and oth
- ALL_LINGUAS="az cs da de en_GB es eu fi fr hu id it ja nl pa pl pt_BR ro ru rw sk sr sv uk vi zh_CN zh_TW"
+@@ -1,11 +1,11 @@
+-AC_PREREQ(2.59)
++AC_PREREQ([2.69])
+ dnl Next stable release must be 2.5.7 or later
+-AC_INIT([gphoto2 command line interface], [2.5.6], [gphoto-devel@lists.sourceforge.net], [gphoto2])
++AC_INIT([gphoto2 command line interface],[2.5.6],[gphoto-devel@lists.sourceforge.net],[gphoto2])
+ AC_CONFIG_SRCDIR([gphoto2/main.c])
+ AC_CONFIG_HEADERS([config.h])
+ AC_CONFIG_MACRO_DIR([auto-m4])
+ AC_CONFIG_AUX_DIR([auto-aux])
+-AM_INIT_AUTOMAKE([-Wall -Werror gnu 1.9 dist-bzip2 check-news])
++AM_INIT_AUTOMAKE([-Wall gnu 1.9 dist-bzip2 check-news])
+ 
+ if test ! -d "$srcdir/m4m"; then
+ AC_MSG_ERROR([
+@@ -36,7 +36,7 @@ AC_PROG_CC
+ AC_PROG_CPP
+ AM_PROG_CC_C_O
+ m4_pattern_allow([AM_PROG_AR], [AM_PROG_AR])
+-AM_PROG_LIBTOOL
++LT_INIT
+ AC_PROG_INSTALL
+ AC_SYS_LARGEFILE
+ GP_PKG_CONFIG
+@@ -64,7 +64,6 @@ GP_GETTEXT_HACK([],[Lutz Müller and oth
+ 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()
  
+@@ -358,22 +357,15 @@ AC_SUBST([AM_LDFLAGS])
+ # Create output files
+ # ---------------------------------------------------------------------------
+ AC_CONFIG_FILES([
+-po/Makefile.in 
+ Makefile
+ gphoto2/Makefile
+ m4m/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
++AC_OUTPUT
+ 
+ # Status output
+ GP_CONFIG_OUTPUT
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,3 +1,3 @@
+-SUBDIRS = m4m contrib doc gphoto2 packaging po tests
++SUBDIRS = m4m contrib gphoto2 packaging
+ 
+ ACLOCAL_AMFLAGS = -I auto-m4 -I m4m
+--- a/gphoto2/Makefile.am
++++ b/gphoto2/Makefile.am
+@@ -9,8 +9,6 @@ EXTRA_DIST = \
+ 
+ bin_PROGRAMS = gphoto2
+ 
+-doc_DATA = test-hook.sh
+-
+ if HAVE_CDK
+ CDK_FILES = gphoto2-cmd-config.c gphoto2-cmd-config.h
+ else
+@@ -50,10 +48,4 @@ gphoto2_LDADD =								\
+ 	$(LIBGPHOTO2_LIBS) $(CDK_LIBS) $(AA_LIBS) $(JPEG_LIBS) 		\
+ 	$(PTHREAD_LIBS) $(LIBEXIF_LIBS) $(INTLLIBS) $(RL_LIBS) $(POPT_LIBS)
+ 
+-TESTS = spawntest
+-
+-TESTS_ENVIRONMENT = GPHOTO_HOOK=$(srcdir)/test-hook.sh
+-
+-check_PROGRAMS = spawntest
+ 
+-spawntest_SOURCES = spawntest.c spawnve.c spawnve.h
diff --git a/multimedia/gphoto2/patches/002-disable-docs-translations.patch b/multimedia/gphoto2/patches/002-disable-docs-translations.patch
deleted file mode 100644
index 1def16a..0000000
--- a/multimedia/gphoto2/patches/002-disable-docs-translations.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -62,12 +62,7 @@ GP_REFERENCES()dnl
- dnl ---------------------------------------------------------------------------
- dnl i18n support
- 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 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_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
-@@ -352,11 +347,9 @@ AC_SUBST([AM_LDFLAGS])
- # Create output files
- # ---------------------------------------------------------------------------
- AC_CONFIG_FILES([
--po/Makefile.in 
- Makefile
- gphoto2/Makefile
- m4m/Makefile
--doc/Makefile
- contrib/Makefile
- packaging/Makefile
- packaging/rpm/Makefile
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,3 +1,3 @@
--SUBDIRS = m4m contrib doc gphoto2 packaging po
-+SUBDIRS = m4m contrib gphoto2 packaging
- 
- ACLOCAL_AMFLAGS = -I auto-m4 -I m4m
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -278,7 +278,7 @@ target_alias = @target_alias@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--SUBDIRS = m4m contrib doc gphoto2 packaging po
-+SUBDIRS = m4m contrib gphoto2 packaging
- ACLOCAL_AMFLAGS = -I auto-m4 -I m4m
- all: config.h
- 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
-- 
2.3.5