diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2014-09-25 10:09:28 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2014-09-25 10:09:28 +0000 |
| commit | 5f3ceef4538f29bdfd71fb6adf7f4bd607b1fdb9 (patch) | |
| tree | b2067bfe4bb9910582e4430d4948fab717be86d1 /media-gfx | |
| parent | Stable for HPPA (bug #523592). (diff) | |
| download | gentoo-2-5f3ceef4538f29bdfd71fb6adf7f4bd607b1fdb9.tar.gz gentoo-2-5f3ceef4538f29bdfd71fb6adf7f4bd607b1fdb9.tar.bz2 gentoo-2-5f3ceef4538f29bdfd71fb6adf7f4bd607b1fdb9.zip | |
Add media-libs/giflib-5 patch by Paolo Pedroni (bug #523680).
(Portage version: 2.2.13/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'media-gfx')
| -rw-r--r-- | media-gfx/fbida/ChangeLog | 8 | ||||
| -rw-r--r-- | media-gfx/fbida/fbida-2.09-r3.ebuild (renamed from media-gfx/fbida/fbida-2.09-r2.ebuild) | 3 | ||||
| -rw-r--r-- | media-gfx/fbida/files/fbida-2.09-giflib-5.patch | 50 |
3 files changed, 59 insertions, 2 deletions
diff --git a/media-gfx/fbida/ChangeLog b/media-gfx/fbida/ChangeLog index dd973fe4b47b..235977bf9b5c 100644 --- a/media-gfx/fbida/ChangeLog +++ b/media-gfx/fbida/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-gfx/fbida # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/ChangeLog,v 1.113 2014/08/10 21:14:20 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/ChangeLog,v 1.114 2014/09/25 10:09:28 jer Exp $ + +*fbida-2.09-r3 (25 Sep 2014) + + 25 Sep 2014; Jeroen Roovers <jer@gentoo.org> -fbida-2.09-r2.ebuild, + +fbida-2.09-r3.ebuild, +files/fbida-2.09-giflib-5.patch: + Add media-libs/giflib-5 patch by Paolo Pedroni (bug #523680). 10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> fbida-2.09-r2.ebuild, fbida-2.09.ebuild: diff --git a/media-gfx/fbida/fbida-2.09-r2.ebuild b/media-gfx/fbida/fbida-2.09-r3.ebuild index e3fdafe54a20..af8f04640114 100644 --- a/media-gfx/fbida/fbida-2.09-r2.ebuild +++ b/media-gfx/fbida/fbida-2.09-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/fbida-2.09-r2.ebuild,v 1.2 2014/08/10 21:14:20 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/fbida-2.09-r3.ebuild,v 1.1 2014/09/25 10:09:28 jer Exp $ EAPI=5 inherit eutils toolchain-funcs @@ -59,6 +59,7 @@ src_prepare() { epatch "${FILESDIR}"/ida-desktop.patch epatch "${FILESDIR}"/${PN}-2.09-make.patch epatch "${FILESDIR}"/${P}-giflib-4.2.patch + epatch "${FILESDIR}"/${P}-giflib-5.patch pushd jpeg/ >/dev/null epatch -p2 "${WORKDIR}"/${P}-jpeg-9a.patch diff --git a/media-gfx/fbida/files/fbida-2.09-giflib-5.patch b/media-gfx/fbida/files/fbida-2.09-giflib-5.patch new file mode 100644 index 000000000000..449954b0f104 --- /dev/null +++ b/media-gfx/fbida/files/fbida-2.09-giflib-5.patch @@ -0,0 +1,50 @@ +--- a/rd/read-gif.c ++++ b/rd/read-gif.c +@@ -25,7 +25,11 @@ + if (GIF_ERROR == DGifGetRecordType(h->gif,&RecordType)) { + if (debug) + fprintf(stderr,"gif: DGifGetRecordType failed\n"); ++#if GIFLIB_MAJOR >= 5 ++ GifErrorString((NULL)); ++#else + GifErrorString(); ++#endif + return -1; + } + switch (RecordType) { +@@ -42,7 +46,11 @@ + if (rc == GIF_ERROR) { + if (debug) + fprintf(stderr,"gif: DGifGetExtension failed\n"); ++#if GIFLIB_MAJOR >= 5 ++ GifErrorString((NULL)); ++#else + GifErrorString(); ++#endif + return -1; + } + if (debug) { +@@ -98,7 +106,11 @@ + memset(h,0,sizeof(*h)); + + h->infile = fp; ++#if GIFLIB_MAJOR >= 5 ++ h->gif = DGifOpenFileHandle(fileno(fp),NULL); ++#else + h->gif = DGifOpenFileHandle(fileno(fp)); ++#endif + h->row = malloc(h->gif->SWidth * sizeof(GifPixelType)); + + while (0 == image) { +@@ -108,7 +120,11 @@ + if (GIF_ERROR == DGifGetImageDesc(h->gif)) { + if (debug) + fprintf(stderr,"gif: DGifGetImageDesc failed\n"); ++#if GIFLIB_MAJOR >= 5 ++ GifErrorString((NULL)); ++#else + GifErrorString(); ++#endif + } + if (NULL == h->gif->SColorMap && + NULL == h->gif->Image.ColorMap) { |