X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=libs%2Flibgphoto2%2FMakefile;h=00a37ca52309f45842413db81babded30dac703e;hp=4953806fec8a471546e2d966fabe1ddd7af90343;hb=e42312a382ab96a287892fcc1445ba19745d3101;hpb=5360edce8f45be94248e74df88c9c3c4206bf3ce

diff --git a/libs/libgphoto2/Makefile b/libs/libgphoto2/Makefile
index 4953806fec..00a37ca523 100644
--- a/libs/libgphoto2/Makefile
+++ b/libs/libgphoto2/Makefile
@@ -9,12 +9,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libgphoto2
-PKG_VERSION:=2.2.1
+PKG_VERSION:=2.3.1
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/gphoto
-PKG_MD5SUM:=69827311733e39fafa9f77bb05e55b77
+PKG_MD5SUM:=37f85e34e5b6031ddf6cac8b8782ac4f
 PKG_CAT:=bzcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
@@ -31,7 +31,7 @@ endef
 
 define Package/libgphoto2
   $(call Package/libgphoto2/Default)
-  DEPENDS:=+libusb +libexif +libjpeg +libpthread +libltdl
+  DEPENDS:=+libusb +libexif +libjpeg +libpthread +libltdl +libiconv
   TITLE:=The basic library of the gphoto2 program.
   MENU:=1
 endef
@@ -47,12 +47,13 @@ define Build/Configure
 		--enable-shared \
 		--enable-static \
 		--disable-rpath \
-		--with-gnu-ld \
 		--with-drivers=all \
 		--without-included-ltdl \
 		--without-libiconv-prefix \
 		--without-libintl-prefix \
 		, \
+		CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/lib/libiconv/include" \
+		LDFLAGS="$$$$LDFLAGS -L$(STAGING_DIR)/usr/lib/libiconv/lib" \
 		LIBEXIF_CFLAGS="$$$$CPPFLAGS" \
 		LIBEXIF_LIBS="$$$$LDFLAGS -lexif" \
 		LIBUSB_CFLAGS="$$$$CPPFLAGS" \
@@ -62,7 +63,7 @@ define Build/Configure
 endef
 
 define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) -j$(CONFIG_JLEVEL) \
+	$(MAKE) -C $(PKG_BUILD_DIR) \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		LIBLTDL="" \
 		all install
@@ -82,10 +83,13 @@ define Build/InstallDev
 	$(SED) 's,-L$$$${exec_prefix}/lib,,g' $(STAGING_DIR)/usr/lib/pkgconfig/libgphoto2.pc
 	$(SED) 's,-I$$$${includedir}/gphoto2,,g' $(STAGING_DIR)/usr/lib/pkgconfig/libgphoto2.pc
 	$(SED) 's,-L$$$${libdir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/libgphoto2.pc
+	# remove annoying recursive symlink
+	rm -f $(STAGING_DIR)/usr/include/gphoto2/gphoto2
 endef
 
 define Build/UninstallDev
-	rm -rf	$(STAGING_DIR)/usr/bin/gphoto2-config \
+	rm -rf \
+		$(STAGING_DIR)/usr/bin/gphoto2-config \
 		$(STAGING_DIR)/usr/bin/gphoto2-port-config \
 		$(STAGING_DIR)/usr/include/gphoto2* \
 		$(STAGING_DIR)/usr/lib/libgphoto*.{a,so*}