From: Leonardo Medici Date: Sun, 15 Oct 2017 18:30:22 +0000 (+0200) Subject: gphoto2: update package to 2.5.15 X-Git-Url: http://git.openwrt.org/?p=feed%2Fpackages.git;a=commitdiff_plain;h=64d55d410dc8afa8362d31f6497168ca229bf5d5 gphoto2: update package to 2.5.15 Signed-off-by: Leonardo Medici --- diff --git a/multimedia/gphoto2/Makefile b/multimedia/gphoto2/Makefile index caf89cfebf..fd63354a06 100644 --- a/multimedia/gphoto2/Makefile +++ b/multimedia/gphoto2/Makefile @@ -9,14 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gphoto2 -PKG_VERSION:=2.5.14 +PKG_VERSION:=2.5.15 PKG_RELEASE:=1 PKG_MAINTAINER:=Leonardo Medici - PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=@SF/gphoto -PKG_HASH:=9302d02fb472d4936988382b7277ccdc4edaf7ede56c490278912ffd0627699c +PKG_HASH:=ae571a227983dc9997876702a73af5431d41f287ea0f483cda897c57a6084a77 PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=COPYING diff --git a/multimedia/gphoto2/patches/001-automake-compat.patch b/multimedia/gphoto2/patches/001-automake-compat.patch index 8b3bc01eb1..47c21f55be 100644 --- a/multimedia/gphoto2/patches/001-automake-compat.patch +++ b/multimedia/gphoto2/patches/001-automake-compat.patch @@ -1,18 +1,18 @@ -Index: gphoto2-2.5.14/Makefile.am +Index: gphoto2-2.5.15/Makefile.am =================================================================== ---- gphoto2-2.5.14.orig/Makefile.am -+++ gphoto2-2.5.14/Makefile.am +--- gphoto2-2.5.15.orig/Makefile.am ++++ gphoto2-2.5.15/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = gphoto-m4 contrib doc gphoto2 packaging po tests +SUBDIRS = gphoto-m4 contrib doc gphoto2 packaging tests ACLOCAL_AMFLAGS = -I auto-m4 -I gphoto-m4 EXTRA_DIST = README.md -Index: gphoto2-2.5.14/Makefile.in +Index: gphoto2-2.5.15/Makefile.in =================================================================== ---- gphoto2-2.5.14.orig/Makefile.in -+++ gphoto2-2.5.14/Makefile.in -@@ -390,7 +390,7 @@ target_alias = @target_alias@ +--- gphoto2-2.5.15.orig/Makefile.in ++++ gphoto2-2.5.15/Makefile.in +@@ -389,7 +389,7 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @@ -21,11 +21,11 @@ Index: gphoto2-2.5.14/Makefile.in ACLOCAL_AMFLAGS = -I auto-m4 -I gphoto-m4 EXTRA_DIST = README.md all: config.h -Index: gphoto2-2.5.14/configure.ac +Index: gphoto2-2.5.15/configure.ac =================================================================== ---- gphoto2-2.5.14.orig/configure.ac -+++ gphoto2-2.5.14/configure.ac -@@ -59,10 +59,7 @@ dnl ------------------------------------ +--- gphoto2-2.5.15.orig/configure.ac ++++ gphoto2-2.5.15/configure.ac +@@ -58,10 +58,7 @@ dnl ------------------------------------ GP_GETTEXT_HACK([],[Lutz Müller and others],[${MAIL_GPHOTO_TRANSLATION}]) ALL_LINGUAS="az cs da de en_GB es eu fi fr hu id is it ja nl pa pl pt_BR ro ru rw sk sr sv uk vi zh_CN zh_TW" AM_GNU_GETTEXT_VERSION([0.14.1]) @@ -36,7 +36,7 @@ Index: gphoto2-2.5.14/configure.ac dnl We cannot use AC_DEFINE_UNQUOTED() for these definitions, as dnl we require make to do insert the proper $(datadir) value -@@ -408,7 +405,6 @@ AC_SUBST([AM_LDFLAGS]) +@@ -407,7 +404,6 @@ AC_SUBST([AM_LDFLAGS]) # Create output files # --------------------------------------------------------------------------- AC_CONFIG_FILES([ diff --git a/multimedia/gphoto2/patches/002-no-docs-test.patch b/multimedia/gphoto2/patches/002-no-docs-test.patch index 8275657ee8..d64a3c6d05 100644 --- a/multimedia/gphoto2/patches/002-no-docs-test.patch +++ b/multimedia/gphoto2/patches/002-no-docs-test.patch @@ -1,18 +1,18 @@ -Index: gphoto2-2.5.14/Makefile.am +Index: gphoto2-2.5.15/Makefile.am =================================================================== ---- gphoto2-2.5.14.orig/Makefile.am -+++ gphoto2-2.5.14/Makefile.am +--- gphoto2-2.5.15.orig/Makefile.am ++++ gphoto2-2.5.15/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = gphoto-m4 contrib doc gphoto2 packaging tests +SUBDIRS = gphoto-m4 contrib gphoto2 packaging ACLOCAL_AMFLAGS = -I auto-m4 -I gphoto-m4 EXTRA_DIST = README.md -Index: gphoto2-2.5.14/Makefile.in +Index: gphoto2-2.5.15/Makefile.in =================================================================== ---- gphoto2-2.5.14.orig/Makefile.in -+++ gphoto2-2.5.14/Makefile.in -@@ -390,7 +390,7 @@ target_alias = @target_alias@ +--- gphoto2-2.5.15.orig/Makefile.in ++++ gphoto2-2.5.15/Makefile.in +@@ -389,7 +389,7 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @@ -21,11 +21,11 @@ Index: gphoto2-2.5.14/Makefile.in ACLOCAL_AMFLAGS = -I auto-m4 -I gphoto-m4 EXTRA_DIST = README.md all: config.h -Index: gphoto2-2.5.14/configure.ac +Index: gphoto2-2.5.15/configure.ac =================================================================== ---- gphoto2-2.5.14.orig/configure.ac -+++ gphoto2-2.5.14/configure.ac -@@ -408,16 +408,10 @@ AC_CONFIG_FILES([ +--- gphoto2-2.5.15.orig/configure.ac ++++ gphoto2-2.5.15/configure.ac +@@ -407,16 +407,10 @@ AC_CONFIG_FILES([ Makefile gphoto2/Makefile gphoto-m4/Makefile