Date: Sunday, June 1, 2014 @ 19:51:58 Author: fyan Revision: 112436 upgpkg: swftools 0.9.2-4
- giflib 5.1 rebuild - added new patch Added: swftools/trunk/giflib-5.1.patch Modified: swftools/trunk/PKGBUILD Deleted: swftools/trunk/giflib-5.0.patch ------------------+ PKGBUILD | 8 ++-- giflib-5.0.patch | 53 ------------------------------ giflib-5.1.patch | 92 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 96 insertions(+), 57 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-06-01 17:23:09 UTC (rev 112435) +++ PKGBUILD 2014-06-01 17:51:58 UTC (rev 112436) @@ -4,7 +4,7 @@ pkgname=swftools pkgver=0.9.2 -pkgrel=3 +pkgrel=4 pkgdesc="A collection of SWF manipulation and creation utilities" arch=('i686' 'x86_64') url="http://www.swftools.org/" @@ -14,15 +14,15 @@ changelog=$pkgname.changelog source=(http://www.swftools.org/$pkgname-$pkgver.tar.gz $pkgname-$pkgver.patch - giflib-5.0.patch) + giflib-5.1.patch) sha256sums=('bf6891bfc6bf535a1a99a485478f7896ebacbe3bbf545ba551298080a26f01f1' '80f69c86ed06b315f576a733fd1e24145b88aef9934085f3790179a119b7923d' - 'd163438fe736fb6d1ddbecaa5099a2edac35044c9fc697a8b7167e57f0d513e0') + '6a995dfd674c5954f5b967e3d45d6845a186872fcaa4223d725902fd4d679f1b') prepare() { cd ${srcdir}/$pkgname-$pkgver - patch -Np1 -i ../giflib-5.0.patch + patch -Np0 -i ../giflib-5.1.patch sed -i 's#PrintGifError()#fprintf(stderr, "%s\\n", GifErrorString())#g' src/gif2swf.c } Deleted: giflib-5.0.patch =================================================================== --- giflib-5.0.patch 2014-06-01 17:23:09 UTC (rev 112435) +++ giflib-5.0.patch 2014-06-01 17:51:58 UTC (rev 112436) @@ -1,53 +0,0 @@ -diff -rupN a/src/gif2swf.c b/src/gif2swf.c ---- a/src/gif2swf.c 2011-01-02 03:30:29.000000000 +0000 -+++ b/src/gif2swf.c 2013-07-30 19:30:32.666103403 +0000 -@@ -65,6 +65,15 @@ enum disposal_method { - RESTORE_TO_PREVIOUS - }; - -+static void PrintGifError(int err) -+{ -+ char *Err = GifErrorString(err); -+ -+ if (Err != NULL) -+ fprintf(stderr, "\nGIF-LIB error: %s.\n", Err); -+ else -+ fprintf(stderr, "\nGIF-LIB undefined error %d.\n", err); -+} - - void SetFrameAction(TAG ** t, const char *src, int ver) - { -@@ -230,13 +239,13 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, c - } - fclose(fi); - -- if ((gft = DGifOpenFileName(sname)) == NULL) { -+ if ((gft = DGifOpenFileName(sname, NULL)) == NULL) { - fprintf(stderr, "%s is not a GIF file!\n", sname); - return t; - } - - if (DGifSlurp(gft) != GIF_OK) { -- PrintGifError(); -+ PrintGifError(DGifSlurp(gft)); - return t; - } - -@@ -488,7 +497,7 @@ int CheckInputFile(char *fname, char **r - } - fclose(fi); - -- if ((gft = DGifOpenFileName(s)) == NULL) { -+ if ((gft = DGifOpenFileName(s, NULL)) == NULL) { - fprintf(stderr, "%s is not a GIF file!\n", fname); - return -1; - } -@@ -499,7 +508,7 @@ int CheckInputFile(char *fname, char **r - global.max_image_height = gft->SHeight; - - if (DGifSlurp(gft) != GIF_OK) { -- PrintGifError(); -+ PrintGifError(DGifSlurp(gft)); - return -1; - } - // After DGifSlurp() call, gft->ImageCount become available Added: giflib-5.1.patch =================================================================== --- giflib-5.1.patch (rev 0) +++ giflib-5.1.patch 2014-06-01 17:51:58 UTC (rev 112436) @@ -0,0 +1,92 @@ +$NetBSD$ + +Fix build with giflib-5.x. + +--- src/gif2swf.c.orig 2011-01-02 03:30:29.000000000 +0000 ++++ src/gif2swf.c +@@ -65,6 +65,17 @@ enum disposal_method { + RESTORE_TO_PREVIOUS + }; + ++/* from util/qprintf.c of giflib 5.0.4 */ ++void ++PrintGifError(int ErrorCode) ++{ ++ char *Err = GifErrorString(ErrorCode); ++ ++ if (Err != NULL) ++ fprintf(stderr, "GIF-LIB error: %s.\n", Err); ++ else ++ fprintf(stderr, "GIF-LIB undefined error %d.\n", ErrorCode); ++} + + void SetFrameAction(TAG ** t, const char *src, int ver) + { +@@ -200,6 +211,7 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, c + SRECT r; + MATRIX m; + int fs; ++ int ErrorCode; + + U8 *imagedata, *from, *to; + GifImageDesc *img; +@@ -230,13 +242,13 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, c + } + fclose(fi); + +- if ((gft = DGifOpenFileName(sname)) == NULL) { ++ if ((gft = DGifOpenFileName(sname, &ErrorCode)) == NULL) { + fprintf(stderr, "%s is not a GIF file!\n", sname); + return t; + } + + if (DGifSlurp(gft) != GIF_OK) { +- PrintGifError(); ++ PrintGifError(ErrorCode); + return t; + } + +@@ -455,7 +467,7 @@ TAG *MovieAddFrame(SWF * swf, TAG * t, c + + free(pal); + free(imagedata); +- DGifCloseFile(gft); ++ DGifCloseFile(gft, NULL); + + return t; + } +@@ -465,6 +477,7 @@ int CheckInputFile(char *fname, char **r + FILE *fi; + char *s = malloc(strlen(fname) + 5); + GifFileType *gft; ++ int ErrorCode; + + if (!s) + exit(2); +@@ -488,7 +501,7 @@ int CheckInputFile(char *fname, char **r + } + fclose(fi); + +- if ((gft = DGifOpenFileName(s)) == NULL) { ++ if ((gft = DGifOpenFileName(s, &ErrorCode)) == NULL) { + fprintf(stderr, "%s is not a GIF file!\n", fname); + return -1; + } +@@ -499,7 +512,7 @@ int CheckInputFile(char *fname, char **r + global.max_image_height = gft->SHeight; + + if (DGifSlurp(gft) != GIF_OK) { +- PrintGifError(); ++ PrintGifError(ErrorCode); + return -1; + } + // After DGifSlurp() call, gft->ImageCount become available +@@ -518,7 +531,7 @@ int CheckInputFile(char *fname, char **r + fprintf(stderr, "frame: %u, delay: %.3f sec\n", i + 1, getGifDelayTime(gft, i) / 100.0); + } + +- DGifCloseFile(gft); ++ DGifCloseFile(gft, NULL); + + return 0; + }