diff options
author | Antoine Brodin <antoine@FreeBSD.org> | 2014-12-26 17:59:25 +0000 |
---|---|---|
committer | Antoine Brodin <antoine@FreeBSD.org> | 2014-12-26 17:59:25 +0000 |
commit | 3339cb80fcf47e3e6b26d4d6cc527d794983422a (patch) | |
tree | 2b0000a888121376729df8aa11b11b81d8343dc3 /graphics/ming | |
parent | 25ca83f2f5da0e685e766eb253af47f57cadffbe (diff) | |
download | ports-3339cb80fcf47e3e6b26d4d6cc527d794983422a.tar.gz ports-3339cb80fcf47e3e6b26d4d6cc527d794983422a.zip |
Allow building with either giflib 4.2 or 5.0
Notes
Notes:
svn path=/head/; revision=375644
Diffstat (limited to 'graphics/ming')
-rw-r--r-- | graphics/ming/files/patch-src_blocks_gifdbl.c | 26 | ||||
-rw-r--r-- | graphics/ming/files/patch-util_gif2dbl.c | 14 | ||||
-rw-r--r-- | graphics/ming/files/patch-util_gif2mask.c | 14 |
3 files changed, 54 insertions, 0 deletions
diff --git a/graphics/ming/files/patch-src_blocks_gifdbl.c b/graphics/ming/files/patch-src_blocks_gifdbl.c new file mode 100644 index 000000000000..a50c9a07a820 --- /dev/null +++ b/graphics/ming/files/patch-src_blocks_gifdbl.c @@ -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; diff --git a/graphics/ming/files/patch-util_gif2dbl.c b/graphics/ming/files/patch-util_gif2dbl.c new file mode 100644 index 000000000000..56deec29a5c6 --- /dev/null +++ b/graphics/ming/files/patch-util_gif2dbl.c @@ -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) diff --git a/graphics/ming/files/patch-util_gif2mask.c b/graphics/ming/files/patch-util_gif2mask.c new file mode 100644 index 000000000000..d7b315faf109 --- /dev/null +++ b/graphics/ming/files/patch-util_gif2mask.c @@ -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) |