diff --git a/graphics/geeqie/Makefile b/graphics/geeqie/Makefile index 0aac9a823883..d2318f6b8b7e 100644 --- a/graphics/geeqie/Makefile +++ b/graphics/geeqie/Makefile @@ -1,100 +1,114 @@ # Created by: Martin Tournoij PORTNAME= geeqie -PORTVERSION= 1.6 -PORTREVISION= 16 +DISTVERSIONPREFIX= v +DISTVERSION= 1.7.1 CATEGORIES= graphics -MASTER_SITES= http://www.geeqie.org/ MAINTAINER= amdmi3@FreeBSD.org COMMENT= Lightweight image viewer forked from GQview LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libpng.so:graphics/png RUN_DEPENDS= bash:shells/bash CONFLICTS= geeqie-devel -USES= autoreconf compiler:c++11-lang gettext gmake gnome jpeg \ +USES= autoreconf compiler:c++11-lang gmake gnome jpeg \ localbase pkgconfig desktop-file-utils tar:xz lua:53 shebangfix USE_GNOME= cairo gdkpixbuf2 intltool - +USE_GITHUB= yes +GH_ACCOUNT= BestImageViewer 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 HEIF WEBP DJVU OPENJPEG -OPTIONS_DEFAULT=EXIV2 LCMS GTK3 PDF FFMPEGTHUMBNAILER HEIF WEBP DJVU OPENJPEG +OPTIONS_DEFINE= EXIV2 LCMS LIRC MAP FFMPEGTHUMBNAILER DOCS NLS ARCHIVE +OPTIONS_DEFAULT=EXIV2 LCMS GTK3 PDF FFMPEGTHUMBNAILER HEIF WEBP DJVU OPENJPEG RAW ARCHIVE JPEGXL OPTIONS_SINGLE= TOOLKIT OPTIONS_SINGLE_TOOLKIT=GTK2 GTK3 +OPTIONS_GROUP= FORMATS +OPTIONS_GROUP_FORMATS= TIFF PDF HEIF WEBP DJVU OPENJPEG RAW JPEGXL OPTIONS_SUB= yes EXIV2_DESC= Metadata editing LCMS_DESC= Color adjusting LIRC_DESC= Remote control (broken) MAP_DESC= GPS map support via libchamplain TOOLKIT_DESC= Graphical user interface toolkit +FORMATS_DESC= Image formats support 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 LCMS_LIB_DEPENDS= liblcms2.so:graphics/lcms2 LCMS_CONFIGURE_ENABLE= lcms LIRC_LIB_DEPENDS= liblirc_client.so:comms/lirc LIRC_CONFIGURE_ENABLE= lirc LIRC_CONFIGURE_ON= --with-lirc-prefix="${LOCALBASE}" LIRC_BROKEN= does not build with old lirc from ports MAP_LIB_DEPENDS= libchamplain-0.12.so:graphics/libchamplain \ libclutter-gtk-1.0.so:graphics/clutter-gtk3 \ libclutter-1.0.so:graphics/clutter \ libcogl.so:graphics/cogl \ libjson-glib-1.0.so:devel/json-glib MAP_CONFIGURE_ENABLE= map gpu-accel MAP_REQUIRES= GTK3 MAP_USES= gl xorg MAP_USE= GL=egl XORG=xrandr,x11,xext,xdamage,xfixes,xcomposite,xi TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff TIFF_CONFIGURE_ENABLE= tiff GTK2_USE= GNOME=gtk20 GTK3_USE= GNOME=gtk30 GTK3_CONFIGURE_ENABLE= gtk3 PDF_LIB_DEPENDS= libpoppler-glib.so:graphics/poppler-glib PDF_CONFIGURE_ENABLE= pdf PDF_REQUIRES= GTK3 FFMPEGTHUMBNAILER_DESC= Video file thumbnails generating support FFMPEGTHUMBNAILER_CONFIGURE_ENABLE= ffmpegthumbnailer FFMPEGTHUMBNAILER_LIB_DEPENDS= libffmpegthumbnailer.so:multimedia/ffmpegthumbnailer GTK2_LIB_DEPENDS= libfreetype.so:print/freetype2 \ libfontconfig.so:x11-fonts/fontconfig NLS_CONFIGURE_ENABLE= nls +NLS_USES= gettext +NLS_USES_OFF= gettext-tools 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 +RAW_CONFIGURE_ENABLE= raw +RAW_LIB_DEPENDS= libraw.so:graphics/libraw + +ARCHIVE_CONFIGURE_ENABLE= archive +ARCHIVE_USES= libarchive + +JPEGXL_DESC= JPEG XL support +JPEGXL_CONFIGURE_ENABLE=jxl +JPEGXL_LIB_DEPENDS= libjxl.so:graphics/libjxl + .include diff --git a/graphics/geeqie/distinfo b/graphics/geeqie/distinfo index ca18b7a41cec..bf2d0ed789a4 100644 --- a/graphics/geeqie/distinfo +++ b/graphics/geeqie/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1606937789 -SHA256 (geeqie-1.6.tar.xz) = 48f8a4474454d182353100e43878754b76227f3b8f30cfc258afc9d90a4e1920 -SIZE (geeqie-1.6.tar.xz) = 1693488 +TIMESTAMP = 1642440876 +SHA256 (BestImageViewer-geeqie-v1.7.1_GH0.tar.gz) = 6625f174abfda86883fd94f4cbd1054528db0f90915ae5d00f4a080dcb80411d +SIZE (BestImageViewer-geeqie-v1.7.1_GH0.tar.gz) = 37803488 diff --git a/graphics/geeqie/files/patch-configure.ac b/graphics/geeqie/files/patch-configure.ac index 7d63e0332a7a..264be8190014 100644 --- a/graphics/geeqie/files/patch-configure.ac +++ b/graphics/geeqie/files/patch-configure.ac @@ -1,29 +1,33 @@ ---- configure.ac.orig 2020-11-20 21:36:33 UTC +--- configure.ac.orig 2022-01-16 14:23:16 UTC +++ configure.ac -@@ -18,7 +18,7 @@ AC_PREREQ(2.57) - AC_INIT([geeqie], 1.6, [https://github.com/BestImageViewer/geeqie/issues], [], [http://www.geeqie.org/]) +@@ -15,10 +15,10 @@ dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOS + dnl GNU General Public License for more details. + + AC_PREREQ(2.57) +-AC_INIT([geeqie], m4_translit(m4_esyscmd([if [ $(git tag --list 'v[1-9]*' --points-at HEAD | wc -c) -gt 0 ]; then git tag --list v[1-9]* --points-at HEAD | tail -n 1 | tr -d 'v' ; else git tag --list v[1-9]* | tail -n 1 | tr -d 'v' && echo "+git" && git log --max-count=1 --date=format:"%Y%m%d" --format="%ad" && echo "-" && git rev-parse --quiet --verify --short HEAD; fi ]), m4_newline), [geeqie@freelists.org], [], [http://www.geeqie.org/]) ++AC_INIT([geeqie], 0, [geeqie@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" +#CFLAGS+=" -Werror -Wno-error=deprecated-declarations -Wno-error=sign-compare -Wno-error=return-type" # Check for rightly dirs AC_CONFIG_SRCDIR([src/main.c]) -@@ -525,7 +525,7 @@ AC_ARG_ENABLE([lua], +@@ -550,7 +550,7 @@ AC_ARG_ENABLE([lua], [liblua=$enableval], [liblua=auto]) if test "x${liblua}" != "xno"; then - PKG_CHECK_MODULES(LUA, lua5.3 >= 5.3, + PKG_CHECK_MODULES(LUA, lua-5.3 >= 5.3, [ HAVE_LUA=yes AC_DEFINE(HAVE_LUA, 1, [define to enable lua support]) -@@ -688,7 +688,7 @@ AC_SUBST(DJVU_LIBS) +@@ -763,7 +763,7 @@ AC_SUBST(JPEGXL_LIBS) # Markdown support # ---------------------------------------------------------------------- -AM_CONDITIONAL(HAVE_MARKDOWN, [ "$(command -v markdown)" ]) +AM_CONDITIONAL(HAVE_MARKDOWN, [ "$(false)" ]) # _NL_TIME_FIRST_WEEKDAY support # note that it is an enum and not a define diff --git a/graphics/geeqie/files/patch-src_misc.c b/graphics/geeqie/files/patch-src_misc.c deleted file mode 100644 index 8b2d9b58ee5d..000000000000 --- a/graphics/geeqie/files/patch-src_misc.c +++ /dev/null @@ -1,10 +0,0 @@ ---- src/misc.c.orig 2020-11-20 21:36:33 UTC -+++ src/misc.c -@@ -378,6 +378,7 @@ gchar *get_symbolic_link(const gchar *path_utf8) - - gint get_cpu_cores(void) - { -+ return MAX(1, sysconf(_SC_NPROCESSORS_ONLN)); - FILE *cpuinfo = fopen("/proc/cpuinfo", "rb"); - char *arg = 0; - size_t size = 0; diff --git a/graphics/geeqie/pkg-descr b/graphics/geeqie/pkg-descr index f5c149c97933..08624be4e751 100644 --- a/graphics/geeqie/pkg-descr +++ b/graphics/geeqie/pkg-descr @@ -1,15 +1,15 @@ Geeqie is a lightweight Gtk+ based image viewer for Unix operating systems. Main features o EXIF, IPTC and XMP metadata browsing and editing. o Interoperability, easy integration with other software. o geeqie works on files and directories, there is no need to import images. o Fast preview for many raw image formats. o Tools for image comparison, sorting and managing photo collection. History Geeqie has been forked from gqview project, because it was not possible to contact gqview author and the only maintainer. Geeqie projects goal is to move the development forward and also integrate the existing patches. -WWW: http://www.geeqie.org/ +WWW: https://www.geeqie.org/ diff --git a/graphics/geeqie/pkg-plist b/graphics/geeqie/pkg-plist index ca690c49dab7..ac901a3cb57a 100644 --- a/graphics/geeqie/pkg-plist +++ b/graphics/geeqie/pkg-plist @@ -1,66 +1,62 @@ bin/geeqie -lib/geeqie/geeqie-rotate -lib/geeqie/geeqie-symlink -lib/geeqie/geeqie-ufraw -lib/geeqie/geocode-parameters.awk lib/geeqie/geeqie-camera-import lib/geeqie/geeqie-camera-import-hook-script lib/geeqie/geeqie-export-jpeg lib/geeqie/geeqie-image-crop lib/geeqie/geeqie-random-image +lib/geeqie/geeqie-rotate +lib/geeqie/geeqie-symlink lib/geeqie/geeqie-tethered-photography lib/geeqie/geeqie-tethered-photography-hook-script +lib/geeqie/geocode-parameters.awk lib/geeqie/lensID man/man1/geeqie.1.gz share/applications/geeqie.desktop %%DATADIR%%/applications/camera-import.desktop %%DATADIR%%/applications/export-jpeg.desktop -%%DATADIR%%/applications/geeqie-ufraw-id.desktop -%%DATADIR%%/applications/geeqie-ufraw-recursive.desktop -%%DATADIR%%/applications/geeqie-ufraw.desktop %%DATADIR%%/applications/image-crop.desktop %%DATADIR%%/applications/random-image.desktop %%DATADIR%%/applications/rotate.desktop %%DATADIR%%/applications/symlink.desktop %%DATADIR%%/applications/tethered-photography.desktop %%DATADIR%%/template.desktop %%NLS%%share/locale/ar/LC_MESSAGES/geeqie.mo %%NLS%%share/locale/be/LC_MESSAGES/geeqie.mo %%NLS%%share/locale/bg/LC_MESSAGES/geeqie.mo %%NLS%%share/locale/ca/LC_MESSAGES/geeqie.mo %%NLS%%share/locale/cs/LC_MESSAGES/geeqie.mo %%NLS%%share/locale/da/LC_MESSAGES/geeqie.mo %%NLS%%share/locale/de/LC_MESSAGES/geeqie.mo %%NLS%%share/locale/el/LC_MESSAGES/geeqie.mo %%NLS%%share/locale/en_GB/LC_MESSAGES/geeqie.mo %%NLS%%share/locale/eo/LC_MESSAGES/geeqie.mo %%NLS%%share/locale/es/LC_MESSAGES/geeqie.mo %%NLS%%share/locale/et/LC_MESSAGES/geeqie.mo %%NLS%%share/locale/eu/LC_MESSAGES/geeqie.mo %%NLS%%share/locale/fi/LC_MESSAGES/geeqie.mo %%NLS%%share/locale/fr/LC_MESSAGES/geeqie.mo %%NLS%%share/locale/hu/LC_MESSAGES/geeqie.mo %%NLS%%share/locale/id/LC_MESSAGES/geeqie.mo %%NLS%%share/locale/it/LC_MESSAGES/geeqie.mo %%NLS%%share/locale/ja/LC_MESSAGES/geeqie.mo %%NLS%%share/locale/ko/LC_MESSAGES/geeqie.mo %%NLS%%share/locale/nb/LC_MESSAGES/geeqie.mo %%NLS%%share/locale/nl/LC_MESSAGES/geeqie.mo %%NLS%%share/locale/pl/LC_MESSAGES/geeqie.mo %%NLS%%share/locale/pt_BR/LC_MESSAGES/geeqie.mo %%NLS%%share/locale/ro/LC_MESSAGES/geeqie.mo %%NLS%%share/locale/ru/LC_MESSAGES/geeqie.mo %%NLS%%share/locale/sk/LC_MESSAGES/geeqie.mo %%NLS%%share/locale/sl/LC_MESSAGES/geeqie.mo %%NLS%%share/locale/sr/LC_MESSAGES/geeqie.mo %%NLS%%share/locale/sr@latin/LC_MESSAGES/geeqie.mo %%NLS%%share/locale/sv/LC_MESSAGES/geeqie.mo %%NLS%%share/locale/th/LC_MESSAGES/geeqie.mo %%NLS%%share/locale/tlh/LC_MESSAGES/geeqie.mo %%NLS%%share/locale/tr/LC_MESSAGES/geeqie.mo %%NLS%%share/locale/uk/LC_MESSAGES/geeqie.mo %%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