Update to 0.4.0:

Release 0.4.0 (2014-10-15)
==========================

- Corrected return value documentation for xcb_image_shm_put().
- Added additional format tests for XY_PIXMAP bit planes.
- Changed test_xcb_image to work with XY_PIXMAP with nontrivial planemask.
- Fixed get_image to handle xy format with nontrivial plane_mask.
- Fixed endianness bug in xy pixmap getimage.
- Use AC_CONFIG_HEADERS to create a config.h file.
- Add missing COPYING file.
- Using X11 Protocol headers, so XPROTO_CFLAGS is required.
- Move test cases into their own directory.
- Fix compilation when NDEBUG is defined.

3 files changed, 17 insertions, 19 deletions

diff --git a/x11/xcb-util-image/Makefile b/x11/xcb-util-image/Makefile
index 1923cdfc607..a6c8dfacb60 100644
--- a/x11/xcb-util-image/Makefile
+++ b/x11/xcb-util-image/Makefile
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2012/10/29 05:06:58 asau Exp $
-#
+# $NetBSD: Makefile,v 1.4 2014/10/20 11:15:38 wiz Exp $
 
-DISTNAME=	xcb-util-image-0.3.9
-PKGREVISION=	1
+DISTNAME=	xcb-util-image-0.4.0
 CATEGORIES=	x11
 MASTER_SITES=	http://xcb.freedesktop.org/dist/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/xcb-util-image/distinfo b/x11/xcb-util-image/distinfo
index 593c79c90fa..a148165ad45 100644
--- a/x11/xcb-util-image/distinfo
+++ b/x11/xcb-util-image/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2012/08/18 08:04:25 marino Exp $
+$NetBSD: distinfo,v 1.3 2014/10/20 11:15:38 wiz Exp $
 
-SHA1 (xcb-util-image-0.3.9.tar.bz2) = afeba6230400fe8bec6076fd07bf20a8e412bbb5
-RMD160 (xcb-util-image-0.3.9.tar.bz2) = c666b87e20eaa703697df758e1d0e26aec2d62a4
-Size (xcb-util-image-0.3.9.tar.bz2) = 310947 bytes
-SHA1 (patch-image_xcb__image.c) = d0a956fc8786f03c8cce9d87f748cc02d3a8ac21
+SHA1 (xcb-util-image-0.4.0.tar.bz2) = c9c9361781911a47b28f74fc6ebe0abd1273fae4
+RMD160 (xcb-util-image-0.4.0.tar.bz2) = 7f36f7aae35194866d36b064061ed6c8abd8cf50
+Size (xcb-util-image-0.4.0.tar.bz2) = 327891 bytes
+SHA1 (patch-image_xcb__image.c) = 38c251282e64eaa4ababfee7250190f4ded3babf
diff --git a/x11/xcb-util-image/patches/patch-image_xcb__image.c b/x11/xcb-util-image/patches/patch-image_xcb__image.c
index 5cbef864462..41987ada935 100644
--- a/x11/xcb-util-image/patches/patch-image_xcb__image.c
+++ b/x11/xcb-util-image/patches/patch-image_xcb__image.c
@@ -1,22 +1,22 @@
-$NetBSD: patch-image_xcb__image.c,v 1.1 2012/08/18 08:04:25 marino Exp $
+$NetBSD: patch-image_xcb__image.c,v 1.2 2014/10/20 11:15:38 wiz Exp $
 
 gcc44 complains "control reaches end of non-void function" on DragonFly
 Apparently gcc45+ recognizes the assert, but for those compilers that don't,
 putting a dummy return value won't hurt anything.
 
---- image/xcb_image.c.orig	2011-06-30 08:05:22.000000000 +0000
+--- image/xcb_image.c.orig	2014-06-11 08:49:48.000000000 +0000
 +++ image/xcb_image.c
 @@ -187,6 +187,8 @@ xcb_image_create_native (xcb_connection_
-       assert(0);
-   }
-   assert(0);
+ 			      setup->image_byte_order,
+ 			      XCB_IMAGE_ORDER_MSB_FIRST,
+ 			      base, bytes, data);
 +/* gcc44 complains "control reaches end of non-void function", fix below */
 +  return (-1);
- }
- 
- 
-@@ -750,6 +752,8 @@ xcb_image_get_pixel (xcb_image_t *image,
-       return pixel;
+   default:
+       assert(0);
+   }
+@@ -658,6 +660,8 @@ xcb_image_put_pixel (xcb_image_t *image,
+       break;
    default:
        assert(0);
 +/* gcc44 complains "control reaches end of non-void function", fix below */