Browse Source

Merge pull request #6749 from DocLM/libgphoto2

libgphoto2: update package 2.5.19
lilik-openwrt-22.03
Hannu Nyman 6 years ago
committed by GitHub
parent
commit
7af29db115
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 27 additions and 27 deletions
  1. +3
    -3
      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

+ 3
- 3
libs/libgphoto2/Makefile View File

@ -1,6 +1,6 @@
#
# Copyright (C) 2006-2012 OpenWrt.org
# Copyright (C) 2017 Leonardo Medici
# Copyright (C) 2017-2018 Leonardo Medici
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
@ -9,14 +9,14 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=libgphoto2
PKG_VERSION:=2.5.18
PKG_VERSION:=2.5.19
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_HASH:=5b17b89d7ca0ec35c72c94ac3701e87d49e52371f9509b8e5c08c913ae57a7ec
PKG_HASH:=62523e52e3b8542301e072635b518387f2bd0948347775cf10cb2da9a6612c63
PKG_LICENSE:=LGPL-2.1
PKG_LICENSE_FILES:=COPYING


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

@ -1,7 +1,7 @@
Index: libgphoto2-2.5.18/configure.ac
Index: libgphoto2-2.5.19/configure.ac
===================================================================
--- libgphoto2-2.5.18.orig/configure.ac
+++ libgphoto2-2.5.18/configure.ac
--- libgphoto2-2.5.19.orig/configure.ac
+++ libgphoto2-2.5.19/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.18/configure.ac
AM_ICONV()
GP_GETTEXT_FLAGS()
Index: libgphoto2-2.5.18/libgphoto2_port/configure.ac
Index: libgphoto2-2.5.19/libgphoto2_port/configure.ac
===================================================================
--- libgphoto2-2.5.18.orig/libgphoto2_port/configure.ac
+++ libgphoto2-2.5.18/libgphoto2_port/configure.ac
--- libgphoto2-2.5.19.orig/libgphoto2_port/configure.ac
+++ libgphoto2-2.5.19/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])


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

@ -1,7 +1,7 @@
Index: libgphoto2-2.5.18/Makefile.am
Index: libgphoto2-2.5.19/Makefile.am
===================================================================
--- libgphoto2-2.5.18.orig/Makefile.am
+++ libgphoto2-2.5.18/Makefile.am
--- libgphoto2-2.5.19.orig/Makefile.am
+++ libgphoto2-2.5.19/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.18/Makefile.am
EXTRA_DIST += libgphoto2.pc.in
pkgconfig_DATA = libgphoto2.pc
Index: libgphoto2-2.5.18/Makefile.in
Index: libgphoto2-2.5.19/Makefile.in
===================================================================
--- libgphoto2-2.5.18.orig/Makefile.in
+++ libgphoto2-2.5.18/Makefile.in
--- libgphoto2-2.5.19.orig/Makefile.in
+++ libgphoto2-2.5.19/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.18/Makefile.in
pkgconfig_DATA = libgphoto2.pc
noinst_DATA = libgphoto2-uninstalled.pc
doc_DATA = AUTHORS COPYING NEWS ABOUT-NLS ChangeLog README \
Index: libgphoto2-2.5.18/configure.ac
Index: libgphoto2-2.5.19/configure.ac
===================================================================
--- libgphoto2-2.5.18.orig/configure.ac
+++ libgphoto2-2.5.18/configure.ac
--- libgphoto2-2.5.19.orig/configure.ac
+++ libgphoto2-2.5.19/configure.ac
@@ -635,20 +635,11 @@ gphoto-m4/Makefile
libgphoto2/Makefile
libgphoto2.pc
@ -49,10 +49,10 @@ Index: libgphoto2-2.5.18/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.18/libgphoto2_port/Makefile.am
Index: libgphoto2-2.5.19/libgphoto2_port/Makefile.am
===================================================================
--- libgphoto2-2.5.18.orig/libgphoto2_port/Makefile.am
+++ libgphoto2-2.5.18/libgphoto2_port/Makefile.am
--- libgphoto2-2.5.19.orig/libgphoto2_port/Makefile.am
+++ libgphoto2-2.5.19/libgphoto2_port/Makefile.am
@@ -25,7 +25,7 @@ udevscript_PROGRAMS =
bin_SCRIPTS = gphoto2-port-config
@ -62,10 +62,10 @@ Index: libgphoto2-2.5.18/libgphoto2_port/Makefile.am
########################################################################
Index: libgphoto2-2.5.18/libgphoto2_port/Makefile.in
Index: libgphoto2-2.5.19/libgphoto2_port/Makefile.in
===================================================================
--- libgphoto2-2.5.18.orig/libgphoto2_port/Makefile.in
+++ libgphoto2-2.5.18/libgphoto2_port/Makefile.in
--- libgphoto2-2.5.19.orig/libgphoto2_port/Makefile.in
+++ libgphoto2-2.5.19/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.18/libgphoto2_port/Makefile.in
########################################################################
# All iolibs are defined as EXTRA_LTLIBRARIES. This requires that
Index: libgphoto2-2.5.18/libgphoto2_port/configure.ac
Index: libgphoto2-2.5.19/libgphoto2_port/configure.ac
===================================================================
--- libgphoto2-2.5.18.orig/libgphoto2_port/configure.ac
+++ libgphoto2-2.5.18/libgphoto2_port/configure.ac
--- libgphoto2-2.5.19.orig/libgphoto2_port/configure.ac
+++ libgphoto2-2.5.19/libgphoto2_port/configure.ac
@@ -512,13 +512,10 @@ AC_SUBST([AM_LDFLAGS])
# ---------------------------------------------------------------------------
AC_CONFIG_FILES([


Loading…
Cancel
Save