xorg-server: Changes to 'ubuntu'
ChangeLog | 448 ++++++++++
Xext/Makefile.am | 4
Xext/xselinux.c | 131 --
Xext/xselinux.h | 8
Xi/exevents.c | 15
Xi/setmode.c | 10
configure.ac | 16
debian/changelog | 69 +
debian/control | 13
debian/local/xvfb-run.1 | 2
debian/patches/02_Add-libgcrypt-and-libnettle-as-options-for-sha1.diff | 180 ++++
debian/patches/02_Add-libgcrypt-as-an-option-for-sha1.diff | 84 -
debian/patches/06_dont_trap_access_to_timer_and_keyboard.diff | 22
debian/patches/107_dont_filter_input_subsys.diff | 44
debian/patches/108_reenable_record_ext.patch | 302 ------
debian/patches/12-Add-libudev-input-hotplug-backend.diff | 8
debian/patches/16-config-dont-filter-input-subsys.diff | 42
debian/patches/16-xfree86-fix-build-with-xv-disabled.diff | 53 +
debian/patches/series | 7
debian/rules | 142 ++-
debian/xdmx-tools.install | 14
debian/xdmx.install | 4
debian/xnest.install | 4
debian/xserver-common.install | 4
debian/xserver-xephyr.install | 4
debian/xserver-xfbdev.install | 2
debian/xserver-xorg-core-udeb.install | 6
debian/xserver-xorg-core.install | 20
debian/xserver-xorg-dev.install | 6
debian/xvfb.install | 8
dix/devices.c | 8
dix/events.c | 48 -
dix/getevents.c | 7
hw/xfree86/common/xf86VGAarbiter.c | 65 -
hw/xfree86/common/xf86cmap.c | 9
hw/xfree86/dri2/dri2.c | 2
hw/xfree86/modes/xf86Crtc.c | 14
hw/xfree86/modes/xf86Crtc.h | 26
hw/xfree86/modes/xf86RandR12.c | 14
hw/xfree86/os-support/solaris/sun_bell.c | 5
hw/xquartz/GL/indirect.c | 2
hw/xquartz/GL/visualConfigs.c | 3
hw/xquartz/X11Application.m | 18
hw/xquartz/darwin.c | 6
hw/xquartz/mach-startup/bundle-main.c | 30
hw/xquartz/mach-startup/stub.c | 7
hw/xquartz/pbproxy/x-selection.h | 9
hw/xquartz/quartzAudio.c | 35
hw/xquartz/quartzKeyboard.c | 26
include/dix-config.h.in | 2
include/dix.h | 6
include/eventconvert.h | 6
include/inputstr.h | 30
record/record.c | 123 +-
54 files changed, 1280 insertions(+), 893 deletions(-)
New commits:
commit bc70f9c422c18dc0f41c047c264b90628b662e3c
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Tue Mar 23 23:50:02 2010 +0200
control: Drop the udeb, we don't need it for lucid.
diff --git a/debian/changelog b/debian/changelog
index bd4a804..1c31cbf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xorg-server (2:1.7.6-1ubuntu1) UNRELEASED; urgency=low
* Merge from Debian unstable.
* Drop patch 107, included in Debian.
* Drop patch 108, included upstream.
+ * control: Drop the udeb, we don't need it for lucid.
-- Timo Aaltonen <tjaalton@ubuntu.com> Tue, 23 Mar 2010 23:43:55 +0200
diff --git a/debian/control b/debian/control
index c6644f3..e3d58dc 100644
--- a/debian/control
+++ b/debian/control
@@ -125,24 +125,6 @@ Description: Xorg X server - core server
.
This package is built from the X.org xserver module.
-Package: xserver-xorg-core-udeb
-XC-Package-Type: udeb
-Section: debian-installer
-# exclude sparc because of linker errors
-Architecture: alpha amd64 armel hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390
-Depends:
-# merged: xserver-common (>= ${source:Version}),
- xkb-data-udeb,
- x11-xkb-utils-udeb,
-# useless: xserver-xorg,
-# disabled: keyboard-configuration [linux-any kfreebsd-any],
- udev-udeb (>= 149) [linux-any],
- ${shlibs:Depends},
- ${misc:Depends},
-Provides: xserver
-Description: Xorg X server - core server
- This is a udeb, or a microdeb, for the debian-installer.
-
Package: xserver-xorg-dev
Architecture: any
Depends:
commit b1c77279057a0acca082e4a3e595b0aff308c2e7
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Tue Mar 23 23:46:35 2010 +0200
Drop obsolete patches.
diff --git a/debian/changelog b/debian/changelog
index 3888af3..bd4a804 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg-server (2:1.7.6-1ubuntu1) UNRELEASED; urgency=low
+
+ * Merge from Debian unstable.
+ * Drop patch 107, included in Debian.
+ * Drop patch 108, included upstream.
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com> Tue, 23 Mar 2010 23:43:55 +0200
+
xorg-server (2:1.7.6-1) unstable; urgency=low
[ Brice Goglin ]
diff --git a/debian/patches/107_dont_filter_input_subsys.diff b/debian/patches/107_dont_filter_input_subsys.diff
deleted file mode 100644
index 148fff5..0000000
--- a/debian/patches/107_dont_filter_input_subsys.diff
+++ /dev/null
@@ -1,44 +0,0 @@
-From 84905007702da2c05a4f7446b3fc5ff52be49655 Mon Sep 17 00:00:00 2001
-From: Thomas Jaeger <ThJaeger@gmail.com>
-Date: Mon, 04 Jan 2010 20:00:49 +0000
-Subject: udev: Don't filter subsystem "input"
-
-This allows serial wacom devices to work, whose subsystem is "tty".
-
-Signed-off-by: Thomas Jaeger <ThJaeger@gmail.com>
-Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
----
-diff --git a/config/udev.c b/config/udev.c
-index 432ab85..69257e9 100644
---- a/config/udev.c
-+++ b/config/udev.c
-@@ -214,7 +214,6 @@ config_udev_init(void)
- struct udev *udev;
- struct udev_enumerate *enumerate;
- struct udev_list_entry *devices, *device;
-- int rc;
-
- udev = udev_new();
- if (!udev)
-@@ -222,10 +221,6 @@ config_udev_init(void)
- udev_monitor = udev_monitor_new_from_netlink(udev, "udev");
- if (!udev_monitor)
- return 0;
-- rc = udev_monitor_filter_add_match_subsystem_devtype(udev_monitor,
-- "input", NULL);
-- if (rc < 0)
-- return 0;
-
- if (udev_monitor_enable_receiving(udev_monitor)) {
- ErrorF("config/udev: failed to bind the udev monitor\n");
-@@ -235,7 +230,6 @@ config_udev_init(void)
- enumerate = udev_enumerate_new(udev);
- if (!enumerate)
- return 0;
-- udev_enumerate_add_match_subsystem(enumerate, "input");
- udev_enumerate_scan_devices(enumerate);
- devices = udev_enumerate_get_list_entry(enumerate);
- udev_list_entry_foreach(device, devices) {
---
-cgit v0.8.3-6-g21f6
diff --git a/debian/patches/108_reenable_record_ext.patch b/debian/patches/108_reenable_record_ext.patch
deleted file mode 100644
index 5582332..0000000
--- a/debian/patches/108_reenable_record_ext.patch
+++ /dev/null
@@ -1,302 +0,0 @@
-From 5ac8298469cd4d5e56ef7fc41af4878b88706b28 Mon Sep 17 00:00:00 2001
-From: Chris Dekter <cdekter@gmail.com>
-Date: Thu, 11 Feb 2010 06:34:09 +0000
-Subject: Re-enable RECORD extension.
-
-RECORD was disabled during the switch to internal events. This patch
-modifies the record callback to work with internal events instead of
-xEvents. The InternalEvents are converted to core/Xi events as needed.
-
-Since record is a loadable extension, the EventTo* calls must be externed.
-
-Signed-off-by: Chris Dekter <cdekter@gmail.com>
-Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
-Reviewed-by: Adam Jackson <ajax@redhat.com>
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-(cherry picked from commit 122fc0e7a0712df4ec2bd9ca6773f90bcd2095cf)
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
----
-diff --git a/Xi/exevents.c b/Xi/exevents.c
-index ee32ba8..a63b65b 100644
---- a/Xi/exevents.c
-+++ b/Xi/exevents.c
-@@ -1051,16 +1051,19 @@ ProcessOtherEvent(InternalEvent *ev, DeviceIntPtr device)
- break;
- }
-
--#if 0
-- /* FIXME: I'm broken. Please fix me. Thanks */
- if (DeviceEventCallback) {
- DeviceEventInfoRec eventinfo;
-+ SpritePtr pSprite = device->spriteInfo->sprite;
-
-- eventinfo.events = (xEventPtr) xE;
-- eventinfo.count = count;
-+ /* see comment in EnqueueEvents regarding the next three lines */
-+ if (ev->any.type == ET_Motion)
-+ ev->device_event.root = WindowTable[pSprite->hotPhys.pScreen->myNum]->drawable.id;
-+
-+ eventinfo.device = device;
-+ eventinfo.event = ev;
- CallCallbacks(&DeviceEventCallback, (pointer) & eventinfo);
- }
--#endif
-+
- grab = device->deviceGrab.grab;
-
- switch(event->type)
-diff --git a/dix/events.c b/dix/events.c
-index e24e0c5..4423c16 100644
---- a/dix/events.c
-+++ b/dix/events.c
-@@ -1131,11 +1131,10 @@ EnqueueEvent(InternalEvent *ev, DeviceIntPtr device)
- event->type == ET_KeyRelease)
- AccessXCancelRepeatKey(device->key->xkbInfo, event->detail.key);
-
--#if 0
-- /* FIXME: I'm broken now. Please fix me. */
- if (DeviceEventCallback)
- {
- DeviceEventInfoRec eventinfo;
-+
- /* The RECORD spec says that the root window field of motion events
- * must be valid. At this point, it hasn't been filled in yet, so
- * we do it here. The long expression below is necessary to get
-@@ -1145,14 +1144,14 @@ EnqueueEvent(InternalEvent *ev, DeviceIntPtr device)
- * the data that GetCurrentRootWindow relies on hasn't been
- * updated yet.
- */
-- if (xE->u.u.type == DeviceMotionNotify)
-- XE_KBPTR.root =
-- WindowTable[pSprite->hotPhys.pScreen->myNum]->drawable.id;
-- eventinfo.events = xE;
-- eventinfo.count = nevents;
-+ if (ev->any.type == ET_Motion)
-+ ev->device_event.root = WindowTable[pSprite->hotPhys.pScreen->myNum]->drawable.id;
-+
-+ eventinfo.event = ev;
-+ eventinfo.device = device;
- CallCallbacks(&DeviceEventCallback, (pointer)&eventinfo);
- }
--#endif
-+
- if (event->type == ET_Motion)
- {
- #ifdef PANORAMIX
-diff --git a/include/dix.h b/include/dix.h
-index 9fd2ed8..8bd52b6 100644
---- a/include/dix.h
-+++ b/include/dix.h
-@@ -581,8 +581,8 @@ typedef struct {
- extern _X_EXPORT CallbackListPtr DeviceEventCallback;
-
- typedef struct {
-- xEventPtr events;
-- int count;
-+ InternalEvent *event;
-+ DeviceIntPtr device;
- } DeviceEventInfoRec;
-
- extern int XItoCoreType(int xi_type);
-@@ -590,7 +590,7 @@ extern Bool DevHasCursor(DeviceIntPtr pDev);
- extern Bool _X_EXPORT IsPointerDevice( DeviceIntPtr dev);
- extern Bool _X_EXPORT IsKeyboardDevice(DeviceIntPtr dev);
- extern Bool IsPointerEvent(InternalEvent *event);
--extern Bool IsMaster(DeviceIntPtr dev);
-+extern _X_EXPORT Bool IsMaster(DeviceIntPtr dev);
-
- extern _X_HIDDEN void CopyKeyClass(DeviceIntPtr device, DeviceIntPtr master);
- extern _X_HIDDEN int CorePointerProc(DeviceIntPtr dev, int what);
-diff --git a/include/eventconvert.h b/include/eventconvert.h
-index 277a6c4..b1196a0 100644
---- a/include/eventconvert.h
-+++ b/include/eventconvert.h
-@@ -30,9 +30,9 @@
-
- #define FP1616(integral, frac) ((integral) * (1 << 16) + (frac) * (1 << 16))
-
--_X_INTERNAL int EventToCore(InternalEvent *event, xEvent *core);
--_X_INTERNAL int EventToXI(InternalEvent *ev, xEvent **xi, int *count);
--_X_INTERNAL int EventToXI2(InternalEvent *ev, xEvent **xi);
-+_X_EXPORT int EventToCore(InternalEvent *event, xEvent *core);
-+_X_EXPORT int EventToXI(InternalEvent *ev, xEvent **xi, int *count);
-+_X_EXPORT int EventToXI2(InternalEvent *ev, xEvent **xi);
- _X_INTERNAL int GetCoreType(InternalEvent* ev);
- _X_INTERNAL int GetXIType(InternalEvent* ev);
- _X_INTERNAL int GetXI2Type(InternalEvent* ev);
-diff --git a/record/record.c b/record/record.c
-index b94b4ae..f092e34 100644
---- a/record/record.c
-+++ b/record/record.c
-@@ -42,6 +42,8 @@ and Jim Haggerty of Metheus.
- #include "set.h"
- #include "swaprep.h"
- #include "inputstr.h"
-+#include "eventconvert.h"
-+
-
- #include <stdio.h>
- #include <assert.h>
-@@ -139,7 +141,8 @@ static int RecordDeleteContext(
- XID /*id*/
- );
-
--
-+void RecordExtensionInit(void);
-+
- /***************************************************************************/
-
- /* client private stuff */
-@@ -727,6 +730,59 @@ RecordADeliveredEventOrError(CallbackListPtr *pcbl, pointer nulldata, pointer ca
- } /* RecordADeliveredEventOrError */
-
-
-+static void
-+RecordSendProtocolEvents(RecordClientsAndProtocolPtr pRCAP,
-+ RecordContextPtr pContext,
-+ xEvent* pev, int count)
-+{
-+ int ev; /* event index */
-+
-+ for (ev = 0; ev < count; ev++, pev++)
-+ {
-+ if (RecordIsMemberOfSet(pRCAP->pDeviceEventSet,
-+ pev->u.u.type & 0177))
-+ {
-+ xEvent swappedEvent;
-+ xEvent *pEvToRecord = pev;
-+#ifdef PANORAMIX
-+ xEvent shiftedEvent;
-+
-+ if (!noPanoramiXExtension &&
-+ (pev->u.u.type == MotionNotify ||
-+ pev->u.u.type == ButtonPress ||
-+ pev->u.u.type == ButtonRelease ||
-+ pev->u.u.type == KeyPress ||
-+ pev->u.u.type == KeyRelease)) {
-+ int scr = XineramaGetCursorScreen(inputInfo.pointer);
-+ memcpy(&shiftedEvent, pev, sizeof(xEvent));
-+ shiftedEvent.u.keyButtonPointer.rootX +=
-+ panoramiXdataPtr[scr].x -
-+ panoramiXdataPtr[0].x;
-+ shiftedEvent.u.keyButtonPointer.rootY +=
-+ panoramiXdataPtr[scr].y -
-+ panoramiXdataPtr[0].y;
-+ pEvToRecord = &shiftedEvent;
-+ }
-+#endif /* PANORAMIX */
-+
-+ if (pContext->pRecordingClient->swapped)
-+ {
-+ (*EventSwapVector[pEvToRecord->u.u.type & 0177])
-+ (pEvToRecord, &swappedEvent);
-+ pEvToRecord = &swappedEvent;
-+ }
-+
-+ RecordAProtocolElement(pContext, NULL,
-+ XRecordFromServer, pEvToRecord, SIZEOF(xEvent), 0);
-+ /* make sure device events get flushed in the absence
-+ * of other client activity
-+ */
-+ SetCriticalOutputPending();
-+ }
-+ } /* end for each event */
-+
-+} /* RecordADeviceEvent */
-+
- /* RecordADeviceEvent
- *
- * Arguments:
-@@ -756,55 +812,24 @@ RecordADeviceEvent(CallbackListPtr *pcbl, pointer nulldata, pointer calldata)
- {
- if (pRCAP->pDeviceEventSet)
- {
-- int ev; /* event index */
-- xEvent *pev = pei->events;
-- for (ev = 0; ev < pei->count; ev++, pev++)
-- {
-- if (RecordIsMemberOfSet(pRCAP->pDeviceEventSet,
-- pev->u.u.type & 0177))
-- {
-- xEvent swappedEvent;
-- xEvent *pEvToRecord = pev;
--#ifdef PANORAMIX
-- xEvent shiftedEvent;
--
-- if (!noPanoramiXExtension &&
-- (pev->u.u.type == MotionNotify ||
-- pev->u.u.type == ButtonPress ||
-- pev->u.u.type == ButtonRelease ||
-- pev->u.u.type == KeyPress ||
-- pev->u.u.type == KeyRelease)) {
-- int scr = XineramaGetCursorScreen(inputInfo.pointer);
-- memcpy(&shiftedEvent, pev, sizeof(xEvent));
-- shiftedEvent.u.keyButtonPointer.rootX +=
-- panoramiXdataPtr[scr].x -
-- panoramiXdataPtr[0].x;
-- shiftedEvent.u.keyButtonPointer.rootY +=
-- panoramiXdataPtr[scr].y -
-- panoramiXdataPtr[0].y;
-- pEvToRecord = &shiftedEvent;
-- }
--#endif /* PANORAMIX */
-+ int count;
-+ xEvent *xi_events = NULL;
-
-- if (pContext->pRecordingClient->swapped)
-- {
-- (*EventSwapVector[pEvToRecord->u.u.type & 0177])
-- (pEvToRecord, &swappedEvent);
-- pEvToRecord = &swappedEvent;
-- }
-+ /* TODO check return values */
-+ if (IsMaster(pei->device))
-+ {
-+ xEvent xE;
-+ EventToCore(pei->event, &xE);
-+ RecordSendProtocolEvents(pRCAP, pContext, &xE, 1);
-+ }
-
-- RecordAProtocolElement(pContext, NULL,
-- XRecordFromServer, pEvToRecord, SIZEOF(xEvent), 0);
-- /* make sure device events get flushed in the absence
-- * of other client activity
-- */
-- SetCriticalOutputPending();
-- }
-- } /* end for each event */
-+ EventToXI(pei->event, &xi_events, &count);
-+ RecordSendProtocolEvents(pRCAP, pContext, xi_events, count);
-+ xfree(xi_events);
- } /* end this RCAP selects device events */
- } /* end for each RCAP on this context */
- } /* end for each enabled context */
--} /* RecordADeviceEvent */
-+}
-
-
- /* RecordFlushAllContexts
-@@ -2866,13 +2891,6 @@ RecordCloseDown(ExtensionEntry *extEntry)
- void
- RecordExtensionInit(void)
- {
-- /* FIXME Record is currently broken. Dont initialize it so that clients
-- * that require it can bail out correctly rather than waiting for stuff
-- * that'll never happen */
-- ErrorF("record: RECORD extension enabled at configure time.\n");
-- ErrorF("record: This extension is known to be broken, disabling extension now..\n");
-- ErrorF("record: http://bugs.freedesktop.org/show_bug.cgi?id=20500\n";);
--#if 0
- ExtensionEntry *extentry;
-
- RTContext = CreateNewResourceType(RecordDeleteContext);
-@@ -2895,6 +2913,5 @@ RecordExtensionInit(void)
- }
- RecordErrorBase = extentry->errorBase;
-
--#endif
- } /* RecordExtensionInit */
-
---
-cgit v0.8.3-6-g21f6
diff --git a/debian/patches/series b/debian/patches/series
index 3524546..09f2101 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -19,8 +19,6 @@
#104_nvidia_autodetect.patch
#105_fglrx_autodetect.patch
106_nouveau_autodetect.patch
-107_dont_filter_input_subsys.diff
-108_reenable_record_ext.patch
109_fix-swcursor-crash.patch
121_only_switch_vt_when_active.diff
#143_default_to_vesa.patch
commit da679bc5497638b169f90755dfdd480af73c45d3
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Mar 23 21:29:39 2010 +0100
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index 6943eeb..c28e16c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.7.6-1) UNRELEASED; urgency=low
+xorg-server (2:1.7.6-1) unstable; urgency=low
[ Brice Goglin ]
* Add 06_dont_trap_access_to_timer_and_keyboard.diff,
@@ -12,7 +12,7 @@ xorg-server (2:1.7.6-1) UNRELEASED; urgency=low
relocations have to be truncated when building statically against
libnettle.
- -- Brice Goglin <bgoglin@debian.org> Tue, 16 Mar 2010 08:06:29 +0100
+ -- Cyril Brulebois <kibi@debian.org> Tue, 23 Mar 2010 16:59:08 +0100
xorg-server (2:1.7.5.902-1) unstable; urgency=low
commit 4e5d3c15b70ed5027cd8d38ef35c4b4f5486856f
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Mar 21 16:49:01 2010 +0100
Don't build xserver-xorg-core-udeb on sparc.
The linker fails because relocations have to be truncated when building
statically against libnettle.
diff --git a/debian/changelog b/debian/changelog
index fe9b157..6943eeb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,11 @@ xorg-server (2:1.7.6-1) UNRELEASED; urgency=low
[ Timo Aaltonen ]
* New upstream release, closes: #574354.
+ [ Julien Cristau ]
+ * Don't build xserver-xorg-core-udeb on sparc. The linker fails because
+ relocations have to be truncated when building statically against
+ libnettle.
+
-- Brice Goglin <bgoglin@debian.org> Tue, 16 Mar 2010 08:06:29 +0100
xorg-server (2:1.7.5.902-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index cb940b3..b6820ae 100644
--- a/debian/control
+++ b/debian/control
@@ -129,7 +129,8 @@ Description: Xorg X server - core server
Package: xserver-xorg-core-udeb
XC-Package-Type: udeb
Section: debian-installer
-Architecture: any
+# exclude sparc because of linker errors
+Architecture: alpha amd64 armel hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390
Depends:
# merged: xserver-common (>= ${source:Version}),
xkb-data-udeb,
diff --git a/debian/rules b/debian/rules
index 649935c..be4dbb7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,6 +32,10 @@ else
confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
endif
+ifneq (, $(filter %-udeb, $(shell dh_listpackages -s)))
+ udeb = yes
+endif
+
ifeq ($(DEB_HOST_ARCH_OS), linux)
build_xfbdev = --enable-xfbdev
selinux = --enable-xselinux
@@ -189,8 +193,12 @@ $(STAMP_DIR)/tests-%: $(STAMP_DIR)/build-%
cd build-$* && $(MAKE) check
>$@
-build: $(STAMP_DIR)/build-main $(STAMP_DIR)/build-udeb
-build: $(STAMP_DIR)/tests-main $(STAMP_DIR)/tests-udeb
+build: $(STAMP_DIR)/build-main
+build: $(STAMP_DIR)/tests-main
+ifeq ($(udeb), yes)
+build: $(STAMP_DIR)/build-udeb
+build: $(STAMP_DIR)/tests-udeb
+endif
clean: xsfclean
dh_testdir
@@ -216,14 +224,16 @@ install: build
dh_installdirs
cd build-main && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp/main install
+ifeq ($(udeb), yes)
cd build-udeb && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp/udeb install
+endif
# oh, yuck.
find debian/tmp/*/usr/lib/xorg -type f -name '*.la' | \
xargs rm -f
# remove modules not needed in d-i
- rm -r debian/tmp/udeb/usr/lib/xorg/modules/multimedia
+ rm -rf debian/tmp/udeb/usr/lib/xorg/modules/multimedia
rm -f debian/tmp/udeb/usr/lib/xorg/modules/libxaa.so
rm -f debian/tmp/udeb/usr/lib/xorg/modules/libexa.so
rm -f debian/tmp/udeb/usr/lib/xorg/modules/libwfb.so
@@ -267,9 +277,11 @@ binary-arch: build install
ifeq ($(DEB_HOST_ARCH_OS), linux)
install -d debian/xserver-xorg-core/lib/udev/rules.d
install -m 644 debian/local/64-xorg-xkb.rules debian/xserver-xorg-core/lib/udev/rules.d
+ifeq ($(udeb), yes)
install -d debian/xserver-xorg-core-udeb/lib/udev/rules.d
install -m 644 debian/local/64-xorg-xkb.rules debian/xserver-xorg-core-udeb/lib/udev/rules.d
endif
+endif
dh_installdebconf -s
dh_installman -s
dh_link -s
commit c981d8e1255e202cd6f267e4a860e0fcbe0f75fc
Author: Brice Goglin <bgoglin@debian.org>
Date: Sun Mar 21 11:06:04 2010 +0100
Add bug closer
diff --git a/debian/changelog b/debian/changelog
index b2f1b77..fe9b157 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,7 @@ xorg-server (2:1.7.6-1) UNRELEASED; urgency=low
thanks Samuel Thibault.
[ Timo Aaltonen ]
- * New upstream release.
+ * New upstream release, closes: #574354.
-- Brice Goglin <bgoglin@debian.org> Tue, 16 Mar 2010 08:06:29 +0100
commit 89496cdbc2c275fca05a8798a203b94c60b5f933
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Thu Mar 18 13:55:01 2010 +0200
Update the changelogs.
diff --git a/ChangeLog b/ChangeLog
index 423f702..f79a90a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,49 @@
+commit c552ec12f9112901d5266c00fb3aaf4e06f5d614
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Wed Mar 17 10:49:28 2010 +1000
+
+ xserver 1.7.6
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 63ef872068299aa2ea6bfd7d11935c222cc1e102
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Tue Mar 16 11:40:53 2010 -0700
+
+ Revert "XQuartz: Explicitly pass a bellProc to make XBell() work again."
+
+ I'm not quite sure why this was necessary, but DDXRingBell is being called
+ from CoreKeyboardBell, so we don't need a separate bellProc which would
+ result in multiple rings.
+
+ This reverts commit 7e7e7935eeb86b5990664a662471800cfd2e7ce0.
+
+ Conflicts:
+
+ hw/xquartz/quartzKeyboard.c
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 31292a7c775e4a249926140a86bc19c3805cdd96
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Wed Feb 10 15:52:14 2010 -0800
+
+ XQuartz: Use an empty xkb keymap by default
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+ (cherry picked from commit 5172253bae3b9867118c6717434e73c173acd5e9)
+
+commit 5b4fabb910eefb393eb3bfb45df5e63fdeb71f26
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon Mar 15 08:44:01 2010 +1000
+
+ configure: restore SHA1_LIB for XSERVER_SYS_LIBS
+
+ Accidentally removed in ff5fb43a4b38c707a, caused by
+ a botched merge when cherry-picking 178da6534fe7ab4b99fb.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
commit 5a2b3f36a05d1e0fcfd1b0f85d6584478ba24eda
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Mar 12 16:53:06 2010 +1000
diff --git a/debian/changelog b/debian/changelog
index d8b15d3..8954a36 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
-xorg-server (2:1.7.5.902-2) UNRELEASED; urgency=low
+xorg-server (2:1.7.6-1) UNRELEASED; urgency=low
+ [ Brice Goglin ]
* Add 06_dont_trap_access_to_timer_and_keyboard.diff,
thanks Samuel Thibault.
+ [ Timo Aaltonen ]
+ * New upstream release.
+
-- Brice Goglin <bgoglin@debian.org> Tue, 16 Mar 2010 08:06:29 +0100
xorg-server (2:1.7.5.902-1) unstable; urgency=low
commit c552ec12f9112901d5266c00fb3aaf4e06f5d614
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Mar 17 10:49:28 2010 +1000
xserver 1.7.6
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index c215b5c..4a19ae4 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.5.902, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE="2010-03-12"
+AC_INIT([xorg-server], 1.7.6, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE="2010-03-17"
AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([dist-bzip2 foreign])
AM_MAINTAINER_MODE
commit 63ef872068299aa2ea6bfd7d11935c222cc1e102
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Tue Mar 16 11:40:53 2010 -0700
Revert "XQuartz: Explicitly pass a bellProc to make XBell() work again."
I'm not quite sure why this was necessary, but DDXRingBell is being called
from CoreKeyboardBell, so we don't need a separate bellProc which would
result in multiple rings.
This reverts commit 7e7e7935eeb86b5990664a662471800cfd2e7ce0.
Conflicts:
hw/xquartz/quartzKeyboard.c
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
diff --git a/hw/xquartz/quartzKeyboard.c b/hw/xquartz/quartzKeyboard.c
index 7e36a9a..c9ef7cc 100644
--- a/hw/xquartz/quartzKeyboard.c
+++ b/hw/xquartz/quartzKeyboard.c
@@ -184,12 +184,6 @@ static void DarwinChangeKeyboardControl(DeviceIntPtr device, KeybdCtrl *ctrl) {
// keyclick, bell volume / pitch, autorepead, LED's
}
-static void DarwinKeyboardBell(int volume, DeviceIntPtr pDev, pointer arg, int something) {
- KeybdCtrl *ctrl = arg;
-
- DDXRingBell(volume, ctrl->bell_pitch, ctrl->bell_duration);
-}
-
//-----------------------------------------------------------------------------
// Utility functions to help parse Darwin keymap
//-----------------------------------------------------------------------------
@@ -301,7 +295,7 @@ void DarwinKeyboardInit(DeviceIntPtr pDev) {
// for a kIOHIDParamConnectType connection.
assert(darwinParamConnect = NXOpenEventStatus());
- InitKeyboardDeviceStruct(pDev, NULL, DarwinKeyboardBell, DarwinChangeKeyboardControl);
+ InitKeyboardDeviceStruct(pDev, NULL, NULL, DarwinChangeKeyboardControl);
DarwinKeyboardReloadHandler();
commit 1ab0d6f915a85a670432e579b760c4604ed2920a
Author: Brice Goglin <bgoglin@debian.org>
Date: Mon Mar 15 13:32:17 2010 +0100
Add 06_dont_trap_access_to_timer_and_keyboard.diff
diff --git a/debian/changelog b/debian/changelog
index c18c3ee..d8b15d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.7.5.902-2) UNRELEASED; urgency=low
+
+ * Add 06_dont_trap_access_to_timer_and_keyboard.diff,
+ thanks Samuel Thibault.
+
+ -- Brice Goglin <bgoglin@debian.org> Tue, 16 Mar 2010 08:06:29 +0100
+
xorg-server (2:1.7.5.902-1) unstable; urgency=low
[ Julien Cristau ]
diff --git a/debian/patches/06_dont_trap_access_to_timer_and_keyboard.diff b/debian/patches/06_dont_trap_access_to_timer_and_keyboard.diff
new file mode 100644
index 0000000..23d8dc7
--- /dev/null
+++ b/debian/patches/06_dont_trap_access_to_timer_and_keyboard.diff
@@ -0,0 +1,22 @@
+[PATCH] Do not trap access to timer and keyboard
+
+Some VESA BIOSes need to access to them.
+
+Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
+---
+ hw/xfree86/os-support/hurd/hurd_video.c | 2 --
+ 1 files changed, 0 insertions(+), 2 deletions(-)
+
+diff --git a/hw/xfree86/os-support/hurd/hurd_video.c b/hw/xfree86/os-support/hurd/hurd_video.c
+index 4a99db3..e049ceb 100644
+--- a/hw/xfree86/os-support/hurd/hurd_video.c
++++ b/hw/xfree86/os-support/hurd/hurd_video.c
+@@ -124,8 +124,6 @@ xf86EnableIO()
+ FatalError("xf86EnableIO: ioperm() failed (%s)\n", strerror(errno));
+ return FALSE;
+ }
+- ioperm(0x40,4,0); /* trap access to the timer chip */
+- ioperm(0x60,4,0); /* trap access to the keyboard controller */
+ return TRUE;
+ }
+
diff --git a/debian/patches/series b/debian/patches/series
index 29afbca..59f2548 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,6 +6,7 @@
03_fedora_glx_versioning.diff
04_fedora_glx14-swrast.diff
05_only_call_gamma_set_if_nonnull.diff
+06_dont_trap_access_to_timer_and_keyboard.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 31292a7c775e4a249926140a86bc19c3805cdd96
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Wed Feb 10 15:52:14 2010 -0800
XQuartz: Use an empty xkb keymap by default
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
(cherry picked from commit 5172253bae3b9867118c6717434e73c173acd5e9)
diff --git a/hw/xquartz/darwin.c b/hw/xquartz/darwin.c
index 30b8905..8b6ce62 100644
--- a/hw/xquartz/darwin.c
+++ b/hw/xquartz/darwin.c
@@ -45,6 +45,7 @@
#include "site.h"
#include "globals.h"
#include "dix.h"
+#include "xkbsrv.h"
#include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h>
@@ -463,6 +464,11 @@ int DarwinParseModifierList(const char *constmodifiers, int separatelr)
*/
void InitInput( int argc, char **argv )
{
+ XkbRMLVOSet rmlvo = { .rules = "base", .model = "empty", .layout = "empty",
+ .variant = NULL, .options = NULL };
+ /* We need to really have rules... or something... */
+ XkbSetRulesDflts(&rmlvo);
+
darwinKeyboard = AddInputDevice(serverClient, DarwinKeybdProc, TRUE);
RegisterKeyboardDevice( darwinKeyboard );
darwinKeyboard->name = strdup("keyboard");
diff --git a/hw/xquartz/quartzKeyboard.c b/hw/xquartz/quartzKeyboard.c
index 3b4eac3..7e36a9a 100644
--- a/hw/xquartz/quartzKeyboard.c
+++ b/hw/xquartz/quartzKeyboard.c
@@ -301,9 +301,6 @@ void DarwinKeyboardInit(DeviceIntPtr pDev) {
// for a kIOHIDParamConnectType connection.
assert(darwinParamConnect = NXOpenEventStatus());
- /* We need to really have rules... or something... */
- //XkbSetRulesDflts("base", "pc105", "us", NULL, NULL);
-
InitKeyboardDeviceStruct(pDev, NULL, DarwinKeyboardBell, DarwinChangeKeyboardControl);
DarwinKeyboardReloadHandler();
@@ -775,12 +772,9 @@ Bool QuartzReadSystemKeymap(darwinKeyboardInfo *info) {
#endif
}
- // There seems to be an issue with this in 1.5+, shift-space is not
- // producing space, it's sending NoSymbol... ?
- //if (k[3] == k[2]) k[3] = NoSymbol;
- //if (k[1] == k[0]) k[1] = NoSymbol;
- //if (k[0] == k[2] && k[1] == k[3]) k[2] = k[3] = NoSymbol;
- //if (k[3] == k[0] && k[2] == k[1] && k[2] == NoSymbol) k[3] = NoSymbol;
+ if (k[3] == k[2]) k[3] = NoSymbol;
+ if (k[1] == k[0]) k[1] = NoSymbol;
+ if (k[0] == k[2] && k[1] == k[3]) k[2] = k[3] = NoSymbol;
}
/* Fix up some things that are normally missing.. */
@@ -791,7 +785,7 @@ Bool QuartzReadSystemKeymap(darwinKeyboardInfo *info) {
if (k[0] == NoSymbol && k[1] == NoSymbol
&& k[2] == NoSymbol && k[3] == NoSymbol)
- k[0] = k[1] = k[2] = k[3] = known_keys[i].keysym;
+ k[0] = known_keys[i].keysym;
}
}
@@ -804,7 +798,7 @@ Bool QuartzReadSystemKeymap(darwinKeyboardInfo *info) {
k = info->keyMap + known_numeric_keys[i].keycode * GLYPHS_PER_KEY;
if (k[0] == known_numeric_keys[i].normal)
- k[0] = k[1] = k[2] = k[3] = known_numeric_keys[i].keypad;
+ k[0] = known_numeric_keys[i].keypad;
}
}
commit 4b30f4314ccfd6a7a46c07ab7027430027bbf288
Author: Cyril Brulebois <kibi@debian.org>
Date: Mon Mar 15 22:19:06 2010 +0100
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index d69fee3..c18c3ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.7.5.902-1) UNRELEASED; urgency=low
+xorg-server (2:1.7.5.902-1) unstable; urgency=low
[ Julien Cristau ]
* config/udev: fix adding unnamed devices.
@@ -38,7 +38,7 @@ xorg-server (2:1.7.5.902-1) UNRELEASED; urgency=low
* Tweak builderstring to use the name of the person responsible for the
upload instead of an host-specific one (Closes: #574017).
- -- Drew Parsons <dparsons@debian.org> Wed, 03 Mar 2010 23:33:54 +1100
+ -- Cyril Brulebois <kibi@debian.org> Mon, 15 Mar 2010 22:19:01 +0100
xorg-server (2:1.7.5-1) unstable; urgency=low
commit 5461b39585e739ed2df0d2200dc657123cfe71ff
Author: Cyril Brulebois <kibi@debian.org>
Date: Mon Mar 15 21:50:31 2010 +0100
Tweak builderstring to use the name of the person responsible for the upload instead of an host-specific one (Closes: #574017).
diff --git a/debian/changelog b/debian/changelog
index b61768a..d69fee3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -35,6 +35,8 @@ xorg-server (2:1.7.5.902-1) UNRELEASED; urgency=low
* Add nettle-dev to Build-Depends; and pass --with-sha1=libnettle for
the udeb build (and --with-sha1=libgcrypt for the main build).
* Add myself to Uploaders.
+ * Tweak builderstring to use the name of the person responsible for the
+ upload instead of an host-specific one (Closes: #574017).
-- Drew Parsons <dparsons@debian.org> Wed, 03 Mar 2010 23:33:54 +1100
diff --git a/debian/rules b/debian/rules
index e767aff..649935c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -65,6 +65,8 @@ INSTALL=/usr/bin/install
VENDOR = $(shell lsb_release -i -s)
+BUILDER=$(shell dpkg-parsechangelog | awk -F': ' '/^Maintainer: / {print $$2}')
+
# disable-static is so we don't get libfoo.a for modules. now if only we could
# kill the .las.
confflags += \
commit 117c4516aa22f19f5c30e6ba0cd221202276dd90
Author: Cyril Brulebois <kibi@debian.org>
Date: Mon Mar 15 15:02:34 2010 +0100
Reply to: