ChangeLog | 39 +++++++++++++++++++++++++++++++++++++++
configure.ac | 2 +-
debian/changelog | 8 ++++++++
debian/control | 18 +++++++++++++-----
pixman/pixman-region.c | 43 ++++++++++++++++++++++++++++++++++++++-----
5 files changed, 99 insertions(+), 11 deletions(-)
New commits:
commit 33671757f5623713832075a6b194e4a6ff18d7df
Author: Julien Cristau <jcris...@debian.org>
Date: Sat Jan 2 11:26:33 2010 +0000
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 28974ca..edf5ec6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-pixman (0.16.4-1) UNRELEASED; urgency=low
+pixman (0.16.4-1) unstable; urgency=low
* New upstream release.
* Add dependencies on ${misc:Depends} (lintian).
* Bump Standards-Version to 3.8.3.
- -- Julien Cristau <jcris...@debian.org> Sat, 02 Jan 2010 11:18:11 +0000
+ -- Julien Cristau <jcris...@debian.org> Sat, 02 Jan 2010 11:26:29 +0000
pixman (0.16.2-1) unstable; urgency=low
commit 610203e9f595cf5a5a4cfb082e693ec62452513e
Author: Julien Cristau <jcris...@debian.org>
Date: Sat Jan 2 11:26:05 2010 +0000
Bump Standards-Version to 3.8.3.
diff --git a/debian/changelog b/debian/changelog
index 042a23a..28974ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ pixman (0.16.4-1) UNRELEASED; urgency=low
* New upstream release.
* Add dependencies on ${misc:Depends} (lintian).
+ * Bump Standards-Version to 3.8.3.
-- Julien Cristau <jcris...@debian.org> Sat, 02 Jan 2010 11:18:11 +0000
diff --git a/debian/control b/debian/control
index 88d932d..55a80c9 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Julien Cristau <jcris...@debian.org>, David Nusinow
<dnusi...@debian.org>
Build-Depends: debhelper (>= 5), automake, autoconf, libtool, pkg-config, quilt
-Standards-Version: 3.8.2
+Standards-Version: 3.8.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/pixman
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/pixman.git
commit ee1fcf5f410e37ad42a26d1c0f21680239950a20
Author: Julien Cristau <jcris...@debian.org>
Date: Sat Jan 2 11:25:49 2010 +0000
Add dependencies on ${misc:Depends} (lintian).
diff --git a/debian/changelog b/debian/changelog
index e51f04e..042a23a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
pixman (0.16.4-1) UNRELEASED; urgency=low
* New upstream release.
+ * Add dependencies on ${misc:Depends} (lintian).
-- Julien Cristau <jcris...@debian.org> Sat, 02 Jan 2010 11:18:11 +0000
diff --git a/debian/control b/debian/control
index 5e9ae3f..88d932d 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,9 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/pixman.git
Package: libpixman-1-0
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
Description: pixel-manipulation library for X and cairo
A library for manipulating pixel regions -- a set of Y-X banded
rectangles, image compositing using the Porter/Duff model
@@ -22,7 +24,9 @@ Package: libpixman-1-0-udeb
Section: debian-installer
XC-Package-Type: udeb
Architecture: any
-Depends: ${shlibs:Depends}
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
Description: pixel-manipulation library for X and cairo
This package contains a minimal set of libraries needed for the Debian
installer. Do not install it on a normal system.
@@ -31,7 +35,9 @@ Package: libpixman-1-0-dbg
Section: debug
Priority: extra
Architecture: any
-Depends: libpixman-1-0 (= ${binary:Version})
+Depends:
+ libpixman-1-0 (= ${binary:Version}),
+ ${misc:Depends},
Description: pixel-manipulation library for X and cairo (debugging symbols)
Debugging symbols for the Cairo/X pixel manipulation library. This is
needed to debug programs linked against libpixman0.
@@ -39,7 +45,9 @@ Description: pixel-manipulation library for X and cairo
(debugging symbols)
Package: libpixman-1-dev
Section: libdevel
Architecture: any
-Depends: libpixman-1-0 (= ${binary:Version})
+Depends:
+ libpixman-1-0 (= ${binary:Version}),
+ ${misc:Depends},
Conflicts: libpixman1-dev
Description: pixel-manipulation library for X and cairo (development files)
Development libraries, header files and documentation needed by
commit 4a14f4ffbd5870cc25adcab6277e06eb22a9523e
Author: Julien Cristau <jcris...@debian.org>
Date: Sat Jan 2 11:18:28 2010 +0000
Bump changelogs
diff --git a/ChangeLog b/ChangeLog
index 1b088a9..601195b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,42 @@
+commit 92865d4decd4607086c22187b8892af9c74fe2f0
+Author: Søren Sandmann Pedersen <sandm...@redhat.com>
+Date: Tue Dec 15 11:09:33 2009 -0500
+
+ Pre-release version bump
+
+commit ec6de472d042bec05aaa53f9d14bfbe23edbe01e
+Author: Søren Sandmann Pedersen <sandm...@redhat.com>
+Date: Fri Dec 11 11:14:19 2009 -0500
+
+ region: Enable or disable fatal errors and selfchecks based on version
number
+
+ There is a couple of bugs in bugzilla where bugs in the X server
+ triggered asserts in the pixman region code. It is probably better to
+ let the X server survive this. (In fact, I thought I had disabled them
+ for 0.16.0, but apparently not).
+
+ The patch below uses these rules:
+
+ - In _stable_ pixman releases, assertions and selfchecks are turned
+ off. Assertions, so that the X server doesn't die. Selfchecks,
+ for performance reasons.
+
+ - In _unstable_ pixman releases, both assertions and selfcheck are
+ turned on. These releases are what get added to development
+ distributions such as rawhide, so we want as much self-checking
+ as possible.
+
+ - In _random git checkouts_, assertions are enabled, so that bugs
+ are caught, but selfchecks are disabled so that you can use them
+ for performance work without having to fiddle with turning
+ selfchecks off.
+
+commit f1ecbaba0c5886dd1c099de3496d595ad1513a49
+Author: Søren Sandmann Pedersen <sandm...@redhat.com>
+Date: Mon Sep 28 09:31:25 2009 -0400
+
+ Post-release version bump
+
commit 601e4dc6fd78984701a231e48fabd1e1e3e23d38
Author: Søren Sandmann Pedersen <sandm...@redhat.com>
Date: Mon Sep 28 09:20:13 2009 -0400
diff --git a/debian/changelog b/debian/changelog
index dc3c536..e51f04e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pixman (0.16.4-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Julien Cristau <jcris...@debian.org> Sat, 02 Jan 2010 11:18:11 +0000
+
pixman (0.16.2-1) unstable; urgency=low
* New upstream release (closes: #546849).
commit 92865d4decd4607086c22187b8892af9c74fe2f0
Author: Søren Sandmann Pedersen <sandm...@redhat.com>
Date: Tue Dec 15 11:09:33 2009 -0500
Pre-release version bump
diff --git a/configure.ac b/configure.ac
index b4d8f32..304a1df 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,7 +54,7 @@ AC_PREREQ([2.57])
m4_define([pixman_major], 0)
m4_define([pixman_minor], 16)
-m4_define([pixman_micro], 3)
+m4_define([pixman_micro], 4)
m4_define([pixman_version],[pixman_major.pixman_minor.pixman_micro])
commit ec6de472d042bec05aaa53f9d14bfbe23edbe01e
Author: Søren Sandmann Pedersen <sandm...@redhat.com>
Date: Fri Dec 11 11:14:19 2009 -0500
region: Enable or disable fatal errors and selfchecks based on version
number
There is a couple of bugs in bugzilla where bugs in the X server
triggered asserts in the pixman region code. It is probably better to
let the X server survive this. (In fact, I thought I had disabled them
for 0.16.0, but apparently not).
The patch below uses these rules:
- In _stable_ pixman releases, assertions and selfchecks are turned
off. Assertions, so that the X server doesn't die. Selfchecks,
for performance reasons.
- In _unstable_ pixman releases, both assertions and selfcheck are
turned on. These releases are what get added to development
distributions such as rawhide, so we want as much self-checking
as possible.
- In _random git checkouts_, assertions are enabled, so that bugs
are caught, but selfchecks are disabled so that you can use them
for performance work without having to fiddle with turning
selfchecks off.
diff --git a/pixman/pixman-region.c b/pixman/pixman-region.c
index f88955f..8ce5deb 100644
--- a/pixman/pixman-region.c
+++ b/pixman/pixman-region.c
@@ -66,9 +66,44 @@
#define GOOD_RECT(rect) ((rect)->x1 < (rect)->x2 && (rect)->y1 < (rect)->y2)
#define BAD_RECT(rect) ((rect)->x1 > (rect)->x2 || (rect)->y1 > (rect)->y2)
-#define noPIXMAN_REGION_LOG_FAILURES
+/* Turn on debugging depending on what type of release this is
+ */
-#if defined PIXMAN_REGION_LOG_FAILURES || defined PIXMAN_REGION_DEBUG
+#if ((PIXMAN_VERSION_MICRO % 2) == 1)
+/* Random git checkout.
+ *
+ * Those are often used for performance work, so we don't turn on the
+ * full self-checking, but we do turn on the asserts.
+ */
+# define FATAL_BUGS
+# define noSELF_CHECKS
+#elif ((PIXMAN_VERSION_MINOR % 2) == 0)
+/* Stable release.
+ *
+ * We don't want assertions because the X server should stay alive
+ * if possible. We also don't want self-checks for performance-reasons.
+ */
+# define noFATAL_BUGS
+# define noSELF_CHECKS
+#else
+/* Development snapshot.
+ *
+ * These are the things that get shipped in development distributions
+ * such as Rawhide. We want both self-checking and fatal assertions
+ * to catch as many bugs as possible.
+ */
+# define FATAL_BUGS
+# define SELF_CHECKS
+#endif
+
+#ifndef FATAL_BUGS
+# undef assert
+# undef abort
+# define assert(expr)
+# define abort()
+#endif
+
+#ifdef SELF_CHECKS
static void
log_region_error (const char *function, const char *message)
@@ -83,9 +118,7 @@ log_region_error (const char *function, const char *message)
"Set a breakpoint on 'log_region_error' to debug\n\n",
function, message);
-#if defined PIXMAN_REGION_DEBUG
- abort ();
-#endif
+ abort (); /* This is #defined away unless FATAL_BUGS is defined */
n_messages++;
}
commit f1ecbaba0c5886dd1c099de3496d595ad1513a49
Author: Søren Sandmann Pedersen <sandm...@redhat.com>
Date: Mon Sep 28 09:31:25 2009 -0400
Post-release version bump
diff --git a/configure.ac b/configure.ac
index a1c6949..b4d8f32 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,7 +54,7 @@ AC_PREREQ([2.57])
m4_define([pixman_major], 0)
m4_define([pixman_minor], 16)
-m4_define([pixman_micro], 2)
+m4_define([pixman_micro], 3)
m4_define([pixman_version],[pixman_major.pixman_minor.pixman_micro])
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
