svn commit: r556998 - in head: . graphics graphics/geeqie graphics/geeqie-devel graphics/geeqie/files

Dmitry Marakasov amdmi3 at FreeBSD.org
Fri Dec 4 18:22:24 UTC 2020 

Author: amdmi3
Date: Fri Dec  4 18:22:22 2020
New Revision: 556998
URL: https://svnweb.freebsd.org/changeset/ports/556998

Log:
  Update graphics/geeqie to 1.6, remove no longer needed devel port

Deleted:
  head/graphics/geeqie-devel/
  head/graphics/geeqie/files/patch-options.c
  head/graphics/geeqie/files/patch-options.h
  head/graphics/geeqie/files/patch-src_layout__util.c
Modified:
  head/MOVED
  head/graphics/Makefile
  head/graphics/geeqie/Makefile
  head/graphics/geeqie/distinfo
  head/graphics/geeqie/files/patch-Makefile.am
  head/graphics/geeqie/files/patch-configure.ac
  head/graphics/geeqie/pkg-plist

Modified: head/MOVED
==============================================================================
--- head/MOVED	Fri Dec  4 18:20:29 2020	(r556997)
+++ head/MOVED	Fri Dec  4 18:22:22 2020	(r556998)
@@ -15735,3 +15735,4 @@ www/rubygem-dashing||2020-12-03|Has expired: Unmaintai
 www/rubygem-redmine_acts_as_taggable_on||2020-12-03|Has expired: Unmaintained by upstream
 www/rubygem-gitlab-grack||2020-12-03|Has expired: Deprecated by upstream
 databases/db6||2020-12-03|Has expired: latest 6.2.x version and newer not downloadable without registration
+graphics/geeqie-devel|graphics/geeqie|2020-12-04|Development version no longer necessary

Modified: head/graphics/Makefile
==============================================================================
--- head/graphics/Makefile	Fri Dec  4 18:20:29 2020	(r556997)
+++ head/graphics/Makefile	Fri Dec  4 18:22:22 2020	(r556998)
@@ -224,7 +224,6 @@
     SUBDIR += gdk-pixbuf2
     SUBDIR += gdtclft
     SUBDIR += geeqie
-    SUBDIR += geeqie-devel
     SUBDIR += gegl
     SUBDIR += generic_image_decoder
     SUBDIR += geoapi

Modified: head/graphics/geeqie/Makefile
==============================================================================
--- head/graphics/geeqie/Makefile	Fri Dec  4 18:20:29 2020	(r556997)
+++ head/graphics/geeqie/Makefile	Fri Dec  4 18:22:22 2020	(r556998)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	geeqie
-PORTVERSION=	1.5.1
-PORTREVISION=	12
+PORTVERSION=	1.6
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.geeqie.org/
 
@@ -23,12 +22,13 @@ USES=		autoreconf compiler:c++11-lang gettext gmake gn
 USE_GNOME=	intltool
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-readmedir="${DOCSDIR}"
+CONFIGURE_ARGS+=--disable-j2k  # not in ports (yet), disable proactively to avoid hidden dependency
 SHEBANG_FILES=	plugins/*/geeqie-*
 
 PORTDOCS=	*
 
-OPTIONS_DEFINE=	EXIV2 LCMS LIRC MAP TIFF PDF FFMPEGTHUMBNAILER DOCS NLS
-OPTIONS_DEFAULT=EXIV2 LCMS GTK3 PDF FFMPEGTHUMBNAILER
+OPTIONS_DEFINE=	EXIV2 LCMS LIRC MAP TIFF PDF FFMPEGTHUMBNAILER DOCS NLS HEIF WEBP DJVU OPENJPEG
+OPTIONS_DEFAULT=EXIV2 LCMS GTK3 PDF FFMPEGTHUMBNAILER HEIF WEBP DJVU OPENJPEG
 OPTIONS_SINGLE=	TOOLKIT
 OPTIONS_SINGLE_TOOLKIT=GTK2 GTK3
 OPTIONS_SUB=	yes
@@ -40,6 +40,7 @@ MAP_DESC=	GPS map support via libchamplain
 TOOLKIT_DESC=	Graphical user interface toolkit
 GTK2_DESC=	Use GTK 2
 GTK3_DESC=	Use GTK 3
+HEIF_DESC=	HEIF image format support
 
 EXIV2_LIB_DEPENDS=	libexiv2.so:graphics/exiv2
 EXIV2_CONFIGURE_ENABLE=	exiv2
@@ -74,8 +75,16 @@ FFMPEGTHUMBNAILER_LIB_DEPENDS=	libffmpegthumbnailer.so
 
 NLS_CONFIGURE_ENABLE=	nls
 
-pre-build:
-	# fixes threaded build
-	@cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} gq-marshal.c
+HEIF_CONFIGURE_ENABLE=	heif
+HEIF_LIB_DEPENDS=	libheif.so:graphics/libheif
+
+WEBP_CONFIGURE_ENABLE=	webp
+WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
+
+DJVU_CONFIGURE_ENABLE=	djvu
+DJVU_LIB_DEPENDS=	libdjvulibre.so:graphics/djvulibre
+
+OPENJPEG_CONFIGURE_ENABLE=	j2k
+OPENJPEG_LIB_DEPENDS=	libopenjp2.so:graphics/openjpeg
 
 .include <bsd.port.mk>

Modified: head/graphics/geeqie/distinfo
==============================================================================
--- head/graphics/geeqie/distinfo	Fri Dec  4 18:20:29 2020	(r556997)
+++ head/graphics/geeqie/distinfo	Fri Dec  4 18:22:22 2020	(r556998)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1566422244
-SHA256 (geeqie-1.5.1.tar.xz) = 4854d5d323c31f8f4068fd73ab2c454ff91e826c4ca4d37b22c246ad14dea10a
-SIZE (geeqie-1.5.1.tar.xz) = 1587116
+TIMESTAMP = 1606937789
+SHA256 (geeqie-1.6.tar.xz) = 48f8a4474454d182353100e43878754b76227f3b8f30cfc258afc9d90a4e1920
+SIZE (geeqie-1.6.tar.xz) = 1693488

Modified: head/graphics/geeqie/files/patch-Makefile.am
==============================================================================
--- head/graphics/geeqie/files/patch-Makefile.am	Fri Dec  4 18:20:29 2020	(r556997)
+++ head/graphics/geeqie/files/patch-Makefile.am	Fri Dec  4 18:22:22 2020	(r556998)
@@ -1,4 +1,4 @@
---- Makefile.am.orig	2019-08-20 19:01:23 UTC
+--- Makefile.am.orig	2020-11-20 21:36:33 UTC
 +++ Makefile.am
 @@ -2,8 +2,8 @@
  

Modified: head/graphics/geeqie/files/patch-configure.ac
==============================================================================
--- head/graphics/geeqie/files/patch-configure.ac	Fri Dec  4 18:20:29 2020	(r556997)
+++ head/graphics/geeqie/files/patch-configure.ac	Fri Dec  4 18:22:22 2020	(r556998)
@@ -1,6 +1,6 @@
---- configure.ac.orig	2019-08-20 19:01:23 UTC
+--- configure.ac.orig	2020-11-20 21:36:33 UTC
 +++ configure.ac
-@@ -518,7 +518,7 @@ AC_ARG_ENABLE([lua],
+@@ -525,7 +525,7 @@ AC_ARG_ENABLE([lua],
      [liblua=$enableval], [liblua=auto])
  
  if test "x${liblua}" != "xno"; then
@@ -9,7 +9,7 @@
      [
        HAVE_LUA=yes
        AC_DEFINE(HAVE_LUA, 1, [define to enable lua support])
-@@ -581,7 +581,7 @@ AC_SUBST(PDF_LIBS)
+@@ -688,7 +688,7 @@ AC_SUBST(DJVU_LIBS)
  #  Markdown support
  # ----------------------------------------------------------------------
  

Modified: head/graphics/geeqie/pkg-plist
==============================================================================
--- head/graphics/geeqie/pkg-plist	Fri Dec  4 18:20:29 2020	(r556997)
+++ head/graphics/geeqie/pkg-plist	Fri Dec  4 18:22:22 2020	(r556998)
@@ -10,6 +10,7 @@ lib/geeqie/geeqie-image-crop
 lib/geeqie/geeqie-random-image
 lib/geeqie/geeqie-tethered-photography
 lib/geeqie/geeqie-tethered-photography-hook-script
+lib/geeqie/lensID
 man/man1/geeqie.1.gz
 share/applications/geeqie.desktop
 %%DATADIR%%/applications/camera-import.desktop
@@ -61,4 +62,5 @@ share/applications/geeqie.desktop
 %%NLS%%share/locale/vi/LC_MESSAGES/geeqie.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/geeqie.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/geeqie.mo
+share/metainfo/org.geeqie.Geeqie.appdata.xml
 share/pixmaps/geeqie.png

More information about the svn-ports-all mailing list