Skip to content

Commit

Permalink
media-libs/libafterimage: fix bug 582308
Browse files Browse the repository at this point in the history
libjpeg provides some macro that were removed in >=giflib-5, so
with USE="gif -jpeg" and >=giflib-5 we had undefined TRUE and
FALSE.

Package-Manager: portage-2.2.28
Signed-off-by: Andrew Savchenko <[email protected]>
  • Loading branch information
bircoph committed May 8, 2016
1 parent 6545b97 commit bc04ac3
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions media-libs/libafterimage/files/libafterimage-giflib5.patch
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ diff -Naurd libAfterImage-1.20.orig/export.c libAfterImage-1.20/export.c
}

+#if (GIFLIB_MAJOR>=5)
+ if( (errcode = EGifPutImageDesc(gif, 0, 0, im->width, im->height, FALSE, (dont_save_cmap)?NULL:gif_cmap )) == GIF_ERROR )
+ if( (errcode = EGifPutImageDesc(gif, 0, 0, im->width, im->height, false, (dont_save_cmap)?NULL:gif_cmap )) == GIF_ERROR )
+ ASIM_PrintGifError(errcode);
+#else
if( EGifPutImageDesc(gif, 0, 0, im->width, im->height, FALSE, (dont_save_cmap)?NULL:gif_cmap ) == GIF_ERROR )
Expand Down Expand Up @@ -155,7 +155,7 @@ diff -Naurd libAfterImage-1.20.orig/export.c libAfterImage-1.20/export.c
EGifPutExtension(gif, 0xf9, GIF_GCE_BYTES, &(gce_bytes[0]));

+#if (GIFLIB_MAJOR>=5)
+ if( (errcode = EGifPutImageDesc(gif, 0, 0, im->width, im->height, FALSE, NULL )) == GIF_ERROR )
+ if( (errcode = EGifPutImageDesc(gif, 0, 0, im->width, im->height, false, NULL )) == GIF_ERROR )
+ ASIM_PrintGifError(errcode);
+#else
if( EGifPutImageDesc(gif, 0, 0, im->width, im->height, FALSE, NULL ) == GIF_ERROR )
Expand Down

0 comments on commit bc04ac3

Please sign in to comment.