diff --git a/libs/libgphoto2/Makefile b/libs/libgphoto2/Makefile index 362d4294d..66bfbf7c8 100644 --- a/libs/libgphoto2/Makefile +++ b/libs/libgphoto2/Makefile @@ -9,15 +9,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libgphoto2 -PKG_VERSION:=2.5.13 +PKG_VERSION:=2.5.14 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_MD5SUM:=73bf5b3d94c8c6f5fad9ea6b5e561843 -PKG_HASH:=ceaacbdf187d1cd1aed5336991f46b0100f6960b6c8383f9aeab98f1f64780ef +PKG_MD5SUM:=65acb6cbd2b4f3f46829599f5dabd89c +PKG_HASH:=d3ce70686fb87d6791b9adcbb6e5693bfbe1cfef9661c23c75eb8a699ec4e274 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 6d162d53b..e1b9977b6 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.13/configure.ac +Index: libgphoto2-2.5.14/configure.ac =================================================================== ---- libgphoto2-2.5.13.orig/configure.ac -+++ libgphoto2-2.5.13/configure.ac +--- libgphoto2-2.5.14.orig/configure.ac ++++ libgphoto2-2.5.14/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]) @@ -9,11 +9,11 @@ Index: libgphoto2-2.5.13/configure.ac -AM_PO_SUBDIRS() AM_ICONV() GP_GETTEXT_FLAGS() - -Index: libgphoto2-2.5.13/libgphoto2_port/configure.ac + +Index: libgphoto2-2.5.14/libgphoto2_port/configure.ac =================================================================== ---- libgphoto2-2.5.13.orig/libgphoto2_port/configure.ac -+++ libgphoto2-2.5.13/libgphoto2_port/configure.ac +--- libgphoto2-2.5.14.orig/libgphoto2_port/configure.ac ++++ libgphoto2-2.5.14/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]) @@ -21,4 +21,3 @@ Index: libgphoto2-2.5.13/libgphoto2_port/configure.ac -AM_PO_SUBDIRS() AM_ICONV() GP_GETTEXT_FLAGS() - 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 49078819a..9914201dc 100644 --- a/libs/libgphoto2/patches/002-no-docs-examples-test-translations.patch +++ b/libs/libgphoto2/patches/002-no-docs-examples-test-translations.patch @@ -1,33 +1,33 @@ -Index: libgphoto2-2.5.13/Makefile.am +Index: libgphoto2-2.5.14/Makefile.am =================================================================== ---- libgphoto2-2.5.13.orig/Makefile.am -+++ libgphoto2-2.5.13/Makefile.am +--- libgphoto2-2.5.14.orig/Makefile.am ++++ libgphoto2-2.5.14/Makefile.am @@ -8,7 +8,7 @@ bin_SCRIPTS = gphoto2-config EXTRA_DIST = HACKING MAINTAINERS TESTERS installcheck.mk - + # Note: @subdirs@ lists all the directories from AC_CONFIG_SUBDIRS() -SUBDIRS = @subdirs@ libgphoto2 camlibs tests examples po packaging doc gphoto-m4 +SUBDIRS = @subdirs@ libgphoto2 camlibs packaging gphoto-m4 - + EXTRA_DIST += libgphoto2.pc.in pkgconfig_DATA = libgphoto2.pc -Index: libgphoto2-2.5.13/Makefile.in +Index: libgphoto2-2.5.14/Makefile.in =================================================================== ---- libgphoto2-2.5.13.orig/Makefile.in -+++ libgphoto2-2.5.13/Makefile.in +--- libgphoto2-2.5.14.orig/Makefile.in ++++ libgphoto2-2.5.14/Makefile.in @@ -482,7 +482,7 @@ EXTRA_DIST = HACKING MAINTAINERS TESTERS 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 gphoto-m4 +SUBDIRS = @subdirs@ libgphoto2 camlibs packaging gphoto-m4 pkgconfig_DATA = libgphoto2.pc noinst_DATA = libgphoto2-uninstalled.pc doc_DATA = AUTHORS COPYING NEWS ABOUT-NLS ChangeLog README \ -Index: libgphoto2-2.5.13/configure.ac +Index: libgphoto2-2.5.14/configure.ac =================================================================== ---- libgphoto2-2.5.13.orig/configure.ac -+++ libgphoto2-2.5.13/configure.ac +--- libgphoto2-2.5.14.orig/configure.ac ++++ libgphoto2-2.5.14/configure.ac @@ -635,20 +635,11 @@ gphoto-m4/Makefile libgphoto2/Makefile libgphoto2.pc @@ -49,36 +49,36 @@ Index: libgphoto2-2.5.13/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.13/libgphoto2_port/Makefile.am +Index: libgphoto2-2.5.14/libgphoto2_port/Makefile.am =================================================================== ---- libgphoto2-2.5.13.orig/libgphoto2_port/Makefile.am -+++ libgphoto2-2.5.13/libgphoto2_port/Makefile.am +--- libgphoto2-2.5.14.orig/libgphoto2_port/Makefile.am ++++ libgphoto2-2.5.14/libgphoto2_port/Makefile.am @@ -25,7 +25,7 @@ udevscript_PROGRAMS = bin_SCRIPTS = gphoto2-port-config - + # The . stands for the current dir, i.e. the iolibs to build. -SUBDIRS = po libgphoto2_port test . doc gphoto-m4 +SUBDIRS = libgphoto2_port . gphoto-m4 - - + + ######################################################################## -Index: libgphoto2-2.5.13/libgphoto2_port/Makefile.in +Index: libgphoto2-2.5.14/libgphoto2_port/Makefile.in =================================================================== ---- libgphoto2-2.5.13.orig/libgphoto2_port/Makefile.in -+++ libgphoto2-2.5.13/libgphoto2_port/Makefile.in +--- libgphoto2-2.5.14.orig/libgphoto2_port/Makefile.in ++++ libgphoto2-2.5.14/libgphoto2_port/Makefile.in @@ -574,7 +574,7 @@ EXTRA_LTLIBRARIES = disk.la ptpip.la ser bin_SCRIPTS = gphoto2-port-config - + # The . stands for the current dir, i.e. the iolibs to build. -SUBDIRS = po libgphoto2_port test . doc gphoto-m4 +SUBDIRS = libgphoto2_port . gphoto-m4 - + ######################################################################## # All iolibs are defined as EXTRA_LTLIBRARIES. This requires that -Index: libgphoto2-2.5.13/libgphoto2_port/configure.ac +Index: libgphoto2-2.5.14/libgphoto2_port/configure.ac =================================================================== ---- libgphoto2-2.5.13.orig/libgphoto2_port/configure.ac -+++ libgphoto2-2.5.13/libgphoto2_port/configure.ac +--- libgphoto2-2.5.14.orig/libgphoto2_port/configure.ac ++++ libgphoto2-2.5.14/libgphoto2_port/configure.ac @@ -512,13 +512,10 @@ AC_SUBST([AM_LDFLAGS]) # --------------------------------------------------------------------------- AC_CONFIG_FILES([