diff options
| author | Antoine Brodin <antoine@FreeBSD.org> | 2014-12-26 17:44:35 +0000 |
|---|---|---|
| committer | Antoine Brodin <antoine@FreeBSD.org> | 2014-12-26 17:44:35 +0000 |
| commit | 25ca83f2f5da0e685e766eb253af47f57cadffbe (patch) | |
| tree | a76b174a40278240d7c5555775a57efa1bebc40b /japanese/ming | |
| parent | 01c229df6f0a06a80626df05bddae00e2eb748e9 (diff) | |
Allow building with either giflib 4.2 or 5.0
Notes
Notes:
svn path=/head/; revision=375643
Diffstat (limited to 'japanese/ming')
| -rw-r--r-- | japanese/ming/files/patch-util_gif2dbl.c | 19 | ||||
| -rw-r--r-- | japanese/ming/files/patch-util_gif2mask.c | 19 |
2 files changed, 30 insertions, 8 deletions
diff --git a/japanese/ming/files/patch-util_gif2dbl.c b/japanese/ming/files/patch-util_gif2dbl.c index e38fe1b82edc..78da800287a8 100644 --- a/japanese/ming/files/patch-util_gif2dbl.c +++ b/japanese/ming/files/patch-util_gif2dbl.c @@ -1,11 +1,22 @@ ---- ../util/gif2dbl.c~ 2002-06-24 21:21:54.000000000 +0900 -+++ ../util/gif2dbl.c 2013-03-14 04:57:51.000000000 +0900 -@@ -16,7 +16,7 @@ +--- ../util/gif2dbl.c.orig 2002-06-24 12:21:54.000000000 +0000 ++++ ../util/gif2dbl.c 2014-12-26 17:29:52.000000000 +0000 +@@ -16,7 +16,6 @@ void error(char *msg) { printf("%s:\n\n", msg); - PrintGifError(); -+ GifError(); exit(-1); } +@@ -50,7 +49,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/japanese/ming/files/patch-util_gif2mask.c b/japanese/ming/files/patch-util_gif2mask.c index 57fa411601f1..49a2b4ffa492 100644 --- a/japanese/ming/files/patch-util_gif2mask.c +++ b/japanese/ming/files/patch-util_gif2mask.c @@ -1,11 +1,22 @@ ---- ../util/gif2mask.c~ 2002-06-24 21:21:54.000000000 +0900 -+++ ../util/gif2mask.c 2013-03-14 04:57:54.000000000 +0900 -@@ -11,7 +11,7 @@ +--- ../util/gif2mask.c.orig 2002-06-24 12:21:54.000000000 +0000 ++++ ../util/gif2mask.c 2014-12-26 17:30:23.000000000 +0000 +@@ -11,7 +11,6 @@ void error(char *msg) { printf("%s:\n\n", msg); - PrintGifError(); -+ GifError(); exit(-1); } +@@ -23,7 +22,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) |