Date: Sat, 27 Dec 2014 00:49:31 +0000 (UTC) From: Antoine Brodin <antoine@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r375668 - head/graphics/p5-ming/files Message-ID: <201412270049.sBR0nVl9031890@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: antoine Date: Sat Dec 27 00:49:30 2014 New Revision: 375668 URL: https://svnweb.freebsd.org/changeset/ports/375668 QAT: https://qat.redports.org/buildarchive/r375668/ Log: Allow building with either giflib 4.2 or 5.0 Added: head/graphics/p5-ming/files/patch-src_blocks_gifdbl.c (contents, props changed) head/graphics/p5-ming/files/patch-util_gif2dbl.c (contents, props changed) head/graphics/p5-ming/files/patch-util_gif2mask.c (contents, props changed) Added: head/graphics/p5-ming/files/patch-src_blocks_gifdbl.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/p5-ming/files/patch-src_blocks_gifdbl.c Sat Dec 27 00:49:30 2014 (r375668) @@ -0,0 +1,26 @@ +--- ../src/blocks/gifdbl.c.orig 2010-10-10 07:19:23 UTC ++++ ../src/blocks/gifdbl.c +@@ -227,7 +227,11 @@ SWFDBLBitmapData newSWFDBLBitmapData_fro + SWFDBLBitmapData ret; + struct dbl_data gifdata; + ++#if GIFLIB_MAJOR >= 5 ++ if((file = DGifOpenFileName(fileName, NULL)) == NULL) ++#else + if((file = DGifOpenFileName(fileName)) == NULL) ++#endif + return NULL; + if(!readGif(file, &gifdata)) + return NULL; +@@ -246,7 +250,11 @@ SWFDBLBitmapData newSWFDBLBitmapData_fro + SWFDBLBitmapData ret; + struct dbl_data gifdata; + ++#if GIFLIB_MAJOR >= 5 ++ if((file = DGifOpen(input, (InputFunc) gifReadFunc, NULL)) == NULL) ++#else + if((file = DGifOpen(input, (InputFunc) gifReadFunc)) == NULL) ++#endif + return NULL; + if(!readGif(file, &gifdata)) + return NULL; Added: head/graphics/p5-ming/files/patch-util_gif2dbl.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/p5-ming/files/patch-util_gif2dbl.c Sat Dec 27 00:49:30 2014 (r375668) @@ -0,0 +1,14 @@ +--- ../util/gif2dbl.c.orig 2013-06-08 14:08:51 UTC ++++ ../util/gif2dbl.c +@@ -59,7 +59,11 @@ unsigned char *readGif(char *fileName, i + unsigned char *p; + int i, nColors, size, alpha, bgColor, alignedWidth; + ++#if GIFLIB_MAJOR >= 5 ++ if((file = DGifOpenFileName(fileName, NULL)) == NULL) ++#else + if((file = DGifOpenFileName(fileName)) == NULL) ++#endif + error("Error opening file"); + + if(DGifSlurp(file) != GIF_OK) Added: head/graphics/p5-ming/files/patch-util_gif2mask.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/p5-ming/files/patch-util_gif2mask.c Sat Dec 27 00:49:30 2014 (r375668) @@ -0,0 +1,14 @@ +--- ../util/gif2mask.c.orig 2013-06-08 14:08:51 UTC ++++ ../util/gif2mask.c +@@ -28,7 +28,11 @@ unsigned char *readGif(char *fileName, i + unsigned char *data; + int i, nColors, size; + ++#if GIFLIB_MAJOR >= 5 ++ if((file = DGifOpenFileName(fileName, NULL)) == NULL) ++#else + if((file = DGifOpenFileName(fileName)) == NULL) ++#endif + error("Error opening file"); + + if(DGifSlurp(file) != GIF_OK)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201412270049.sBR0nVl9031890>