commit:     5010be8da3881400821413ff328367933908331b
Author:     Matthew White <mehw.is.me <AT> inventati <DOT> org>
AuthorDate: Sat Aug 27 11:30:58 2022 +0000
Commit:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Mon Oct 17 21:38:10 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5010be8d

media-gfx/geeqie: 2.0.1 bump version and major ebuild rewrite

It is now required to use the meson build system.

Multiple new USE flags (and some removed), this version only supports
gtk3

Closes: https://bugs.gentoo.org/866968
Closes: https://bugs.gentoo.org/877435
Package-Manager: Portage-3.0.30-r3, Repoman-3.0.3-r2
Signed-off-by: Matteo Bianco <mehw.is.me <AT> inventati.org>
Closes: https://github.com/gentoo/gentoo/pull/27033
Co-Authored-By:: Bernard Cafarelli <voyageur <AT> gentoo.org>
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>

 media-gfx/geeqie/Manifest                          |   2 +
 .../geeqie/files/geeqie-2.0.1-allow_xxdi.patch     |  17 ++++
 media-gfx/geeqie/geeqie-2.0.1.ebuild               | 110 +++++++++++++++++++++
 media-gfx/geeqie/metadata.xml                      |   2 +
 4 files changed, 131 insertions(+)

diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest
index bcf1bedba4d1..103cf41721d8 100644
--- a/media-gfx/geeqie/Manifest
+++ b/media-gfx/geeqie/Manifest
@@ -3,3 +3,5 @@ DIST geeqie-1.6.tar.xz 1693488 BLAKE2B 
ee5369884c4c0e60fe827d43ef336c5aaa89d55ae
 DIST geeqie-1.6_p20211016.tar.xz 36433388 BLAKE2B 
e8932398ce7354c08ad4199834870e2844555ee1a8ae2beebd9a512100784a5cb62e00993b3ef1854a7ab1bd37eb0742ebcfc17605429f99b61e1af2fbaf859e
 SHA512 
9e536beac39028fdcbe04d014460de2b02039b2c027f9603a71554339b2d14116f8dff11bb09c6e73d51550188daf40031535f978fbbc2d355d30593f4f29e9d
 DIST geeqie-1.7.2.tar.xz 1949240 BLAKE2B 
4dde2c902151da677470dca359b321978afe861cafddb7baf76e68acc8a9cf7943ce8ebd8e46aa007a773cce62444d16908d1b8b1339de58587c98d911775ec7
 SHA512 
07b06ef51cb520b91b9097bbe06d170af39d3d513d9853c912e1b60bd5b47e0ae3571f6ac449c9f9c6cee4d227fc4c906ee5f90f7498cd0b2119d12ff4673c4d
 DIST geeqie-1.7.3.tar.xz 1949696 BLAKE2B 
c261a09446472f2decb0f332f227453e14fbffbc64bff77c538062d7cf57fd91efd7d30a121b2760795eb9c097e993a1dcbe5ead79cb32c200092e27422ad8b9
 SHA512 
5647422876dcd41ec369cc926783661e15f33c2794e073df98827b8fc030baf3ebf03587e42eef35caaddc3b315b74ee0f8c3a156422f72522ffbbb7ec0fd8d9
+DIST geeqie-2.0.1-ChangeLog.tar.gz 626106 BLAKE2B 
b1e166e7537d6e2bf8a9fec259315af4d70194688b489eb44715eb51c690806dd6387e6aa884b737222a25114c36b2e1a2a70fd2bbec015e64d5f6274cac1ab9
 SHA512 
a986981f28bad254747fb674ee16691bbec64afb354eb158dc511e0f9b198bba8e3bd0fc2ae432322806959a5ea7434687cb462c8cbb0d1c9dc17b5431f72288
+DIST geeqie-2.0.1.tar.xz 1666600 BLAKE2B 
e90d9b5c0bfe9d4f84c65e4754ba3ddaee8ba44c6d493cf4b5c0e37d398a4e2f6234c60fc6e88e4022ff4f8fcaf10626037c3a80450921f88f5fd937fd386958
 SHA512 
cd2251c831c6d4d461d92eee84df08590752ad625e1f50d57e1fb5d0fc6ac16a225584a8217e14bf4f993ba247f7df3296498b27fcc4f5f4c7f25307699aadc5

diff --git a/media-gfx/geeqie/files/geeqie-2.0.1-allow_xxdi.patch 
b/media-gfx/geeqie/files/geeqie-2.0.1-allow_xxdi.patch
new file mode 100644
index 000000000000..440de7189344
--- /dev/null
+++ b/media-gfx/geeqie/files/geeqie-2.0.1-allow_xxdi.patch
@@ -0,0 +1,17 @@
+diff -Naur geeqie-2.0.1.orig/scripts/generate-ClayRGB1998-icc-h.sh 
geeqie-2.0.1/scripts/generate-ClayRGB1998-icc-h.sh
+--- geeqie-2.0.1.orig/scripts/generate-ClayRGB1998-icc-h.sh    2022-08-12 
11:32:26.000000000 +0200
++++ geeqie-2.0.1/scripts/generate-ClayRGB1998-icc-h.sh 2022-10-17 
23:04:08.203219782 +0200
+@@ -12,9 +12,12 @@
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ # GNU General Public License for more details.
+ 
++# Allow standalone replacement for xxd
++command -v xxdi.pl >/dev/null 2>&1 && XXD="xxdi.pl" || XXD="xxd -i"
++
+ # To generate the required code, xxd has to run in the same folder as the 
source
+ build_dir="$PWD"
+ 
+ cd "$(dirname "$1")" || return 1
+ 
+-xxd -i "$(basename "$1")" "$build_dir/$2"
++${XXD} "$(basename "$1")" "$build_dir/$2"

diff --git a/media-gfx/geeqie/geeqie-2.0.1.ebuild 
b/media-gfx/geeqie/geeqie-2.0.1.ebuild
new file mode 100644
index 000000000000..4f6f2af33d64
--- /dev/null
+++ b/media-gfx/geeqie/geeqie-2.0.1.ebuild
@@ -0,0 +1,110 @@
+# 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/${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/metadata.xml b/media-gfx/geeqie/metadata.xml
index 6bc08d24362e..684ebb361389 100644
--- a/media-gfx/geeqie/metadata.xml
+++ b/media-gfx/geeqie/metadata.xml
@@ -10,6 +10,8 @@
                <flag name="ffmpegthumbnailer">Enable video thumbnail support 
with <pkg>media-video/ffmpegthumbnailer</pkg></flag>
                <flag name="gpu-accel">Enable GPU acceleration support - 
experimental</flag>
                <flag name="gtk3">Link against <pkg>x11-libs/gtk+</pkg>:3 
instead of <pkg>x11-libs/gtk+</pkg>:2</flag>
+               <flag name="heif">Enable support for ISO/IEC 23008-12:2017 HEIF 
files</flag>
+               <flag name="jpegxl">Enable support for JPEG XL image 
format</flag>
                <flag name="map">Enable items map display - experimental</flag>
        </use>
 </pkgmetadata>

Reply via email to