diff options
| author | obache <obache> | 2014-05-16 10:19:11 +0000 |
|---|---|---|
| committer | obache <obache> | 2014-05-16 10:19:11 +0000 |
| commit | 5d94f0cdaf552c52fb8d5a64856b84d6789220a5 (patch) | |
| tree | 447dbd6b7934dd6c0dc43b03ed24a1f04443b1bb /graphics/imlib2 | |
| parent | acffd0c996af4b4ae3ee4fe6d56e258c981c5c8f (diff) | |
| download | pkgsrc-5d94f0cdaf552c52fb8d5a64856b84d6789220a5.tar.gz | |
fixes build with giflib>=5.1
Diffstat (limited to 'graphics/imlib2')
| -rw-r--r-- | graphics/imlib2/distinfo | 4 | ||||
| -rw-r--r-- | graphics/imlib2/patches/patch-src_modules_loaders_loader__gif.c | 56 |
2 files changed, 56 insertions, 4 deletions
diff --git a/graphics/imlib2/distinfo b/graphics/imlib2/distinfo index 2d0dcfab96d..de27f2baed0 100644 --- a/graphics/imlib2/distinfo +++ b/graphics/imlib2/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.31 2013/07/06 05:58:03 ryoon Exp $ +$NetBSD: distinfo,v 1.32 2014/05/16 10:19:11 obache Exp $ SHA1 (imlib2-1.4.5.tar.bz2) = af86a2c38f4bc3806db57e64e74dc9814ad474a0 RMD160 (imlib2-1.4.5.tar.bz2) = 3b8fd51a854f628f8e8b38612da6c99a0609c6aa @@ -10,4 +10,4 @@ SHA1 (patch-ae) = 9a2838ebfebe2db8bcd1f5fbe13a680122f0f8c0 SHA1 (patch-imlib2-config.in) = 621831f2fe661db1d78632b4c1c0b36ab2e8916d SHA1 (patch-src_lib_amd64__blend.S) = 226de814e6c890ec1fea105641e036416e670a9f SHA1 (patch-src_lib_amd64__blend__cmod.S) = a02c7b101cc16889002101cfc689e8e39cb04016 -SHA1 (patch-src_modules_loaders_loader__gif.c) = 00b0eab470cee236764aa804f030ba7ea5331d7c +SHA1 (patch-src_modules_loaders_loader__gif.c) = fc4b01b32d277a8aa8b471fa800b3797371ccc90 diff --git a/graphics/imlib2/patches/patch-src_modules_loaders_loader__gif.c b/graphics/imlib2/patches/patch-src_modules_loaders_loader__gif.c index ef8320d6760..bff55a98dc0 100644 --- a/graphics/imlib2/patches/patch-src_modules_loaders_loader__gif.c +++ b/graphics/imlib2/patches/patch-src_modules_loaders_loader__gif.c @@ -1,6 +1,6 @@ -$NetBSD: patch-src_modules_loaders_loader__gif.c,v 1.1 2013/07/06 05:58:03 ryoon Exp $ +$NetBSD: patch-src_modules_loaders_loader__gif.c,v 1.2 2014/05/16 10:19:11 obache Exp $ -* Fix build with giflib 5.0. +* Fix build with giflib>=5.1. --- src/modules/loaders/loader_gif.c.orig 2011-04-15 22:05:28.000000000 +0000 +++ src/modules/loaders/loader_gif.c @@ -13,3 +13,55 @@ $NetBSD: patch-src_modules_loaders_loader__gif.c,v 1.1 2013/07/06 05:58:03 ryoon if (!gif) { close(fd); +@@ -60,13 +60,13 @@ load(ImlibImage * im, ImlibProgressFunct + h = gif->Image.Height; + if (!IMAGE_DIMENSIONS_OK(w, h)) + { +- DGifCloseFile(gif); ++ DGifCloseFile(gif, NULL); + return 0; + } + rows = malloc(h * sizeof(GifRowType *)); + if (!rows) + { +- DGifCloseFile(gif); ++ DGifCloseFile(gif, NULL); + return 0; + } + for (i = 0; i < h; i++) +@@ -78,7 +78,7 @@ load(ImlibImage * im, ImlibProgressFunct + rows[i] = malloc(w * sizeof(GifPixelType)); + if (!rows[i]) + { +- DGifCloseFile(gif); ++ DGifCloseFile(gif, NULL); + for (i = 0; i < h; i++) + { + if (rows[i]) +@@ -150,7 +150,7 @@ load(ImlibImage * im, ImlibProgressFunct + im->data = (DATA32 *) malloc(sizeof(DATA32) * w * h); + if (!im->data) + { +- DGifCloseFile(gif); ++ DGifCloseFile(gif, NULL); + free(rows); + return 0; + } +@@ -181,7 +181,7 @@ load(ImlibImage * im, ImlibProgressFunct + last_per = (int)per; + if (!(progress(im, (int)per, 0, last_y, w, i))) + { +- DGifCloseFile(gif); ++ DGifCloseFile(gif, NULL); + for (i = 0; i < h; i++) + { + free(rows[i]); +@@ -198,7 +198,7 @@ load(ImlibImage * im, ImlibProgressFunct + { + progress(im, 100, 0, last_y, w, h); + } +- DGifCloseFile(gif); ++ DGifCloseFile(gif, NULL); + for (i = 0; i < h; i++) + { + free(rows[i]); |