libgphoto2: update to 2.5.8

- Added build dependencies zlib and libxml2
- Adapted 0001-configure-ac-remove-AM_PO_SUBDIRS.patch
- Removed patch allow.to.disable.gd.patch:
  Removing libgd is now possible using the
  configure flag "--without-gdlib"
- Regenerated .fdi and .rules files

Signed-off-by: Andreas Baak <andreas.baak@gmail.com>

meta-oe/recipes-graphics/gphoto2/libgphoto2-2.4.11/allow.to.disable.gd.patch

@@ -1,33 +0,0 @@
---- libgphoto2-2.4.11.orig/configure.ac	2013-07-19 21:59:10.857223729 +0200
-+++ libgphoto2-2.4.11/configure.ac	2013-07-19 22:06:13.873233928 +0200
-@@ -270,15 +270,21 @@
- dnl ---------------------------------------------------------------------------
- dnl check for libgd
- dnl ---------------------------------------------------------------------------
--LIBGD=""
--libgd_msg="no"
--AC_SUBST(LIBGD)
--AC_CHECK_LIB(gd,gdImageCreateTrueColor,[
--	AC_CHECK_HEADER(gd.h,[
--		AC_DEFINE(HAVE_GD,1,[define if we have LIBGD and its headers])
--		LIBGD="-lgd"
--		libgd_msg="yes"
--	])
-+AC_ARG_ENABLE([gd],
-+[AS_HELP_STRING([--enable-gd],
-+                [enable gd support])],[
-+        LIBGD=""
-+        libgd_msg="no"
-+        AC_SUBST(LIBGD)
-+        if test "x$enableval" != "xno"; then
-+                AC_CHECK_LIB(gd,gdImageCreateTrueColor,[
-+                        AC_CHECK_HEADER(gd.h,[
-+                                AC_DEFINE(HAVE_GD,1,[define if we have LIBGD and its headers])
-+                                LIBGD="-lgd"
-+                                libgd_msg="yes"
-+                        ])
-+                ])
-+        fi
- ])
- GP_CONFIG_MSG([GD conversion support],[${libgd_msg}])
- 

meta-oe/recipes-graphics/gphoto2/libgphoto2-2.5.8/0001-configure.ac-remove-AM_PO_SUBDIRS.patch

@@ -23,7 +23,7 @@ diff --git a/configure.ac b/configure.ac
 index 2f8e1b8..2e90acf 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -227,7 +227,6 @@ ALL_LINGUAS="da de es eu fr hu it ja nl pl ru sv uk vi zh_CN"
+@@ -209,7 +209,6 @@ ALL_LINGUAS="cs da de es eu fr hu it ja nl pl ru sv uk vi zh_CN"
  GP_GETTEXT_HACK([${PACKAGE}-${LIBGPHOTO2_CURRENT_MIN}],[The gPhoto Team],[${MAIL_GPHOTO_TRANSLATION}])
  AM_GNU_GETTEXT_VERSION([0.14.1])
  AM_GNU_GETTEXT([external])
@@ -35,8 +35,8 @@ diff --git a/libgphoto2_port/configure.ac b/libgphoto2_port/configure.ac
 index 0b66d58..df47357 100644
 --- a/libgphoto2_port/configure.ac
 +++ b/libgphoto2_port/configure.ac
-@@ -116,7 +116,6 @@ GP_GETTEXT_HACK([${PACKAGE}-${LIBGPHOTO2_PORT_CURRENT_MIN}],[Lutz Mueller and ot
- ALL_LINGUAS="cs da de fr es eu it ja nl pl pt_BR ru sk sv uk vi zh_CN zh_TW"
+@@ -124,7 +124,6 @@ GP_GETTEXT_HACK([${PACKAGE}-${LIBGPHOTO2_PORT_CURRENT_MIN}],[Lutz Mueller and ot
+ 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])
  AM_GNU_GETTEXT([external])
 -AM_PO_SUBDIRS()

meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.8.bb

@@ -3,12 +3,10 @@ SECTION = "libs"
 LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=0448d3676bc0de00406af227d341a4d1"
 
-PR = "r5"
-
-DEPENDS = "libtool jpeg virtual/libusb0 libexif"
+DEPENDS = "libtool jpeg virtual/libusb0 libexif zlib libxml2"
 
 # The .fdi and .rules files were generated with:
-#  libgphoto2-2.4.7/packaging/generic$ qemu-arm -s 1048576 -r 2.6.24 -L /OE/angstrom-dev/staging/armv5te-angstrom-linux-gnueabi/ .libs/print-camera-list
+#  libgphoto2-2.5.8/packaging/generic$ qemu-arm -s 1048576 -r 2.6.24 -L /OE/angstrom-dev/staging/armv5te-angstrom-linux-gnueabi/ .libs/print-camera-list
 # They are release specific, so please regen when adding new releases
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/libgphoto2-${PV}.tar.bz2;name=libgphoto2 \
@@ -16,18 +14,17 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/libgphoto2-${PV}.tar.bz2;name=libgphoto2
            file://10-camera-libgphoto2.fdi \
            file://40-libgphoto2.rules \
            file://0001-configure.ac-remove-AM_PO_SUBDIRS.patch \
-           file://allow.to.disable.gd.patch \
 "
 
-SRC_URI[libgphoto2.md5sum] = "16a22b9739e45a95980ed62705fe7333"
-SRC_URI[libgphoto2.sha256sum] = "5116bbacea57dfe22585e8e939ea30b5fb99fe08de526002788c84e37105c423"
+SRC_URI[libgphoto2.md5sum] = "873ab01aced49c6b92a98e515db5dcef"
+SRC_URI[libgphoto2.sha256sum] = "031a262e342fae43f724afe66787947ce1fb483277dfe5a8cf1fbe92c58e27b6"
 
 inherit autotools pkgconfig gettext lib_package
 
 EXTRA_OECONF = " --with-drivers=all udevscriptdir=/lib/udev ac_cv_lib_ltdl_lt_dlcaller_register=yes"
 
 PACKAGECONFIG ??= ""
-PACKAGECONFIG[gd] = "--enable-gd,--disable-gd,gd"
+PACKAGECONFIG[gd] = ",--without-gdlib,gd"
 PACKAGECONFIG[serial] = "--enable-serial,--disable-serial,lockdev"
 
 do_configure_append() {
@@ -56,5 +53,3 @@ FILES_${PN} += "${nonarch_base_libdir}/udev/* ${datadir}/hal"
 FILES_${PN}-dbg += "${libdir}/*/*/.debug"
 FILES_${PN}-dev += "${libdir}/*/*/*.la"
 
-
-