[packages_10.03.2] libgphoto2: merge r30323

git-svn-id: svn://svn.openwrt.org/openwrt/branches/packages_10.03.2@30341 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/libs/libgphoto2/Makefile b/libs/libgphoto2/Makefile
index 8ecea47..1eb335c 100644 (file)
--- a/libs/libgphoto2/Makefile
+++ b/libs/libgphoto2/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2011 OpenWrt.org
+# Copyright (C) 2006-2012 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libgphoto2
-PKG_VERSION:=2.4.9
-PKG_RELEASE:=2
+PKG_VERSION:=2.4.12
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/gphoto
-PKG_MD5SUM:=32b233189e3df7e5e67d2a81163682b8
+PKG_MD5SUM:=735c50ebb15cb8be61bac400ee4afb1e
 
 PKG_FIXUP:=libtool
 PKG_LIBTOOL_PATHS:=. libgphoto2_port
@@ -59,7 +59,7 @@ CONFIGURE_VARS += \
        LIBUSB_LIBS="$$$$LDFLAGS -lusb" \
        LIBS="-lltdl" \
 
-# If OpenWrt is using the iconv stub, we disable iconv support 
+# If OpenWrt is using the iconv stub, we disable iconv support
 # in libgphoto2 entirely since the stub lacks some essential
 # conversions like UCS-2 to UTF-8 which will let certain drivers
 # fail with "Failed to create iconv converter" .

diff --git a/libs/libgphoto2/patches/001-automake-compat.patch b/libs/libgphoto2/patches/001-automake-compat.patch
index 0da6e46..60e47c8 100644 (file)
--- a/libs/libgphoto2/patches/001-automake-compat.patch
+++ b/libs/libgphoto2/patches/001-automake-compat.patch
@@ -1,6 +1,6 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -227,7 +227,6 @@ ALL_LINGUAS="da de es eu fr hu it ja nl 
+@@ -227,7 +227,6 @@ ALL_LINGUAS="da de es eu fr hu it ja nl
  GP_GETTEXT_HACK([${PACKAGE}-${LIBGPHOTO2_CURRENT_MIN}],[The gPhoto Team],[${MAIL_GPHOTO_TRANSLATION}])
  AM_GNU_GETTEXT_VERSION([0.14.1])
  AM_GNU_GETTEXT([external])
@@ -20,7 +20,7 @@
  
 --- a/libgphoto2_port/libgphoto2_port/Makefile.in
 +++ b/libgphoto2_port/libgphoto2_port/Makefile.in
-@@ -14,6 +14,8 @@
+@@ -15,6 +15,8 @@
  
  @SET_MAKE@
  
@@ -28,10 +28,10 @@
 +
  VPATH = @srcdir@
  pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
 --- a/libgphoto2_port/Makefile.in
 +++ b/libgphoto2_port/Makefile.in
-@@ -14,7 +14,7 @@
+@@ -15,7 +15,7 @@
  
  @SET_MAKE@
  
@@ -42,7 +42,7 @@
  pkgdatadir = $(datadir)/@PACKAGE@
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -19,7 +19,7 @@
+@@ -20,7 +20,7 @@
  ########################################################################
  # put file lists and special compile rules here
  

diff --git a/libs/libgphoto2/patches/002-no-tests-docs-examples-translations.patch b/libs/libgphoto2/patches/002-no-tests-docs-examples-translations.patch
index 36a64aa..702e4cf 100644 (file)
--- a/libs/libgphoto2/patches/002-no-tests-docs-examples-translations.patch
+++ b/libs/libgphoto2/patches/002-no-tests-docs-examples-translations.patch
@@ -1,6 +1,6 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -628,20 +628,11 @@ camlibs/konica/localization/Makefile
+@@ -637,20 +637,11 @@ camlibs/konica/localization/Makefile
  libgphoto2/Makefile
  libgphoto2.pc
  libgphoto2-uninstalled.pc
@@ -23,7 +23,7 @@
  dnl with ac_file set to the filename.
 --- a/libgphoto2_port/configure.ac
 +++ b/libgphoto2_port/configure.ac
-@@ -483,7 +483,6 @@ AC_SUBST([AM_LDFLAGS])
+@@ -485,7 +485,6 @@ AC_SUBST([AM_LDFLAGS])
  # ---------------------------------------------------------------------------
  AC_CONFIG_FILES([
  Makefile
@@ -31,7 +31,7 @@
  libgphoto2_port/Makefile
  libgphoto2_port.pc
  libgphoto2_port-uninstalled.pc
-@@ -494,8 +493,6 @@ usbscsi/Makefile
+@@ -497,8 +496,6 @@ usbscsi/Makefile
  disk/Makefile
  ptpip/Makefile
  gphoto2-port-config
@@ -53,7 +53,7 @@
        AUTHORS \
 --- a/libgphoto2_port/Makefile.in
 +++ b/libgphoto2_port/Makefile.in
-@@ -271,7 +271,7 @@ VERSION_FLAGS = -DLIBGPPORT_VERSION=\"@L
+@@ -325,7 +325,7 @@ VERSION_FLAGS = -DLIBGPPORT_VERSION=\"@L
  bin_SCRIPTS = gphoto2-port-config
  
  # Note: @subdirs@ lists all the directories from AC_CONFIG_SUBDIRS()
@@ -75,7 +75,7 @@
  pkgconfig_DATA = libgphoto2.pc
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -302,7 +302,7 @@ EXTRA_DIST = HACKING MAINTAINERS TESTERS
+@@ -357,7 +357,7 @@ EXTRA_DIST = HACKING MAINTAINERS TESTERS
        ChangeLog INSTALL README.in README README.packaging
  
  # Note: @subdirs@ lists all the directories from AC_CONFIG_SUBDIRS()