diff options
| -rw-r--r-- | media-gfx/fbi/ChangeLog | 8 | ||||
| -rw-r--r-- | media-gfx/fbi/Manifest | 15 | ||||
| -rw-r--r-- | media-gfx/fbi/fbi-1.31-r2.ebuild | 45 | ||||
| -rw-r--r-- | media-gfx/fbi/files/digest-fbi-1.31-r2 | 1 | ||||
| -rw-r--r-- | media-gfx/fbi/files/libexif-0.6.patch | 45 |
5 files changed, 107 insertions, 7 deletions
diff --git a/media-gfx/fbi/ChangeLog b/media-gfx/fbi/ChangeLog index 26a2cb96bcb1..4cca629c6655 100644 --- a/media-gfx/fbi/ChangeLog +++ b/media-gfx/fbi/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-gfx/fbi # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbi/ChangeLog,v 1.33 2005/07/05 18:51:04 killerfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbi/ChangeLog,v 1.34 2005/10/02 19:14:39 spock Exp $ + +*fbi-1.31-r2 (02 Oct 2005) + + 02 Oct 2005; Michał Januszewski <spock@gentoo.org> + +files/libexif-0.6.patch, +fbi-1.31-r2.ebuild: + Added libexif patches submitted in bug #87203. Thanks! 05 Jul 2005; Rene Nussbaumer <killerfox@gentoo.org> fbi-1.31-r1.ebuild: Stable on hppa. diff --git a/media-gfx/fbi/Manifest b/media-gfx/fbi/Manifest index 63d759396f19..327fa37e4c27 100644 --- a/media-gfx/fbi/Manifest +++ b/media-gfx/fbi/Manifest @@ -1,16 +1,19 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +MD5 3cea4d52fae981c56e196120997c2a45 fbi-1.31.ebuild 964 MD5 613c1083cd2f413525dc7d4c59068968 fbi-1.31-r1.ebuild 1130 +MD5 3b037e25cdcb13c80eb0256a857e7aee fbi-1.31-r2.ebuild 1216 +MD5 91d22c21db02f0ecb1ef6d36248ac3b9 ChangeLog 4426 MD5 7fc77b947cec0d01897854f31eb34b31 metadata.xml 367 -MD5 71f04cdbc9d615c1eedcf4b76543e1ba ChangeLog 4241 -MD5 3cea4d52fae981c56e196120997c2a45 fbi-1.31.ebuild 964 MD5 9dde96dcd60bc6d7921ce3302e83a343 files/digest-fbi-1.31-r1 59 +MD5 9dde96dcd60bc6d7921ce3302e83a343 files/digest-fbi-1.31-r2 59 MD5 9dde96dcd60bc6d7921ce3302e83a343 files/digest-fbi-1.31 59 +MD5 784a957950cb4e63c0f58c4988e75d84 files/libexif-0.6.patch 1489 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.1 (GNU/Linux) +Version: GnuPG v1.4.2 (GNU/Linux) -iD8DBQFC4f1MgIKl8Uu19MoRAiKCAJ4+VbgEJCBVhZdJrZ55y/22zUa5cgCdHW/Z -iNQ6DrE16pqDzxKuQvWyNZc= -=B3cJ +iD8DBQFDQDHFchej4aZK9/cRApfdAJ9rdSwucSvoFZhoYcKbvTP7NNKgdwCfVirT +CaIN7I503AJzgj9pyHj+EqU= +=Y0Ze -----END PGP SIGNATURE----- diff --git a/media-gfx/fbi/fbi-1.31-r2.ebuild b/media-gfx/fbi/fbi-1.31-r2.ebuild new file mode 100644 index 000000000000..eb1b5f40b141 --- /dev/null +++ b/media-gfx/fbi/fbi-1.31-r2.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbi/fbi-1.31-r2.ebuild,v 1.1 2005/10/02 19:14:39 spock Exp $ + +inherit toolchain-funcs eutils + +DESCRIPTION="A image viewer for the Linux framebuffer console." +HOMEPAGE="http://linux.bytesex.org/fbida/" +SRC_URI="http://dl.bytesex.org/releases/fbida/${P/-/_}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" +IUSE="png jpeg gif tiff curl lirc X" + +DEPEND="jpeg? ( >=media-libs/jpeg-6b ) + png? ( media-libs/libpng ) + gif? ( media-libs/giflib ) + tiff? ( media-libs/tiff ) + curl? ( net-misc/curl ) + lirc? ( app-misc/lirc ) + X? ( virtual/x11 ) + media-libs/libexif + !media-gfx/fbida" + +src_unpack() { + unpack ${A} + sed -e 's/DGifOpenFileName,ungif/DGifOpenFileName,gif/' \ + -e 's/-lungif/-lgif/' -i ${S}/GNUmakefile + sed -i -e 's/ps\*.jpeg/ps*.tiff/g' ${S}/fbgs + has_version ">=media-libs/libexif-0.6.10" && epatch ${FILESDIR}/libexif-0.6.patch +} + +src_compile() { + export CFLAGS="${CFLAGS}" + make CC="$(tc-getCC)" || die +} + +src_install() { + make \ + prefix=${D}/usr \ + mandir=${D}/usr/share/man \ + install || die + dodoc README +} diff --git a/media-gfx/fbi/files/digest-fbi-1.31-r2 b/media-gfx/fbi/files/digest-fbi-1.31-r2 new file mode 100644 index 000000000000..d0803f0384ba --- /dev/null +++ b/media-gfx/fbi/files/digest-fbi-1.31-r2 @@ -0,0 +1 @@ +MD5 0f6c0423098c6a9b28a464df9fab7f39 fbi_1.31.tar.gz 92194 diff --git a/media-gfx/fbi/files/libexif-0.6.patch b/media-gfx/fbi/files/libexif-0.6.patch new file mode 100644 index 000000000000..1bb37766d103 --- /dev/null +++ b/media-gfx/fbi/files/libexif-0.6.patch @@ -0,0 +1,45 @@ +diff -rNu fbi-1.31.orig/exiftran.c fbi-1.31/exiftran.c +--- fbi-1.31.orig/exiftran.c 2004-02-22 20:27:40.000000000 +0800 ++++ fbi-1.31/exiftran.c 2005-03-30 10:43:37.969549144 +0800 +@@ -22,9 +22,10 @@ + #ifdef HAVE_LIBEXIF + static void dump_exif(FILE *out, ExifData *ed) + { +- const char *title, *value; ++ const char *title; + ExifEntry *ee; + int tag,i; ++ char value[1024]; + + for (i = 0; i < EXIF_IFD_COUNT; i++) { + fprintf(out," ifd %s\n", exif_ifd_get_name (i)); +@@ -35,7 +36,7 @@ + ee = exif_content_get_entry (ed->ifd[i], tag); + if (NULL == ee) + continue; +- value = exif_entry_get_value(ee); ++ exif_entry_get_value(ee, value, sizeof(value)); + fprintf(out," 0x%04x %-30s %s\n", tag, title, value); + } + } +diff -rNu fbi-1.31.orig/fbi.c fbi-1.31/fbi.c +--- fbi-1.31.orig/fbi.c 2004-02-22 20:24:29.000000000 +0800 ++++ fbi-1.31/fbi.c 2005-03-30 10:47:50.785115336 +0800 +@@ -398,6 +398,7 @@ + l1 = 0; + l2 = 0; + for (tag = 0; tag < ARRAY_SIZE(tags); tag++) { ++ char temp_value[1024]; + ee = exif_content_get_entry (ed->ifd[EXIF_IFD_0], tags[tag]); + if (NULL == ee) + ee = exif_content_get_entry (ed->ifd[EXIF_IFD_EXIF], tags[tag]); +@@ -407,7 +408,8 @@ + continue; + } + title[tag] = exif_tag_get_title(tags[tag]); +- value[tag] = strdup(exif_entry_get_value(ee)); ++ exif_entry_get_value(ee, temp_value, sizeof(temp_value)); ++ value[tag] = strdup(temp_value); + len = strlen(title[tag]); + if (l1 < len) + l1 = len; |