ChangeLog | 40 ++++++++++++++++++
configure.ac | 4 -
debian/changelog | 31 +++++++++++++
debian/patches/05_only_call_gamma_set_if_nonnull.diff | 25 +++++++++++
debian/patches/101_nv-crash-fix.diff | 11 ----
debian/patches/series | 2
debian/rules | 16 +++----
dix/devices.c | 6 +-
include/eventstr.h | 4 -
9 files changed, 110 insertions(+), 29 deletions(-)
New commits:
commit d5977c965291d4ae83620c05f3b1a0f19a20a633
Author: Timo Aaltonen <tjaal...@cc.hut.fi>
Date: Fri Feb 5 16:21:01 2010 +0200
Merge from Debian unstable.
* Merge from Debian unstable.
* Drop patch 101, included in Debian.
diff --git a/debian/changelog b/debian/changelog
index cfc03c6..65d8c86 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.7.4-2ubuntu1) UNRELEASED; urgency=low
+
+ * Merge from Debian unstable.
+ * Drop patch 101, included in Debian.
+
+ -- Timo Aaltonen <tjaal...@ubuntu.com> Fri, 05 Feb 2010 16:14:37 +0200
+
xorg-server (2:1.7.4-2) unstable; urgency=low
[ Julien Cristau ]
diff --git a/debian/patches/101_nv-crash-fix.diff
b/debian/patches/101_nv-crash-fix.diff
deleted file mode 100644
index cbfc337..0000000
--- a/debian/patches/101_nv-crash-fix.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/hw/xfree86/modes/xf86Crtc.c
-+++ b/hw/xfree86/modes/xf86Crtc.c
-@@ -354,7 +354,7 @@ xf86CrtcSetModeTransform (xf86CrtcPtr crtc, DisplayModePtr
mode, Rotation rotati
- }
-
- /* Only upload when needed, to avoid unneeded delays. */
-- if (!crtc->active)
-+ if (!crtc->active && crtc->funcs->gamma_set)
- crtc->funcs->gamma_set(crtc, crtc->gamma_red, crtc->gamma_green,
- crtc->gamma_blue,
crtc->gamma_size);
-
diff --git a/debian/patches/series b/debian/patches/series
index f6d935a..3fe762f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,7 +13,6 @@
14-config-add-example-udev-rules.diff
15-config-udev-look-for-xkb-rules-model-layout-variant-.diff
100_rethrow_signals.patch
-101_nv-crash-fix.diff
#104_nvidia_autodetect.patch
#105_fglrx_autodetect.patch
121_only_switch_vt_when_active.diff
commit 58f1c12709c8369fec7f719a71114a307fc6ce08
Author: Brice Goglin <bgog...@debian.org>
Date: Wed Jan 20 23:51:37 2010 +0100
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 32ed9f0..f771567 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.7.4-2) UNRELEASED; urgency=low
+xorg-server (2:1.7.4-2) unstable; urgency=low
[ Julien Cristau ]
* Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
@@ -8,7 +8,7 @@ xorg-server (2:1.7.4-2) UNRELEASED; urgency=low
* Add 05_only_call_gamma_set_if_nonnull.diff to unbreak the nv driver,
closes: #564203.
- -- Julien Cristau <jcris...@debian.org> Sat, 16 Jan 2010 16:48:01 +0000
+ -- Brice Goglin <bgog...@debian.org> Wed, 20 Jan 2010 23:51:26 +0100
xorg-server (2:1.7.4-1) unstable; urgency=low
commit 189f4bb9b941b4204d8e73ae8938d2509e76b474
Author: Brice Goglin <bgog...@debian.org>
Date: Wed Jan 20 23:48:12 2010 +0100
Add 05_only_call_gamma_set_if_nonnull.diff
diff --git a/debian/changelog b/debian/changelog
index bcdf3fa..32ed9f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
xorg-server (2:1.7.4-2) UNRELEASED; urgency=low
+ [ Julien Cristau ]
* Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
good reason. Thanks, Colin Watson!
+ [ Brice Goglin ]
+ * Add 05_only_call_gamma_set_if_nonnull.diff to unbreak the nv driver,
+ closes: #564203.
+
-- Julien Cristau <jcris...@debian.org> Sat, 16 Jan 2010 16:48:01 +0000
xorg-server (2:1.7.4-1) unstable; urgency=low
diff --git a/debian/patches/05_only_call_gamma_set_if_nonnull.diff
b/debian/patches/05_only_call_gamma_set_if_nonnull.diff
new file mode 100644
index 0000000..b1d00ba
--- /dev/null
+++ b/debian/patches/05_only_call_gamma_set_if_nonnull.diff
@@ -0,0 +1,25 @@
+Bug#564203
+
+From 8ca4233017e9f441303088e7054b6a7c4f171d80 Mon Sep 17 00:00:00 2001
+From: Michael Vogt <m...@ubuntu.com>
+Date: Wed, 6 Jan 2010 14:40:34 +0100
+Subject: [PATCH] * hw/xfree86/modes/xf86Crtc.c:
+ - only call gamma_set if its non NULL
+
+---
+ hw/xfree86/modes/xf86Crtc.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
+index d015c6a..573fe96 100644
+--- a/hw/xfree86/modes/xf86Crtc.c
++++ b/hw/xfree86/modes/xf86Crtc.c
+@@ -354,7 +354,7 @@ xf86CrtcSetModeTransform (xf86CrtcPtr crtc, DisplayModePtr
mode, Rotation rotati
+ }
+
+ /* Only upload when needed, to avoid unneeded delays. */
+- if (!crtc->active)
++ if (!crtc->active && crtc->funcs->gamma_set)
+ crtc->funcs->gamma_set(crtc, crtc->gamma_red, crtc->gamma_green,
+ crtc->gamma_blue,
crtc->gamma_size);
+
diff --git a/debian/patches/series b/debian/patches/series
index 7d97522..047e43d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,6 +5,7 @@
# 03 and 04 are backports from git master
03_fedora_glx_versioning.diff
04_fedora_glx14-swrast.diff
+05_only_call_gamma_set_if_nonnull.diff
#13_debian_add_xkbpath_env_variable.diff
11-Move-config_init-after-CreateWellKnownSockets-and-In.diff
12-Add-libudev-input-hotplug-backend.diff
commit 54f80ef05f7e068cae08369defd69978690f19ba
Author: Julien Cristau <jcris...@debian.org>
Date: Sat Jan 16 16:49:10 2010 +0000
Rename the build directory to not include DEB_BUILD_GNU_TYPE for no good
reason. Thanks, Colin Watson!
diff --git a/debian/changelog b/debian/changelog
index 04c341f..bcdf3fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.7.4-2) UNRELEASED; urgency=low
+
+ * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
+ good reason. Thanks, Colin Watson!
+
+ -- Julien Cristau <jcris...@debian.org> Sat, 16 Jan 2010 16:48:01 +0000
+
xorg-server (2:1.7.4-1) unstable; urgency=low
[ Timo Aaltonen ]
diff --git a/debian/rules b/debian/rules
index d2efc7a..6d6777d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -127,10 +127,10 @@ configure: $(STAMP_DIR)/patch
dh_testdir
autoreconf -vfi
-obj-$(DEB_BUILD_GNU_TYPE)/config.status: configure
+build/config.status: configure
dh_testdir
- mkdir -p obj-$(DEB_BUILD_GNU_TYPE)
- cd obj-$(DEB_BUILD_GNU_TYPE) && \
+ mkdir -p build
+ cd build && \
../configure \
--prefix=/usr \
--mandir=\$${prefix}/share/man \
@@ -142,13 +142,13 @@ obj-$(DEB_BUILD_GNU_TYPE)/config.status: configure
CPPFLAGS="$(CPPFLAGS)"
build: build-stamp tests-stamp
-build-stamp: obj-$(DEB_BUILD_GNU_TYPE)/config.status
+build-stamp: build/config.status
dh_testdir
- cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE)
+ cd build && $(MAKE)
>$@
tests-stamp: build-stamp
- cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) check
+ cd build && $(MAKE) check
>$@
clean: xsfclean
@@ -160,7 +160,7 @@ clean: xsfclean
rm -f */config.cache */config.log */config.status
rm -f conftest* */conftest*
rm -rf autom4te.cache */autom4te.cache
- rm -rf obj-*
+ rm -rf build
rm -f compile config.guess config.sub configure depcomp install-sh
rm -f ltmain.sh missing INSTALL aclocal.m4 ylwrap
rm -f include/do-not-use-config.h.in
@@ -175,7 +175,7 @@ install: build
dh_clean -k
dh_installdirs
- cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp
install
+ cd build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
# oh, yuck.
find $(CURDIR)/debian/tmp/usr/lib/xorg -type f -name '*.la' | \
commit 35ea2e37ab87e1a45711eabf2e72934bfa3cd887
Author: Julien Cristau <jcris...@debian.org>
Date: Tue Jan 12 10:49:39 2010 +0000
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index c93f18a..04c341f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.7.4-1) UNRELEASED; urgency=low
+xorg-server (2:1.7.4-1) unstable; urgency=low
[ Timo Aaltonen ]
* New upstream release.
@@ -8,7 +8,7 @@ xorg-server (2:1.7.4-1) UNRELEASED; urgency=low
queue, so that devices don't get enabled too early (closes: #564256,
#564324).
- -- Timo Aaltonen <tjaal...@ubuntu.com> Fri, 08 Jan 2010 18:53:59 +0200
+ -- Julien Cristau <jcris...@debian.org> Tue, 12 Jan 2010 10:49:22 +0000
xorg-server (2:1.7.3.902-1) unstable; urgency=low
commit c456ff309f53a41d954c4f7e419b8f4b38e492e1
Author: Julien Cristau <jcris...@debian.org>
Date: Sat Jan 9 12:37:36 2010 +0000
Call config_init() later
Don't call config_init() until after InitInput() has initialized the
event queue, so that devices don't get enabled too early (closes:
#564256, #564324).
diff --git a/debian/changelog b/debian/changelog
index c8af465..c93f18a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,13 @@
xorg-server (2:1.7.4-1) UNRELEASED; urgency=low
+ [ Timo Aaltonen ]
* New upstream release.
+ [ Julien Cristau ]
+ * Don't call config_init() until after InitInput() has initialized the event
+ queue, so that devices don't get enabled too early (closes: #564256,
+ #564324).
+
-- Timo Aaltonen <tjaal...@ubuntu.com> Fri, 08 Jan 2010 18:53:59 +0200
xorg-server (2:1.7.3.902-1) unstable; urgency=low
diff --git
a/debian/patches/11-Move-config_init-after-CreateWellKnownSockets-and-In.diff
b/debian/patches/11-Move-config_init-after-CreateWellKnownSockets-and-In.diff
index 3536198..38d8d8d 100644
---
a/debian/patches/11-Move-config_init-after-CreateWellKnownSockets-and-In.diff
+++
b/debian/patches/11-Move-config_init-after-CreateWellKnownSockets-and-In.diff
@@ -12,11 +12,11 @@ Tested-by: Peter Hutterer <peter.hutte...@who-t.net>
dix/main.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
-diff --git a/dix/main.c b/dix/main.c
-index f96245a..2117a1e 100644
---- a/dix/main.c
-+++ b/dix/main.c
-@@ -168,7 +168,6 @@ int main(int argc, char *argv[], char *envp[])
+Index: xorg-server/dix/main.c
+===================================================================
+--- xorg-server.orig/dix/main.c
++++ xorg-server/dix/main.c
+@@ -168,7 +168,6 @@
InitBlockAndWakeupHandlers();
/* Perform any operating system dependent initializations you'd like */
OsInit();
@@ -24,14 +24,11 @@ index f96245a..2117a1e 100644
if(serverGeneration == 1)
{
CreateWellKnownSockets();
-@@ -254,6 +253,7 @@ int main(int argc, char *argv[], char *envp[])
- InitRootWindow(WindowTable[i]);
-
+@@ -256,6 +255,7 @@
InitCoreDevices();
-+ config_init();
InitInput(argc, argv);
InitAndStartDevices();
++ config_init();
+
+ dixSaveScreens(serverClient, SCREEN_SAVER_FORCER, ScreenSaverReset);
---
-1.6.5
-
commit 9b6d3192926f74513ecdf6e157940f3593a59702
Author: Timo Aaltonen <tjaal...@cc.hut.fi>
Date: Sat Jan 9 01:41:38 2010 +0200
Really fix the version.
diff --git a/debian/changelog b/debian/changelog
index 9dcfba0..c8af465 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.7.3.902-1) UNRELEASED; urgency=low
+xorg-server (2:1.7.4-1) UNRELEASED; urgency=low
* New upstream release.
commit d058bf7516bf7d6e0c3e4ed8d979fef48b6313da
Author: Julien Cristau <jcris...@debian.org>
Date: Fri Jan 8 19:43:31 2010 +0000
Delete empty files
These come from the initial svn import.
Thanks to Bernhard R. Link for noticing.
diff --git a/hw/xfree86/os-support/xorgos.c b/hw/xfree86/os-support/xorgos.c
deleted file mode 100644
index e69de29..0000000
diff --git a/hw/xfree86/osandcommon.c b/hw/xfree86/osandcommon.c
deleted file mode 100644
index e69de29..0000000
diff --git a/hw/xfree86/xorg.c b/hw/xfree86/xorg.c
deleted file mode 100644
index e69de29..0000000
commit 8b5a15dc1f12e947e4387d6c2af2e71eebce51b1
Author: Timo Aaltonen <tjaal...@cc.hut.fi>
Date: Fri Jan 8 18:54:16 2010 +0200
Update the changelogs.
diff --git a/ChangeLog b/ChangeLog
index c9efdf7..2386bf7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,43 @@
+commit 88582f3d41315abf548a52622e52b7652d2c5281
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Fri Jan 8 09:38:58 2010 +1000
+
+ xserver 1.7.4
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit e54309e2ec1d16eb5570fad60af9be31f710c852
+Author: Adam Tkac <at...@redhat.com>
+Date: Thu Jan 7 15:34:52 2010 +0100
+
+ Do not define members of include/eventstr.h:EventType enum conditionally.
+
+ Main problem is that EventType enumeration members can be different in
+ module and in server, which obviously causes problems.
+
+ Signed-off-by: Adam Tkac <at...@redhat.com>
+ Reviewed-by: Adam Jackson <a...@redhat.com>
+ Signed-off-by: Keith Packard <kei...@keithp.com>
+ (cherry picked from commit 8d53d84485fdce8ea9686e6f300a69f7ddebd467)
+
+commit 8661189c2c443e2d3e5d98e6b04d1852a98bac41
+Author: Alan Coopersmith <alan.coopersm...@sun.com>
+Date: Mon Jan 4 18:21:54 2010 -0800
+
+ CloseDevice: call XkbRemoveResourceClient before freeing key class struct
+
+ XkbRemoveResourceClient() returns immediately if dev->key is NULL.
+ CloseDevice calls XkbRemoveResourceClient until it removes all resources.
+
+ If we free dev->key and NULL it before XkbRemoveResourceClient, then
+ infinite loop ensues, and the server appears to hang on exit or crash.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@sun.com>
+ Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net>
+ Reviewed-by: Daniel Stone <dan...@fooishbar.org>
+ Signed-off-by: Keith Packard <kei...@keithp.com>
+ (cherry picked from commit 13c8bd3fde3b0831921e59f84936022a16379d63)
+
commit d1320f4f2908fd3a248a79314bd78f76b03c71c5
Author: Peter Hutterer <peter.hutte...@who-t.net>
Date: Sat Dec 26 10:13:46 2009 +1000
diff --git a/debian/changelog b/debian/changelog
index a2136ee..9dcfba0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.7.3.902-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Timo Aaltonen <tjaal...@ubuntu.com> Fri, 08 Jan 2010 18:53:59 +0200
+
xorg-server (2:1.7.3.902-1) unstable; urgency=low
[ Timo Aaltonen ]
commit 88582f3d41315abf548a52622e52b7652d2c5281
Author: Peter Hutterer <peter.hutte...@who-t.net>
Date: Fri Jan 8 09:38:58 2010 +1000
xserver 1.7.4
Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
diff --git a/configure.ac b/configure.ac
index 10cf26f..c564cf9 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.7.3.902,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE="2009-12-26"
+AC_INIT([xorg-server], 1.7.4,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE="2010-01-08"
AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([dist-bzip2 foreign])
AM_MAINTAINER_MODE
commit e54309e2ec1d16eb5570fad60af9be31f710c852
Author: Adam Tkac <at...@redhat.com>
Date: Thu Jan 7 15:34:52 2010 +0100
Do not define members of include/eventstr.h:EventType enum conditionally.
Main problem is that EventType enumeration members can be different in
module and in server, which obviously causes problems.
Signed-off-by: Adam Tkac <at...@redhat.com>
Reviewed-by: Adam Jackson <a...@redhat.com>
Signed-off-by: Keith Packard <kei...@keithp.com>
(cherry picked from commit 8d53d84485fdce8ea9686e6f300a69f7ddebd467)
diff --git a/include/eventstr.h b/include/eventstr.h
index 0d5b1c6..79685c1 100644
--- a/include/eventstr.h
+++ b/include/eventstr.h
@@ -58,17 +58,13 @@ enum EventType {
ET_ProximityOut,
ET_DeviceChanged,
ET_Hierarchy,
-#if XFreeXDGA
ET_DGAEvent,
-#endif
ET_RawKeyPress,
ET_RawKeyRelease,
ET_RawButtonPress,
ET_RawButtonRelease,
ET_RawMotion,
-#ifdef XQUARTZ
ET_XQuartz,
-#endif
ET_Internal = 0xFF /* First byte */
};
commit 8661189c2c443e2d3e5d98e6b04d1852a98bac41
Author: Alan Coopersmith <alan.coopersm...@sun.com>
Date: Mon Jan 4 18:21:54 2010 -0800
CloseDevice: call XkbRemoveResourceClient before freeing key class struct
XkbRemoveResourceClient() returns immediately if dev->key is NULL.
CloseDevice calls XkbRemoveResourceClient until it removes all resources.
If we free dev->key and NULL it before XkbRemoveResourceClient, then
infinite loop ensues, and the server appears to hang on exit or crash.
Signed-off-by: Alan Coopersmith <alan.coopersm...@sun.com>
Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net>
Reviewed-by: Daniel Stone <dan...@fooishbar.org>
Signed-off-by: Keith Packard <kei...@keithp.com>
(cherry picked from commit 13c8bd3fde3b0831921e59f84936022a16379d63)
diff --git a/dix/devices.c b/dix/devices.c
index e3fd456..245a95b 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -843,6 +843,9 @@ CloseDevice(DeviceIntPtr dev)
if(dev->valuator && dev->valuator->accelScheme.AccelCleanupProc)
dev->valuator->accelScheme.AccelCleanupProc(dev);
+ while (dev->xkb_interest)
+ XkbRemoveResourceClient((DevicePtr)dev,dev->xkb_interest->resource);
+
xfree(dev->name);
classes = (ClassesPtr)&dev->key;
@@ -854,9 +857,6 @@ CloseDevice(DeviceIntPtr dev)
FreeAllDeviceClasses(classes);
}
- while (dev->xkb_interest)
- XkbRemoveResourceClient((DevicePtr)dev,dev->xkb_interest->resource);
-
if (DevHasCursor(dev) && dev->spriteInfo->sprite) {
xfree(dev->spriteInfo->sprite->spriteTrace);
xfree(dev->spriteInfo->sprite);
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
