xorg-server: Changes to 'debian-experimental'
ChangeLog | 28 ++++++++++++++++++++++++++++
configure.ac | 6 +++---
debian/changelog | 6 ++++++
miext/damage/damage.c | 6 +++++-
4 files changed, 42 insertions(+), 4 deletions(-)
New commits:
commit a30c7d3c1a52f2a4b6889dc3b361136822504420
Author: Cyril Brulebois <kibi@debian.org>
Date: Wed Nov 10 00:10:24 2010 +0100
Upload to experimental.
diff --git a/debian/changelog b/debian/changelog
index d4ed4b3..bb8b61a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xorg-server (2:1.9.2-1) UNRELEASED; urgency=low
+xorg-server (2:1.9.2-1) experimental; urgency=low
* New upstream release.
- -- Cyril Brulebois <kibi@debian.org> Mon, 01 Nov 2010 23:26:17 +0100
+ -- Cyril Brulebois <kibi@debian.org> Wed, 10 Nov 2010 00:10:19 +0100
xorg-server (2:1.9.0.902-1) experimental; urgency=low
commit 3caa15e1eaed980fa803039a5ced16347dbc1382
Author: Cyril Brulebois <kibi@debian.org>
Date: Mon Nov 1 23:26:29 2010 +0100
Update changelogs.
diff --git a/ChangeLog b/ChangeLog
index 6aeeb43..3a79c2e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,31 @@
+commit e3769c20d5f656f76e2c475a722db97c58089260
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Sat Oct 30 19:49:42 2010 -0700
+
+ Bump version to 1.9.2
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit e0ab016d85f828a78cb53ee9bcb171535de6032e
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Sat Oct 30 19:48:22 2010 -0700
+
+ Revert "rootless: Remove ROOTLESS_WORKAROUND"
+
+ Christof Wolf has reported a regression that seems to be caused by
+ this change, so reverting the change in the 1.9 branch. We'll
+ investigate a proper fix in master for 1.10.
+
+ This reverts commit c89f0521044083a11d538ebfeaabee6fc7fb9a03.
+
+commit 6e1f78bddfb854933206f9f5fd8d1dfc66ba8820
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Fri Oct 22 20:18:38 2010 -0700
+
+ Bump version to 1.9.1
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
commit 4dd316f25261707620cd4c52e2987b93627ff260
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Fri Oct 15 11:08:42 2010 -0700
diff --git a/debian/changelog b/debian/changelog
index 015d768..d4ed4b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.9.2-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Cyril Brulebois <kibi@debian.org> Mon, 01 Nov 2010 23:26:17 +0100
+
xorg-server (2:1.9.0.902-1) experimental; urgency=low
* New upstream release (1.9.1 rc2).
commit e3769c20d5f656f76e2c475a722db97c58089260
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sat Oct 30 19:49:42 2010 -0700
Bump version to 1.9.2
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
diff --git a/configure.ac b/configure.ac
index b1f6282..77cad54 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,8 +26,8 @@ dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ(2.57)
-AC_INIT([xorg-server], 1.9.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE="2010-10-22"
+AC_INIT([xorg-server], 1.9.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE="2010-10-30"
AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
commit e0ab016d85f828a78cb53ee9bcb171535de6032e
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sat Oct 30 19:48:22 2010 -0700
Revert "rootless: Remove ROOTLESS_WORKAROUND"
Christof Wolf has reported a regression that seems to be caused by
this change, so reverting the change in the 1.9 branch. We'll
investigate a proper fix in master for 1.10.
This reverts commit c89f0521044083a11d538ebfeaabee6fc7fb9a03.
diff --git a/configure.ac b/configure.ac
index a3843dc..b1f6282 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1926,7 +1926,7 @@ if test "x$XQUARTZ" = xyes; then
AC_CHECK_LIB([Xplugin],[xp_init],[:])
- CFLAGS="${CFLAGS} -DROOTLESS_SAFEALPHA -DNO_ALLOCA"
+ CFLAGS="${CFLAGS} -DROOTLESS_WORKAROUND -DROOTLESS_SAFEALPHA -DNO_ALLOCA"
PKG_CHECK_MODULES(XPBPROXY, $APPLEWMPROTO $LIBAPPLEWM xfixes x11)
diff --git a/miext/damage/damage.c b/miext/damage/damage.c
index e0e96f2..1cf0513 100644
--- a/miext/damage/damage.c
+++ b/miext/damage/damage.c
@@ -89,7 +89,11 @@ getDrawableDamageRef (DrawablePtr pDrawable)
ScreenPtr pScreen = pDrawable->pScreen;
pPixmap = 0;
- if (pScreen->GetWindowPixmap)
+ if (pScreen->GetWindowPixmap
+#ifdef ROOTLESS_WORKAROUND
+ && ((WindowPtr)pDrawable)->viewable
+#endif
+ )
pPixmap = (*pScreen->GetWindowPixmap) ((WindowPtr)pDrawable);
if (!pPixmap)
commit 6e1f78bddfb854933206f9f5fd8d1dfc66ba8820
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Fri Oct 22 20:18:38 2010 -0700
Bump version to 1.9.1
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
diff --git a/configure.ac b/configure.ac
index fd533a5..a3843dc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,8 +26,8 @@ dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ(2.57)
-AC_INIT([xorg-server], 1.9.0.902, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE="2010-10-15"
+AC_INIT([xorg-server], 1.9.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE="2010-10-22"
AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
Reply to: