svn commit: r547187 - in head/graphics: . geeqie geeqie-devel geeqie-devel/files
Dmitry Marakasov
amdmi3 at FreeBSD.org
Mon Aug 31 14:44:13 UTC 2020
Author: amdmi3
Date: Mon Aug 31 14:44:11 2020
New Revision: 547187
URL: https://svnweb.freebsd.org/changeset/ports/547187
Log:
- Add graphics/geeqie-devel, latest git version of geeqie with support for more image formats including HEIC
Suggested by: ehaupt
Added:
head/graphics/geeqie-devel/
- copied from r546726, head/graphics/geeqie/
Deleted:
head/graphics/geeqie-devel/files/patch-options.c
head/graphics/geeqie-devel/files/patch-options.h
head/graphics/geeqie-devel/files/patch-src_layout__util.c
Modified:
head/graphics/Makefile
head/graphics/geeqie-devel/Makefile
head/graphics/geeqie-devel/distinfo
head/graphics/geeqie-devel/files/patch-configure.ac
head/graphics/geeqie-devel/pkg-plist
head/graphics/geeqie/Makefile
Modified: head/graphics/Makefile
==============================================================================
--- head/graphics/Makefile Mon Aug 31 14:28:47 2020 (r547186)
+++ head/graphics/Makefile Mon Aug 31 14:44:11 2020 (r547187)
@@ -222,6 +222,7 @@
SUBDIR += gdk-pixbuf2
SUBDIR += gdtclft
SUBDIR += geeqie
+ SUBDIR += geeqie-devel
SUBDIR += gegl
SUBDIR += generic_image_decoder
SUBDIR += geoapi
Modified: head/graphics/geeqie-devel/Makefile
==============================================================================
--- head/graphics/geeqie/Makefile Fri Aug 28 11:37:17 2020 (r546726)
+++ head/graphics/geeqie-devel/Makefile Mon Aug 31 14:44:11 2020 (r547187)
@@ -2,10 +2,9 @@
# $FreeBSD$
PORTNAME= geeqie
-PORTVERSION= 1.5.1
-PORTREVISION= 8
+PORTVERSION= 1.5.1.git20200724
CATEGORIES= graphics
-MASTER_SITES= http://www.geeqie.org/
+PKGNAMESUFFIX= -devel
MAINTAINER= amdmi3 at FreeBSD.org
COMMENT= Lightweight image viewer forked from GQview
@@ -16,17 +15,24 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libpng.so:graphics/png
RUN_DEPENDS= bash:shells/bash
+USE_GITHUB= yes
+GH_ACCOUNT= BestImageViewer
+GH_TAGNAME= d6195e5
+
+CONFLICTS= geeqie-[0-9]*
+
USES= autoreconf compiler:c++11-lang gettext gmake gnome jpeg \
localbase pkgconfig desktop-file-utils tar:xz lua:53 shebangfix
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
@@ -38,6 +44,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
@@ -72,8 +79,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-devel/distinfo
==============================================================================
--- head/graphics/geeqie/distinfo Fri Aug 28 11:37:17 2020 (r546726)
+++ head/graphics/geeqie-devel/distinfo Mon Aug 31 14:44:11 2020 (r547187)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1566422244
-SHA256 (geeqie-1.5.1.tar.xz) = 4854d5d323c31f8f4068fd73ab2c454ff91e826c4ca4d37b22c246ad14dea10a
-SIZE (geeqie-1.5.1.tar.xz) = 1587116
+TIMESTAMP = 1598617789
+SHA256 (BestImageViewer-geeqie-1.5.1.git20200724-d6195e5_GH0.tar.gz) = fd7be00cff302c5813c5dd26809506c67bc43a6a3d61e4f91d322d6a80809385
+SIZE (BestImageViewer-geeqie-1.5.1.git20200724-d6195e5_GH0.tar.gz) = 37626411
Modified: head/graphics/geeqie-devel/files/patch-configure.ac
==============================================================================
--- head/graphics/geeqie/files/patch-configure.ac Fri Aug 28 11:37:17 2020 (r546726)
+++ head/graphics/geeqie-devel/files/patch-configure.ac Mon Aug 31 14:44:11 2020 (r547187)
@@ -1,6 +1,15 @@
---- configure.ac.orig 2019-08-20 19:01:23 UTC
+--- configure.ac.orig 2020-07-24 09:03:17 UTC
+++ configure.ac
-@@ -518,7 +518,7 @@ AC_ARG_ENABLE([lua],
+@@ -15,7 +15,7 @@ dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOS
+ dnl GNU General Public License for more details.
+
+ AC_PREREQ(2.57)
+-AC_INIT([geeqie], m4_esyscmd_s(git rev-parse --quiet --verify --short HEAD), [geeqie at freelists.org], [], [http://www.geeqie.org/])
++AC_INIT([geeqie], git, [geeqie at freelists.org], [], [http://www.geeqie.org/])
+
+ # Add -Werror to the default CFLAGS
+ CFLAGS+=" -Werror -Wno-error=deprecated-declarations -Wno-error=sign-compare -Wno-error=return-type"
+@@ -525,7 +525,7 @@ AC_ARG_ENABLE([lua],
[liblua=$enableval], [liblua=auto])
if test "x${liblua}" != "xno"; then
@@ -9,7 +18,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-devel/pkg-plist
==============================================================================
--- head/graphics/geeqie/pkg-plist Fri Aug 28 11:37:17 2020 (r546726)
+++ head/graphics/geeqie-devel/pkg-plist Mon Aug 31 14:44:11 2020 (r547187)
@@ -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
Modified: head/graphics/geeqie/Makefile
==============================================================================
--- head/graphics/geeqie/Makefile Mon Aug 31 14:28:47 2020 (r547186)
+++ head/graphics/geeqie/Makefile Mon Aug 31 14:44:11 2020 (r547187)
@@ -16,6 +16,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libpng.so:graphics/png
RUN_DEPENDS= bash:shells/bash
+CONFLICTS= geeqie-devel-[0-9]*
+
USES= autoreconf compiler:c++11-lang gettext gmake gnome jpeg \
localbase pkgconfig desktop-file-utils tar:xz lua:53 shebangfix
USE_GNOME= intltool
More information about the svn-ports-all
mailing list