What's wrong with this patch?
2012/9/10 Henning Meyer <[email protected]>: > From: Henning Meyer <[email protected]> > > Update from libgphoto2 2.4.12 to 2.5.0 and gphoto2 2.4.11 to 2.5.0. > > Signed-off-by: Henning Meyer <[email protected]> > --- > svn diff packages > Index: packages/libs/libgphoto2/Makefile > =================================================================== > --- packages/libs/libgphoto2/Makefile (Revision 33315) > +++ packages/libs/libgphoto2/Makefile (Arbeitskopie) > @@ -8,12 +8,12 @@ > include $(TOPDIR)/rules.mk > > PKG_NAME:=libgphoto2 > -PKG_VERSION:=2.4.12 > +PKG_VERSION:=2.5.0 > PKG_RELEASE:=1 > > PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 > PKG_SOURCE_URL:=@SF/gphoto > -PKG_MD5SUM:=735c50ebb15cb8be61bac400ee4afb1e > +PKG_MD5SUM:=467638d80ec0ef057999361aeb49d123 > > PKG_FIXUP:=autoreconf > PKG_LIBTOOL_PATHS:=. libgphoto2_port > Index: > packages/libs/libgphoto2/patches/002-no-tests-docs-examples-translations.patch > =================================================================== > --- > packages/libs/libgphoto2/patches/002-no-tests-docs-examples-translations.patch > (Revision > 33315) > +++ > packages/libs/libgphoto2/patches/002-no-tests-docs-examples-translations.patch > (Arbeitskopie) > @@ -1,12 +1,23 @@ > ---- a/configure.ac > -+++ b/configure.ac > -@@ -637,20 +637,11 @@ camlibs/konica/localization/Makefile > +diff -upNr a/camlibs/st2205/library.c b/camlibs/st2205/library.c > +--- a/camlibs/st2205/library.c 2011-04-04 22:57:00.000000000 +0200 > ++++ b/camlibs/st2205/library.c 2012-09-06 20:21:44.341737161 +0200 > +@@ -290,6 +290,7 @@ put_file_func (CameraFilesystem *fs, con > + outc = out - out_name; > + out_name[outc] = 0; > + #else > ++ int i; > + for (i = 0; i < inc; i++) { > + if ((uint8_t)in_name[i] < 0x20 || (uint8_t)in_name[i] > 0x7E) > + out_name[i] = '?'; > +diff -upNr a/configure.ac b/configure.ac > +--- a/configure.ac 2012-07-10 09:12:29.000000000 +0200 > ++++ b/configure.ac 2012-09-06 20:20:47.949735820 +0200 > +@@ -660,20 +660,11 @@ camlibs/konica/localization/Makefile > libgphoto2/Makefile > libgphoto2.pc > libgphoto2-uninstalled.pc > -examples/Makefile > -tests/Makefile > --tests/check-camera-list.sh > -tests/ddb/Makefile > -tests/ddb/check-ddb.sh > packaging/Makefile > @@ -17,13 +28,15 @@ > -po/Makefile.in > -doc/Makefile > -doc/Doxyfile > +-doc/Doxyfile-internals > -doc/api/Makefile > ],[ > dnl This relies on this code being called for each of the above files > dnl with ac_file set to the filename. > ---- a/libgphoto2_port/configure.ac > -+++ b/libgphoto2_port/configure.ac > -@@ -485,7 +485,6 @@ AC_SUBST([AM_LDFLAGS]) > +diff -upNr a/libgphoto2_port/configure.ac b/libgphoto2_port/configure.ac > +--- a/libgphoto2_port/configure.ac 2012-06-03 13:58:54.000000000 +0200 > ++++ b/libgphoto2_port/configure.ac 2012-09-06 20:20:47.953735820 +0200 > +@@ -474,13 +474,10 @@ AC_SUBST([AM_LDFLAGS]) > # > --------------------------------------------------------------------------- > AC_CONFIG_FILES([ > Makefile > @@ -31,41 +44,41 @@ > libgphoto2_port/Makefile > libgphoto2_port.pc > libgphoto2_port-uninstalled.pc > -@@ -497,8 +496,6 @@ usbscsi/Makefile > - disk/Makefile > - ptpip/Makefile > gphoto2-port-config > -test/Makefile > -doc/Makefile > m4/Makefile > ]) > AC_OUTPUT > ---- a/libgphoto2_port/Makefile.am > -+++ b/libgphoto2_port/Makefile.am > -@@ -10,7 +10,7 @@ VERSION_FLAGS = -DLIBGPPORT_VERSION=\"@L > +diff -upNr a/libgphoto2_port/Makefile.am b/libgphoto2_port/Makefile.am > +--- a/libgphoto2_port/Makefile.am 2011-11-11 20:56:37.000000000 +0100 > ++++ b/libgphoto2_port/Makefile.am 2012-09-06 20:20:47.953735820 +0200 > +@@ -25,7 +25,7 @@ udevscript_PROGRAMS = > bin_SCRIPTS = gphoto2-port-config > > - # Note: @subdirs@ lists all the directories from AC_CONFIG_SUBDIRS() > --SUBDIRS = po libgphoto2_port test @IOLIB_SUBDIRS@ doc m4 > -+SUBDIRS = libgphoto2_port @IOLIB_SUBDIRS@ m4 > + # The . stands for the current dir, i.e. the iolibs to build. > +-SUBDIRS = po libgphoto2_port test . doc m4 > ++SUBDIRS = libgphoto2_port . m4 > > - EXTRA_DIST = \ > - AUTHORS \ > ---- a/libgphoto2_port/Makefile.in > -+++ b/libgphoto2_port/Makefile.in > -@@ -325,7 +325,7 @@ VERSION_FLAGS = -DLIBGPPORT_VERSION=\"@L > + > + ######################################################################## > +diff -upNr a/libgphoto2_port/Makefile.in b/libgphoto2_port/Makefile.in > +--- a/libgphoto2_port/Makefile.in 2012-06-03 13:59:12.000000000 +0200 > ++++ b/libgphoto2_port/Makefile.in 2012-09-06 20:20:47.953735820 +0200 > +@@ -443,7 +443,7 @@ EXTRA_LTLIBRARIES = disk.la ptpip.la ser > bin_SCRIPTS = gphoto2-port-config > > - # Note: @subdirs@ lists all the directories from AC_CONFIG_SUBDIRS() > --SUBDIRS = po libgphoto2_port test @IOLIB_SUBDIRS@ doc m4 > -+SUBDIRS = libgphoto2_port @IOLIB_SUBDIRS@ m4 > - EXTRA_DIST = AUTHORS ChangeLog COPYING.LIB NEWS README iolib.sym \ > - gphoto2-port-config.in libgphoto2_port.pc.in \ > - libgphoto2_port-uninstalled.pc.in \ > ---- a/Makefile.am > -+++ b/Makefile.am > + # The . stands for the current dir, i.e. the iolibs to build. > +-SUBDIRS = po libgphoto2_port test . doc m4 > ++SUBDIRS = libgphoto2_port . m4 > + > + ######################################################################## > + # All iolibs are defined as EXTRA_LTLIBRARIES. This requires that > +diff -upNr a/Makefile.am b/Makefile.am > +--- a/Makefile.am 2008-10-04 20:53:09.000000000 +0200 > ++++ b/Makefile.am 2012-09-06 20:20:47.957735819 +0200 > @@ -8,7 +8,7 @@ bin_SCRIPTS = gphoto2-config > - EXTRA_DIST = HACKING MAINTAINERS TESTERS installcheck.mk README.packaging > + EXTRA_DIST = HACKING MAINTAINERS TESTERS installcheck.mk > > # Note: @subdirs@ lists all the directories from AC_CONFIG_SUBDIRS() > -SUBDIRS = @subdirs@ libgphoto2 camlibs tests examples po packaging doc > @@ -73,10 +86,11 @@ > > EXTRA_DIST += libgphoto2.pc.in > pkgconfig_DATA = libgphoto2.pc > ---- a/Makefile.in > -+++ b/Makefile.in > -@@ -357,7 +357,7 @@ EXTRA_DIST = HACKING MAINTAINERS TESTERS > - ChangeLog INSTALL README.in README README.packaging > +diff -upNr a/Makefile.in b/Makefile.in > +--- a/Makefile.in 2012-07-10 09:12:55.000000000 +0200 > ++++ b/Makefile.in 2012-09-06 20:20:47.957735819 +0200 > +@@ -366,7 +366,7 @@ EXTRA_DIST = HACKING MAINTAINERS TESTERS > + INSTALL README.in README README.packaging > > # Note: @subdirs@ lists all the directories from AC_CONFIG_SUBDIRS() > -SUBDIRS = @subdirs@ libgphoto2 camlibs tests examples po packaging doc > Index: packages/multimedia/gphoto2/patches/001-automake-compat.patch > =================================================================== > --- packages/multimedia/gphoto2/patches/001-automake-compat.patch > (Revision > 33315) > +++ packages/multimedia/gphoto2/patches/001-automake-compat.patch > (Arbeitskopie) > @@ -1,7 +1,8 @@ > ---- 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" > +diff -uprNr a/configure.ac b/configure.ac > +--- a/configure.ac 2012-07-10 09:13:10.000000000 +0200 > ++++ b/configure.ac 2012-09-08 14:17:34.389403102 +0200 > +@@ -67,7 +67,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() > Index: packages/multimedia/gphoto2/patches/002-disable-docs-translations.patch > =================================================================== > --- packages/multimedia/gphoto2/patches/002-disable-docs-translations.patch > (Revision > 33315) > +++ packages/multimedia/gphoto2/patches/002-disable-docs-translations.patch > (Arbeitskopie) > @@ -1,11 +1,12 @@ > ---- a/configure.ac > -+++ b/configure.ac > -@@ -62,12 +62,7 @@ GP_REFERENCES()dnl > +diff -upNr a/configure.ac b/configure.ac > +--- a/configure.ac 2012-09-08 14:37:00.901430825 +0200 > ++++ b/configure.ac 2012-09-08 14:58:49.021461914 +0200 > +@@ -63,12 +63,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" > +-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_ICONV() > @@ -13,7 +14,7 @@ > > 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]) > +@@ -361,20 +356,13 @@ AC_SUBST([AM_LDFLAGS]) > # Create output files > # > --------------------------------------------------------------------------- > AC_CONFIG_FILES([ > @@ -25,20 +26,31 @@ > contrib/Makefile > packaging/Makefile > packaging/rpm/Makefile > ---- a/Makefile.am > -+++ b/Makefile.am > + packaging/rpm/package.spec > +-tests/data/Makefile > +-tests/staging/subdir1/Makefile > +-tests/staging/subdir2/Makefile > +-tests/staging/Makefile > +-tests/Makefile > + ]) > + AC_OUTPUT()dnl > + > +diff -upNr a/Makefile.am b/Makefile.am > +--- a/Makefile.am 2007-10-28 18:55:01.000000000 +0100 > ++++ b/Makefile.am 2012-09-08 14:56:47.621459028 +0200 > @@ -1,3 +1,3 @@ > --SUBDIRS = m4m contrib doc gphoto2 packaging po > +-SUBDIRS = m4m contrib doc gphoto2 packaging po tests > +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@ > +diff -upNr a/Makefile.in b/Makefile.in > +--- a/Makefile.in 2012-07-10 09:13:22.000000000 +0200 > ++++ b/Makefile.in 2012-09-08 14:33:00.653425114 +0200 > +@@ -279,7 +279,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 doc gphoto2 packaging po tests > +SUBDIRS = m4m contrib gphoto2 packaging > ACLOCAL_AMFLAGS = -I auto-m4 -I m4m > all: config.h > Index: packages/multimedia/gphoto2/Makefile > =================================================================== > --- packages/multimedia/gphoto2/Makefile (Revision 33315) > +++ packages/multimedia/gphoto2/Makefile (Arbeitskopie) > @@ -8,12 +8,12 @@ > include $(TOPDIR)/rules.mk > > PKG_NAME:=gphoto2 > -PKG_VERSION:=2.4.11 > +PKG_VERSION:=2.5.0 > PKG_RELEASE:=1 > > PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 > PKG_SOURCE_URL:=@SF/gphoto > -PKG_MD5SUM:=2635075f702b40eb2e95a80658bd4773 > +PKG_MD5SUM:=64c6d291c5bd50388af0c51da71efb59 > > PKG_FIXUP:=autoreconf > PKG_INSTALL:=1 _______________________________________________ openwrt-devel mailing list [email protected] https://lists.openwrt.org/mailman/listinfo/openwrt-devel
