diff --git a/libs/libgphoto2/Makefile b/libs/libgphoto2/Makefile index b5af7f1008..6f3ca92a2b 100644 --- a/libs/libgphoto2/Makefile +++ b/libs/libgphoto2/Makefile @@ -9,14 +9,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libgphoto2 -PKG_VERSION:=2.5.16 +PKG_VERSION:=2.5.17 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:=e757416d1623e01a9d0d294b2e790162e434c0964f50d3b7ff1a3424b62a2906 +PKG_HASH:=417464f0a313fa937e8a71cdf18a371cf01e750830195cd63ae31da0d092b555 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 fa70b543f2..4614d7bd22 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.16/configure.ac +Index: libgphoto2-2.5.17/configure.ac =================================================================== ---- libgphoto2-2.5.16.orig/configure.ac -+++ libgphoto2-2.5.16/configure.ac +--- libgphoto2-2.5.17.orig/configure.ac ++++ libgphoto2-2.5.17/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.16/configure.ac AM_ICONV() GP_GETTEXT_FLAGS() -Index: libgphoto2-2.5.16/libgphoto2_port/configure.ac +Index: libgphoto2-2.5.17/libgphoto2_port/configure.ac =================================================================== ---- libgphoto2-2.5.16.orig/libgphoto2_port/configure.ac -+++ libgphoto2-2.5.16/libgphoto2_port/configure.ac +--- libgphoto2-2.5.17.orig/libgphoto2_port/configure.ac ++++ libgphoto2-2.5.17/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 2bb0e0c43a..944a4c3020 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.16/Makefile.am +Index: libgphoto2-2.5.17/Makefile.am =================================================================== ---- libgphoto2-2.5.16.orig/Makefile.am -+++ libgphoto2-2.5.16/Makefile.am +--- libgphoto2-2.5.17.orig/Makefile.am ++++ libgphoto2-2.5.17/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.16/Makefile.am EXTRA_DIST += libgphoto2.pc.in pkgconfig_DATA = libgphoto2.pc -Index: libgphoto2-2.5.16/Makefile.in +Index: libgphoto2-2.5.17/Makefile.in =================================================================== ---- libgphoto2-2.5.16.orig/Makefile.in -+++ libgphoto2-2.5.16/Makefile.in +--- libgphoto2-2.5.17.orig/Makefile.in ++++ libgphoto2-2.5.17/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.16/Makefile.in pkgconfig_DATA = libgphoto2.pc noinst_DATA = libgphoto2-uninstalled.pc doc_DATA = AUTHORS COPYING NEWS ABOUT-NLS ChangeLog README \ -Index: libgphoto2-2.5.16/configure.ac +Index: libgphoto2-2.5.17/configure.ac =================================================================== ---- libgphoto2-2.5.16.orig/configure.ac -+++ libgphoto2-2.5.16/configure.ac +--- libgphoto2-2.5.17.orig/configure.ac ++++ libgphoto2-2.5.17/configure.ac @@ -635,20 +635,11 @@ gphoto-m4/Makefile libgphoto2/Makefile libgphoto2.pc @@ -49,10 +49,10 @@ Index: libgphoto2-2.5.16/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.16/libgphoto2_port/Makefile.am +Index: libgphoto2-2.5.17/libgphoto2_port/Makefile.am =================================================================== ---- libgphoto2-2.5.16.orig/libgphoto2_port/Makefile.am -+++ libgphoto2-2.5.16/libgphoto2_port/Makefile.am +--- libgphoto2-2.5.17.orig/libgphoto2_port/Makefile.am ++++ libgphoto2-2.5.17/libgphoto2_port/Makefile.am @@ -25,7 +25,7 @@ udevscript_PROGRAMS = bin_SCRIPTS = gphoto2-port-config @@ -62,10 +62,10 @@ Index: libgphoto2-2.5.16/libgphoto2_port/Makefile.am ######################################################################## -Index: libgphoto2-2.5.16/libgphoto2_port/Makefile.in +Index: libgphoto2-2.5.17/libgphoto2_port/Makefile.in =================================================================== ---- libgphoto2-2.5.16.orig/libgphoto2_port/Makefile.in -+++ libgphoto2-2.5.16/libgphoto2_port/Makefile.in +--- libgphoto2-2.5.17.orig/libgphoto2_port/Makefile.in ++++ libgphoto2-2.5.17/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.16/libgphoto2_port/Makefile.in ######################################################################## # All iolibs are defined as EXTRA_LTLIBRARIES. This requires that -Index: libgphoto2-2.5.16/libgphoto2_port/configure.ac +Index: libgphoto2-2.5.17/libgphoto2_port/configure.ac =================================================================== ---- libgphoto2-2.5.16.orig/libgphoto2_port/configure.ac -+++ libgphoto2-2.5.16/libgphoto2_port/configure.ac +--- libgphoto2-2.5.17.orig/libgphoto2_port/configure.ac ++++ libgphoto2-2.5.17/libgphoto2_port/configure.ac @@ -512,13 +512,10 @@ AC_SUBST([AM_LDFLAGS]) # --------------------------------------------------------------------------- AC_CONFIG_FILES([ diff --git a/multimedia/gphoto2/Makefile b/multimedia/gphoto2/Makefile index fd63354a06..e0515f673d 100644 --- a/multimedia/gphoto2/Makefile +++ b/multimedia/gphoto2/Makefile @@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gphoto2 -PKG_VERSION:=2.5.15 +PKG_VERSION:=2.5.17 PKG_RELEASE:=1 PKG_MAINTAINER:=Leonardo Medici PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=@SF/gphoto -PKG_HASH:=ae571a227983dc9997876702a73af5431d41f287ea0f483cda897c57a6084a77 +PKG_HASH:=aa571039240c68a053be710ca41645aed0239fa2f0b737b8ec767fef29e3544f 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 47c21f55be..3b24ffd52a 100644 --- a/multimedia/gphoto2/patches/001-automake-compat.patch +++ b/multimedia/gphoto2/patches/001-automake-compat.patch @@ -1,17 +1,17 @@ -Index: gphoto2-2.5.15/Makefile.am +Index: gphoto2-2.5.17/Makefile.am =================================================================== ---- gphoto2-2.5.15.orig/Makefile.am -+++ gphoto2-2.5.15/Makefile.am +--- gphoto2-2.5.17.orig/Makefile.am ++++ gphoto2-2.5.17/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.15/Makefile.in +Index: gphoto2-2.5.17/Makefile.in =================================================================== ---- gphoto2-2.5.15.orig/Makefile.in -+++ gphoto2-2.5.15/Makefile.in +--- gphoto2-2.5.17.orig/Makefile.in ++++ gphoto2-2.5.17/Makefile.in @@ -389,7 +389,7 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ @@ -21,10 +21,10 @@ Index: gphoto2-2.5.15/Makefile.in ACLOCAL_AMFLAGS = -I auto-m4 -I gphoto-m4 EXTRA_DIST = README.md all: config.h -Index: gphoto2-2.5.15/configure.ac +Index: gphoto2-2.5.17/configure.ac =================================================================== ---- gphoto2-2.5.15.orig/configure.ac -+++ gphoto2-2.5.15/configure.ac +--- gphoto2-2.5.17.orig/configure.ac ++++ gphoto2-2.5.17/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" diff --git a/multimedia/gphoto2/patches/002-no-docs-test.patch b/multimedia/gphoto2/patches/002-no-docs-test.patch index d64a3c6d05..df874163b8 100644 --- a/multimedia/gphoto2/patches/002-no-docs-test.patch +++ b/multimedia/gphoto2/patches/002-no-docs-test.patch @@ -1,17 +1,17 @@ -Index: gphoto2-2.5.15/Makefile.am +Index: gphoto2-2.5.17/Makefile.am =================================================================== ---- gphoto2-2.5.15.orig/Makefile.am -+++ gphoto2-2.5.15/Makefile.am +--- gphoto2-2.5.17.orig/Makefile.am ++++ gphoto2-2.5.17/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.15/Makefile.in +Index: gphoto2-2.5.17/Makefile.in =================================================================== ---- gphoto2-2.5.15.orig/Makefile.in -+++ gphoto2-2.5.15/Makefile.in +--- gphoto2-2.5.17.orig/Makefile.in ++++ gphoto2-2.5.17/Makefile.in @@ -389,7 +389,7 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ @@ -21,10 +21,10 @@ Index: gphoto2-2.5.15/Makefile.in ACLOCAL_AMFLAGS = -I auto-m4 -I gphoto-m4 EXTRA_DIST = README.md all: config.h -Index: gphoto2-2.5.15/configure.ac +Index: gphoto2-2.5.17/configure.ac =================================================================== ---- gphoto2-2.5.15.orig/configure.ac -+++ gphoto2-2.5.15/configure.ac +--- gphoto2-2.5.17.orig/configure.ac ++++ gphoto2-2.5.17/configure.ac @@ -407,16 +407,10 @@ AC_CONFIG_FILES([ Makefile gphoto2/Makefile