public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andrew Savchenko" <bircoph@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/libafterimage/files/
Date: Sun,  8 May 2016 07:21:33 +0000 (UTC)	[thread overview]
Message-ID: <1462692068.bc04ac3d16115fd75cfa89b3907bec80c3499359.bircoph@gentoo> (raw)

commit:     bc04ac3d16115fd75cfa89b3907bec80c3499359
Author:     Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
AuthorDate: Sun May  8 07:21:08 2016 +0000
Commit:     Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
CommitDate: Sun May  8 07:21:08 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc04ac3d

media-libs/libafterimage: fix bug 582308

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 <bircoph <AT> gentoo.org>

 media-libs/libafterimage/files/libafterimage-giflib5.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/libafterimage/files/libafterimage-giflib5.patch b/media-libs/libafterimage/files/libafterimage-giflib5.patch
index 32037d9..b650b24 100644
--- a/media-libs/libafterimage/files/libafterimage-giflib5.patch
+++ b/media-libs/libafterimage/files/libafterimage-giflib5.patch
@@ -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 )
@@ -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 )


                 reply	other threads:[~2016-05-08  7:21 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1462692068.bc04ac3d16115fd75cfa89b3907bec80c3499359.bircoph@gentoo \
    --to=bircoph@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox