Merge pull request #6143 from DocLM/libgphoto2

libgphoto2: update package 2.5.18

libs/libgphoto2/Makefile

@@ -9,14 +9,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libgphoto2
-PKG_VERSION:=2.5.17
+PKG_VERSION:=2.5.18
 PKG_RELEASE:=1
 PORT_VERSION:=0.12.0
 PKG_MAINTAINER:=Leonardo Medici <leonardo_medici@me.com>
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/gphoto
-PKG_HASH:=417464f0a313fa937e8a71cdf18a371cf01e750830195cd63ae31da0d092b555
+PKG_HASH:=5b17b89d7ca0ec35c72c94ac3701e87d49e52371f9509b8e5c08c913ae57a7ec
 PKG_LICENSE:=LGPL-2.1
 PKG_LICENSE_FILES:=COPYING
 

libs/libgphoto2/patches/001-automake-compat.patch

@@ -1,7 +1,7 @@
-Index: libgphoto2-2.5.17/configure.ac
+Index: libgphoto2-2.5.18/configure.ac
 ===================================================================
---- libgphoto2-2.5.17.orig/configure.ac
-+++ libgphoto2-2.5.17/configure.ac
+--- libgphoto2-2.5.18.orig/configure.ac
++++ libgphoto2-2.5.18/configure.ac
 @@ -209,7 +209,6 @@ ALL_LINGUAS="cs da de es eu fr hu it ja
  GP_GETTEXT_HACK([${PACKAGE}-${LIBGPHOTO2_CURRENT_MIN}],[The gPhoto Team],[${MAIL_GPHOTO_TRANSLATION}])
  AM_GNU_GETTEXT_VERSION([0.14.1])
@@ -10,10 +10,10 @@ Index: libgphoto2-2.5.17/configure.ac
  AM_ICONV()
  GP_GETTEXT_FLAGS()
 
-Index: libgphoto2-2.5.17/libgphoto2_port/configure.ac
+Index: libgphoto2-2.5.18/libgphoto2_port/configure.ac
 ===================================================================
---- libgphoto2-2.5.17.orig/libgphoto2_port/configure.ac
-+++ libgphoto2-2.5.17/libgphoto2_port/configure.ac
+--- libgphoto2-2.5.18.orig/libgphoto2_port/configure.ac
++++ libgphoto2-2.5.18/libgphoto2_port/configure.ac
 @@ -124,7 +124,6 @@ GP_GETTEXT_HACK([${PACKAGE}-${LIBGPHOTO2
  ALL_LINGUAS="cs da de es eu fi fr it ja nl pl pt_BR ru sk sr sv uk vi zh_CN zh_TW"
  AM_GNU_GETTEXT_VERSION([0.14.1])

libs/libgphoto2/patches/002-no-docs-examples-test-translations.patch

@@ -1,7 +1,7 @@
-Index: libgphoto2-2.5.17/Makefile.am
+Index: libgphoto2-2.5.18/Makefile.am
 ===================================================================
---- libgphoto2-2.5.17.orig/Makefile.am
-+++ libgphoto2-2.5.17/Makefile.am
+--- libgphoto2-2.5.18.orig/Makefile.am
++++ libgphoto2-2.5.18/Makefile.am
 @@ -8,7 +8,7 @@ bin_SCRIPTS = gphoto2-config
  EXTRA_DIST = HACKING MAINTAINERS TESTERS installcheck.mk
 
@@ -11,10 +11,10 @@ Index: libgphoto2-2.5.17/Makefile.am
 
  EXTRA_DIST    += libgphoto2.pc.in
  pkgconfig_DATA = libgphoto2.pc
-Index: libgphoto2-2.5.17/Makefile.in
+Index: libgphoto2-2.5.18/Makefile.in
 ===================================================================
---- libgphoto2-2.5.17.orig/Makefile.in
-+++ libgphoto2-2.5.17/Makefile.in
+--- libgphoto2-2.5.18.orig/Makefile.in
++++ libgphoto2-2.5.18/Makefile.in
 @@ -482,7 +482,7 @@ EXTRA_DIST = HACKING MAINTAINERS TESTERS
  	INSTALL README.in README README.packaging
 
@@ -24,10 +24,10 @@ Index: libgphoto2-2.5.17/Makefile.in
  pkgconfig_DATA = libgphoto2.pc
  noinst_DATA = libgphoto2-uninstalled.pc
  doc_DATA = AUTHORS COPYING NEWS ABOUT-NLS ChangeLog README \
-Index: libgphoto2-2.5.17/configure.ac
+Index: libgphoto2-2.5.18/configure.ac
 ===================================================================
---- libgphoto2-2.5.17.orig/configure.ac
-+++ libgphoto2-2.5.17/configure.ac
+--- libgphoto2-2.5.18.orig/configure.ac
++++ libgphoto2-2.5.18/configure.ac
 @@ -635,20 +635,11 @@ gphoto-m4/Makefile
  libgphoto2/Makefile
  libgphoto2.pc
@@ -49,10 +49,10 @@ Index: libgphoto2-2.5.17/configure.ac
  ],[
  dnl This relies on this code being called for each of the above files
  dnl with ac_file set to the filename.
-Index: libgphoto2-2.5.17/libgphoto2_port/Makefile.am
+Index: libgphoto2-2.5.18/libgphoto2_port/Makefile.am
 ===================================================================
---- libgphoto2-2.5.17.orig/libgphoto2_port/Makefile.am
-+++ libgphoto2-2.5.17/libgphoto2_port/Makefile.am
+--- libgphoto2-2.5.18.orig/libgphoto2_port/Makefile.am
++++ libgphoto2-2.5.18/libgphoto2_port/Makefile.am
 @@ -25,7 +25,7 @@ udevscript_PROGRAMS =
  bin_SCRIPTS = gphoto2-port-config
 
@@ -62,10 +62,10 @@ Index: libgphoto2-2.5.17/libgphoto2_port/Makefile.am
 
 
  ########################################################################
-Index: libgphoto2-2.5.17/libgphoto2_port/Makefile.in
+Index: libgphoto2-2.5.18/libgphoto2_port/Makefile.in
 ===================================================================
---- libgphoto2-2.5.17.orig/libgphoto2_port/Makefile.in
-+++ libgphoto2-2.5.17/libgphoto2_port/Makefile.in
+--- libgphoto2-2.5.18.orig/libgphoto2_port/Makefile.in
++++ libgphoto2-2.5.18/libgphoto2_port/Makefile.in
 @@ -574,7 +574,7 @@ EXTRA_LTLIBRARIES = disk.la ptpip.la ser
  bin_SCRIPTS = gphoto2-port-config
 
@@ -75,10 +75,10 @@ Index: libgphoto2-2.5.17/libgphoto2_port/Makefile.in
 
  ########################################################################
  # All iolibs are defined as EXTRA_LTLIBRARIES. This requires that
-Index: libgphoto2-2.5.17/libgphoto2_port/configure.ac
+Index: libgphoto2-2.5.18/libgphoto2_port/configure.ac
 ===================================================================
---- libgphoto2-2.5.17.orig/libgphoto2_port/configure.ac
-+++ libgphoto2-2.5.17/libgphoto2_port/configure.ac
+--- libgphoto2-2.5.18.orig/libgphoto2_port/configure.ac
++++ libgphoto2-2.5.18/libgphoto2_port/configure.ac
 @@ -512,13 +512,10 @@ AC_SUBST([AM_LDFLAGS])
  # ---------------------------------------------------------------------------
  AC_CONFIG_FILES([