svn commit: r375644 - head/graphics/ming/files

[Antoine Brodin]

Author: antoine
Date: Fri Dec 26 17:59:25 2014
New Revision: 375644
URL: https://svnweb.freebsd.org/changeset/ports/375644
QAT: https://qat.redports.org/buildarchive/r375644/

Log:
  Allow building with either giflib 4.2 or 5.0

Added:
  head/graphics/ming/files/
  head/graphics/ming/files/patch-src_blocks_gifdbl.c   (contents, props changed)
  head/graphics/ming/files/patch-util_gif2dbl.c   (contents, props changed)
  head/graphics/ming/files/patch-util_gif2mask.c   (contents, props changed)

Added: head/graphics/ming/files/patch-src_blocks_gifdbl.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/ming/files/patch-src_blocks_gifdbl.c	Fri Dec 26 17:59:25 2014	(r375644)
@@ -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/ming/files/patch-util_gif2dbl.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/ming/files/patch-util_gif2dbl.c	Fri Dec 26 17:59:25 2014	(r375644)
@@ -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/ming/files/patch-util_gif2mask.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/ming/files/patch-util_gif2mask.c	Fri Dec 26 17:59:25 2014	(r375644)
@@ -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)