From f60840f3ee255a5fc80ff7a6ed228e1b0f793e1c Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Wed, 20 Jul 2011 21:50:51 +0000
Subject: [PATCH] [packages_10.03.1] merge r27714, r27715

SVN-Revision: 27716
---
 libs/libgphoto2/Makefile | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/libs/libgphoto2/Makefile b/libs/libgphoto2/Makefile
index 897c1e34c9..8ecea475bf 100644
--- a/libs/libgphoto2/Makefile
+++ b/libs/libgphoto2/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2010 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libgphoto2
 PKG_VERSION:=2.4.9
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/gphoto
@@ -51,14 +51,22 @@ CONFIGURE_ARGS += \
 	--without-libintl-prefix \
 
 CONFIGURE_VARS += \
-	CPPFLAGS="$$$$CPPFLAGS -I$(ICONV_PREFIX)/include" \
-	LDFLAGS="$$$$LDFLAGS -L$(ICONV_PREFIX)/lib" \
+	CPPFLAGS="$$$$CPPFLAGS $(ICONV_CFLAGS)" \
+	LDFLAGS="$$$$LDFLAGS $(ICONV_LDFLAGS)" \
 	LIBEXIF_CFLAGS="$$$$CPPFLAGS" \
 	LIBEXIF_LIBS="$$$$LDFLAGS -lexif" \
 	LIBUSB_CFLAGS="$$$$CPPFLAGS" \
 	LIBUSB_LIBS="$$$$LDFLAGS -lusb" \
 	LIBS="-lltdl" \
 
+# 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" .
+ifneq ($(ICONV_FULL),1)
+  CONFIGURE_VARS += am_cv_func_iconv=no am_cv_lib_iconv=no
+endif
+
 MAKE_FLAGS += \
 	LIBLTDL="" \
 
-- 
2.30.2