commit: 865cea8418f1e3a9fbaa37cee94f9c986bc07430 Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> AuthorDate: Mon Jun 27 16:28:34 2016 +0000 Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> CommitDate: Mon Jun 27 17:20:17 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=865cea84
media-gfx/geeqie: 1.3 version bump Backport a patch to fix RAW image support with C++11 (reported by Dominic Eschweiler) Also add USE flags for experimental GPU acceleration and map support Package-Manager: portage-2.3.0 media-gfx/geeqie/Manifest | 1 + media-gfx/geeqie/files/geeqie-1.3-stdstring.patch | 63 +++++++++++++++++ media-gfx/geeqie/geeqie-1.3.ebuild | 83 +++++++++++++++++++++++ media-gfx/geeqie/metadata.xml | 2 + 4 files changed, 149 insertions(+) diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest index cb93df5..9b4fe7a 100644 --- a/media-gfx/geeqie/Manifest +++ b/media-gfx/geeqie/Manifest @@ -1,2 +1,3 @@ DIST geeqie-1.2.2.tar.xz 1156616 SHA256 e1cbc403650730e2f4092159e4347c858d3d81e4374d2a51d635234ba90b3ee3 SHA512 0e134802b42061e76ec2f2d9069ab13ebcab17f889b04917e15aba74a208a4c4ffa5a957f45eb5bd14917d98d2d6250c1085cb065a1ae487050e5e2f325c14c4 WHIRLPOOL 78e960d2e551675b6474d30cfb0119177e14d1930a23b930c5b7ef7757092085db423713be495a4fcb51112c293eb88b12fe511b5b4bf64c86c27b8e410cb318 DIST geeqie-1.2.3.tar.xz 1129804 SHA256 2629bf33a9070fad4804b1ef051c3bf8a8fdad3bba4e6188dc20588185003248 SHA512 1bb2a6e5782cdafb4aeb1ab9247f7d43f4ef341594ea795214c136ba1fe416cf8bc37faa43462780eca3d0b07a7852e27719f8d23c8bdb42c899857846b4f7b1 WHIRLPOOL 8b4ee7218bb1562695c5c5322e684652f9318f04ed77bc0a54e70dd46f63801a7f0cc9c9b37346a58f6c1059278c07f980dec439dd753f2f87ce7f2a98e01566 +DIST geeqie-1.3.tar.xz 1141820 SHA256 4b6f566dd1a8badac68c4353c7dd0f4de17f8627b85a7a70d5eb1ae3b540ec3f SHA512 b17c4174741acd60261af268f0e9290ee3d7766d18fc0d28ada5730bb50651a6261d0b04b9fbe810d323c8e6a1b5a21a4f1ebf0eb88daf95f123b77b8484e718 WHIRLPOOL 8b3e54ae6cf8f8a633225df4f5058c29a7dd56adc63c9594cb995929d4cebb3b07d76a257a454506330f32673ac9a57ce63eb3fbf33126ed4cbccc7542910720 diff --git a/media-gfx/geeqie/files/geeqie-1.3-stdstring.patch b/media-gfx/geeqie/files/geeqie-1.3-stdstring.patch new file mode 100644 index 0000000..fb58db6 --- /dev/null +++ b/media-gfx/geeqie/files/geeqie-1.3-stdstring.patch @@ -0,0 +1,63 @@ +From 0b044d1d685307e5755917e31d56a1a3104cd505 Mon Sep 17 00:00:00 2001 +From: David Kalnischkies <[email protected]> +Date: Fri, 27 May 2016 12:04:40 +0100 +Subject: [PATCH] Work around changed c++11 std::string implementation + +Bug was already partly fixed by 96db62d but there was even more +positions that was unseen by Solomon. + +The patch is originally from Debian bug report #800350. + +Signed-off-by: Klaus Ethgen <[email protected]> +--- + src/exiv2.cc | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +diff --git a/src/exiv2.cc b/src/exiv2.cc +index 1dbe118..49b8e07 100644 +--- a/src/exiv2.cc ++++ b/src/exiv2.cc +@@ -25,6 +25,7 @@ + #include <exiv2/image.hpp> + #include <exiv2/exif.hpp> + #include <iostream> ++#include <string> + + // EXIV2_TEST_VERSION is defined in Exiv2 0.15 and newer. + #ifndef EXIV2_TEST_VERSION +@@ -1140,8 +1141,9 @@ guchar *exif_get_preview(ExifData *exif, guint *data_len, gint requested_width, + + if (!exif->image()) return NULL; + ++ std::string const path = exif->image()->io().path(); + /* given image pathname, first do simple (and fast) file extension test */ +- gboolean is_raw = filter_file_class(exif->image()->io().path().c_str(), FORMAT_CLASS_RAWIMAGE); ++ gboolean is_raw = filter_file_class(path.c_str(), FORMAT_CLASS_RAWIMAGE); + + if (!is_raw && requested_width == 0) return NULL; + +@@ -1241,10 +1243,10 @@ extern "C" guchar *exif_get_preview(ExifData *exif, guint *data_len, gint reques + if (!exif) return NULL; + if (!exif->image()) return NULL; + +- const char* path = exif->image()->io().path().c_str(); ++ std::string const path = exif->image()->io().path(); + + /* given image pathname, first do simple (and fast) file extension test */ +- if (!filter_file_class(path, FORMAT_CLASS_RAWIMAGE)) return NULL; ++ if (!filter_file_class(path.c_str(), FORMAT_CLASS_RAWIMAGE)) return NULL; + + try { + struct stat st; +@@ -1255,9 +1257,9 @@ extern "C" guchar *exif_get_preview(ExifData *exif, guint *data_len, gint reques + + RawFile rf(exif->image()->io()); + offset = rf.preview_offset(); +- DEBUG_1("%s: offset %lu", path, offset); ++ DEBUG_1("%s: offset %lu", path.c_str(), offset); + +- fd = open(path, O_RDONLY); ++ fd = open(path.c_str(), O_RDONLY); + if (fd == -1) + { + return NULL; diff --git a/media-gfx/geeqie/geeqie-1.3.ebuild b/media-gfx/geeqie/geeqie-1.3.ebuild new file mode 100644 index 0000000..f278e24 --- /dev/null +++ b/media-gfx/geeqie/geeqie-1.3.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 +inherit autotools + +DESCRIPTION="A lightweight GTK image viewer forked from GQview" +HOMEPAGE="http://www.geeqie.org"; +SRC_URI="http://www.geeqie.org/${P}.tar.xz"; + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="debug doc exif gpu-accel gtk3 jpeg lcms lirc lua map tiff xmp" + +RDEPEND="gtk3? ( x11-libs/gtk+:3 ) + !gtk3? ( x11-libs/gtk+:2 ) + virtual/libintl + doc? ( app-text/gnome-doc-utils ) + gpu-accel? ( media-libs/clutter-gtk ) + jpeg? ( virtual/jpeg:0 ) + lcms? ( media-libs/lcms:2 ) + lirc? ( app-misc/lirc ) + lua? ( >=dev-lang/lua-5.1:= ) + map? ( media-libs/libchamplain:0.12 ) + xmp? ( >=media-gfx/exiv2-0.17:=[xmp] ) + !xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) ) + tiff? ( media-libs/tiff:0 )" +DEPEND="${RDEPEND} + virtual/pkgconfig + dev-util/intltool + sys-devel/gettext" + +REQUIRED_USE="gpu-accel? ( gtk3 ) + map? ( gpu-accel )" + +PATCHES=( + "${FILESDIR}"/${P}-stdstring.patch +) + +src_prepare() { + default + + eautoreconf +} + +src_configure() { + # clutter does not compile, gps depends on clutter + local myconf="--disable-dependency-tracking + --with-readmedir=/usr/share/doc/${PF} + $(use_enable debug debug-log) + $(use_enable gpu-accel) + $(use_enable gtk3) + $(use_enable jpeg) + $(use_enable lcms) + $(use_enable lua) + $(use_enable lirc) + $(use_enable map) + $(use_enable tiff)" + + if use exif || use xmp; then + myconf="${myconf} --enable-exiv2" + else + myconf="${myconf} --disable-exiv2" + fi + + econf ${myconf} +} + +src_install() { + emake DESTDIR="${D}" install + + rm -f "${D}/usr/share/doc/${PF}/COPYING" + # Application needs access to the uncompressed file + docompress -x /usr/share/doc/${PF}/README +} + +pkg_postinst() { + elog "Some plugins may require additional packages" + elog "- Image rotate plugin: media-gfx/fbida (JPEG), media-gfx/imagemagick (TIFF/PNG)" + elog "- RAW images plugin: media-gfx/ufraw" +} diff --git a/media-gfx/geeqie/metadata.xml b/media-gfx/geeqie/metadata.xml index b188953..4ccccdc 100644 --- a/media-gfx/geeqie/metadata.xml +++ b/media-gfx/geeqie/metadata.xml @@ -7,6 +7,8 @@ </maintainer> <longdescription>Geeqie is a lightweight image viewer. It was forked from GQview. The development is focused on features for photo collection maintenance: raw format, Exif/IPTC/XMP metadata and integration with programs like UFraw, ImageMagick, Gimp, gPhoto or ExifTool</longdescription> <use> + <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="map">Enable items map display - experimental</flag> </use> </pkgmetadata>
