diff options
Diffstat (limited to 'graphics/imlib2/patches')
| -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 |
3 files changed, 5 insertions, 81 deletions
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; |