From: Leonardo Medici Date: Sun, 15 Oct 2017 18:27:25 +0000 (+0200) Subject: libgphoto2: update package to 2.5.16 X-Git-Url: http://git.openwrt.org/?p=feed%2Fpackages.git;a=commitdiff_plain;h=52879d761c9ac8c306cecb4484f9241695d07736 libgphoto2: update package to 2.5.16 Signed-off-by: Leonardo Medici --- diff --git a/libs/libgphoto2/Makefile b/libs/libgphoto2/Makefile index 20a5585b13..b5af7f1008 100644 --- a/libs/libgphoto2/Makefile +++ b/libs/libgphoto2/Makefile @@ -9,14 +9,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libgphoto2 -PKG_VERSION:=2.5.14 -PKG_RELEASE:=2 +PKG_VERSION:=2.5.16 +PKG_RELEASE:=1 PORT_VERSION:=0.12.0 PKG_MAINTAINER:=Leonardo Medici PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=@SF/gphoto -PKG_HASH:=d3ce70686fb87d6791b9adcbb6e5693bfbe1cfef9661c23c75eb8a699ec4e274 +PKG_HASH:=e757416d1623e01a9d0d294b2e790162e434c0964f50d3b7ff1a3424b62a2906 PKG_LICENSE:=LGPL-2.1 PKG_LICENSE_FILES:=COPYING diff --git a/libs/libgphoto2/patches/001-automake-compat.patch b/libs/libgphoto2/patches/001-automake-compat.patch index e1b9977b6d..fa70b543f2 100644 --- a/libs/libgphoto2/patches/001-automake-compat.patch +++ b/libs/libgphoto2/patches/001-automake-compat.patch @@ -1,7 +1,7 @@ -Index: libgphoto2-2.5.14/configure.ac +Index: libgphoto2-2.5.16/configure.ac =================================================================== ---- libgphoto2-2.5.14.orig/configure.ac -+++ libgphoto2-2.5.14/configure.ac +--- libgphoto2-2.5.16.orig/configure.ac ++++ libgphoto2-2.5.16/configure.ac @@ -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]) @@ -10,10 +10,10 @@ Index: libgphoto2-2.5.14/configure.ac AM_ICONV() GP_GETTEXT_FLAGS() -Index: libgphoto2-2.5.14/libgphoto2_port/configure.ac +Index: libgphoto2-2.5.16/libgphoto2_port/configure.ac =================================================================== ---- libgphoto2-2.5.14.orig/libgphoto2_port/configure.ac -+++ libgphoto2-2.5.14/libgphoto2_port/configure.ac +--- libgphoto2-2.5.16.orig/libgphoto2_port/configure.ac ++++ libgphoto2-2.5.16/libgphoto2_port/configure.ac @@ -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]) diff --git a/libs/libgphoto2/patches/002-no-docs-examples-test-translations.patch b/libs/libgphoto2/patches/002-no-docs-examples-test-translations.patch index 9914201dc0..2bb0e0c43a 100644 --- a/libs/libgphoto2/patches/002-no-docs-examples-test-translations.patch +++ b/libs/libgphoto2/patches/002-no-docs-examples-test-translations.patch @@ -1,7 +1,7 @@ -Index: libgphoto2-2.5.14/Makefile.am +Index: libgphoto2-2.5.16/Makefile.am =================================================================== ---- libgphoto2-2.5.14.orig/Makefile.am -+++ libgphoto2-2.5.14/Makefile.am +--- libgphoto2-2.5.16.orig/Makefile.am ++++ libgphoto2-2.5.16/Makefile.am @@ -8,7 +8,7 @@ bin_SCRIPTS = gphoto2-config EXTRA_DIST = HACKING MAINTAINERS TESTERS installcheck.mk @@ -11,10 +11,10 @@ Index: libgphoto2-2.5.14/Makefile.am EXTRA_DIST += libgphoto2.pc.in pkgconfig_DATA = libgphoto2.pc -Index: libgphoto2-2.5.14/Makefile.in +Index: libgphoto2-2.5.16/Makefile.in =================================================================== ---- libgphoto2-2.5.14.orig/Makefile.in -+++ libgphoto2-2.5.14/Makefile.in +--- libgphoto2-2.5.16.orig/Makefile.in ++++ libgphoto2-2.5.16/Makefile.in @@ -482,7 +482,7 @@ EXTRA_DIST = HACKING MAINTAINERS TESTERS INSTALL README.in README README.packaging @@ -24,10 +24,10 @@ Index: libgphoto2-2.5.14/Makefile.in pkgconfig_DATA = libgphoto2.pc noinst_DATA = libgphoto2-uninstalled.pc doc_DATA = AUTHORS COPYING NEWS ABOUT-NLS ChangeLog README \ -Index: libgphoto2-2.5.14/configure.ac +Index: libgphoto2-2.5.16/configure.ac =================================================================== ---- libgphoto2-2.5.14.orig/configure.ac -+++ libgphoto2-2.5.14/configure.ac +--- libgphoto2-2.5.16.orig/configure.ac ++++ libgphoto2-2.5.16/configure.ac @@ -635,20 +635,11 @@ gphoto-m4/Makefile libgphoto2/Makefile libgphoto2.pc @@ -49,10 +49,10 @@ Index: libgphoto2-2.5.14/configure.ac ],[ dnl This relies on this code being called for each of the above files dnl with ac_file set to the filename. -Index: libgphoto2-2.5.14/libgphoto2_port/Makefile.am +Index: libgphoto2-2.5.16/libgphoto2_port/Makefile.am =================================================================== ---- libgphoto2-2.5.14.orig/libgphoto2_port/Makefile.am -+++ libgphoto2-2.5.14/libgphoto2_port/Makefile.am +--- libgphoto2-2.5.16.orig/libgphoto2_port/Makefile.am ++++ libgphoto2-2.5.16/libgphoto2_port/Makefile.am @@ -25,7 +25,7 @@ udevscript_PROGRAMS = bin_SCRIPTS = gphoto2-port-config @@ -62,10 +62,10 @@ Index: libgphoto2-2.5.14/libgphoto2_port/Makefile.am ######################################################################## -Index: libgphoto2-2.5.14/libgphoto2_port/Makefile.in +Index: libgphoto2-2.5.16/libgphoto2_port/Makefile.in =================================================================== ---- libgphoto2-2.5.14.orig/libgphoto2_port/Makefile.in -+++ libgphoto2-2.5.14/libgphoto2_port/Makefile.in +--- libgphoto2-2.5.16.orig/libgphoto2_port/Makefile.in ++++ libgphoto2-2.5.16/libgphoto2_port/Makefile.in @@ -574,7 +574,7 @@ EXTRA_LTLIBRARIES = disk.la ptpip.la ser bin_SCRIPTS = gphoto2-port-config @@ -75,10 +75,10 @@ Index: libgphoto2-2.5.14/libgphoto2_port/Makefile.in ######################################################################## # All iolibs are defined as EXTRA_LTLIBRARIES. This requires that -Index: libgphoto2-2.5.14/libgphoto2_port/configure.ac +Index: libgphoto2-2.5.16/libgphoto2_port/configure.ac =================================================================== ---- libgphoto2-2.5.14.orig/libgphoto2_port/configure.ac -+++ libgphoto2-2.5.14/libgphoto2_port/configure.ac +--- libgphoto2-2.5.16.orig/libgphoto2_port/configure.ac ++++ libgphoto2-2.5.16/libgphoto2_port/configure.ac @@ -512,13 +512,10 @@ AC_SUBST([AM_LDFLAGS]) # --------------------------------------------------------------------------- AC_CONFIG_FILES([