diff --git a/.cvsignore b/.cvsignore index e19334d..bcbcf77 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xorg-server-20100319.tar.xz +xorg-server-1.8.0.tar.bz2 diff --git a/sources b/sources index f1a490c..f939c06 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c98c25437ee1cca9799bbfda721f0395 xorg-server-20100319.tar.xz +7cec3a11890bb53f4a07854319360348 xorg-server-1.8.0.tar.bz2 diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 63d49f7..371e4ef 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -14,12 +14,12 @@ # Fix rhpxl to no longer need vesamodes/extramodes %define pkgname xorg-server -%define gitdate 20100319 +#define gitdate 20100319 Summary: X.Org X11 X server Name: xorg-x11-server -Version: 1.7.99.902 -Release: 3%{?gitdate:.%{gitdate}}%{dist} +Version: 1.8.0 +Release: 1%{?gitdate:.%{gitdate}}%{dist} URL: http://www.x.org License: MIT Group: User Interface/X @@ -86,9 +86,7 @@ Patch6052: xserver-1.8-udev-warning.patch # fallback to vesa when module is missing seems broken Patch6053: xserver-1.8-disable-vboxvideo.patch -# 543647 -Patch6054: xserver-1.7.4-owner-events.patch -Patch6055: xserver-1.8-merge-driver.patch +Patch6054: xserver-1.8-no-hardcoded-etc.patch %define moduledir %{_libdir}/xorg/modules %define drimoduledir %{_libdir}/dri @@ -402,6 +400,8 @@ find %{inst_srcdir}/hw/xfree86 -name \*.c -delete rm -f $RPM_BUILD_ROOT%{_bindir}/pcitweak rm -f $RPM_BUILD_ROOT%{_mandir}/man1/pcitweak.1* find $RPM_BUILD_ROOT -type f -name '*.la' | xargs rm -f -- || : + # we install our own + rm -f $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/10-evdev.conf %if !%{with_hw_servers} rm -f $RPM_BUILD_ROOT%{_libdir}/pkgconfig/xorg-server.pc rm -f $RPM_BUILD_ROOT%{_datadir}/aclocal/xorg-server.m4 @@ -490,7 +490,7 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/dmxtodmx %{_bindir}/dmxwininfo %{_bindir}/vdltodmx -%{_bindir}/xdmx +%{_bindir}/dmxinfo %{_bindir}/xdmxconfig %{_mandir}/man1/Xdmx.1* %{_mandir}/man1/dmxtodmx.1* @@ -526,6 +526,13 @@ rm -rf $RPM_BUILD_ROOT %{xserver_source_dir} %changelog +* Tue Apr 06 2010 Peter Hutterer 1.8.0-1 +- xserver 1.8.0 +- Drop merged patches. +- Rename xdmx client to dmxinfo (change upstream). +- xserver-1.8-no-hardcoded-etc.patch: don't hardcode $prefix/etc for the + server-installed 10-evdev.conf. + * Tue Apr 06 2010 Peter Hutterer - Auto-append the gitdate to the Release whenever it is set. diff --git a/xserver-1.7.4-owner-events.patch b/xserver-1.7.4-owner-events.patch deleted file mode 100644 index f77a8b0..0000000 --- a/xserver-1.7.4-owner-events.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 883ed64cd23ad286250894b42c04603da85b65b5 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Wed, 16 Dec 2009 13:43:22 +1000 -Subject: [PATCH] dix: if owner-events is true for passive grabs, add the window mask (#25400) - -A client requesting a GrabModeSync button grab, owner-events true, with only -the ButtonRelease mask set would never receive the press event even if the -grab window had the ButtonPress mask set. - -The protocol requires that if owner-events is true, then the delivery mask -is the combination of the grab mask + the window event mask. - -X.Org Bug 25400 - -Signed-off-by: Peter Hutterer -Tested-by: Jim Ramsay ---- - dix/events.c | 36 ++++++++++++++++++++++++++++++++++++ - 1 files changed, 36 insertions(+), 0 deletions(-) - -diff --git a/dix/events.c b/dix/events.c -index 85c8f9a..b854d98 100644 ---- a/dix/events.c -+++ b/dix/events.c -@@ -3580,6 +3580,8 @@ CheckPassiveGrabsOnWindow( - xE = &core; - count = 1; - mask = grab->eventMask; -+ if (grab->ownerEvents) -+ mask |= pWin->eventMask; - } else if (match & XI2_MATCH) - { - rc = EventToXI2((InternalEvent*)event, &xE); -@@ -3601,6 +3603,24 @@ CheckPassiveGrabsOnWindow( - mask = grab->xi2mask[device->id][((xGenericEvent*)xE)->evtype/8]; - else if (event->type == XI_Enter || event->type == XI_FocusIn) - mask = grab->xi2mask[device->id][event->type/8]; -+ -+ if (grab->ownerEvents && wOtherInputMasks(grab->window)) -+ { -+ InputClientsPtr icp = -+ wOtherInputMasks(grab->window)->inputClients; -+ -+ while(icp) -+ { -+ if (rClient(icp) == rClient(grab)) -+ { -+ int evtype = (xE) ? ((xGenericEvent*)xE)->evtype : event->type; -+ mask |= icp->xi2mask[device->id][evtype/8]; -+ break; -+ } -+ -+ icp = icp->next; -+ } -+ } - } else - { - rc = EventToXI((InternalEvent*)event, &xE, &count); -@@ -3612,6 +3632,22 @@ CheckPassiveGrabsOnWindow( - continue; - } - mask = grab->eventMask; -+ if (grab->ownerEvents && wOtherInputMasks(grab->window)) -+ { -+ InputClientsPtr icp = -+ wOtherInputMasks(grab->window)->inputClients; -+ -+ while(icp) -+ { -+ if (rClient(icp) == rClient(grab)) -+ { -+ mask |= icp->mask[device->id]; -+ break; -+ } -+ -+ icp = icp->next; -+ } -+ } - } - - (*grabinfo->ActivateGrab)(device, grab, currentTime, TRUE); --- -1.6.6 - diff --git a/xserver-1.8-merge-driver.patch b/xserver-1.8-merge-driver.patch deleted file mode 100644 index 6c3818f..0000000 --- a/xserver-1.8-merge-driver.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 4528e6dfb838a0f2d164ae15e637406adba36144 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Tue, 23 Mar 2010 12:13:56 +1000 -Subject: [PATCH] xfree86: merge driver from the input class into the options. - -A driver that is assigned by an input class is only present as idev->driver. -The driver itself has no access to this information once PreInit is called. -For devices that rely on chain-hotplugging (wacom), this means that for the -second device the driver information is lost and the second device cannot be -initialized through NewInputDeviceRequest. Although this could be worked -around by hardcoding the driver name in the wacom driver, having the -assigned driver in the options seems like the better solution. - -This issue only manifests itself with the udev backend. With HAL, the driver -is assigned by HAL and the option is duplicated in config/hal.c. - -Signed-off-by: Peter Hutterer ---- - hw/xfree86/common/xf86Xinput.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c -index e9f7f2f..8229227 100644 ---- a/hw/xfree86/common/xf86Xinput.c -+++ b/hw/xfree86/common/xf86Xinput.c -@@ -618,6 +618,7 @@ MergeInputClasses(IDevPtr idev, InputAttributes *attrs) - "InputClass configuration"); - return BadAlloc; - } -+ mergedopts = xf86ReplaceStrOption(mergedopts, "driver", idev->driver); - } - idev->commonOptions = xf86optionListMerge(idev->commonOptions, mergedopts); - --- -1.6.6.1 - diff --git a/xserver-1.8-no-hardcoded-etc.patch b/xserver-1.8-no-hardcoded-etc.patch new file mode 100644 index 0000000..b9266bb --- /dev/null +++ b/xserver-1.8-no-hardcoded-etc.patch @@ -0,0 +1,28 @@ +From 7fc78783018cf2ce27f8e6829f9eff1d9032541c Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +Date: Wed, 7 Apr 2010 09:27:59 +1000 +Subject: [PATCH] config: don't hardcode /etc for 10-evdev.conf + +Use sysconfdir instead to avoid amusements like /usr/etc/ and the like. + +Signed-off-by: Peter Hutterer +--- + config/Makefile.am | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/config/Makefile.am b/config/Makefile.am +index eed7454..2e468cf 100644 +--- a/config/Makefile.am ++++ b/config/Makefile.am +@@ -9,7 +9,7 @@ AM_CFLAGS += $(UDEV_CFLAGS) + libconfig_la_SOURCES += udev.c + libconfig_la_LIBADD = $(UDEV_LIBS) + +-xorgconfddir = $(prefix)/etc/X11/$(XF86CONFIGDIR) ++xorgconfddir = $(sysconfdir)/X11/$(XF86CONFIGDIR) + xorgconfd_DATA = 10-evdev.conf + + else +-- +1.6.6.1 +