Browse Source

Merge pull request #14078 from neheb/gpht

gphoto2: update to 2.5.26
lilik-openwrt-22.03
Rosen Penev 4 years ago
committed by GitHub
parent
commit
e728d3d735
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 10 deletions
  1. +5
    -9
      multimedia/gphoto2/Makefile
  2. +1
    -1
      multimedia/gphoto2/patches/001-automake-compat.patch

+ 5
- 9
multimedia/gphoto2/Makefile View File

@ -9,12 +9,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=gphoto2 PKG_NAME:=gphoto2
PKG_VERSION:=2.5.23
PKG_RELEASE:=2
PKG_VERSION:=2.5.26
PKG_RELEASE:=1
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:=df87092100e7766c9d0a4323217c91908a9c891c0d3670ebf40b76903be458d1
PKG_HASH:=7653213b05329c1dc2779efea3eff00504e12011436587aedc9aaa1e8665ab2f
PKG_MAINTAINER:=Leonardo Medici <leonardo_medici@me.com> PKG_MAINTAINER:=Leonardo Medici <leonardo_medici@me.com>
PKG_LICENSE:=GPL-2.0 PKG_LICENSE:=GPL-2.0
@ -43,12 +43,8 @@ CONFIGURE_ARGS += \
--without-aalib --without-aalib
CONFIGURE_VARS += \ CONFIGURE_VARS += \
LIBGPHOTO2_CFLAGS="$$$$CFLAGS -I$(STAGING_DIR)/usr/include/gphoto2 $$$$CPPFLAGS" \
LIBGPHOTO2_LIBS="$$$$LDFLAGS -lgphoto2 -lgphoto2_port -lltdl" \
LIBEXIF_CFLAGS="$$$$CFLAGS $$$$CPPFLAGS" \
LIBEXIF_LIBS="$$$$LDFLAGS -lexif" \
POPT_CFLAGS="$$$$CFLAGS $$$$CPPFLAGS" \
POPT_LIBS="$$$$LDFLAGS -lpopt" \
POPT_CFLAGS="-I$(STAGING_DIR)/usr/include" \
POPT_LIBS="-L$(STAGING_DIR)/usr/lib -lpopt"
define Package/gphoto2/install define Package/gphoto2/install
$(INSTALL_DIR) $(1)/usr/bin $(INSTALL_DIR) $(1)/usr/bin


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

@ -19,7 +19,7 @@
all: config.h all: config.h
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/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"
AM_GNU_GETTEXT_VERSION([0.14.1]) AM_GNU_GETTEXT_VERSION([0.14.1])


Loading…
Cancel
Save