Bug#686055: xserver-xorg: intermittent crash on VT switch from GNOME 3 to a virtual console (intel)
On Tue, 2012-08-28 at 15:22 +0200, Julien Cristau wrote: You don't have to involve gdm3, and it's possible the error would show up in valgrind earlier than that. So I managed to get gdm3 to run Xorg under valgrind, here are some of the traces that I was able to get. The first is just login, logout. The second gnome-shell crashed. The third was running for almost a day and I logged out of it normally to remove the slowness. The fourth I think that was the gdm3 Xorg session before I stopped gdm3 and disabled starting Xorg. http://people.debian.org/~pabs/tmp/Xorg-valgrind.22333.txt http://people.debian.org/~pabs/tmp/Xorg-valgrind.23183.txt http://people.debian.org/~pabs/tmp/Xorg-valgrind.23954.txt http://people.debian.org/~pabs/tmp/Xorg-valgrind.29658.txt -- bye, pabs http://wiki.debian.org/PaulWise signature.asc Description: This is a digitally signed message part
libglu: Changes to 'debian-unstable'
debian/copyright |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) New commits: commit a3e72024ac806298595cc8b236676caa2b88255c Author: Timo Aaltonen tjaal...@ubuntu.com Date: Thu Sep 6 10:16:44 2012 +0300 refer to the gnu.org website for a copy of LGPL diff --git a/debian/copyright b/debian/copyright index 3679363..0973eb0 100644 --- a/debian/copyright +++ b/debian/copyright @@ -73,8 +73,7 @@ License: LGPL-2 Library General Public License for more details. . You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the Free - Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + License along with this library; if not, see http://www.gnu.org/licenses/ . On Debian systems, the complete text of the GNU Library General Public License version 2 can be found in /usr/share/common-licenses/LGPL-2. -- 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/e1t9wkw-0005wr...@vasks.debian.org
Bug#492099: Postkassen har overskredet det lagergrænse
Din postkasse har overskredet det lagergrænse som fastsat af administratoren, og du vil ikke være i stand til at modtage nye mails indtil du igen validere det. At re-validere - klik her https://docs.google.com/spreadsheet/viewform?formkey=dExoSEZHdVRVSFlEQ2V3VVNhdXZDSUE6MQ
libglu: Changes to 'ubuntu'
New branch 'ubuntu' available with the following commits: commit 76937414c2551a42e8be0454aaf530c1940f7b8b Author: Timo Aaltonen tjaal...@ubuntu.com Date: Thu Sep 6 10:49:22 2012 +0300 release to quantal -- 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/e1t9x29-0002qp...@vasks.debian.org
xserver-xorg-video-openchrome: Changes to 'upstream-unstable'
.gitignore|2 Makefile.am |2 NEWS | 39 configure.ac | 99 - libxvmc/Imakefile | 59 libxvmc/Makefile.am | 46 libxvmc/driDrawable.c | 173 -- libxvmc/driDrawable.h | 64 libxvmc/viaLowLevel.c | 1055 --- libxvmc/viaLowLevel.h | 141 -- libxvmc/viaLowLevelPro.c | 1650 libxvmc/viaXvMC.c | 1947 - libxvmc/viaXvMCPriv.h | 197 -- libxvmc/vldXvMC.h | 178 -- libxvmc/xf86dri.c | 599 - libxvmc/xf86dri.h | 116 - libxvmc/xf86dristr.h | 390 - src/Imakefile | 231 --- src/Makefile.am | 52 src/compat-api.h | 95 + src/via.h | 737 --- src/via_accel.c | 2806 -- src/via_bandwidth.c |2 src/via_bios.h| 296 src/via_ch7xxx.c | 112 - src/via_ch7xxx.h |9 src/via_crtc.c| 675 -- src/via_cursor.c | 592 src/via_dga.c | 321 src/via_display.c | 1747 +- src/via_dmabuffer.h |7 src/via_dri.c | 443 ++ src/via_dri.h |7 src/via_driver.c | 3038 +++--- src/via_driver.h | 309 ++-- src/via_drm.h | 143 +- src/via_eng_regs.h| 741 +++ src/via_exa.c | 1020 +++ src/via_exa_h2.c | 559 src/via_exa_h6.c | 536 src/via_i2c.c | 75 - src/via_id.c | 58 src/via_id.h | 79 - src/via_kms.c | 1011 +++ src/via_kms.h | 84 + src/via_lvds.c| 1386 src/via_memcpy.c | 30 src/via_memcpy.h | 31 src/via_memmgr.c | 253 +++ src/via_memmgr.h | 54 src/via_memory.c | 182 -- src/via_mode.c| 1765 -- src/via_mode.h| 49 src/via_outputs.c | 1311 +++ src/via_panel.c | 492 --- src/via_priv.h| 27 src/via_regs.h| 595 + src/via_shadow.c | 453 -- src/via_swov.c| 2497 - src/via_swov.h| 87 - src/via_timing.c | 398 -- src/via_timing.h | 51 src/via_ums.c | 817 src/via_ums.h | 256 +++ src/via_vbe.c | 78 - src/via_vgahw.c | 337 + src/via_vgahw.h | 12 src/via_video.c | 1627 src/via_video.h | 117 - src/via_vt162x.c | 51 src/via_vt162x.h | 44 src/via_xv.c | 1574 +++ src/via_xv.h | 117 + src/via_xv_overlay.c | 2482 + src/via_xv_overlay.h | 87 + src/via_xvmc.c| 69 - src/via_xvmc.h|5 src/xvmc/Imakefile| 59 src/xvmc/Makefile.am | 46 src/xvmc/driDrawable.c| 173 ++ src/xvmc/driDrawable.h| 64 src/xvmc/viaLowLevel.c| 1055 +++ src/xvmc/viaLowLevel.h| 141 ++ src/xvmc/viaLowLevelPro.c | 1650 src/xvmc/viaXvMC.c| 1947 + src/xvmc/viaXvMCPriv.h| 197 ++ src/xvmc/vldXvMC.h| 178 ++ src/xvmc/xf86dri.c| 599 + src/xvmc/xf86dri.h| 116 + src/xvmc/xf86dristr.h | 390 + tools/Makefile.am |2 tools/registers.c |3 92 files changed, 22922 insertions(+), 23574 deletions(-) New commits: commit eee95bd967f452026bbd1379074c1ee0f83b2df3 Author: Xavier Bachelot xav...@bachelot.org Date: Tue Sep 4 22:43:37 2012 +0200 bump version to 0.3.1 diff --git a/NEWS b/NEWS index c7a2a76..32acfcd 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,9 @@ +openchrome 0.3.1 (04/09/2012) +- + +This is a bugfix release. It mainly fixes a crash at startup with X server 1.13. + + openchrome 0.3.0 (20/07/2012) - diff --git a/configure.ac b/configure.ac index f98d13a..9eea422 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ # Initialize Autoconf AC_PREREQ(2.57) AC_INIT([xf86-video-openchrome], -[0.3.0], +[0.3.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorgcomponent=Driver/openchrome], [xf86-video-openchrome]) commit a8e7783856c1754e5c4a85045d7d536ceca40994 Author: Xavier Bachelot xav...@bachelot.org Date: Fri Aug 24 18:04:52 2012 +0200 Dell Optiplex FX130 (reported by Maciej Kazulak) diff --git a/src/via_id.c
xserver-xorg-video-openchrome: Changes to 'debian-unstable'
.gitignore|2 Makefile.am |2 NEWS | 39 configure.ac | 99 debian/changelog |8 debian/control|2 debian/patches/10-Deal-with-xserver-1.12.diff | 29 debian/patches/series |2 libxvmc/Imakefile | 59 libxvmc/Makefile.am | 46 libxvmc/driDrawable.c | 173 - libxvmc/driDrawable.h | 64 libxvmc/viaLowLevel.c | 1055 - libxvmc/viaLowLevel.h | 141 - libxvmc/viaLowLevelPro.c | 1650 -- libxvmc/viaXvMC.c | 1947 libxvmc/viaXvMCPriv.h | 197 - libxvmc/vldXvMC.h | 178 - libxvmc/xf86dri.c | 599 - libxvmc/xf86dri.h | 116 libxvmc/xf86dristr.h | 390 --- src/Imakefile | 231 - src/Makefile.am | 52 src/compat-api.h | 95 src/via.h | 737 -- src/via_accel.c | 2806 src/via_bandwidth.c |2 src/via_bios.h| 296 -- src/via_ch7xxx.c | 112 src/via_ch7xxx.h |9 src/via_crtc.c| 675 - src/via_cursor.c | 592 - src/via_dga.c | 321 -- src/via_display.c | 1747 ++ src/via_dmabuffer.h |7 src/via_dri.c | 443 +-- src/via_dri.h |7 src/via_driver.c | 3038 ++ src/via_driver.h | 309 +- src/via_drm.h | 143 - src/via_eng_regs.h| 741 ++ src/via_exa.c | 1020 src/via_exa_h2.c | 559 src/via_exa_h6.c | 536 src/via_i2c.c | 75 src/via_id.c | 58 src/via_id.h | 79 src/via_kms.c | 1011 src/via_kms.h | 84 src/via_lvds.c| 1386 +++ src/via_memcpy.c | 30 src/via_memcpy.h | 31 src/via_memmgr.c | 253 ++ src/via_memmgr.h | 54 src/via_memory.c | 182 - src/via_mode.c| 1765 --- src/via_mode.h| 49 src/via_outputs.c | 1311 +++ src/via_panel.c | 492 src/via_priv.h| 27 src/via_regs.h| 595 ++--- src/via_shadow.c | 453 --- src/via_swov.c| 2497 - src/via_swov.h| 87 src/via_timing.c | 398 --- src/via_timing.h | 51 src/via_ums.c | 817 ++ src/via_ums.h | 256 ++ src/via_vbe.c | 78 src/via_vgahw.c | 337 ++ src/via_vgahw.h | 12 src/via_video.c | 1627 - src/via_video.h | 117 - src/via_vt162x.c | 51 src/via_vt162x.h | 44 src/via_xv.c | 1574 + src/via_xv.h | 117 + src/via_xv_overlay.c | 2482 + src/via_xv_overlay.h | 87 src/via_xvmc.c| 69 src/via_xvmc.h|5 src/xvmc/Imakefile| 59 src/xvmc/Makefile.am | 46 src/xvmc/driDrawable.c| 173 + src/xvmc/driDrawable.h| 64
xserver-xorg-video-openchrome: Changes to 'debian-unstable'
debian/changelog |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f23794b12d6d9bf741076ef69a78b6c8faa1c761 Author: Timo Aaltonen tjaal...@ubuntu.com Date: Thu Sep 6 11:44:42 2012 +0300 close a bug diff --git a/debian/changelog b/debian/changelog index 1931931..0b3a142 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,7 +6,7 @@ xserver-xorg-video-openchrome (1:0.3.1-1) UNRELEASED; urgency=low * Remove README.VCS-source [ Timo Aaltonen ] - * New upstream release. + * New upstream release. (LP: #1041625) * Remove 10-Deal-with-xserver-1.12.diff, not needed anymore. * control: Bump policy to 3.9.3, no changes. -- 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/e1t9y75-0001xc...@vasks.debian.org
xserver-xorg-video-openchrome: Changes to 'ubuntu'
New branch 'ubuntu' available with the following commits: commit 14cec9312f96dc999c57b2689dacc6a6bf896e22 Author: Timo Aaltonen tjaal...@ubuntu.com Date: Thu Sep 6 12:08:26 2012 +0300 release to quantal commit 46ebca7374b7967c2768520ffb2504e290b2945c Author: Timo Aaltonen tjaal...@ubuntu.com Date: Thu Sep 6 12:02:17 2012 +0300 update the changelog -- 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/e1t9y79-0001xf...@vasks.debian.org
xorg-server: Changes to 'upstream-experimental'
config/udev.c|8 +
configure.ac |7 -
dix/dispatch.c |4
dix/getevents.c | 18 +++
hw/xfree86/common/xf86Events.c | 11 ++
hw/xfree86/modes/xf86Crtc.c |2
hw/xquartz/bundle/Info.plist.cpp |4
include/dix-config.h.in |3
include/hotplug.h|2
include/list.h | 21 +++
include/misc.h |1
mi/mipointer.c |2
os/log.c | 50 ++---
os/utils.c | 14 ++
test/list.c |4
test/os.c|2
test/signal-logging.c| 210 +--
17 files changed, 322 insertions(+), 41 deletions(-)
New commits:
commit f0bad69edd57facd6cffde8cb0863d1a735e2492
Author: Keith Packard kei...@keithp.com
Date: Wed Sep 5 14:45:08 2012 -0700
Version bumped to 1.13
Signed-off-by: Keith Packard kei...@keithp.com
diff --git a/configure.ac b/configure.ac
index ab89027..ac3bf26 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,9 +26,9 @@ dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ(2.60)
-AC_INIT([xorg-server], 1.12.99.905,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE=2012-08-21
-RELEASE_NAME=Splashing Orca
+AC_INIT([xorg-server], 1.13.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE=2012-09-05
+RELEASE_NAME=Iced Tea
AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
commit 0db936a5b7125d9b73633733cb34e5e4b72f01e8
Author: Dave Airlie airl...@redhat.com
Date: Mon Sep 3 15:09:36 2012 +1000
xf86: call enter/leave VT for gpu screens as well
Otherwise we can't do fast user switch properly for multiple GPUs.
Reviewed-by: Alex Deucher alexander.deuc...@amd.com
Signed-off-by: Dave Airlie airl...@redhat.com
diff --git a/hw/xfree86/common/xf86Events.c b/hw/xfree86/common/xf86Events.c
index 47429ec..3ad34b5 100644
--- a/hw/xfree86/common/xf86Events.c
+++ b/hw/xfree86/common/xf86Events.c
@@ -460,6 +460,8 @@ xf86VTSwitch(void)
OsBlockSIGIO();
for (i = 0; i xf86NumScreens; i++)
xf86Screens[i]-LeaveVT(xf86Screens[i]);
+for (i = 0; i xf86NumGPUScreens; i++)
+xf86GPUScreens[i]-LeaveVT(xf86GPUScreens[i]);
xf86AccessLeave(); /* We need this here, otherwise */
@@ -474,6 +476,10 @@ xf86VTSwitch(void)
if (!xf86Screens[i]-EnterVT(xf86Screens[i]))
FatalError(EnterVT failed for screen %d\n, i);
}
+for (i = 0; i xf86NumGPUScreens; i++) {
+if (!xf86GPUScreens[i]-EnterVT(xf86GPUScreens[i]))
+FatalError(EnterVT failed for gpu screen %d\n, i);
+}
if (!(dispatchException DE_TERMINATE)) {
for (i = 0; i xf86NumScreens; i++) {
if (xf86Screens[i]-EnableDisableFBAccess)
@@ -530,6 +536,11 @@ xf86VTSwitch(void)
if (!xf86Screens[i]-EnterVT(xf86Screens[i]))
FatalError(EnterVT failed for screen %d\n, i);
}
+for (i = 0; i xf86NumGPUScreens; i++) {
+xf86GPUScreens[i]-vtSema = TRUE;
+if (!xf86GPUScreens[i]-EnterVT(xf86GPUScreens[i]))
+FatalError(EnterVT failed for gpu screen %d\n, i);
+}
for (i = 0; i xf86NumScreens; i++) {
if (xf86Screens[i]-EnableDisableFBAccess)
(*xf86Screens[i]-EnableDisableFBAccess) (xf86Screens[i],
TRUE);
commit 18deac48db0d2387242461025904eb28a0f71fac
Author: Dave Airlie airl...@redhat.com
Date: Mon Aug 27 15:17:21 2012 +1000
config/udev: respect seat for hotplugged video devices.
This respects the seat tag for hotplugged video devices at X start.
Reviewed-by: Keith Packard kei...@keithp.com
Signed-off-by: Dave Airlie airl...@redhat.com
diff --git a/config/udev.c b/config/udev.c
index 5a8f481..c2d00bb 100644
--- a/config/udev.c
+++ b/config/udev.c
@@ -454,6 +454,10 @@ config_udev_odev_probe(config_odev_probe_proc_ptr
probe_callback)
udev_enumerate_add_match_subsystem(enumerate, drm);
udev_enumerate_add_match_sysname(enumerate, card[0-9]*);
+#ifdef HAVE_UDEV_ENUMERATE_ADD_MATCH_TAG
+if (ServerIsNotSeat0())
+udev_enumerate_add_match_tag(enumerate, SeatId);
+#endif
udev_enumerate_scan_devices(enumerate);
devices = udev_enumerate_get_list_entry(enumerate);
udev_list_entry_foreach(device, devices) {
commit ec740cffeba59216f4293fba829097654cde3b11
Author: Dave Airlie airl...@redhat.com
Date: Mon Aug 27 15:15:19 2012 +1000
config/udev: add wrapper around check if server is not seat 0
this is a simple clean-up that is useful to stop further propogation
of this construct.
xorg-server: Changes to 'debian-experimental'
ChangeLog | 271 config/udev.c |8 configure.ac|7 debian/changelog|9 debian/patches/02_Add-libnettle-as-option-for-sha1.diff | 22 - dix/dispatch.c |4 dix/getevents.c | 18 + hw/xfree86/common/xf86Events.c | 11 hw/xfree86/modes/xf86Crtc.c |2 hw/xquartz/bundle/Info.plist.cpp|4 include/dix-config.h.in |3 include/hotplug.h |2 include/list.h | 21 + include/misc.h |1 mi/mipointer.c |2 os/log.c| 50 ++ os/utils.c | 14 test/list.c |4 test/os.c |2 test/signal-logging.c | 210 +++- 20 files changed, 606 insertions(+), 59 deletions(-) New commits: commit 02f3319f1168e6f9123c1e2afeab2372ef15123f Author: Timo Aaltonen tjaal...@ubuntu.com Date: Thu Sep 6 12:18:11 2012 +0300 Refresh 02_Add-libnettle-as-option-for-sha1.diff. diff --git a/debian/changelog b/debian/changelog index 75f601c..2d29e53 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,9 @@ xorg-server (2:1.13.0-1) UNRELEASED; urgency=low [ Maarten Lankhorst ] * Bump minimum required abi, randr, dri2 and gl protos. + [ Timo Aaltonen ] + * Refresh 02_Add-libnettle-as-option-for-sha1.diff. + -- Robert Hooker sarv...@ubuntu.com Wed, 22 Aug 2012 11:12:17 -0400 xorg-server (2:1.12.1.902-1) unstable; urgency=medium diff --git a/debian/patches/02_Add-libnettle-as-option-for-sha1.diff b/debian/patches/02_Add-libnettle-as-option-for-sha1.diff index a3fc6f6..fc184f7 100644 --- a/debian/patches/02_Add-libnettle-as-option-for-sha1.diff +++ b/debian/patches/02_Add-libnettle-as-option-for-sha1.diff @@ -8,11 +8,9 @@ Signed-off-by: Cyril Brulebois k...@debian.org [jcristau: forward-ported from 1.7 to 1.8] Signed-off-by: Julien Cristau jcris...@debian.org --- -Index: xorg-server/configure.ac -=== xorg-server.orig/configure.ac 2012-07-12 14:32:56.665990355 +0200 -+++ xorg-server/configure.ac 2012-07-12 14:33:23.040019369 +0200 -@@ -1359,7 +1359,7 @@ +--- a/configure.ac b/configure.ac +@@ -1361,7 +1361,7 @@ # SHA1 hashing AC_ARG_WITH([sha1], @@ -21,7 +19,7 @@ Index: xorg-server/configure.ac [choose SHA1 implementation])]) AC_CHECK_FUNC([SHA1Init], [HAVE_SHA1_IN_LIBC=yes]) if test x$with_sha1 = x test x$HAVE_SHA1_IN_LIBC = xyes; then -@@ -1455,6 +1455,16 @@ +@@ -1457,6 +1457,16 @@ SHA1_CFLAGS=$OPENSSL_CFLAGS fi fi @@ -38,10 +36,8 @@ Index: xorg-server/configure.ac AC_MSG_CHECKING([for SHA1 implementation]) if test x$with_sha1 = x; then AC_MSG_ERROR([No suitable SHA1 implementation found]) -Index: xorg-server/include/dix-config.h.in -=== xorg-server.orig/include/dix-config.h.in 2012-07-12 13:52:16.0 +0200 -+++ xorg-server/include/dix-config.h.in2012-07-12 14:33:01.499195672 +0200 +--- a/include/dix-config.h.in b/include/dix-config.h.in @@ -160,6 +160,9 @@ /* Define to use libsha1 for SHA1 */ #undef HAVE_SHA1_IN_LIBSHA1 @@ -52,10 +48,8 @@ Index: xorg-server/include/dix-config.h.in /* Define to 1 if you have the `shmctl64' function. */ #undef HAVE_SHMCTL64 -Index: xorg-server/os/xsha1.c -=== xorg-server.orig/os/xsha1.c2012-07-12 13:52:16.0 +0200 -+++ xorg-server/os/xsha1.c 2012-07-12 14:33:01.626295814 +0200 +--- a/os/xsha1.c b/os/xsha1.c @@ -190,6 +190,31 @@ return 1; } commit 526e43d8fa563d8aa01521e881ccab7129b6c64d Author: Timo Aaltonen tjaal...@ubuntu.com Date: Thu Sep 6 09:20:55 2012 +0300 update the changelogs diff --git a/ChangeLog b/ChangeLog index 8f15c51..65ac4bc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,194 @@ +commit f0bad69edd57facd6cffde8cb0863d1a735e2492 +Author: Keith Packard kei...@keithp.com +Date: Wed Sep 5 14:45:08 2012 -0700 + +Version bumped to 1.13 + +Signed-off-by: Keith Packard kei...@keithp.com + +commit 856f80c8d7f22b979c72d9c70b70187df6004a03 +Merge: 0db936a b8ab93d +Author: Keith Packard kei...@keithp.com +Date: Wed Sep 5 11:02:58 2012 -0700 + +Merge remote-tracking branch
xorg-server: Changes to 'ubuntu'
ChangeLog | 271 config/udev.c |8 configure.ac|7 debian/changelog| 29 + debian/patches/02_Add-libnettle-as-option-for-sha1.diff | 22 - dix/dispatch.c |4 dix/getevents.c | 18 + hw/xfree86/common/xf86Events.c | 11 hw/xfree86/modes/xf86Crtc.c |2 hw/xquartz/bundle/Info.plist.cpp|4 include/dix-config.h.in |3 include/hotplug.h |2 include/list.h | 21 + include/misc.h |1 mi/mipointer.c |2 os/log.c| 50 ++ os/utils.c | 14 test/list.c |4 test/os.c |2 test/signal-logging.c | 210 +++- 20 files changed, 619 insertions(+), 66 deletions(-) New commits: commit 193e0ae367670be4e58824b7fcccd7948cf35a27 Author: Timo Aaltonen tjaal...@ubuntu.com Date: Thu Sep 6 12:26:17 2012 +0300 update the changelog diff --git a/debian/changelog b/debian/changelog index e9277dd..3bcf899 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xorg-server (2:1.13.0-1.1) UNRELEASED; urgency=low + + * Merge from unreleased debian git. + + -- Timo Aaltonen tjaal...@ubuntu.com Thu, 06 Sep 2012 12:25:51 +0300 + xorg-server (2:1.13.0-1) UNRELEASED; urgency=low * New upstream release commit 02f3319f1168e6f9123c1e2afeab2372ef15123f Author: Timo Aaltonen tjaal...@ubuntu.com Date: Thu Sep 6 12:18:11 2012 +0300 Refresh 02_Add-libnettle-as-option-for-sha1.diff. diff --git a/debian/changelog b/debian/changelog index 75f601c..2d29e53 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,9 @@ xorg-server (2:1.13.0-1) UNRELEASED; urgency=low [ Maarten Lankhorst ] * Bump minimum required abi, randr, dri2 and gl protos. + [ Timo Aaltonen ] + * Refresh 02_Add-libnettle-as-option-for-sha1.diff. + -- Robert Hooker sarv...@ubuntu.com Wed, 22 Aug 2012 11:12:17 -0400 xorg-server (2:1.12.1.902-1) unstable; urgency=medium diff --git a/debian/patches/02_Add-libnettle-as-option-for-sha1.diff b/debian/patches/02_Add-libnettle-as-option-for-sha1.diff index a3fc6f6..fc184f7 100644 --- a/debian/patches/02_Add-libnettle-as-option-for-sha1.diff +++ b/debian/patches/02_Add-libnettle-as-option-for-sha1.diff @@ -8,11 +8,9 @@ Signed-off-by: Cyril Brulebois k...@debian.org [jcristau: forward-ported from 1.7 to 1.8] Signed-off-by: Julien Cristau jcris...@debian.org --- -Index: xorg-server/configure.ac -=== xorg-server.orig/configure.ac 2012-07-12 14:32:56.665990355 +0200 -+++ xorg-server/configure.ac 2012-07-12 14:33:23.040019369 +0200 -@@ -1359,7 +1359,7 @@ +--- a/configure.ac b/configure.ac +@@ -1361,7 +1361,7 @@ # SHA1 hashing AC_ARG_WITH([sha1], @@ -21,7 +19,7 @@ Index: xorg-server/configure.ac [choose SHA1 implementation])]) AC_CHECK_FUNC([SHA1Init], [HAVE_SHA1_IN_LIBC=yes]) if test x$with_sha1 = x test x$HAVE_SHA1_IN_LIBC = xyes; then -@@ -1455,6 +1455,16 @@ +@@ -1457,6 +1457,16 @@ SHA1_CFLAGS=$OPENSSL_CFLAGS fi fi @@ -38,10 +36,8 @@ Index: xorg-server/configure.ac AC_MSG_CHECKING([for SHA1 implementation]) if test x$with_sha1 = x; then AC_MSG_ERROR([No suitable SHA1 implementation found]) -Index: xorg-server/include/dix-config.h.in -=== xorg-server.orig/include/dix-config.h.in 2012-07-12 13:52:16.0 +0200 -+++ xorg-server/include/dix-config.h.in2012-07-12 14:33:01.499195672 +0200 +--- a/include/dix-config.h.in b/include/dix-config.h.in @@ -160,6 +160,9 @@ /* Define to use libsha1 for SHA1 */ #undef HAVE_SHA1_IN_LIBSHA1 @@ -52,10 +48,8 @@ Index: xorg-server/include/dix-config.h.in /* Define to 1 if you have the `shmctl64' function. */ #undef HAVE_SHMCTL64 -Index: xorg-server/os/xsha1.c -=== xorg-server.orig/os/xsha1.c2012-07-12 13:52:16.0 +0200 -+++ xorg-server/os/xsha1.c 2012-07-12 14:33:01.626295814 +0200 +--- a/os/xsha1.c b/os/xsha1.c @@ -190,6 +190,31 @@ return 1; } commit 526e43d8fa563d8aa01521e881ccab7129b6c64d Author: Timo Aaltonen tjaal...@ubuntu.com Date: Thu Sep 6 09:20:55 2012 +0300
xorg-server: Changes to 'ubuntu'
debian/changelog |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 785b7f0b910f344117cc728381ed4c6f4f5c3db5 Author: Timo Aaltonen tjaal...@ubuntu.com Date: Thu Sep 6 17:44:18 2012 +0300 release to quantal diff --git a/debian/changelog b/debian/changelog index 3bcf899..ea4f6bf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xorg-server (2:1.13.0-1.1) UNRELEASED; urgency=low +xorg-server (2:1.13.0-0ubuntu1) quantal; urgency=low * Merge from unreleased debian git. -- 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/e1t9dm8-0003se...@vasks.debian.org
mesa: Changes to 'ubuntu'
debian/changelog |5 +++--
debian/control |2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
New commits:
commit b29906f981e97cfb7ec04b7da731a8ce64108ac3
Author: Timo Aaltonen tjaal...@ubuntu.com
Date: Thu Sep 6 18:10:11 2012 +0300
release to quantal
diff --git a/debian/changelog b/debian/changelog
index 208228d..2134713 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-mesa (9.0~git20120903.e1673d20-0ubuntu1) UNRELEASED; urgency=low
+mesa (9.0~git20120903.e1673d20-0ubuntu1) quantal; urgency=low
* Merge from unreleased debian git.
* Remove 118-remove-assertion.diff, included upstream.
- -- Timo Aaltonen tjaal...@ubuntu.com Tue, 04 Sep 2012 17:25:27 +0300
+ -- Timo Aaltonen tjaal...@ubuntu.com Thu, 06 Sep 2012 18:09:56 +0300
mesa (9.0~git20120821.c1114c61-0ubuntu2) quantal; urgency=low
commit 25eaee1c979657c6132e2fc511b873a126249d35
Author: Sven Joachim svenj...@gmx.de
Date: Tue Sep 4 21:08:55 2012 +0200
rules: Rename swx11-i686 target
No glu here anymore.
diff --git a/debian/rules b/debian/rules
index 4346b68..248e7a0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -42,7 +42,7 @@ CONFIGS = swx11 \
dri
ifeq ($(DEB_HOST_ARCH_CPU), i386)
- CONFIGS += swx11+glu-i386-i686
+ CONFIGS += swx11-i386-i686
endif
STAMP_DIR = debian/stamp
@@ -149,7 +149,7 @@ confflags-swx11-static = \
CFLAGS=$(CFLAGS) \
CXXFLAGS=$(CXXFLAGS)
-confflags-swx11+glu-i386-i686 = \
+confflags-swx11-i386-i686 = \
--disable-dri \
--disable-egl \
--with-gallium-drivers= \
commit c4fee2980b5b4f4656f56c4b0c00ca3a687be3c2
Author: Sven Joachim svenj...@gmx.de
Date: Tue Sep 4 21:04:33 2012 +0200
not-installed: Update i386-specific list
An i686-optimized osmesa library is apparently no longer built.
diff --git a/debian/not-installed b/debian/not-installed
index 5ff192f..8fdb25b 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -22,11 +22,7 @@ NOT_INSTALLED := \
# Architecture-specific additional files:
NOT_INSTALLED_i386 = \
usr/lib/*/i686/cmov/libGL.so \
- usr/lib/*/i686/cmov/libOSMesa.so \
- usr/lib/*/i686/cmov/libOSMesa.so.6 \
- usr/lib/*/i686/cmov/libOSMesa.so.6.* \
- usr/lib/*/i686/cmov/pkgconfig/gl.pc \
- usr/lib/*/i686/cmov/pkgconfig/osmesa.pc
+ usr/lib/*/i686/cmov/pkgconfig/gl.pc
# Same for linux, kfreebsd, and hurd on i386:
NOT_INSTALLED_kfreebsd-i386 = $(NOT_INSTALLED_i386)
commit 29621fba47e76e8d0c94eecbfa3f27fb80c287a1
Author: Timo Aaltonen tjaal...@ubuntu.com
Date: Tue Sep 4 17:22:38 2012 +0300
control: Add libdrm-dev to mesa-common-dev Depends.
diff --git a/debian/changelog b/debian/changelog
index 34428f0..c9b9f16 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -33,6 +33,7 @@ mesa (9.0~git20120903.e1673d20-1) UNRELEASED; urgency=low
* not-installed: Updated.
* Update symbols for libgles2-mesa
* libegl1-mesa-drivers.install.linux: Bump libwayland-egl.so version
+ * control: Add libdrm-dev to mesa-common-dev Depends.
[ Steve Langasek ]
* Install all dri drivers from the DESTDIR tree, instead of copying them
diff --git a/debian/control b/debian/control
index 5477756..e9eefb6 100644
--- a/debian/control
+++ b/debian/control
@@ -734,6 +734,7 @@ Architecture: any
Replaces: xlibmesa-gl-dev ( 1:7), xlibosmesa-dev, libgl1-mesa-swx11-dev (
6.5.2), libgl1-mesa-dev ( 7.5~rc4-2)
Depends:
libx11-dev,
+ libdrm-dev [!hurd-any],
${misc:Depends},
Description: Developer documentation for Mesa
This package includes the specifications for the Mesa-specific OpenGL
commit 99b54968abf02eb14ef4289bd30d1a3b6966bf38
Author: Timo Aaltonen tjaal...@ubuntu.com
Date: Tue Sep 4 17:20:38 2012 +0300
remove bin/install-sh on clean
diff --git a/debian/rules b/debian/rules
index 0319d2f..4346b68 100755
--- a/debian/rules
+++ b/debian/rules
@@ -222,7 +222,7 @@ clean: unpatch
rm -rf configure bin/config.guess bin/config.sub config.h.in
rm -rf $$(find -name Makefile.in)
rm -rf aclocal.m4 bin/missing bin/depcomp install-sh bin/ltmain.sh
- rm -f bin/ar-lib bin/compile bin/ylwrap
+ rm -f bin/ar-lib bin/compile bin/ylwrap bin/install-sh
rm -rf $(STAMP_DIR)
for file in debian/*.in; do rm -f $${file%%.in}; done
rm -f src/glsl/builtins/tools/texture_builtins.pyc
--
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/e1t9dw1-0005yq...@vasks.debian.org
Bug#686172: +1 --Blankong screen on HP All in One 3240--
deb:~# lspci |grep -i vga 00:02.0 VGA compatible controller: Intel Corporation 2nd Generation Core Processor Family Integrated Graphics Controller (rev 09) deb:~# lspci -n 00:00.0 0600: 8086:0100 (rev 09) 00:02.0 0300: 8086:0102 (rev 09) 00:16.0 0780: 8086:1c3a (rev 04) 00:1a.0 0c03: 8086:1c2d (rev 05) 00:1b.0 0403: 8086:1c20 (rev 05) 00:1c.0 0604: 8086:1c10 (rev b5) 00:1c.2 0604: 8086:1c14 (rev b5) 00:1c.3 0604: 8086:1c16 (rev b5) 00:1c.5 0604: 8086:1c1a (rev b5) 00:1d.0 0c03: 8086:1c26 (rev 05) 00:1f.0 0601: 8086:1c5c (rev 05) 00:1f.2 0106: 8086:1c02 (rev 05) 00:1f.3 0c05: 8086:1c22 (rev 05) 02:00.0 0280: 1814:5390 03:00.0 0200: 10ec:8168 (rev 06) 04:00.0 ff00: 10ec:5209 (rev 01) deb:~# Blanking screen by white color. In console and in X session. Fresh installed Debian Wheezy. All packages installed from officional repository deb:~# uname -a Linux deb 3.2.0-3-amd64 #1 SMP Mon Jul 23 02:45:17 UTC 2012 x86_64 GNU/Linux deb:~# After write grub options to /etc/default/grub: GRUB_CMDLINE_LINUX_DEFAULT=quiet i915.modeset=0 and run # update-grub2 i can work, but system resolution maximum 1024x768 How can i do work my VGA correctly? -- 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/201209061856.15762.v.cheredniche...@avangardco.ua
Bug#686152: xorg server 1.12.3: xf86UnloadSubModule() hangs, patch proposal
A patch proposal.
The unpatched code is (hw/xfree86/loader/loadmod.c):
static void
UnloadModuleOrDriver(ModuleDescPtr mod)
{
if (mod == (ModuleDescPtr) 1)
return;
if (mod == NULL || mod-name == NULL)
return;
if (mod-parent)
xf86MsgVerb(X_INFO, 3, UnloadSubModule: \%s\\n, mod-name);
else
xf86MsgVerb(X_INFO, 3, UnloadModule: \%s\\n, mod-name);
if (mod-TearDownData != ModuleDuplicated) {
if ((mod-TearDownProc) (mod-TearDownData))
mod-TearDownProc(mod-TearDownData);
LoaderUnload(mod-name, mod-handle);
}
if (mod-child)
UnloadModuleOrDriver(mod-child);
if (mod-sib)
UnloadModuleOrDriver(mod-sib);
free(mod-path);
free(mod-name);
free(mod);
}
void
UnloadSubModule(pointer _mod)
{
ModuleDescPtr mod = (ModuleDescPtr) _mod;
/* Some drivers are calling us on built-in submodules, ignore them */
if (mod == (ModuleDescPtr) 1)
return;
RemoveChild(mod);
UnloadModuleOrDriver(mod);
}
static void
RemoveChild(ModuleDescPtr child)
{
ModuleDescPtr mdp;
ModuleDescPtr prevsib;
ModuleDescPtr parent;
if (!child-parent)
return;
parent = child-parent;
if (parent-child == child) {
parent-child = child-sib;
return;
}
prevsib = parent-child;
mdp = prevsib-sib;
while (mdp mdp != child) {
prevsib = mdp;
mdp = mdp-sib;
}
if (mdp == child)
prevsib-sib = child-sib;
child-sib = NULL;
return;
}
The UnloadSubModule() function is called by xf86UnloadSubModule() as
you can see in my first report.
UnloadSubModule() first calls RemoveChild(), finally
UnloadModuleOrDriver() for the submodule pointer to unload it.
As you can see, each ModuleDescPtr instance maintains its childs:
ptr-child is the first child,
ptr-child-sib is the second child,
prt-child-sib-sib is the third child
as long as -child or -sib isn't NULL.
The idea seems to be that UnloadSubModule() deals with modules that
didn't unload their childs - in the TearDownProc that
UnloadModuleOrDriver() calls.
Thus, UnloadModuleOrDriver() has the code lines which unload all
childs and grand childs etc. recursively:
if (mod-child)
UnloadModuleOrDriver(mod-child);
if (mod-sib)
UnloadModuleOrDriver(mod-sib);
Note that the call of UnloadModuleOrDriver(mod-sib) is needed for
that recursive unload.
The top-level instance of UnloadModuleOrDriver() gets the module
pointer which UnloadSubModule() had.
The UnloadModuleOrDriver() function must not unload mod-sib for that
top-level module pointer because it is a sibling of the module but not
a child.
The call of UnloadModuleOrDriver(mod-sib) can't be removed because it
would break the mentioned recursive unload.
Thus, RemoveChild() sets -sib to NULL for the module pointer that it gets.
When UnloadSubModule() calls RemoveChild(), then
UnloadModuleOrDriver() for the submodule to unload, everything works
fine, because UnloadModuleOrDriver() detects the NULL -sib pointer
and won't call UnloadModuleOrDriver() in recursive manner for it.
The real bug is in RemoveChild() - it doesn't set -sib to NULL if the
module is the first child of its parent. This causes wrong and
multiple unload attempts for particular submodules what hangs up the
xorg server.
The patch corrects the RemoveChild() function:
static void
RemoveChild(ModuleDescPtr child)
{
ModuleDescPtr mdp;
ModuleDescPtr prevsib;
ModuleDescPtr parent;
if (!child-parent)
return;
parent = child-parent;
if (parent-child == child) {
parent-child = child-sib;
}
else {
prevsib = parent-child;
mdp = prevsib-sib;
while (mdp mdp != child) {
prevsib = mdp;
mdp = mdp-sib;
}
if (mdp == child)
prevsib-sib = child-sib;
}
child-sib = NULL;
}
I built the xorg-xserver package with the patch (and the ones of
bug#685750 and 686153).
It works; the resulting Xorg.0.log is:
[31.839]
X.Org X Server 1.12.3
Release Date: 2012-07-09
[31.839] X Protocol Version 11, Revision 0
[31.839] Build Operating System: Linux 3.2.0-3-mckinley ia64 Debian
[31.839] Current Operating System: Linux itanic 3.2.0-3-mckinley
#1 SMP Sat Aug 18 20:50:43 UTC 2012 ia64
[31.839] Kernel command line: BOOT_IMAGE=scsi0:/EFI/debian/vmlinuz
root=/dev/sdb5 ro
[31.839] Build Date: 05 September 2012 06:41:52PM
[31.839] xorg-server 2:1.12.3-1 (Julien Cristau jcris...@debian.org)
[31.839] Current version of pixman: 0.26.0
[31.839]Before reporting problems, check http://wiki.x.org
to make sure that you have the latest version.
[31.840] Markers: (--) probed, (**) from config file, (==) default
setting,
(++) from command line, (!!) notice, (II) informational,
(WW) warning, (EE) error, (NI) not implemented, (??) unknown.
[
Processed: your mail
Processing commands for cont...@bugs.debian.org: tags 685750 + patch Bug #685750 [xserver-xorg-video-mach64] IA64 (Itanium) Wheezy, mach64, decommissioned xorg drivers Added tag(s) patch. End of message, stopping processing here. Please contact me if you need assistance. -- 685750: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=685750 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems -- 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/handler.s.c.13469498388600.transcr...@bugs.debian.org
[bts-link] source package xkeyboard-config
# # bts-link upstream status pull for source package xkeyboard-config # see http://lists.debian.org/debian-devel-announce/2006/05/msg1.html # user bts-link-upstr...@lists.alioth.debian.org # remote status report for #656685 (http://bugs.debian.org/656685) # Bug title: xkb-data: new version breaks F10 key # * https://bugs.freedesktop.org/show_bug.cgi?id=45008 # * remote status changed: NEW - RESOLVED # * remote resolution changed: (?) - FIXED usertags 656685 - status-NEW usertags 656685 + status-RESOLVED resolution-FIXED thanks -- 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/20120906163341.16035.65236.btsl...@sonntag.debian.org
Processed: your mail
Processing commands for cont...@bugs.debian.org: tags 686152 + patch Bug #686152 [src:xorg-server] xorg server 1.12.3: xf86UnloadSubModule() hangs Added tag(s) patch. End of message, stopping processing here. Please contact me if you need assistance. -- 686152: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=686152 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems -- 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/handler.s.c.134695013010972.transcr...@bugs.debian.org
Bug#686152: xorg server 1.12.3: xf86UnloadSubModule() hangs, patch proposal
On Thu, Sep 6, 2012 at 18:31:52 +0200, Stephan Schreiber wrote: A patch proposal. Please check if this is still an issue in xorg-server 1.13. For 1.12 I think I'll just revert the commit that made UnloadSubModule do something. Cheers, Julien signature.asc Description: Digital signature
[bts-link] source package mesa
# # bts-link upstream status pull for source package mesa # see http://lists.debian.org/debian-devel-announce/2006/05/msg1.html # user bts-link-upstr...@lists.alioth.debian.org # remote status report for #686581 (http://bugs.debian.org/686581) # Bug title: st_glsl_to_tgsi.cpp:4006:dst_register: Assertion `index VERT_RESULT_MAX' failed # * https://bugs.freedesktop.org/show_bug.cgi?id=54402 # * remote status changed: (?) - NEW usertags 686581 + status-NEW thanks -- 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/20120906163341.16035.57315.btsl...@sonntag.debian.org
