From d1262423b614597cd55d30370eb8de6bfa8f0899 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 18 Oct 2022 19:56:57 +0100 Subject: gentoo auto-resync : 18:10:2022 - 19:56:57 --- media-gfx/Manifest.gz | Bin 38299 -> 38298 bytes media-gfx/geeqie/Manifest | 7 +- .../geeqie/files/geeqie-2.0.1-doc_option.patch | 81 ++++++++++++++ media-gfx/geeqie/geeqie-2.0.1-r1.ebuild | 116 +++++++++++++++++++++ media-gfx/geeqie/geeqie-2.0.1.ebuild | 110 ------------------- media-gfx/geeqie/geeqie-9999.ebuild | 32 +++--- media-gfx/geeqie/metadata.xml | 4 +- 7 files changed, 221 insertions(+), 129 deletions(-) create mode 100644 media-gfx/geeqie/files/geeqie-2.0.1-doc_option.patch create mode 100644 media-gfx/geeqie/geeqie-2.0.1-r1.ebuild delete mode 100644 media-gfx/geeqie/geeqie-2.0.1.ebuild (limited to 'media-gfx') diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz index 549694dfb43b..e558dc422762 100644 Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest index 2543e6def964..c2bb4e1c8b3f 100644 --- a/media-gfx/geeqie/Manifest +++ b/media-gfx/geeqie/Manifest @@ -1,6 +1,7 @@ AUX geeqie-1.5.1-no_common.patch 2168 BLAKE2B 3949807b4bdd99a9283ca1ff1108fbfcc6cc034d56339875bf1d65513461ccd2da447c4923e5c1c0c14af8f204503c8b2fa72bce4faa4e270a8309cae2fd75e1 SHA512 3198780bc3840691cf2239fdf8d963bb9ead90b38fdf32d4276bd55c70fbb69d0e88f55ed901990c50907dde5b242e0f1af96ca6733ccb767b9e5e2d82ffeda9 AUX geeqie-1.6-yelp.patch 1044 BLAKE2B be5523c05bf0bc9a416b843a3fea8f5722272e138540ac7e1f4cdbafcf585c1357d07877c14a3dea2209f0206114b45aa4c45410e471bf5604df1be4b8553570 SHA512 fd5d11655ff788d7fb138db8f9cdce3dc9111888e0c2e37b31f9e07c956ab21f9952fd31deccb514a258426382c8c0a0de716e4cde254f4f0f4349793c119445 AUX geeqie-2.0.1-allow_xxdi.patch 774 BLAKE2B 4bba0667ea4030bba821787d22725e0db177ab5034a77124c85467f4c4b34b3148f4b3001f9466ee472425958d6d97fd868539a7c7d04740872255aad6ed6543 SHA512 83788dc0e4e99e9a2ad6e4da20c9c8d61e8bea9678d86b40c82cfc9d925abde2bfbdc5cfa0fbf421056b3625049fdf037dcc18402049dfba8c1c4443106464d8 +AUX geeqie-2.0.1-doc_option.patch 4141 BLAKE2B 59ea49f13d8bd666a01c0905ae95845eb1ecc6acbe71b7ef8553902c0ffca172984ca7dabe39e840d0ca779e13418a8a8043cacc0e3992d691a363f547fa0d58 SHA512 4edb088606d5a4b6f1d83390b40c47c8d2e06a2da2a2ea21dd9049961c63253a9aaa32d0270ef3969b0a273f5f9d2114a740328d9d4d7bbf73b766ecd2aaa8a8 DIST geeqie-1.5.1.tar.xz 1587116 BLAKE2B f8742a88eefd90fb1e7e1d1365058cef190b6231fcb001faa9f110676e8403c8e5959f9af398d6fa1ddc4e4c62439728904c6c39f5095f476014a5b7b74b4d16 SHA512 265eade90afe45856855e856c5f640786ca2e3add57c3ade8ca380d075297f96bf44c6e0c4fd6eabbc2666a37f898b50d37dd2e01d77875b8a622d72d8a0e6ac DIST geeqie-1.6.tar.xz 1693488 BLAKE2B ee5369884c4c0e60fe827d43ef336c5aaa89d55aec8905bb8cdd4edb2ee12e15d525577a3c85403e2e8955a08c817007b72d1d1e3614063377a21aaba317acee SHA512 4acd05c6012c80581e9c594c7dc7d12265528aa8d3868afef9def36798945afb851da9376bbe5f205ac3c5e1e2362188cc0e2891b49f3ea4396bbc6974c143ef DIST geeqie-1.6_p20211016.tar.xz 36433388 BLAKE2B e8932398ce7354c08ad4199834870e2844555ee1a8ae2beebd9a512100784a5cb62e00993b3ef1854a7ab1bd37eb0742ebcfc17605429f99b61e1af2fbaf859e SHA512 9e536beac39028fdcbe04d014460de2b02039b2c027f9603a71554339b2d14116f8dff11bb09c6e73d51550188daf40031535f978fbbc2d355d30593f4f29e9d @@ -13,6 +14,6 @@ EBUILD geeqie-1.6-r1.ebuild 2087 BLAKE2B b72278d1f36cbaed2cd0eccf1f2d8c8126ffd79 EBUILD geeqie-1.6_p20211016.ebuild 2412 BLAKE2B ec74ea03a4f7d9431b2fa1fa8eb474ac4c8a1e8a46b1887d7f7a67bc4af1b389c4581299aff6a301e490958412bf91561294bc8dd015220b7ad6e5e470d7e213 SHA512 23a6a0c2d60d4498b99195a87e158683a312276c1d0b29d0dbd3ca334eb0ac96e19e3985a9be1c88fce9d528ca0a74c41a739dd90bde3d3b04728321d5f94fa4 EBUILD geeqie-1.7.2.ebuild 2324 BLAKE2B 973682fbaacbf054ad6033b45e4ec4f79f2e0ccfa2a4e7e88dd73f2dc61adaba8f0010c6190f3ea9bc16b3939974216bf19b0127c59810dc41a5d05dd6a4e3c8 SHA512 f136a470d8ffa269f47af621cf13c5f9c2a87b0dc3a0a75fb1a325ad94ccf0a7cd6d1cc789241210e18e9ab8ffc326f9c1d6d66539f86592922cc02ad0938d5a EBUILD geeqie-1.7.3.ebuild 2324 BLAKE2B 973682fbaacbf054ad6033b45e4ec4f79f2e0ccfa2a4e7e88dd73f2dc61adaba8f0010c6190f3ea9bc16b3939974216bf19b0127c59810dc41a5d05dd6a4e3c8 SHA512 f136a470d8ffa269f47af621cf13c5f9c2a87b0dc3a0a75fb1a325ad94ccf0a7cd6d1cc789241210e18e9ab8ffc326f9c1d6d66539f86592922cc02ad0938d5a -EBUILD geeqie-2.0.1.ebuild 3078 BLAKE2B eac2d8367a2ee54296e80626c00088ff7f4e78199f9d9ea08a94665a69ca0be8c085455ff0ffffccb7c34def1a4e22272db0618121e3b8f431255a6f0af5232c SHA512 277b7792102bb01c28702e497e664e963765fa3527200731ef97d8f53c2db8e27da53e16d724c9839b017532ee0a7bbdd62dff063c6d053fe8c231cb13e2f40e -EBUILD geeqie-9999.ebuild 3101 BLAKE2B 8dff88fd6cfe2a8947a22baf91855894d1d4b232c0110fda519d3ec5f4a42dde5d6c35d485b647fe72cb0f90940fdf27a5ed9d1e7bfdbe27e5d24f38f8c902ac SHA512 436e0f7ae64b237f6e7b27c48c71038be72102d2a98388ae67ce2f8d93e4c68ee4f47e08232d4e7974542fa53083e659be074199db4a779e4424843f67c9a2d3 -MISC metadata.xml 1072 BLAKE2B 271e83900ee4859d4e6d89057af3c181c428956200cb4d45072a9dd95a6c7ad343b0bc04084435a25c8e2d3caa1790559583e9b3020aa60de227597b9757d8e9 SHA512 83de6f50169385f8099f389a40a1431dd3d5b87068d6a411fa01ebb68519d9625144bc83dba07c894dc2b5a23941204ee40aa5a02ce3a3330fc921c9faebedfd +EBUILD geeqie-2.0.1-r1.ebuild 3206 BLAKE2B 6c3f999812883d72561c7a3404fb56ec9e26831293661629df71dc60093d76f82214436724d6f6d7e96e7f54606519f2b86202dc5641e436d2bb6c0363e8d5ee SHA512 8adbe3711c9dc40e039757a03c259da700bf9306399da8ff5d4fe505f465b1aad7ceb415a8b10aeb21b6a448b544069216f29e6481cf3a093fad041ccf1d7eec +EBUILD geeqie-9999.ebuild 3091 BLAKE2B 1f747574cea7f6aa597bcc2032d508e9f47787929f0b80252df9040dfa536d207858cfd22e2ace24c9f4a001c19fbc52421942f2d3c9bb42adced267d6f93ded SHA512 d94cc2ce8c5b0aa6d6d2d99002f6873f8d69d54d1bcebc6a8c690f24e5f061751303949705040b11d056a0354de507001159da22237b0a8285098311894b9cc0 +MISC metadata.xml 1109 BLAKE2B bf1ec34f87dbc856e9f69d87d6903034689bdfa3d19e50a8f1dbbf23f08e101e49068454f296aab15579b45f77785beff26453393bd3b88682f7e6cc3f5bfdc5 SHA512 7f755e0c4e2085bb543990d1b395a6cf072663a13437aa843145d89e0224ed3d4b51cc16f2f7d8daed10879712c00d5965d70daa52ef69def4f3fcd0d5b8546b diff --git a/media-gfx/geeqie/files/geeqie-2.0.1-doc_option.patch b/media-gfx/geeqie/files/geeqie-2.0.1-doc_option.patch new file mode 100644 index 000000000000..e12ab036b4c9 --- /dev/null +++ b/media-gfx/geeqie/files/geeqie-2.0.1-doc_option.patch @@ -0,0 +1,81 @@ +diff -Naur geeqie-2.0.1.orig/doc/meson.build geeqie-2.0.1/doc/meson.build +--- geeqie-2.0.1.orig/doc/meson.build 2022-08-12 11:32:25.000000000 +0200 ++++ geeqie-2.0.1/doc/meson.build 2022-10-18 16:26:33.776338232 +0200 +@@ -20,21 +20,16 @@ + guideindex_ln = join_paths(destdir, 'index.html') + + # Not-found notification already handled by ../meson.build +-if gnome_doc_tool.found() ++if not get_option('doc').disabled() and gnome_doc_tool.found() + run_command(gnome_doc_tool, 'html', '-o', destdir, '-p', iconsdir, guideindex_xml, check : false) + run_command(find_program('ln'), '-s', '-f', guideindex_html, guideindex_ln, check : false) + endif + + install_subdir(destdir, install_dir : helpdir, exclude_directories : 'lua-api/latex') + +-doxygen = find_program('doxygen', required : false) +-if doxygen.found() ++if not get_option('doc').disabled() and doxygen.found() + srcdir = join_paths(meson.source_root()) + destdir = join_paths(meson.build_root(), 'doc', 'html', 'lua-api') + + run_command(find_program('create-doxygen-lua-api.sh'), srcdir, destdir, check : false) +- +- summary({'lua-api' : ['lua-api help file created:', true]}, section : 'Documentation', bool_yn : true) +-else +- summary({'lua-api' : ['doxygen not found - lua-api help file created:', false]}, section : 'Documentation', bool_yn : true) + endif +diff -Naur geeqie-2.0.1.orig/meson.build geeqie-2.0.1/meson.build +--- geeqie-2.0.1.orig/meson.build 2022-08-12 11:32:25.000000000 +0200 ++++ geeqie-2.0.1/meson.build 2022-10-18 16:25:38.063273607 +0200 +@@ -62,12 +62,6 @@ + # External programs + gdk_pixbuf_csource = find_program('gdk-pixbuf-csource', required : true) + glib_genmarshal = find_program('glib-genmarshal', required : true) +-gnome_doc_tool = find_program('yelp-build', required : false) +-if gnome_doc_tool.found() +- summary({'help' : ['Help files created:', true]}, section : 'Documentation', bool_yn : true) +-else +- summary({'help' : ['yelp-build not found - Help files created:', false]}, section : 'Documentation', bool_yn : true) +-endif + + debug = get_option('debug') + +@@ -138,6 +132,26 @@ + gtk_dep = dependency('gtk+-3.0', version : '>=3.22', required: true) + glib_dep = dependency('glib-2.0', version : '>=2.52', required: true) + ++#option = get_option('doc') ++if not get_option('doc').disabled() ++ gnome_doc_tool = find_program('yelp-build', required : false) ++ if gnome_doc_tool.found() ++ summary({'help' : ['Help files created:', true]}, section : 'Documentation', bool_yn : true) ++ else ++ summary({'help' : ['yelp-build not found - Help files created:', false]}, section : 'Documentation', bool_yn : true) ++ endif ++ ++ doxygen = find_program('doxygen', required : false) ++ if doxygen.found() ++ summary({'lua-api' : ['lua-api help file created:', true]}, section : 'Documentation', bool_yn : true) ++ else ++ summary({'lua-api' : ['doxygen not found - lua-api help file created:', false]}, section : 'Documentation', bool_yn : true) ++ endif ++else ++ summary({'help' : ['disabled - Help files created:', false]}, section : 'Documentation', bool_yn : true) ++ summary({'lua-api' : ['disabled - lua-api help file created:', false]}, section : 'Documentation', bool_yn : true) ++endif ++ + libarchive_dep = [] + req_version = '>=3.4.0' + option = get_option('archive') +diff -Naur geeqie-2.0.1.orig/meson_options.txt geeqie-2.0.1/meson_options.txt +--- geeqie-2.0.1.orig/meson_options.txt 2022-08-12 11:32:25.000000000 +0200 ++++ geeqie-2.0.1/meson_options.txt 2022-10-18 16:25:38.063273607 +0200 +@@ -26,6 +26,7 @@ + option('archive', type : 'feature', value : 'auto', description : 'archive files e.g. zip, gz') + option('cms', type : 'feature', value : 'auto', description : 'color management system') + option('djvu', type : 'feature', value : 'auto', description : 'djvu') ++option('doc', type : 'feature', value : 'auto', description : 'doc') + option('exiv2', type : 'feature', value : 'auto', description : 'exiv2') + option('videothumbnailer', type : 'feature', value : 'auto', description : 'video thumbnailer') + option('gps-map', type : 'feature', value : 'auto', description : 'gps map') diff --git a/media-gfx/geeqie/geeqie-2.0.1-r1.ebuild b/media-gfx/geeqie/geeqie-2.0.1-r1.ebuild new file mode 100644 index 000000000000..8a99ae4480da --- /dev/null +++ b/media-gfx/geeqie/geeqie-2.0.1-r1.ebuild @@ -0,0 +1,116 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +LUA_COMPAT=( lua5-{3,4} ) + +inherit lua-single meson optfeature xdg + +DESCRIPTION="A lightweight GTK image viewer forked from GQview" +HOMEPAGE="http://www.geeqie.org" +SRC_URI="https://github.com/BestImageViewer/${PN}/releases/download/v${PV}/${P}.tar.xz + https://dev.gentoo.org/~voyageur/distfiles/${P}-ChangeLog.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="debug doc djvu exif ffmpegthumbnailer heif jpeg jpeg2k jpegxl lcms lua map pdf raw spell tiff webp xmp zip" + +RDEPEND="gnome-extra/zenity + virtual/libintl + x11-libs/gtk+:3 + djvu? ( app-text/djvu ) + doc? ( app-text/yelp-tools ) + exif? ( >=media-gfx/exiv2-0.17:=[xmp?] ) + ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) + heif? ( >=media-libs/libheif-1.3.2 ) + jpeg2k? ( >=media-libs/openjpeg-2.3.0:2 ) + jpeg? ( media-libs/libjpeg-turbo:= ) + jpegxl? ( >=media-libs/libjxl-0.3.7 ) + lcms? ( media-libs/lcms:2 ) + lua? ( ${LUA_DEPS} + doc? ( app-doc/doxygen ) ) + map? ( media-libs/clutter-gtk + media-libs/libchamplain:0.12[gtk] ) + pdf? ( >=app-text/poppler-0.62[cairo] ) + raw? ( >=media-libs/libraw-0.20 ) + spell? ( app-text/gspell ) + tiff? ( media-libs/tiff:0 ) + webp? ( >=media-libs/libwebp-0.6.1 ) + zip? ( >=app-arch/libarchive-3.4.0 )" +DEPEND="${RDEPEND}" +BDEPEND=" + || ( dev-util/xxdi app-editors/vim-core ) + dev-util/glib-utils + dev-util/intltool + sys-devel/gettext + virtual/pkgconfig" + +REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )" + +PATCHES=( + "${FILESDIR}"/${P}-allow_xxdi.patch + "${FILESDIR}"/${P}-doc_option.patch +) + +pkg_setup() { + # Do not require setting LUA_SINGLE_TARGET if lua is not used + use lua && lua-single_pkg_setup +} + +src_prepare() { + default + + # Lua version + sed -e "s/lua5.[0-9]/${LUA_SINGLE_TARGET/-/.}/" -i meson.build || die +} + +src_configure() { + local emesonargs=( + -Dgq_helpdir="share/doc/${PF}" + -Dgq_htmldir="share/doc/${PF}/html" + $(meson_use debug) + $(meson_feature djvu) + $(meson_feature doc) + $(meson_feature exif exiv2) + $(meson_feature ffmpegthumbnailer videothumbnailer) + $(meson_feature heif) + $(meson_feature jpeg) + $(meson_feature jpeg2k j2k) + $(meson_feature jpegxl) + $(meson_feature lcms cms) + $(meson_feature lua) + $(meson_feature map gps-map) + $(meson_feature pdf) + $(meson_feature raw libraw) + $(meson_feature spell) + $(meson_feature tiff) + $(meson_feature webp) + $(meson_feature zip archive) + ) + + meson_src_configure +} + +src_install() { + meson_src_install + + # Manually generated ChangeLog + dodoc "${WORKDIR}"/${P}-ChangeLog/* + + # The application needs access to some uncompressed doc files. + docompress -x /usr/share/doc/${PF}/AUTHORS + docompress -x /usr/share/doc/${PF}/ChangeLog + docompress -x /usr/share/doc/${PF}/README.md +} + +pkg_postinst() { + xdg_pkg_postinst + + optfeature "Camera import and tethered photography plugins" media-gfx/gphoto2 + optfeature "Lens ID plugin" media-libs/exiftool + optfeature "Image crop plugin" "media-libs/exiftool media-gfx/imagemagick" + optfeature "Image rotate plugin (JPEG)" media-gfx/fbida + optfeature "Image rotate plugin (TIFF/PNG)" media-gfx/imagemagick + optfeature "Print preview functionality" app-text/evince +} diff --git a/media-gfx/geeqie/geeqie-2.0.1.ebuild b/media-gfx/geeqie/geeqie-2.0.1.ebuild deleted file mode 100644 index 0e4c3907aa5c..000000000000 --- a/media-gfx/geeqie/geeqie-2.0.1.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -LUA_COMPAT=( lua5-{3,4} ) - -inherit lua-single meson optfeature xdg - -DESCRIPTION="A lightweight GTK image viewer forked from GQview" -HOMEPAGE="http://www.geeqie.org" -SRC_URI="https://github.com/BestImageViewer/${PN}/releases/download/v${PV}/${P}.tar.xz - https://dev.gentoo.org/~voyageur/distfiles/${P}-ChangeLog.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="debug doc djvu exif ffmpegthumbnailer gpu-accel heif jpeg jpeg2k jpegxl lcms lua map pdf raw spell tiff webp xmp zip" - -RDEPEND="gnome-extra/zenity - virtual/libintl - x11-libs/gtk+:3 - djvu? ( app-text/djvu ) - doc? ( app-text/yelp-tools ) - exif? ( >=media-gfx/exiv2-0.17:=[xmp?] ) - ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) - gpu-accel? ( media-libs/clutter-gtk ) - heif? ( >=media-libs/libheif-1.3.2 ) - jpeg2k? ( >=media-libs/openjpeg-2.3.0:2 ) - jpeg? ( media-libs/libjpeg-turbo:= ) - jpegxl? ( >=media-libs/libjxl-0.3.7 ) - lcms? ( media-libs/lcms:2 ) - lua? ( ${LUA_DEPS} - doc? ( app-doc/doxygen ) ) - map? ( media-libs/libchamplain:0.12 ) - pdf? ( >=app-text/poppler-0.62[cairo] ) - raw? ( >=media-libs/libraw-0.20 ) - spell? ( app-text/gspell ) - tiff? ( media-libs/tiff:0 ) - webp? ( >=media-libs/libwebp-0.6.1 ) - zip? ( >=app-arch/libarchive-3.4.0 )" -DEPEND="${RDEPEND}" -BDEPEND=" - || ( dev-util/xxdi app-editors/vim-core ) - dev-util/glib-utils - dev-util/intltool - sys-devel/gettext - virtual/pkgconfig" - -REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) - map? ( gpu-accel )" - -PATCHES=( - "${FILESDIR}/${P}-allow_xxdi.patch" -) - -src_prepare() { - default - - # Lua version - sed -e "s/lua5.[0-9]/${LUA_SINGLE_TARGET/-/.}/" -i meson.build || die -} - -src_configure() { - local emesonargs=( - -Dgq_helpdir="share/doc/${PF}" - -Dgq_htmldir="share/doc/${PF}/html" - $(meson_use debug) - $(meson_feature zip archive) - $(meson_feature lcms cms) - $(meson_feature djvu) - $(meson_feature exif exiv2) - $(meson_feature ffmpegthumbnailer videothumbnailer) - $(meson_feature gpu-accel gps-map) - $(meson_feature heif) - $(meson_feature jpeg2k j2k) - $(meson_feature jpeg) - $(meson_feature jpegxl) - $(meson_feature raw libraw) - $(meson_feature lua) - $(meson_feature pdf) - $(meson_feature spell) - $(meson_feature tiff) - $(meson_feature webp) - ) - - meson_src_configure -} - -src_install() { - meson_src_install - - # Manually generated ChangeLog - dodoc "${WORKDIR}"/${P}-ChangeLog/* - - # The application needs access to some uncompressed doc files. - docompress -x /usr/share/doc/${PF}/AUTHORS - docompress -x /usr/share/doc/${PF}/ChangeLog - docompress -x /usr/share/doc/${PF}/README.md -} - -pkg_postinst() { - xdg_pkg_postinst - - optfeature "Camera import and tethered photography plugins" media-gfx/gphoto2 - optfeature "Lens ID plugin" media-libs/exiftool - optfeature "Image crop plugin" "media-libs/exiftool media-gfx/imagemagick" - optfeature "Image rotate plugin (JPEG)" media-gfx/fbida - optfeature "Image rotate plugin (TIFF/PNG)" media-gfx/imagemagick - optfeature "Print preview functionality" app-text/evince -} diff --git a/media-gfx/geeqie/geeqie-9999.ebuild b/media-gfx/geeqie/geeqie-9999.ebuild index 2c4b54ad1991..5a49b5e60c1c 100644 --- a/media-gfx/geeqie/geeqie-9999.ebuild +++ b/media-gfx/geeqie/geeqie-9999.ebuild @@ -15,7 +15,7 @@ EGIT_REPO_URI="https://github.com/BestImageViewer/geeqie.git" LICENSE="GPL-2" SLOT="0" KEYWORDS="" -IUSE="debug doc djvu exif ffmpegthumbnailer gpu-accel heif jpeg jpeg2k jpegxl lcms lua map pdf raw spell tiff webp xmp zip" +IUSE="debug doc djvu exif ffmpegthumbnailer heif jpeg jpeg2k jpegxl lcms lua map pdf raw spell tiff webp xmp zip" RDEPEND="gnome-extra/zenity virtual/libintl @@ -24,7 +24,6 @@ RDEPEND="gnome-extra/zenity doc? ( app-text/yelp-tools ) exif? ( >=media-gfx/exiv2-0.17:=[xmp?] ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) - gpu-accel? ( media-libs/clutter-gtk ) heif? ( >=media-libs/libheif-1.3.2 ) jpeg2k? ( >=media-libs/openjpeg-2.3.0:2 ) jpeg? ( media-libs/libjpeg-turbo:= ) @@ -32,7 +31,8 @@ RDEPEND="gnome-extra/zenity lcms? ( media-libs/lcms:2 ) lua? ( ${LUA_DEPS} doc? ( app-doc/doxygen ) ) - map? ( media-libs/libchamplain:0.12 ) + map? ( media-libs/clutter-gtk + media-libs/libchamplain:0.12[gtk] ) pdf? ( >=app-text/poppler-0.62[cairo] ) raw? ( >=media-libs/libraw-0.20 ) spell? ( app-text/gspell ) @@ -47,13 +47,17 @@ BDEPEND=" sys-devel/gettext virtual/pkgconfig" -REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) - map? ( gpu-accel )" +REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )" PATCHES=( "${FILESDIR}/${PN}-2.0.1-allow_xxdi.patch" ) +pkg_setup() { + # Do not require setting LUA_SINGLE_TARGET if lua is not used + use lua && lua-single_pkg_setup +} + src_prepare() { default @@ -66,22 +70,23 @@ src_configure() { -Dgq_helpdir="share/doc/${PF}" -Dgq_htmldir="share/doc/${PF}/html" $(meson_use debug) - $(meson_feature zip archive) - $(meson_feature lcms cms) $(meson_feature djvu) + $(meson_feature doc) $(meson_feature exif exiv2) $(meson_feature ffmpegthumbnailer videothumbnailer) - $(meson_feature gpu-accel gps-map) $(meson_feature heif) - $(meson_feature jpeg2k j2k) $(meson_feature jpeg) + $(meson_feature jpeg2k j2k) $(meson_feature jpegxl) - $(meson_feature raw libraw) + $(meson_feature lcms cms) $(meson_feature lua) + $(meson_feature map gps-map) $(meson_feature pdf) + $(meson_feature raw libraw) $(meson_feature spell) $(meson_feature tiff) $(meson_feature webp) + $(meson_feature zip archive) ) meson_src_configure @@ -100,10 +105,9 @@ pkg_postinst() { xdg_pkg_postinst optfeature "Camera import and tethered photography plugins" media-gfx/gphoto2 - optfeature "Export JPEG plugin" media-gfx/exiv2 optfeature "Lens ID plugin" media-libs/exiftool - optfeature "Image crop plugin" "media-gfx/exiv2 media-libs/exiftool media-gfx/imagemagick" - optfeature "Image rotate plugin (JPEG)" "media-gfx/exiv2 media-gfx/fbida" - optfeature "Image rotate plugin (TIFF/PNG)" "media-gfx/exiv2 media-gfx/imagemagick" + optfeature "Image crop plugin" "media-libs/exiftool media-gfx/imagemagick" + optfeature "Image rotate plugin (JPEG)" media-gfx/fbida + optfeature "Image rotate plugin (TIFF/PNG)" media-gfx/imagemagick optfeature "Print preview functionality" app-text/evince } diff --git a/media-gfx/geeqie/metadata.xml b/media-gfx/geeqie/metadata.xml index 684ebb361389..3ee5d0faec97 100644 --- a/media-gfx/geeqie/metadata.xml +++ b/media-gfx/geeqie/metadata.xml @@ -10,8 +10,8 @@ Enable video thumbnail support with media-video/ffmpegthumbnailer Enable GPU acceleration support - experimental Link against x11-libs/gtk+:3 instead of x11-libs/gtk+:2 - Enable support for ISO/IEC 23008-12:2017 HEIF files + Enable support for ISO/IEC 23008-12:2017 HEIF/HEIC image format using media-libs/libheif Enable support for JPEG XL image format - Enable items map display - experimental + Enable items GPS map display -- cgit v1.2.3