Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #4942 from DocLM/gphoto2

Browse source 
ibgphoto2 and gphoto2: Update to 2.5.16 and 2.5.15
This commit is contained in:
Hannu Nyman 2017-10-16 18:11:12 +03:00 committed by GitHub
commit f550fe4ad8
6 changed files with 52 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libs/libgphoto2/Makefile
View file

@ -9,14 +9,14 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=libgphoto2 PKG_NAME:=libgphoto2
PKG_VERSION:=2.5.14 PKG_VERSION:=2.5.16
PKG_RELEASE:=2 PKG_RELEASE:=1
PORT_VERSION:=0.12.0 PORT_VERSION:=0.12.0
PKG_MAINTAINER:=Leonardo Medici <leonardo_medici@me.com> PKG_MAINTAINER:=Leonardo Medici <leonardo_medici@me.com>
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=@SF/gphoto PKG_SOURCE_URL:=@SF/gphoto
PKG_HASH:=d3ce70686fb87d6791b9adcbb6e5693bfbe1cfef9661c23c75eb8a699ec4e274 PKG_HASH:=e757416d1623e01a9d0d294b2e790162e434c0964f50d3b7ff1a3424b62a2906
PKG_LICENSE:=LGPL-2.1 PKG_LICENSE:=LGPL-2.1
PKG_LICENSE_FILES:=COPYING PKG_LICENSE_FILES:=COPYING

12
libs/libgphoto2/patches/001-automake-compat.patch
View file

@ -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.16.orig/configure.ac
+++ libgphoto2-2.5.14/configure.ac +++ libgphoto2-2.5.16/configure.ac
@@ -209,7 +209,6 @@ ALL_LINGUAS="cs da de es eu fr hu it ja @@ -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}]) GP_GETTEXT_HACK([${PACKAGE}-${LIBGPHOTO2_CURRENT_MIN}],[The gPhoto Team],[${MAIL_GPHOTO_TRANSLATION}])
AM_GNU_GETTEXT_VERSION([0.14.1]) AM_GNU_GETTEXT_VERSION([0.14.1])
@ -10,10 +10,10 @@ Index: libgphoto2-2.5.14/configure.ac
AM_ICONV() AM_ICONV()
GP_GETTEXT_FLAGS() 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.16.orig/libgphoto2_port/configure.ac
+++ libgphoto2-2.5.14/libgphoto2_port/configure.ac +++ libgphoto2-2.5.16/libgphoto2_port/configure.ac
@@ -124,7 +124,6 @@ GP_GETTEXT_HACK([${PACKAGE}-${LIBGPHOTO2 @@ -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" 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_VERSION([0.14.1])

36
libs/libgphoto2/patches/002-no-docs-examples-test-translations.patch
View file

@ -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.16.orig/Makefile.am
+++ libgphoto2-2.5.14/Makefile.am +++ libgphoto2-2.5.16/Makefile.am
@@ -8,7 +8,7 @@ bin_SCRIPTS = gphoto2-config @@ -8,7 +8,7 @@ bin_SCRIPTS = gphoto2-config
EXTRA_DIST = HACKING MAINTAINERS TESTERS installcheck.mk EXTRA_DIST = HACKING MAINTAINERS TESTERS installcheck.mk
@ -11,10 +11,10 @@ Index: libgphoto2-2.5.14/Makefile.am
EXTRA_DIST += libgphoto2.pc.in EXTRA_DIST += libgphoto2.pc.in
pkgconfig_DATA = libgphoto2.pc 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.16.orig/Makefile.in
+++ libgphoto2-2.5.14/Makefile.in +++ libgphoto2-2.5.16/Makefile.in
@@ -482,7 +482,7 @@ EXTRA_DIST = HACKING MAINTAINERS TESTERS @@ -482,7 +482,7 @@ EXTRA_DIST = HACKING MAINTAINERS TESTERS
INSTALL README.in README README.packaging INSTALL README.in README README.packaging
@ -24,10 +24,10 @@ Index: libgphoto2-2.5.14/Makefile.in
pkgconfig_DATA = libgphoto2.pc pkgconfig_DATA = libgphoto2.pc
noinst_DATA = libgphoto2-uninstalled.pc noinst_DATA = libgphoto2-uninstalled.pc
doc_DATA = AUTHORS COPYING NEWS ABOUT-NLS ChangeLog README \ 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.16.orig/configure.ac
+++ libgphoto2-2.5.14/configure.ac +++ libgphoto2-2.5.16/configure.ac
@@ -635,20 +635,11 @@ gphoto-m4/Makefile @@ -635,20 +635,11 @@ gphoto-m4/Makefile
libgphoto2/Makefile libgphoto2/Makefile
libgphoto2.pc 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 This relies on this code being called for each of the above files
dnl with ac_file set to the filename. 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.16.orig/libgphoto2_port/Makefile.am
+++ libgphoto2-2.5.14/libgphoto2_port/Makefile.am +++ libgphoto2-2.5.16/libgphoto2_port/Makefile.am
@@ -25,7 +25,7 @@ udevscript_PROGRAMS = @@ -25,7 +25,7 @@ udevscript_PROGRAMS =
bin_SCRIPTS = gphoto2-port-config 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.16.orig/libgphoto2_port/Makefile.in
+++ libgphoto2-2.5.14/libgphoto2_port/Makefile.in +++ libgphoto2-2.5.16/libgphoto2_port/Makefile.in
@@ -574,7 +574,7 @@ EXTRA_LTLIBRARIES = disk.la ptpip.la ser @@ -574,7 +574,7 @@ EXTRA_LTLIBRARIES = disk.la ptpip.la ser
bin_SCRIPTS = gphoto2-port-config 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 # 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.16.orig/libgphoto2_port/configure.ac
+++ libgphoto2-2.5.14/libgphoto2_port/configure.ac +++ libgphoto2-2.5.16/libgphoto2_port/configure.ac
@@ -512,13 +512,10 @@ AC_SUBST([AM_LDFLAGS]) @@ -512,13 +512,10 @@ AC_SUBST([AM_LDFLAGS])
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
AC_CONFIG_FILES([ AC_CONFIG_FILES([

5
multimedia/gphoto2/Makefile
View file

@ -9,14 +9,13 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=gphoto2 PKG_NAME:=gphoto2
PKG_VERSION:=2.5.14 PKG_VERSION:=2.5.15
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_MAINTAINER:=Leonardo Medici <leonardo_medici@me.com> PKG_MAINTAINER:=Leonardo Medici <leonardo_medici@me.com>
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=@SF/gphoto PKG_SOURCE_URL:=@SF/gphoto
PKG_HASH:=9302d02fb472d4936988382b7277ccdc4edaf7ede56c490278912ffd0627699c PKG_HASH:=ae571a227983dc9997876702a73af5431d41f287ea0f483cda897c57a6084a77
PKG_LICENSE:=GPL-2.0 PKG_LICENSE:=GPL-2.0
PKG_LICENSE_FILES:=COPYING PKG_LICENSE_FILES:=COPYING

24
multimedia/gphoto2/patches/001-automake-compat.patch
View file

@ -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.15.orig/Makefile.am
+++ gphoto2-2.5.14/Makefile.am +++ gphoto2-2.5.15/Makefile.am
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
-SUBDIRS = gphoto-m4 contrib doc gphoto2 packaging po tests -SUBDIRS = gphoto-m4 contrib doc gphoto2 packaging po tests
+SUBDIRS = gphoto-m4 contrib doc gphoto2 packaging tests +SUBDIRS = gphoto-m4 contrib doc gphoto2 packaging tests
ACLOCAL_AMFLAGS = -I auto-m4 -I gphoto-m4 ACLOCAL_AMFLAGS = -I auto-m4 -I gphoto-m4
EXTRA_DIST = README.md 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.15.orig/Makefile.in
+++ gphoto2-2.5.14/Makefile.in +++ gphoto2-2.5.15/Makefile.in
@@ -390,7 +390,7 @@ target_alias = @target_alias@ @@ -389,7 +389,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
@ -21,11 +21,11 @@ Index: gphoto2-2.5.14/Makefile.in
ACLOCAL_AMFLAGS = -I auto-m4 -I gphoto-m4 ACLOCAL_AMFLAGS = -I auto-m4 -I gphoto-m4
EXTRA_DIST = README.md EXTRA_DIST = README.md
all: config.h 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.15.orig/configure.ac
+++ gphoto2-2.5.14/configure.ac +++ gphoto2-2.5.15/configure.ac
@@ -59,10 +59,7 @@ dnl ------------------------------------ @@ -58,10 +58,7 @@ dnl ------------------------------------
GP_GETTEXT_HACK([],[Lutz Müller and others],[${MAIL_GPHOTO_TRANSLATION}]) 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" 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]) 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 cannot use AC_DEFINE_UNQUOTED() for these definitions, as
dnl we require make to do insert the proper $(datadir) value 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 # Create output files
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
AC_CONFIG_FILES([ AC_CONFIG_FILES([

22
multimedia/gphoto2/patches/002-no-docs-test.patch
View file

@ -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.15.orig/Makefile.am
+++ gphoto2-2.5.14/Makefile.am +++ gphoto2-2.5.15/Makefile.am
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
-SUBDIRS = gphoto-m4 contrib doc gphoto2 packaging tests -SUBDIRS = gphoto-m4 contrib doc gphoto2 packaging tests
+SUBDIRS = gphoto-m4 contrib gphoto2 packaging +SUBDIRS = gphoto-m4 contrib gphoto2 packaging
ACLOCAL_AMFLAGS = -I auto-m4 -I gphoto-m4 ACLOCAL_AMFLAGS = -I auto-m4 -I gphoto-m4
EXTRA_DIST = README.md 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.15.orig/Makefile.in
+++ gphoto2-2.5.14/Makefile.in +++ gphoto2-2.5.15/Makefile.in
@@ -390,7 +390,7 @@ target_alias = @target_alias@ @@ -389,7 +389,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
@ -21,11 +21,11 @@ Index: gphoto2-2.5.14/Makefile.in
ACLOCAL_AMFLAGS = -I auto-m4 -I gphoto-m4 ACLOCAL_AMFLAGS = -I auto-m4 -I gphoto-m4
EXTRA_DIST = README.md EXTRA_DIST = README.md
all: config.h 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.15.orig/configure.ac
+++ gphoto2-2.5.14/configure.ac +++ gphoto2-2.5.15/configure.ac
@@ -408,16 +408,10 @@ AC_CONFIG_FILES([ @@ -407,16 +407,10 @@ AC_CONFIG_FILES([
Makefile Makefile
gphoto2/Makefile gphoto2/Makefile
gphoto-m4/Makefile gphoto-m4/Makefile