xcb-util-image: Changes to 'upstream-unstable'

2012-06-07 Thread Arnaud Fontaine
 Doxyfile | 1305 ---
 Makefile.am  |1 
 NEWS |7 
 configure.ac |4 
 image/Makefile.am|6 
 image/test_formats.c |4 
 6 files changed, 18 insertions(+), 1309 deletions(-)

New commits:
commit 155d4c90d7ddb599fcff34dfc403b223c3a35ce8
Author: Arnaud Fontaine 
Date:   Wed May 30 14:23:19 2012 +0900

Release 0.3.9

Signed-off-by: Arnaud Fontaine 

diff --git a/NEWS b/NEWS
index c826c60..a874594 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,10 @@
+Release 0.3.9 (2012-05-30)
+==
+
+- Add missing xcb_bitops.h.
+- Don't try to build test_xcb_image_shm if SHM isn't available (for example on 
MinGW).
+- Use rand() instead of random() (more portable, for example to MinGW).
+
 Release 0.3.8 (2010-04-25)
 ==
 
diff --git a/configure.ac b/configure.ac
index ce3cdee..63a32e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.59c)
-AC_INIT([xcb-util-image],0.3.8,[x...@lists.freedesktop.org])
+AC_INIT([xcb-util-image],0.3.9,[x...@lists.freedesktop.org])
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])

commit 22d62378f721555970d5f6a9a1f9fde233fd226c
Author: Arnaud Fontaine 
Date:   Tue May 22 17:22:15 2012 +0900

Fix GCC warning in test_formats.

diff --git a/image/test_formats.c b/image/test_formats.c
index 185492a..2a5b641 100644
--- a/image/test_formats.c
+++ b/image/test_formats.c
@@ -102,7 +102,7 @@ static xcb_gcontext_t create_gcontext(xcb_connection_t *c,
 
 
 typedef struct {
-   char *name;
+   const char *name;
xcb_image_format_t format;
uint8_t depth;
 } format_t;

commit f7921a5f1b4524300f297c41200623d7b7fbf17a
Author: Jon TURNEY 
Date:   Thu Jan 5 21:01:51 2012 +

Use rand() instead of random(), being part of the C standard library,
it is more portable (for example, to MinGW)

Signed-off-by: Jon TURNEY 
Reviewed-by: Arnaud Fontaine 

diff --git a/image/test_formats.c b/image/test_formats.c
index b03673b..185492a 100644
--- a/image/test_formats.c
+++ b/image/test_formats.c
@@ -43,7 +43,7 @@ color (uint32_t depth, uint32_t x, uint32_t y)
uint32_t p;
 
if (depth == 1) {
-   int frac = random() % (WIDTH * HEIGHT);
+   int frac = rand() % (WIDTH * HEIGHT);
p = x * y >= frac;
return p;
}

commit 98ca67376f87854b1b9308ac948d16a890e5088b
Author: Jon TURNEY 
Date:   Thu Jan 5 21:01:50 2012 +

Don't try to build test_xcb_image_shm if SHM isn't available (for example, 
on MinGW)

Signed-off-by: Jon TURNEY 
Reviewed-by: Arnaud Fontaine 

diff --git a/configure.ac b/configure.ac
index 5a53b5c..ce3cdee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,6 +7,8 @@ AM_MAINTAINER_MODE
 
 XCB_UTIL_COMMON([1.4], [1.6])
 
+AC_CHECK_HEADERS([sys/shm.h])
+AM_CONDITIONAL(HAVE_SHM, test x$ac_cv_header_sys_shm_h = xyes)
 PKG_CHECK_MODULES(XCB_SHM, xcb-shm)
 PKG_CHECK_MODULES(XPROTO, xproto >= 7.0.8)
 PKG_CHECK_MODULES(XCB_UTIL, xcb-util)
diff --git a/image/Makefile.am b/image/Makefile.am
index 1f7beed..f6a67ff 100644
--- a/image/Makefile.am
+++ b/image/Makefile.am
@@ -17,7 +17,11 @@ pkgconfig_DATA = xcb-image.pc
 
 EXTRA_DIST=xcb-image.pc.in
 
-noinst_PROGRAMS = test_xcb_image test_xcb_image_shm test_formats test_bitmap
+noinst_PROGRAMS = test_xcb_image test_formats test_bitmap
+
+if HAVE_SHM
+noinst_PROGRAMS += test_xcb_image_shm
+endif
 
 check_PROGRAMS = test_swap
 

commit 51ba72634a3fdaaddacf917373cc44b1bf53829d
Author: Arnaud Fontaine 
Date:   Mon May 21 11:06:59 2012 +0900

Add autogen.sh to EXTRA_DIST.

diff --git a/Makefile.am b/Makefile.am
index 0a2547d..21d2066 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,3 +13,4 @@ ChangeLog:
 dist-hook: ChangeLog INSTALL
 
 SUBDIRS = image
+EXTRA_DIST = autogen.sh

commit 8b31d4b184a03d6de95d50275e237958909aebcd
Author: Arnaud Fontaine 
Date:   Mon May 21 11:06:53 2012 +0900

Remove Doxyfile which is unused, out dated and wrong.

diff --git a/Doxyfile b/Doxyfile
deleted file mode 100644
index ffb0602..000
--- a/Doxyfile
+++ /dev/null
@@ -1,1305 +0,0 @@
-# Doxyfile 1.5.3-20071008
-
-# This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project
-#
-# All text after a hash (#) is considered a comment and will be ignored
-# The format is:
-#   TAG = value [value, ...]
-# For lists items can also be appended using:
-#   TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (" ")
-
-#---
-# Project related configuration options
-#---
-
-# This tag specifies the encoding used for all characters in the config file 
that 
-# follow. The default is UTF-8 which

xcb-util-image: Changes to 'upstream'

2011-05-06 Thread Arnaud Fontaine
New branch 'upstream' available with the following commits:
commit 46842004b8a9419dec49caf95e516f801bcda5b0
Author: Roberto Branciforti 
Date:   Mon May 2 17:40:42 2011 +0200

Fix xcb_bitops.h include path

This patch fix the include path of the xcb_bitops.h file.

Signed-off-by: rbbrnc 

commit 97e6f64dfee62a65758c0667a4ee208d7e9ab44a
Author: Arnaud Fontaine 
Date:   Sun May 1 22:24:41 2011 +0900

Add missing xcb_bitops.h.

Following the split up of xcb-util, this header was incorrectly put into 
util,
which doesn't actually use it, whereas it should have always been in
util-image.

Signed-off-by: Arnaud Fontaine 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1qihag-0003og...@alioth.debian.org