LILiK
/
openwrt-packages-dist
5
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 0 Wiki Activity
Browse Source

Merge pull request #5959 from DocLM/gphoto2 

libgphoto2 and gphoto2: Update to 2.5.17
lilik-openwrt-22.03
Hannu Nyman 7 years ago
committed by GitHub
parent
7bdc5214e4 101fe59635
commit
75dc2dda21
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 46 additions and 46 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +2
    -2
      libs/libgphoto2/Makefile
  2. +6
    -6
      libs/libgphoto2/patches/001-automake-compat.patch
  3. +18
    -18
      libs/libgphoto2/patches/002-no-docs-examples-test-translations.patch
  4. +2
    -2
      multimedia/gphoto2/Makefile
  5. +9
    -9
      multimedia/gphoto2/patches/001-automake-compat.patch
  6. +9
    -9
      multimedia/gphoto2/patches/002-no-docs-test.patch

+ 2
- 2
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.16
PKG_VERSION:=2.5.17
PKG_RELEASE:=1 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:=e757416d1623e01a9d0d294b2e790162e434c0964f50d3b7ff1a3424b62a2906
PKG_HASH:=417464f0a313fa937e8a71cdf18a371cf01e750830195cd63ae31da0d092b555
PKG_LICENSE:=LGPL-2.1 PKG_LICENSE:=LGPL-2.1
PKG_LICENSE_FILES:=COPYING PKG_LICENSE_FILES:=COPYING


+ 6
- 6
libs/libgphoto2/patches/001-automake-compat.patch View File

@ -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 @@ -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.16/configure.ac
AM_ICONV() AM_ICONV()
GP_GETTEXT_FLAGS() 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 @@ -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])


+ 18
- 18
libs/libgphoto2/patches/002-no-docs-examples-test-translations.patch View File

@ -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 @@ -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.16/Makefile.am
EXTRA_DIST += libgphoto2.pc.in EXTRA_DIST += libgphoto2.pc.in
pkgconfig_DATA = libgphoto2.pc 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 @@ -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.16/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.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 @@ -635,20 +635,11 @@ gphoto-m4/Makefile
libgphoto2/Makefile libgphoto2/Makefile
libgphoto2.pc 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 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.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 = @@ -25,7 +25,7 @@ udevscript_PROGRAMS =
bin_SCRIPTS = gphoto2-port-config 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 @@ -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.16/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.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]) @@ -512,13 +512,10 @@ AC_SUBST([AM_LDFLAGS])
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
AC_CONFIG_FILES([ AC_CONFIG_FILES([


+ 2
- 2
multimedia/gphoto2/Makefile View File

@ -9,13 +9,13 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=gphoto2 PKG_NAME:=gphoto2
PKG_VERSION:=2.5.15
PKG_VERSION:=2.5.17
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:=ae571a227983dc9997876702a73af5431d41f287ea0f483cda897c57a6084a77
PKG_HASH:=aa571039240c68a053be710ca41645aed0239fa2f0b737b8ec767fef29e3544f
PKG_LICENSE:=GPL-2.0 PKG_LICENSE:=GPL-2.0
PKG_LICENSE_FILES:=COPYING PKG_LICENSE_FILES:=COPYING


+ 9
- 9
multimedia/gphoto2/patches/001-automake-compat.patch View File

@ -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 @@ @@ -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.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@ @@ -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@
@ -21,10 +21,10 @@ Index: gphoto2-2.5.15/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.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 ------------------------------------ @@ -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"


+ 9
- 9
multimedia/gphoto2/patches/002-no-docs-test.patch View File

@ -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 @@ @@ -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.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@ @@ -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@
@ -21,10 +21,10 @@ Index: gphoto2-2.5.15/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.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([ @@ -407,16 +407,10 @@ AC_CONFIG_FILES([
Makefile Makefile
gphoto2/Makefile gphoto2/Makefile


Write Preview
Loading…
Cancel
Save