xorg-server: Changes to 'debian-unstable'
debian/changelog | 6 ++++--
debian/xserver-xorg-core.bug.script | 6 ++++++
exa/exa.c | 3 ++-
3 files changed, 12 insertions(+), 3 deletions(-)
New commits:
commit 085be71f1d7e5d904a5f00f13860824bedd4abe4
Author: Cyril Brulebois <kibi@debian.org>
Date: Wed Feb 16 23:17:13 2011 +0100
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index 7b269cf..e714ae3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.9.4-2) UNRELEASED; urgency=low
+xorg-server (2:1.9.4-2) unstable; urgency=low
* Put an end to the dependency hell! Now that we have proper
dependencies between drivers and the server, remove xserver-xorg from
@@ -16,7 +16,7 @@ xorg-server (2:1.9.4-2) UNRELEASED; urgency=low
drivers have reached unstable.
* Merge server-1.9-branch up to 0a4b0de9af.
- -- Cyril Brulebois <kibi@debian.org> Wed, 09 Feb 2011 08:57:02 +0100
+ -- Cyril Brulebois <kibi@debian.org> Wed, 16 Feb 2011 23:17:07 +0100
xorg-server (2:1.9.4-1) unstable; urgency=low
commit adf7b7d040ad12e4559d3d679ae08de6eaed6c45
Author: Cyril Brulebois <kibi@debian.org>
Date: Wed Feb 16 23:16:34 2011 +0100
Merge server-1.9-branch up to 0a4b0de9af.
diff --git a/debian/changelog b/debian/changelog
index f556639..7b269cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ xorg-server (2:1.9.4-2) UNRELEASED; urgency=low
* bug script: Report libGL-related diversions.
* Stop providing xorg-input-abi-11.0 and xorg-video-abi-8.0 now that
drivers have reached unstable.
+ * Merge server-1.9-branch up to 0a4b0de9af.
-- Cyril Brulebois <kibi@debian.org> Wed, 09 Feb 2011 08:57:02 +0100
commit b6f04c1d2717db3ba86758b6839c1343558d4ed6
Author: Cyril Brulebois <kibi@debian.org>
Date: Wed Feb 16 22:58:19 2011 +0100
bug script: Report libGL-related diversions.
diff --git a/debian/changelog b/debian/changelog
index 84492c5..f556639 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ xorg-server (2:1.9.4-2) UNRELEASED; urgency=low
* bug script: Report KMS configuration files and their contents.
* bug script: Keep only one lspci call (with proper filtering), which
makes PCI IDs come back.
+ * bug script: Report libGL-related diversions.
* Stop providing xorg-input-abi-11.0 and xorg-video-abi-8.0 now that
drivers have reached unstable.
diff --git a/debian/xserver-xorg-core.bug.script b/debian/xserver-xorg-core.bug.script
index 32b5e6b..c78ce6e 100644
--- a/debian/xserver-xorg-core.bug.script
+++ b/debian/xserver-xorg-core.bug.script
@@ -48,6 +48,12 @@ if ldd "$SERVER_BINARY" | grep -qs "$X11R6_LIBS"; then
echo
fi
+if dpkg-divert --list | grep -qs -i libgl; then
+ pecho "Diversions concerning libGL are in place"
+ dpkg-divert --list | grep -i libgl
+ echo
+fi
+
if which lspci > /dev/null 2>&1; then
pecho "VGA-compatible devices on PCI bus:"
LC_ALL=C lspci -nn | grep 'VGA compatible controller'
commit 0a4b0de9afeab0cd47e1e297d5b5d42bfda0a5a7
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Sun Jan 30 14:06:15 2011 +0100
exa: Only call driver FinishAccess hook if PrepareAccess hook succeeded.
Reviewed-by: Michel Dänzer <michel@daenzer.net>
Signed-off-by: Maarten Maathuis <madman2003@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit af87f6367ef733d1a4f3cfca4eeb92bfd84c2b6f)
diff --git a/exa/exa.c b/exa/exa.c
index 8adf847..a4e294a 100644
--- a/exa/exa.c
+++ b/exa/exa.c
@@ -421,7 +421,8 @@ exaFinishAccess(DrawablePtr pDrawable, int index)
/* We always hide the devPrivate.ptr. */
pPixmap->devPrivate.ptr = NULL;
- if (!pExaScr->info->FinishAccess || !exaPixmapHasGpuCopy(pPixmap))
+ /* Only call FinishAccess if PrepareAccess was called and succeeded. */
+ if (!pExaScr->info->FinishAccess || !pExaScr->access[i].retval)
return;
if (i >= EXA_PREPARE_AUX_DEST &&
Reply to: