svn commit: r562563 - in branches/2021Q1/graphics: gphoto2 libgphoto2

[Dima Panov]

Author: fluffy
Date: Mon Jan 25 11:27:56 2021
New Revision: 562563
URL: https://svnweb.freebsd.org/changeset/ports/562563

Log:
  MFH: r562561
  
  graphics/[lib]gphoto2: update to 2.5.26
  
  LibCurl and LibXml2 now are mandatory to build driver for Lumix cameras
  
  Changelog:	http://www.gphoto.org/news/
  
  No ABI change, no need to bump consumers
  
  PR:		252959, 252960
  Submitted by:	fluffy
  Approved by:	maintainer (woodsb02)

Modified:
  branches/2021Q1/graphics/gphoto2/Makefile
  branches/2021Q1/graphics/gphoto2/distinfo
  branches/2021Q1/graphics/libgphoto2/Makefile
  branches/2021Q1/graphics/libgphoto2/distinfo
  branches/2021Q1/graphics/libgphoto2/pkg-plist
Directory Properties:
  branches/2021Q1/   (props changed)

Modified: branches/2021Q1/graphics/gphoto2/Makefile
==============================================================================
--- branches/2021Q1/graphics/gphoto2/Makefile	Mon Jan 25 11:26:15 2021	(r562562)
+++ branches/2021Q1/graphics/gphoto2/Makefile	Mon Jan 25 11:27:56 2021	(r562563)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gphoto2
-PORTVERSION=	2.5.23
+PORTVERSION=	2.5.26
 CATEGORIES=	graphics
 MASTER_SITES=	SF/gphoto/gphoto/${PORTVERSION}
 

Modified: branches/2021Q1/graphics/gphoto2/distinfo
==============================================================================
--- branches/2021Q1/graphics/gphoto2/distinfo	Mon Jan 25 11:26:15 2021	(r562562)
+++ branches/2021Q1/graphics/gphoto2/distinfo	Mon Jan 25 11:27:56 2021	(r562563)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1576064341
-SHA256 (gphoto2-2.5.23.tar.bz2) = df87092100e7766c9d0a4323217c91908a9c891c0d3670ebf40b76903be458d1
-SIZE (gphoto2-2.5.23.tar.bz2) = 802951
+TIMESTAMP = 1611463835
+SHA256 (gphoto2-2.5.26.tar.bz2) = 7653213b05329c1dc2779efea3eff00504e12011436587aedc9aaa1e8665ab2f
+SIZE (gphoto2-2.5.26.tar.bz2) = 804521

Modified: branches/2021Q1/graphics/libgphoto2/Makefile
==============================================================================
--- branches/2021Q1/graphics/libgphoto2/Makefile	Mon Jan 25 11:26:15 2021	(r562562)
+++ branches/2021Q1/graphics/libgphoto2/Makefile	Mon Jan 25 11:27:56 2021	(r562563)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libgphoto2
-PORTVERSION=	2.5.23
-PORTREVISION=	1
+PORTVERSION=	2.5.26
 CATEGORIES=	graphics
 MASTER_SITES=	SF/gphoto/libgphoto/${PORTVERSION}
 
@@ -13,10 +12,12 @@ COMMENT=	Universal digital camera control library
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libltdl.so:devel/libltdl
+LIB_DEPENDS=	libltdl.so:devel/libltdl \
+		libcurl.so:ftp/curl
 
-USES=		gmake iconv libtool localbase pathfix pkgconfig tar:bzip2
+USES=		gmake gnome iconv libtool localbase pathfix pkgconfig tar:bzip2
 USE_CSTD=	gnu89
+USE_GNOME=	libxml2
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	LTDLINCL="-I${LOCALBASE}/include" \
@@ -34,8 +35,8 @@ PATHFIX_MAKEFILEIN=	Makefile.in \
 
 PLIST_SUB=	VERSION="${PORTVERSION}" VERSION_PORT=0.12.0
 
-OPTIONS_DEFINE=		DOCS GD JPEG LIBEXIF NLS XML
-OPTIONS_DEFAULT=	GD JPEG LIBEXIF XML
+OPTIONS_DEFINE=		DOCS GD JPEG LIBEXIF NLS
+OPTIONS_DEFAULT=	GD JPEG LIBEXIF
 OPTIONS_SUB=		yes
 
 GD_LIB_DEPENDS=		libgd.so:graphics/gd
@@ -46,9 +47,6 @@ LIBEXIF_LIB_DEPENDS=	libexif.so:graphics/libexif
 LIBEXIF_CONFIGURE_OFF=	--with-libexif=no
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
-XML_USE=		GNOME=libxml2
-XML_USES=		gnome
-XML_CONFIGURE_OFF=	--with-libxml-2.0=no
 
 post-patch:
 .for i in configure libgphoto2_port/configure

Modified: branches/2021Q1/graphics/libgphoto2/distinfo
==============================================================================
--- branches/2021Q1/graphics/libgphoto2/distinfo	Mon Jan 25 11:26:15 2021	(r562562)
+++ branches/2021Q1/graphics/libgphoto2/distinfo	Mon Jan 25 11:27:56 2021	(r562563)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1576064373
-SHA256 (libgphoto2-2.5.23.tar.bz2) = d8af23364aa40fd8607f7e073df74e7ace05582f4ba13f1724d12d3c97e8852d
-SIZE (libgphoto2-2.5.23.tar.bz2) = 7616078
+TIMESTAMP = 1611463219
+SHA256 (libgphoto2-2.5.26.tar.bz2) = 7740fea3cbb78489071cdfec06c07fab528e69e27ac82734eae6a73eaeeabcd4
+SIZE (libgphoto2-2.5.26.tar.bz2) = 7572381

Modified: branches/2021Q1/graphics/libgphoto2/pkg-plist
==============================================================================
--- branches/2021Q1/graphics/libgphoto2/pkg-plist	Mon Jan 25 11:26:15 2021	(r562562)
+++ branches/2021Q1/graphics/libgphoto2/pkg-plist	Mon Jan 25 11:27:56 2021	(r562563)
@@ -1,6 +1,5 @@
 bin/gphoto2-config
 bin/gphoto2-port-config
-include/gphoto2/gphoto2
 include/gphoto2/gphoto2-abilities-list.h
 include/gphoto2/gphoto2-camera.h
 include/gphoto2/gphoto2-context.h
@@ -27,12 +26,15 @@ lib/libgphoto2/%%VERSION%%/canon.so
 lib/libgphoto2/%%VERSION%%/digigr8.so
 lib/libgphoto2/%%VERSION%%/dimagev.so
 lib/libgphoto2/%%VERSION%%/directory.so
+lib/libgphoto2/%%VERSION%%/docupen.so
 lib/libgphoto2/%%VERSION%%/jl2005a.so
 lib/libgphoto2/%%VERSION%%/jl2005c.so
 lib/libgphoto2/%%VERSION%%/kodak_dc240.so
+lib/libgphoto2/%%VERSION%%/lumix.so
 lib/libgphoto2/%%VERSION%%/mars.so
 lib/libgphoto2/%%VERSION%%/pentax.so
 lib/libgphoto2/%%VERSION%%/ptp2.so
+lib/libgphoto2/%%VERSION%%/ricoh_g3.so
 lib/libgphoto2/%%VERSION%%/sierra.so
 lib/libgphoto2/%%VERSION%%/sonix.so
 lib/libgphoto2/%%VERSION%%/sq905.so
@@ -46,8 +48,6 @@ lib/libgphoto2_port.so.12.0.0
 lib/libgphoto2_port/%%VERSION_PORT%%/disk.so
 lib/libgphoto2_port/%%VERSION_PORT%%/ptpip.so
 lib/libgphoto2_port/%%VERSION_PORT%%/usb1.so
-lib/libgphoto2_port/%%VERSION_PORT%%/usbdiskdirect.so
-lib/libgphoto2_port/%%VERSION_PORT%%/usbscsi.so
 libdata/pkgconfig/libgphoto2.pc
 libdata/pkgconfig/libgphoto2_port.pc
 man/man3/libgphoto2.3.gz