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 #4452 from DocLM/gphoto2 

libgphoto2 and gphoto2: Update to 2.5.14
lilik-openwrt-22.03
Hannu Nyman 7 years ago
committed by GitHub
parent
29b32556c2 f9e686e5f7
commit
a95e2dc1a9
6 changed files with 59 additions and 60 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +3
    -3
      libs/libgphoto2/Makefile
  2. +7
    -8
      libs/libgphoto2/patches/001-automake-compat.patch
  3. +26
    -26
      libs/libgphoto2/patches/002-no-docs-examples-test-translations.patch
  4. +3
    -3
      multimedia/gphoto2/Makefile
  5. +10
    -10
      multimedia/gphoto2/patches/001-automake-compat.patch
  6. +10
    -10
      multimedia/gphoto2/patches/002-no-docs-test.patch

+ 3
- 3
libs/libgphoto2/Makefile View File

@ -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 <leonardo_medici@me.com>
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


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

@ -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()

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

@ -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([


+ 3
- 3
multimedia/gphoto2/Makefile View File

@ -9,15 +9,15 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=gphoto2
PKG_VERSION:=2.5.11
PKG_VERSION:=2.5.14
PKG_RELEASE:=1
PKG_MAINTAINER:=Leonardo Medici <leonardo_medici@me.com>
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=@SF/gphoto
PKG_MD5SUM:=a62a51474a681aca51b087905deb5e35
PKG_HASH:=392844d6a06512b0d85e7983a5a0c85c8039feb6ab3bc420674ffdbf7536f9e9
PKG_MD5SUM:=6c6a21b5e879330cdd71ef92dce36399
PKG_HASH:=9302d02fb472d4936988382b7277ccdc4edaf7ede56c490278912ffd0627699c
PKG_LICENSE:=GPL-2.0
PKG_LICENSE_FILES:=COPYING


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

@ -1,17 +1,17 @@
Index: gphoto2-2.5.11/Makefile.am
Index: gphoto2-2.5.14/Makefile.am
===================================================================
--- gphoto2-2.5.11.orig/Makefile.am
+++ gphoto2-2.5.11/Makefile.am
--- gphoto2-2.5.14.orig/Makefile.am
+++ gphoto2-2.5.14/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.11/Makefile.in
Index: gphoto2-2.5.14/Makefile.in
===================================================================
--- gphoto2-2.5.11.orig/Makefile.in
+++ gphoto2-2.5.11/Makefile.in
--- gphoto2-2.5.14.orig/Makefile.in
+++ gphoto2-2.5.14/Makefile.in
@@ -390,7 +390,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
@ -21,10 +21,10 @@ Index: gphoto2-2.5.11/Makefile.in
ACLOCAL_AMFLAGS = -I auto-m4 -I gphoto-m4
EXTRA_DIST = README.md
all: config.h
Index: gphoto2-2.5.11/configure.ac
Index: gphoto2-2.5.14/configure.ac
===================================================================
--- gphoto2-2.5.11.orig/configure.ac
+++ gphoto2-2.5.11/configure.ac
--- gphoto2-2.5.14.orig/configure.ac
+++ gphoto2-2.5.14/configure.ac
@@ -59,10 +59,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"
@ -36,7 +36,7 @@ Index: gphoto2-2.5.11/configure.ac
dnl We cannot use AC_DEFINE_UNQUOTED() for these definitions, as
dnl we require make to do insert the proper $(datadir) value
@@ -354,7 +351,6 @@ AC_SUBST([AM_LDFLAGS])
@@ -408,7 +405,6 @@ AC_SUBST([AM_LDFLAGS])
# Create output files
# ---------------------------------------------------------------------------
AC_CONFIG_FILES([


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

@ -1,17 +1,17 @@
Index: gphoto2-2.5.11/Makefile.am
Index: gphoto2-2.5.14/Makefile.am
===================================================================
--- gphoto2-2.5.11.orig/Makefile.am
+++ gphoto2-2.5.11/Makefile.am
--- gphoto2-2.5.14.orig/Makefile.am
+++ gphoto2-2.5.14/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.11/Makefile.in
Index: gphoto2-2.5.14/Makefile.in
===================================================================
--- gphoto2-2.5.11.orig/Makefile.in
+++ gphoto2-2.5.11/Makefile.in
--- gphoto2-2.5.14.orig/Makefile.in
+++ gphoto2-2.5.14/Makefile.in
@@ -390,7 +390,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
@ -21,11 +21,11 @@ Index: gphoto2-2.5.11/Makefile.in
ACLOCAL_AMFLAGS = -I auto-m4 -I gphoto-m4
EXTRA_DIST = README.md
all: config.h
Index: gphoto2-2.5.11/configure.ac
Index: gphoto2-2.5.14/configure.ac
===================================================================
--- gphoto2-2.5.11.orig/configure.ac
+++ gphoto2-2.5.11/configure.ac
@@ -354,16 +354,10 @@ AC_CONFIG_FILES([
--- gphoto2-2.5.14.orig/configure.ac
+++ gphoto2-2.5.14/configure.ac
@@ -408,16 +408,10 @@ AC_CONFIG_FILES([
Makefile
gphoto2/Makefile
gphoto-m4/Makefile


Write Preview
Loading…
Cancel
Save