xorg-server: Changes to 'debian-unstable'
ChangeLog | 63 +++++++++++++++++++++++++++++++++++++++++
configure.ac | 4 +-
debian/changelog | 11 +++++--
fb/wfbrename.h | 2 +
hw/xfree86/common/xf86Module.h | 2 -
5 files changed, 77 insertions(+), 5 deletions(-)
New commits:
commit dc69edefe29656970d3298755a4cba85d5ba4268
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Sep 24 10:15:38 2011 +0200
Bump changelogs
diff --git a/ChangeLog b/ChangeLog
index 11653bc..634a4c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,66 @@
+commit aabd25bd0bd5f30e4ebbf1d48ef800b3ed2abcbe
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Sat Sep 24 00:06:32 2011 -0700
+
+ configure.ac: Version bumped to 1.11.1
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 89881051664209b5b2e2c4a7c2dd25f085581d43
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date: Wed Sep 14 15:25:06 2011 -0700
+
+ fb: Rename wfbTriangles and wfbTrapezoids
+
+ These symbols were not renamed when they were added to libfb:
+
+ # nm -D libwfb.so | grep ' fb'
+ 0000000000028d00 T fbTrapezoids
+ 0000000000028d60 T fbTriangles
+
+ This causes corruption and/or crashes on wfb-ful drivers like nvidia:
+
+ Program received signal SIGABRT, Aborted.
+ 0x00007fd67f3a0405 in *__GI_raise (sig=<optimized out>) at ../nptl/sysdeps/unix/sysv/linux/raise.c:64
+ 64 ../nptl/sysdeps/unix/sysv/linux/raise.c: No such file or directory.
+ in ../nptl/sysdeps/unix/sysv/linux/raise.c
+ (gdb) bt
+ #0 0x00007fd67f3a0405 in *__GI_raise (sig=<optimized out>) at ../nptl/sysdeps/unix/sysv/linux/raise.c:64
+ #1 0x00007fd67f3a3680 in *__GI_abort () at abort.c:92
+ #2 0x00007fd67f3995b1 in *__GI___assert_fail (assertion=0x7fd679ecb804 "key->initialized", file=<optimized out>, line=116, function=0x7fd679ecbbc0 "dixGetPrivateAddr")
+ at assert.c:81
+ #3 0x00007fd679ec55b6 in ?? () from /usr/lib/xorg/modules/libfb.so
+ #4 0x00007fd679eca9ef in ?? () from /usr/lib/xorg/modules/libfb.so
+ #5 0x00007fd679ecae20 in fbTriangles () from /usr/lib/xorg/modules/libfb.so
+ #6 0x00007fd67a58fc55 in ?? () from /usr/lib/xorg/modules/drivers/nvidia_drv.so
+ #7 0x00000000004f38d1 in ?? ()
+ #8 0x0000000000437ae9 in ?? ()
+ #9 0x0000000000426eaa in ?? ()
+ #10 0x00007fd67f38cead in __libc_start_main (main=<optimized out>, argc=<optimized out>, ubp_av=<optimized out>, init=<optimized out>, fini=<optimized out>,
+ rtld_fini=<optimized out>, stack_end=0x7fff99860d78) at libc-start.c:228
+ #11 0x000000000042719d in _start ()
+
+ Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
+ Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit 03d032991da21bf866ca30dcbb6b7f9f99df441a)
+
+commit 4ad271d06c5aa42721c0e2e01e17e34a39825c65
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date: Mon Aug 29 20:44:18 2011 -0700
+
+ xfree86: Bump extension ABI version to 6.0
+
+ The video driver ABI was bumped to 11.0 in commit
+ 0de7cec90738a7a5020150309866bb0e23b6f479 because of a change to the
+ size of ATOM in commit 51f353d0a0d116af16d7d9590cadef6c56328746. This
+ also affects extension modules, so the extension ABI version should
+ have been bumped too.
+
+ Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
commit 0caeef6146bee5fb1827ab25db191685dde9d4b4
Author: Keith Packard <keithp@keithp.com>
Date: Fri Aug 26 16:46:13 2011 -0700
diff --git a/debian/changelog b/debian/changelog
index 1aa34a7..4321d66 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,15 @@
-xorg-server (2:1.11.0-2) UNRELEASED; urgency=low
+xorg-server (2:1.11.1-1) UNRELEASED; urgency=low
+ [ Cyril Brulebois ]
* Bump glproto dependency for xserver-xorg-dev (Closes: #639651).
- -- Cyril Brulebois <kibi@Fallonne> Mon, 29 Aug 2011 13:18:50 +0200
+ [ Julien Cristau ]
+ * New upstream bugfix release
+ - belatedly bump extension ABI major
+ - add missing fbFoo → wfbFoo renames for libwfb.so, fixing issues with the
+ nvidia driver (closes: #641344)
+
+ -- Julien Cristau <jcristau@debian.org> Sat, 24 Sep 2011 10:13:15 +0200
xorg-server (2:1.11.0-1) unstable; urgency=low
commit aabd25bd0bd5f30e4ebbf1d48ef800b3ed2abcbe
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sat Sep 24 00:06:32 2011 -0700
configure.ac: Version bumped to 1.11.1
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
diff --git a/configure.ac b/configure.ac
index 2ac1f2e..51d01e4 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.11.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE="2011-08-26"
+AC_INIT([xorg-server], 1.11.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE="2011-09-24"
AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
commit 89881051664209b5b2e2c4a7c2dd25f085581d43
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Wed Sep 14 15:25:06 2011 -0700
fb: Rename wfbTriangles and wfbTrapezoids
These symbols were not renamed when they were added to libfb:
# nm -D libwfb.so | grep ' fb'
0000000000028d00 T fbTrapezoids
0000000000028d60 T fbTriangles
This causes corruption and/or crashes on wfb-ful drivers like nvidia:
Program received signal SIGABRT, Aborted.
0x00007fd67f3a0405 in *__GI_raise (sig=<optimized out>) at ../nptl/sysdeps/unix/sysv/linux/raise.c:64
64 ../nptl/sysdeps/unix/sysv/linux/raise.c: No such file or directory.
in ../nptl/sysdeps/unix/sysv/linux/raise.c
(gdb) bt
#0 0x00007fd67f3a0405 in *__GI_raise (sig=<optimized out>) at ../nptl/sysdeps/unix/sysv/linux/raise.c:64
#1 0x00007fd67f3a3680 in *__GI_abort () at abort.c:92
#2 0x00007fd67f3995b1 in *__GI___assert_fail (assertion=0x7fd679ecb804 "key->initialized", file=<optimized out>, line=116, function=0x7fd679ecbbc0 "dixGetPrivateAddr")
at assert.c:81
#3 0x00007fd679ec55b6 in ?? () from /usr/lib/xorg/modules/libfb.so
#4 0x00007fd679eca9ef in ?? () from /usr/lib/xorg/modules/libfb.so
#5 0x00007fd679ecae20 in fbTriangles () from /usr/lib/xorg/modules/libfb.so
#6 0x00007fd67a58fc55 in ?? () from /usr/lib/xorg/modules/drivers/nvidia_drv.so
#7 0x00000000004f38d1 in ?? ()
#8 0x0000000000437ae9 in ?? ()
#9 0x0000000000426eaa in ?? ()
#10 0x00007fd67f38cead in __libc_start_main (main=<optimized out>, argc=<optimized out>, ubp_av=<optimized out>, init=<optimized out>, fini=<optimized out>,
rtld_fini=<optimized out>, stack_end=0x7fff99860d78) at libc-start.c:228
#11 0x000000000042719d in _start ()
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit 03d032991da21bf866ca30dcbb6b7f9f99df441a)
diff --git a/fb/wfbrename.h b/fb/wfbrename.h
index e855edd..8b896eb 100644
--- a/fb/wfbrename.h
+++ b/fb/wfbrename.h
@@ -160,6 +160,8 @@
#define fbStippleTable wfbStippleTable
#define fbTile wfbTile
#define fbTransparentSpan wfbTransparentSpan
+#define fbTrapezoids wfbTrapezoids
+#define fbTriangles wfbTriangles
#define fbUninstallColormap wfbUninstallColormap
#define fbUnmapWindow wfbUnmapWindow
#define fbUnrealizeFont wfbUnrealizeFont
commit 4ad271d06c5aa42721c0e2e01e17e34a39825c65
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Mon Aug 29 20:44:18 2011 -0700
xfree86: Bump extension ABI version to 6.0
The video driver ABI was bumped to 11.0 in commit
0de7cec90738a7a5020150309866bb0e23b6f479 because of a change to the
size of ATOM in commit 51f353d0a0d116af16d7d9590cadef6c56328746. This
also affects extension modules, so the extension ABI version should
have been bumped too.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
diff --git a/hw/xfree86/common/xf86Module.h b/hw/xfree86/common/xf86Module.h
index 2a5c805..3038c04 100644
--- a/hw/xfree86/common/xf86Module.h
+++ b/hw/xfree86/common/xf86Module.h
@@ -84,7 +84,7 @@ typedef enum {
#define ABI_ANSIC_VERSION SET_ABI_VERSION(0, 4)
#define ABI_VIDEODRV_VERSION SET_ABI_VERSION(11, 0)
#define ABI_XINPUT_VERSION SET_ABI_VERSION(13, 0)
-#define ABI_EXTENSION_VERSION SET_ABI_VERSION(5, 0)
+#define ABI_EXTENSION_VERSION SET_ABI_VERSION(6, 0)
#define ABI_FONT_VERSION SET_ABI_VERSION(0, 6)
#define MODINFOSTRING1 0xef23fdc5
Reply to: