svn commit: r375669 - head/graphics/php5-swfed/files

[Antoine Brodin]

Author: antoine
Date: Sat Dec 27 00:51:07 2014
New Revision: 375669
URL: https://svnweb.freebsd.org/changeset/ports/375669
QAT: https://qat.redports.org/buildarchive/r375669/

Log:
  Allow building with either giflib 4.2 or 5.0

Added:
  head/graphics/php5-swfed/files/
  head/graphics/php5-swfed/files/patch-swf__gif.c   (contents, props changed)

Added: head/graphics/php5-swfed/files/patch-swf__gif.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/php5-swfed/files/patch-swf__gif.c	Sat Dec 27 00:51:07 2014	(r375669)
@@ -0,0 +1,38 @@
+--- swf_gif.c.orig	2014-02-10 02:32:16 UTC
++++ swf_gif.c
+@@ -132,7 +132,11 @@ gifconv_gif2lossless(unsigned char *gif_
+     gif_buff.data = gif_data;
+     gif_buff.data_len = gif_data_len;
+     gif_buff.data_offset = 0;
++#if GIFLIB_MAJOR >= 5
++    GifFile = DGifOpen(& gif_buff, gif_data_read_func, NULL);
++#else
+     GifFile = DGifOpen(& gif_buff, gif_data_read_func);
++#endif
+     if (GifFile == NULL) {
+         fprintf(stderr, "gifconv_gif2lossless: can't open GIFFile\n");
+         return NULL;
+@@ -252,7 +256,11 @@ gifconv_lossless2gif(void *image_data,
+     gif_buff.data = NULL;
+     gif_buff.data_len = 0;
+     gif_buff.data_offset = 0;
++#if GIFLIB_MAJOR >= 5
++    GifFile = EGifOpen(& gif_buff, gif_data_write_func, NULL);
++#else
+     GifFile = EGifOpen(& gif_buff, gif_data_write_func);
++#endif
+     if (GifFile == NULL) {
+         fprintf(stderr, "gifconv_lossless2gif: can't open GIFFile\n");
+         return NULL;
+@@ -292,7 +300,11 @@ gifconv_lossless2gif(void *image_data,
+     }
+ 
+     GifFile->SavedImages[0].RasterBits = gif_image_data;
++#if GIFLIB_MAJOR >= 5
++    GifFile->SColorMap = GifMakeMapObject(ColorCount, Colors);
++#else
+     GifFile->SColorMap = MakeMapObject(ColorCount, Colors);
++#endif
+     EGifSpew(GifFile); // XXX
+ 
+     free(gif_image_data);