diff options
author | drochner <drochner> | 2011-11-07 12:14:15 +0000 |
---|---|---|
committer | drochner <drochner> | 2011-11-07 12:14:15 +0000 |
commit | b8c403438ff7f70312d4f5c5f07076ab384bc763 (patch) | |
tree | 9fcffc3716d099d54ab83c4260c209766829c01d | |
parent | f66740d73419feabb030052c2d461d416371c38a (diff) | |
download | pkgsrc-b8c403438ff7f70312d4f5c5f07076ab384bc763.tar.gz |
update to 1.4.5
changes:
-bugfixes
-cleanup, spelling fixes
-rw-r--r-- | graphics/imlib2/Makefile | 5 | ||||
-rw-r--r-- | graphics/imlib2/distinfo | 13 | ||||
-rw-r--r-- | graphics/imlib2/patches/patch-ab | 4 | ||||
-rw-r--r-- | graphics/imlib2/patches/patch-ac | 6 | ||||
-rw-r--r-- | graphics/imlib2/patches/patch-af | 76 |
5 files changed, 13 insertions, 91 deletions
diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile index 00e10423ae7..2b13d0a2804 100644 --- a/graphics/imlib2/Makefile +++ b/graphics/imlib2/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.58 2011/11/01 06:01:37 sbd Exp $ +# $NetBSD: Makefile,v 1.59 2011/11/07 12:14:15 drochner Exp $ -DISTNAME= imlib2-1.4.4 -PKGREVISION= 1 +DISTNAME= imlib2-1.4.5 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=enlightenment/} EXTRACT_SUFX= .tar.bz2 diff --git a/graphics/imlib2/distinfo b/graphics/imlib2/distinfo index f84443a8739..8c0416c60c4 100644 --- a/graphics/imlib2/distinfo +++ b/graphics/imlib2/distinfo @@ -1,10 +1,9 @@ -$NetBSD: distinfo,v 1.27 2011/05/18 10:04:26 drochner Exp $ +$NetBSD: distinfo,v 1.28 2011/11/07 12:14:15 drochner Exp $ -SHA1 (imlib2-1.4.4.tar.bz2) = aca2cf5d40ddcd8a3acfde605f319fccce7c2a2b -RMD160 (imlib2-1.4.4.tar.bz2) = 0206b97134fa55c35e2ab1a2e103e5341770d88b -Size (imlib2-1.4.4.tar.bz2) = 888878 bytes -SHA1 (patch-ab) = 47f0165c3a4abfc6de1078768104b8e2acd2e9b5 -SHA1 (patch-ac) = cf2ddba76a50ae4082ad984aaf6f43857d5a5175 +SHA1 (imlib2-1.4.5.tar.bz2) = af86a2c38f4bc3806db57e64e74dc9814ad474a0 +RMD160 (imlib2-1.4.5.tar.bz2) = 3b8fd51a854f628f8e8b38612da6c99a0609c6aa +Size (imlib2-1.4.5.tar.bz2) = 895624 bytes +SHA1 (patch-ab) = 9ec9287a8003760e3c330b6a751c0d28bef19afc +SHA1 (patch-ac) = 4f5e05fd921499c2ef679135e42bd8dc6f71d2de SHA1 (patch-ad) = 3dc74b7804fde49f6fa0f0b8fe8c1bd87b37535a SHA1 (patch-ae) = 9a2838ebfebe2db8bcd1f5fbe13a680122f0f8c0 -SHA1 (patch-af) = 9ee80e6dac9cc182ac847ac0b8c215352ee99290 diff --git a/graphics/imlib2/patches/patch-ab b/graphics/imlib2/patches/patch-ab index d9f768b8f29..efb9a4a6c37 100644 --- a/graphics/imlib2/patches/patch-ab +++ b/graphics/imlib2/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.11 2006/07/19 16:16:23 rillig Exp $ +$NetBSD: patch-ab,v 1.12 2011/11/07 12:14:15 drochner Exp $ This patch makes imlib2 compile on systems that don't have an lround function, which is defined in C99. @@ -29,4 +29,4 @@ Needed at least for NetBSD-1.6.2 and NetBSD-2.0. + /* * Color space conversion helper routines - * Convert between rgb and hsv adn between rgb and hls + * Convert between rgb and hsv and between rgb and hls diff --git a/graphics/imlib2/patches/patch-ac b/graphics/imlib2/patches/patch-ac index 5e7b3ebefd5..faf99e024e9 100644 --- a/graphics/imlib2/patches/patch-ac +++ b/graphics/imlib2/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.7 2011/05/18 10:04:26 drochner Exp $ +$NetBSD: patch-ac,v 1.8 2011/11/07 12:14:15 drochner Exp $ Add minimalist #ifndef blocks to rip out XShm support on Interix. ---- src/lib/grab.c.orig 2010-05-05 18:25:50.000000000 +0000 +--- src/lib/grab.c.orig 2011-04-15 22:05:28.000000000 +0000 +++ src/lib/grab.c @@ -530,7 +530,9 @@ __imlib_GrabDrawableToRGBA(DATA32 * data int i; @@ -22,7 +22,7 @@ Add minimalist #ifndef blocks to rip out XShm support on Interix. if (x_does_shm) { xim = __imlib_ShmGetXImage(d, v, p, xatt.depth, x, y, w, h, &shminfo); - is_shm = xim != NULL; + is_shm = ! !xim; } +#endif /* !__INTERIX */ if (!xim) diff --git a/graphics/imlib2/patches/patch-af b/graphics/imlib2/patches/patch-af deleted file mode 100644 index d5ba9672d0b..00000000000 --- a/graphics/imlib2/patches/patch-af +++ /dev/null @@ -1,76 +0,0 @@ -$NetBSD: patch-af,v 1.4 2011/01/14 10:02:54 wiz Exp $ - -Fix build with png-1.5. - ---- src/modules/loaders/loader_png.c.orig 2010-02-08 00:29:06.000000000 -0800 -+++ src/modules/loaders/loader_png.c 2010-02-08 00:34:14.000000000 -0800 -@@ -58,7 +58,7 @@ - fclose(f); - return 0; - } -- if (setjmp(png_ptr->jmpbuf)) -+ if (setjmp(png_jmpbuf(png_ptr))) - { - png_destroy_read_struct(&png_ptr, &info_ptr, NULL); - fclose(f); -@@ -238,7 +238,7 @@ - png_structp png_ptr; - png_infop info_ptr; - DATA32 *ptr; -- int x, y, j; -+ int x, y, j, interlace; - png_bytep row_ptr, data = NULL; - png_color_8 sig_bit; - int pl = 0; -@@ -265,7 +265,7 @@ - png_destroy_write_struct(&png_ptr, (png_infopp) NULL); - return 0; - } -- if (setjmp(png_ptr->jmpbuf)) -+ if (setjmp(png_jmpbuf(png_ptr))) - { - fclose(f); - png_destroy_write_struct(&png_ptr, (png_infopp) & info_ptr); -@@ -274,11 +274,11 @@ - } - - /* check whether we should use interlacing */ -+ interlace = PNG_INTERLACE_NONE; - if ((tag = __imlib_GetTag(im, "interlacing")) && tag->val) - { - #ifdef PNG_WRITE_INTERLACING_SUPPORTED -- png_ptr->interlaced = PNG_INTERLACE_ADAM7; -- num_passes = png_set_interlace_handling(png_ptr); -+ interlace = PNG_INTERLACE_ADAM7; - #endif - } - -@@ -286,7 +286,7 @@ - if (im->flags & F_HAS_ALPHA) - { - png_set_IHDR(png_ptr, info_ptr, im->w, im->h, 8, -- PNG_COLOR_TYPE_RGB_ALPHA, png_ptr->interlaced, -+ PNG_COLOR_TYPE_RGB_ALPHA, interlace, - PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE); - #ifdef WORDS_BIGENDIAN - png_set_swap_alpha(png_ptr); -@@ -297,7 +297,7 @@ - else - { - png_set_IHDR(png_ptr, info_ptr, im->w, im->h, 8, PNG_COLOR_TYPE_RGB, -- png_ptr->interlaced, PNG_COMPRESSION_TYPE_BASE, -+ interlace, PNG_COMPRESSION_TYPE_BASE, - PNG_FILTER_TYPE_BASE); - data = malloc(im->w * 3 * sizeof(char)); - } -@@ -344,6 +344,10 @@ - png_set_shift(png_ptr, &sig_bit); - png_set_packing(png_ptr); - -+#ifdef PNG_WRITE_INTERLACING_SUPPORTED -+ num_passes = png_set_interlace_handling(png_ptr); -+#endif -+ - for (pass = 0; pass < num_passes; pass++) - { - ptr = im->data; |