From: jow Date: Mon, 6 Feb 2012 19:23:39 +0000 (+0000) Subject: [packages_10.03.2] gphoto2: merge r30324 X-Git-Url: https://git.archive.openwrt.org/?a=commitdiff_plain;h=8983384ac99e26be92b8e13f628e0928b8a510fc;p=10.03%2Fpackages.git [packages_10.03.2] gphoto2: merge r30324 git-svn-id: svn://svn.openwrt.org/openwrt/branches/packages_10.03.2@30342 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- diff --git a/multimedia/gphoto2/Makefile b/multimedia/gphoto2/Makefile index 0063a5a..29af0af 100644 --- a/multimedia/gphoto2/Makefile +++ b/multimedia/gphoto2/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2010 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:=gphoto2 -PKG_VERSION:=2.4.9 +PKG_VERSION:=2.4.11 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=@SF/gphoto -PKG_MD5SUM:=a08a93a425cde03ca8f9bade83bbd26a +PKG_MD5SUM:=2635075f702b40eb2e95a80658bd4773 PKG_FIXUP:=libtool PKG_INSTALL:=1 @@ -25,7 +25,7 @@ define Package/gphoto2 CATEGORY:=Multimedia TITLE:=Gphoto Digital Camera Control URL:=http://www.gphoto.org/ - DEPENDS:=+libgphoto2 +libpopt +libpthread + DEPENDS:=+libgphoto2 +libpopt +libpthread +libreadline endef define Package/gphoto2/description diff --git a/multimedia/gphoto2/patches/002-disable-docs-translations.patch b/multimedia/gphoto2/patches/002-disable-docs-translations.patch index 6431b48..1def16a 100644 --- a/multimedia/gphoto2/patches/002-disable-docs-translations.patch +++ b/multimedia/gphoto2/patches/002-disable-docs-translations.patch @@ -34,8 +34,8 @@ ACLOCAL_AMFLAGS = -I auto-m4 -I m4m --- a/Makefile.in +++ b/Makefile.in -@@ -238,7 +238,7 @@ sysconfdir = @sysconfdir@ - target_alias = @target_alias@ +@@ -278,7 +278,7 @@ target_alias = @target_alias@ + top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -SUBDIRS = m4m contrib doc gphoto2 packaging po