Gentoo Archives: gentoo-commits

From: "Jeroen Roovers (jer)" <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-gfx/fbida/files: fbida-2.09-giflib-5.patch
Date: Thu, 25 Sep 2014 10:09:32
Message-Id: 20140925100928.AA5EC639D@oystercatcher.gentoo.org
1 jer 14/09/25 10:09:28
2
3 Added: fbida-2.09-giflib-5.patch
4 Log:
5 Add media-libs/giflib-5 patch by Paolo Pedroni (bug #523680).
6
7 (Portage version: 2.2.13/cvs/Linux x86_64, signed Manifest commit with key A792A613)
8
9 Revision Changes Path
10 1.1 media-gfx/fbida/files/fbida-2.09-giflib-5.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/fbida/files/fbida-2.09-giflib-5.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/fbida/files/fbida-2.09-giflib-5.patch?rev=1.1&content-type=text/plain
14
15 Index: fbida-2.09-giflib-5.patch
16 ===================================================================
17 --- a/rd/read-gif.c
18 +++ b/rd/read-gif.c
19 @@ -25,7 +25,11 @@
20 if (GIF_ERROR == DGifGetRecordType(h->gif,&RecordType)) {
21 if (debug)
22 fprintf(stderr,"gif: DGifGetRecordType failed\n");
23 +#if GIFLIB_MAJOR >= 5
24 + GifErrorString((NULL));
25 +#else
26 GifErrorString();
27 +#endif
28 return -1;
29 }
30 switch (RecordType) {
31 @@ -42,7 +46,11 @@
32 if (rc == GIF_ERROR) {
33 if (debug)
34 fprintf(stderr,"gif: DGifGetExtension failed\n");
35 +#if GIFLIB_MAJOR >= 5
36 + GifErrorString((NULL));
37 +#else
38 GifErrorString();
39 +#endif
40 return -1;
41 }
42 if (debug) {
43 @@ -98,7 +106,11 @@
44 memset(h,0,sizeof(*h));
45
46 h->infile = fp;
47 +#if GIFLIB_MAJOR >= 5
48 + h->gif = DGifOpenFileHandle(fileno(fp),NULL);
49 +#else
50 h->gif = DGifOpenFileHandle(fileno(fp));
51 +#endif
52 h->row = malloc(h->gif->SWidth * sizeof(GifPixelType));
53
54 while (0 == image) {
55 @@ -108,7 +120,11 @@
56 if (GIF_ERROR == DGifGetImageDesc(h->gif)) {
57 if (debug)
58 fprintf(stderr,"gif: DGifGetImageDesc failed\n");
59 +#if GIFLIB_MAJOR >= 5
60 + GifErrorString((NULL));
61 +#else
62 GifErrorString();
63 +#endif
64 }
65 if (NULL == h->gif->SColorMap &&
66 NULL == h->gif->Image.ColorMap) {