Created
April 14, 2015 11:51
-
-
Save plntyk/d87b62930481789e9bd2 to your computer and use it in GitHub Desktop.
libgphoto2: update to 2.5.7
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
libgphoto2: update to 2.5.7 | |
compile tested only | |
Signed-off-by: Dirk Neukirchen <dirkneukirchen@web.de> | |
--- | |
libs/libgphoto2/Makefile | 8 +- | |
libs/libgphoto2/patches/001-automake-compat.patch | 51 +++++-------- | |
.../002-no-tests-docs-examples-translations.patch | 86 ---------------------- | |
3 files changed, 23 insertions(+), 122 deletions(-) | |
delete mode 100644 libs/libgphoto2/patches/002-no-tests-docs-examples-translations.patch | |
diff --git a/libs/libgphoto2/Makefile b/libs/libgphoto2/Makefile | |
index bf4f55f..b5c4987 100644 | |
--- a/libs/libgphoto2/Makefile | |
+++ b/libs/libgphoto2/Makefile | |
@@ -1,5 +1,5 @@ | |
# | |
-# Copyright (C) 2006-2012 OpenWrt.org | |
+# Copyright (C) 2006-2015 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:=libgphoto2 | |
-PKG_VERSION:=2.4.12 | |
+PKG_VERSION:=2.5.7 | |
PKG_RELEASE:=1 | |
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 | |
PKG_SOURCE_URL:=@SF/gphoto | |
-PKG_MD5SUM:=735c50ebb15cb8be61bac400ee4afb1e | |
+PKG_MD5SUM:=6b20635dc9120efb3d23c3b5201894a2 | |
PKG_FIXUP:=autoreconf | |
PKG_LIBTOOL_PATHS:=. libgphoto2_port | |
@@ -30,7 +30,7 @@ endef | |
define Package/libgphoto2 | |
$(call Package/libgphoto2/Default) | |
- DEPENDS:=+libexif +libjpeg +libpthread +libltdl $(ICONV_DEPENDS) | |
+ DEPENDS:=+libexif +libjpeg +libpthread +libltdl $(ICONV_DEPENDS) +libxml2 | |
TITLE:=The basic library of the gphoto2 program. | |
MENU:=1 | |
endef | |
diff --git a/libs/libgphoto2/patches/001-automake-compat.patch b/libs/libgphoto2/patches/001-automake-compat.patch | |
index 60e47c8..306b64a 100644 | |
--- a/libs/libgphoto2/patches/001-automake-compat.patch | |
+++ b/libs/libgphoto2/patches/001-automake-compat.patch | |
@@ -1,6 +1,6 @@ | |
--- a/configure.ac | |
+++ b/configure.ac | |
-@@ -227,7 +227,6 @@ ALL_LINGUAS="da de es eu fr hu it ja nl | |
+@@ -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]) | |
AM_GNU_GETTEXT([external]) | |
@@ -10,44 +10,31 @@ | |
--- a/libgphoto2_port/configure.ac | |
+++ b/libgphoto2_port/configure.ac | |
-@@ -116,7 +116,6 @@ GP_GETTEXT_HACK([${PACKAGE}-${LIBGPHOTO2 | |
- ALL_LINGUAS="cs da de fr es eu it ja nl pl pt_BR ru sk sv uk vi zh_CN zh_TW" | |
+@@ -12,7 +12,7 @@ dnl The generated Makefile rule fails to | |
+ dnl the beginning of the /path/to/buildroot/PACKAGE-VERSION/foo/bar | |
+ dnl before determining the string length. However, the only relevant | |
+ dnl string to determine the length of would be PACKAGE-VERSION/foo/bar | |
+-AM_INIT_AUTOMAKE([-Wall gnu 1.9 dist-bzip2 check-news]) | |
++AM_INIT_AUTOMAKE([-Wall gnu 1.9 dist-bzip2 check-news subdir-objects]) | |
+ | |
+ AC_LANG(C) | |
+ | |
+@@ -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]) | |
AM_GNU_GETTEXT([external]) | |
-AM_PO_SUBDIRS() | |
AM_ICONV() | |
GP_GETTEXT_FLAGS() | |
---- a/libgphoto2_port/libgphoto2_port/Makefile.in | |
-+++ b/libgphoto2_port/libgphoto2_port/Makefile.in | |
-@@ -15,6 +15,8 @@ | |
- | |
- @SET_MAKE@ | |
+--- a/libgphoto2_port/Makefile.am | |
++++ b/libgphoto2_port/Makefile.am | |
+@@ -25,7 +25,7 @@ udevscript_PROGRAMS = | |
+ bin_SCRIPTS = gphoto2-port-config | |
-+SHELL = @SHELL@ | |
-+ | |
- VPATH = @srcdir@ | |
- pkgdatadir = $(datadir)/@PACKAGE@ | |
- pkgincludedir = $(includedir)/@PACKAGE@ | |
---- a/libgphoto2_port/Makefile.in | |
-+++ b/libgphoto2_port/Makefile.in | |
-@@ -15,7 +15,7 @@ | |
+ # The . stands for the current dir, i.e. the iolibs to build. | |
+-SUBDIRS = po libgphoto2_port test . doc m4 | |
++SUBDIRS = libgphoto2_port . m4 | |
- @SET_MAKE@ | |
-- | |
-+SHELL = @SHELL@ | |
- | |
- VPATH = @srcdir@ | |
- pkgdatadir = $(datadir)/@PACKAGE@ | |
---- a/Makefile.in | |
-+++ b/Makefile.in | |
-@@ -20,7 +20,7 @@ | |
######################################################################## | |
- # put file lists and special compile rules here | |
- | |
-- | |
-+SHELL = @SHELL@ | |
- | |
- VPATH = @srcdir@ | |
- pkgdatadir = $(datadir)/@PACKAGE@ | |
diff --git a/libs/libgphoto2/patches/002-no-tests-docs-examples-translations.patch b/libs/libgphoto2/patches/002-no-tests-docs-examples-translations.patch | |
deleted file mode 100644 | |
index 702e4cf..0000000 | |
--- a/libs/libgphoto2/patches/002-no-tests-docs-examples-translations.patch | |
+++ /dev/null | |
@@ -1,86 +0,0 @@ | |
---- a/configure.ac | |
-+++ b/configure.ac | |
-@@ -637,20 +637,11 @@ camlibs/konica/localization/Makefile | |
- libgphoto2/Makefile | |
- libgphoto2.pc | |
- libgphoto2-uninstalled.pc | |
--examples/Makefile | |
--tests/Makefile | |
--tests/check-camera-list.sh | |
--tests/ddb/Makefile | |
--tests/ddb/check-ddb.sh | |
- packaging/Makefile | |
- packaging/linux-hotplug/Makefile | |
- packaging/generic/Makefile | |
- packaging/rpm/Makefile | |
- packaging/rpm/package.spec | |
--po/Makefile.in | |
--doc/Makefile | |
--doc/Doxyfile | |
--doc/api/Makefile | |
- ],[ | |
- dnl This relies on this code being called for each of the above files | |
- dnl with ac_file set to the filename. | |
---- a/libgphoto2_port/configure.ac | |
-+++ b/libgphoto2_port/configure.ac | |
-@@ -485,7 +485,6 @@ AC_SUBST([AM_LDFLAGS]) | |
- # --------------------------------------------------------------------------- | |
- AC_CONFIG_FILES([ | |
- Makefile | |
--po/Makefile.in | |
- libgphoto2_port/Makefile | |
- libgphoto2_port.pc | |
- libgphoto2_port-uninstalled.pc | |
-@@ -497,8 +496,6 @@ usbscsi/Makefile | |
- disk/Makefile | |
- ptpip/Makefile | |
- gphoto2-port-config | |
--test/Makefile | |
--doc/Makefile | |
- m4/Makefile | |
- ]) | |
- AC_OUTPUT | |
---- a/libgphoto2_port/Makefile.am | |
-+++ b/libgphoto2_port/Makefile.am | |
-@@ -10,7 +10,7 @@ VERSION_FLAGS = -DLIBGPPORT_VERSION=\"@L | |
- bin_SCRIPTS = gphoto2-port-config | |
- | |
- # Note: @subdirs@ lists all the directories from AC_CONFIG_SUBDIRS() | |
--SUBDIRS = po libgphoto2_port test @IOLIB_SUBDIRS@ doc m4 | |
-+SUBDIRS = libgphoto2_port @IOLIB_SUBDIRS@ m4 | |
- | |
- EXTRA_DIST = \ | |
- AUTHORS \ | |
---- a/libgphoto2_port/Makefile.in | |
-+++ b/libgphoto2_port/Makefile.in | |
-@@ -325,7 +325,7 @@ VERSION_FLAGS = -DLIBGPPORT_VERSION=\"@L | |
- bin_SCRIPTS = gphoto2-port-config | |
- | |
- # Note: @subdirs@ lists all the directories from AC_CONFIG_SUBDIRS() | |
--SUBDIRS = po libgphoto2_port test @IOLIB_SUBDIRS@ doc m4 | |
-+SUBDIRS = libgphoto2_port @IOLIB_SUBDIRS@ m4 | |
- EXTRA_DIST = AUTHORS ChangeLog COPYING.LIB NEWS README iolib.sym \ | |
- gphoto2-port-config.in libgphoto2_port.pc.in \ | |
- libgphoto2_port-uninstalled.pc.in \ | |
---- a/Makefile.am | |
-+++ b/Makefile.am | |
-@@ -8,7 +8,7 @@ bin_SCRIPTS = gphoto2-config | |
- EXTRA_DIST = HACKING MAINTAINERS TESTERS installcheck.mk README.packaging | |
- | |
- # Note: @subdirs@ lists all the directories from AC_CONFIG_SUBDIRS() | |
--SUBDIRS = @subdirs@ libgphoto2 camlibs tests examples po packaging doc | |
-+SUBDIRS = @subdirs@ libgphoto2 camlibs packaging | |
- | |
- EXTRA_DIST += libgphoto2.pc.in | |
- pkgconfig_DATA = libgphoto2.pc | |
---- a/Makefile.in | |
-+++ b/Makefile.in | |
-@@ -357,7 +357,7 @@ EXTRA_DIST = HACKING MAINTAINERS TESTERS | |
- ChangeLog INSTALL README.in README README.packaging | |
- | |
- # Note: @subdirs@ lists all the directories from AC_CONFIG_SUBDIRS() | |
--SUBDIRS = @subdirs@ libgphoto2 camlibs tests examples po packaging doc | |
-+SUBDIRS = @subdirs@ libgphoto2 camlibs packaging | |
- pkgconfig_DATA = libgphoto2.pc | |
- noinst_DATA = libgphoto2-uninstalled.pc | |
- doc_DATA = AUTHORS COPYING NEWS ABOUT-NLS ChangeLog README \ | |
-- | |
2.3.5 | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment