Version bump.

(Portage version: 2.1.3.19)

4 files changed, 79 insertions, 1 deletions

diff --git a/media-libs/giflib/ChangeLog b/media-libs/giflib/ChangeLog
index 432ef054b2dd..6cc9cc9504c4 100644
--- a/media-libs/giflib/ChangeLog
+++ b/media-libs/giflib/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/giflib
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/giflib/ChangeLog,v 1.44 2007/07/22 09:40:53 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/giflib/ChangeLog,v 1.45 2007/11/11 00:38:12 vapier Exp $
+
+*giflib-4.1.6 (11 Nov 2007)
+
+  11 Nov 2007; Mike Frysinger <vapier@gentoo.org>
+  +files/giflib-4.1.6-gif2rle.patch, +giflib-4.1.6.ebuild:
+  Version bump.
 
   22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; giflib-4.1.4.ebuild:
   Drop virtual/x11 references.
diff --git a/media-libs/giflib/files/digest-giflib-4.1.6 b/media-libs/giflib/files/digest-giflib-4.1.6
new file mode 100644
index 000000000000..f8a2a2092725
--- /dev/null
+++ b/media-libs/giflib/files/digest-giflib-4.1.6
@@ -0,0 +1,3 @@
+MD5 7125644155ae6ad33dbc9fc15a14735f giflib-4.1.6.tar.bz2 506050
+RMD160 bdb99f7048a79b9e771b069f90ac151537011d19 giflib-4.1.6.tar.bz2 506050
+SHA256 e1c1ced9c5bc8f93ef0faf0a8c7717abf784d10a7b270d2285e8e1f3b93f2bed giflib-4.1.6.tar.bz2 506050
diff --git a/media-libs/giflib/files/giflib-4.1.6-gif2rle.patch b/media-libs/giflib/files/giflib-4.1.6-gif2rle.patch
new file mode 100644
index 000000000000..f36b6b41fcc2
--- /dev/null
+++ b/media-libs/giflib/files/giflib-4.1.6-gif2rle.patch
@@ -0,0 +1,18 @@
+http://sourceforge.net/tracker/index.php?func=detail&aid=1829712&group_id=102202&atid=631304
+
+--- giflib/util/gif2rle.c
++++ giflib/util/gif2rle.c
+@@ -222,11 +222,8 @@
+     ColorMap = (GifFile->Image.ColorMap ?
+                     GifFile->Image.ColorMap->Colors :
+                     GifFile->SColorMap->Colors);
+-    if (ColorMap == NULL) {
+-        fprintf(stderr, "Gif Image does not have a colormap\n");
+-        exit(EXIT_FAILURE);
+-    }
+-    ColorMapSize = 1 << ColorMap->BitsPerPixel;
++    ColorMapSize = 1 << (GifFile->Image.ColorMap ? GifFile->Image.ColorMap->BitsPerPixel :
++				                GifFile->SColorMap->BitsPerPixel);
+     DumpScreen2Rle(ScreenBuffer, GifFile->SWidth, GifFile->SHeight);
+ 
+     if (DGifCloseFile(GifFile) == GIF_ERROR) {
diff --git a/media-libs/giflib/giflib-4.1.6.ebuild b/media-libs/giflib/giflib-4.1.6.ebuild
new file mode 100644
index 000000000000..2e2f4e353850
--- /dev/null
+++ b/media-libs/giflib/giflib-4.1.6.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/giflib/giflib-4.1.6.ebuild,v 1.1 2007/11/11 00:38:12 vapier Exp $
+
+inherit eutils libtool
+
+DESCRIPTION="Library to handle, display and manipulate GIF images"
+HOMEPAGE="http://sourceforge.net/projects/giflib/"
+SRC_URI="mirror://sourceforge/giflib/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="rle X"
+
+DEPEND="!media-libs/libungif
+	X? (
+		x11-libs/libXt
+		x11-libs/libX11
+		x11-libs/libICE
+		x11-libs/libSM
+	)
+	rle? ( media-libs/urt )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gif2rle.patch
+	elibtoolize
+	epunt_cxx
+}
+
+src_compile() {
+	econf \
+		$(use_enable X x11) \
+		$(
+			# prevent circular depend #111455
+			has_version media-libs/urt \
+				|| --disable-rle \
+				&& use_enable rle \
+		) \
+		--disable-gl \
+		|| die
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS BUGS ChangeLog NEWS ONEWS README TODO doc/*.txt
+	dohtml -r doc
+}