diff --git a/.cvsignore b/.cvsignore index a9bc8d1..ef4b7ef 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xorg-server-1.6.1.tar.bz2 +xorg-server-1.6.1.901.tar.bz2 diff --git a/import.log b/import.log index 782e371..493d1dc 100644 --- a/import.log +++ b/import.log @@ -4,3 +4,4 @@ xorg-x11-server-1_5_2-1_fc10:HEAD:xorg-x11-server-1.5.2-1.fc10.src.rpm:122366700 xorg-x11-server-1_5_3-1_fc10:HEAD:xorg-x11-server-1.5.3-1.fc10.src.rpm:1225918317 xorg-x11-server-1_6_0-1_fc11:HEAD:xorg-x11-server-1.6.0-1.fc11.src.rpm:1235594175 xorg-x11-server-1_6_1-1_fc11:HEAD:xorg-x11-server-1.6.1-1.fc11.src.rpm:1239742477 +xorg-x11-server-1_6_1_901-1_fc11:F-11:xorg-x11-server-1.6.1.901-1.fc11.src.rpm:1242671995 diff --git a/sources b/sources index 6eb325e..358b339 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ed0878bf32a24d4948c3b8a122a39eff xorg-server-1.6.1.tar.bz2 +e6cba1f07006143daa95ce3f11d999b2 xorg-server-1.6.1.901.tar.bz2 diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 00b7c4b..e45859a 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -18,8 +18,8 @@ Summary: X.Org X11 X server Name: xorg-x11-server -Version: 1.6.1 -Release: 14%{?dist} +Version: 1.6.1.901 +Release: 1%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X @@ -52,6 +52,7 @@ Patch103: xserver-1.5.0-bg-none-root.patch # Red Hat specific tweaking, not intended for upstream # XXX move these to the end of the list Patch1003: xserver-1.4.99-pic-libxf86config.patch +Patch1004: xserver-1.6.1-hush-warning.patch Patch2013: xserver-1.6.1-document-fontpath-correctly.patch Patch2014: xserver-1.5.0-projector-fb-size.patch @@ -82,9 +83,6 @@ Patch6012: xserver-1.5.99.902-sod-off-poulsbo.patch # don't do selinux if we're not told to Patch6013: xserver-1.6.0-selinux-less.patch -# selinux performance hack -#Patch6014: xserver-1.6.0-selinux-nlfd.patch - # https://bugs.freedesktop.org/show_bug.cgi?id=20087 Patch6015: xserver-1.5.99.902-vnc.patch @@ -94,8 +92,6 @@ Patch6016: xserver-1.6.1-nouveau.patch Patch6022: xserver-1.6.0-primary.patch Patch6024: xserver-1.6.0-xinerama-cursors.patch -# http://bugs.freedesktop.org/show_bug.cgi?id=20557 -Patch6026: xserver-1.6.0-xinerama-crashes.patch # ajax needs to upstream this Patch6027: xserver-1.6.0-displayfd.patch @@ -108,13 +104,13 @@ Patch6031: xserver-1.6.1-exa-avoid-swapped-out.patch Patch6032: xserver-1.6.1-randr-gamma.patch # Nominated for 1.6.2 -Patch6033: xserver-1.6.1-activate-device.patch Patch6034: xserver-1.6.1-exa-create-pixmap2.patch Patch6035: xserver-1.6.1-avoid-malloc-for-logging.patch Patch6040: xserver-1.6.1-vt-switch.patch # from upstream, nominated for 1.6.2 (#499792) Patch6041: xserver-1.6.1-synaptics.patch +Patch6042: xserver-1.6.1-proc-cmdline.patch %define moduledir %{_libdir}/xorg/modules %define drimoduledir %{_libdir}/dri @@ -418,22 +414,6 @@ xargs tar cf - | (cd %{inst_srcdir} && tar xf -) %clean rm -rf $RPM_BUILD_ROOT -%if %{with_hw_servers} -%pre Xorg -{ - pushd /etc/X11 - - [ -e xorg.conf ] || return 0 - - sed -i 's/^.*Load.*"(pex5|xie|xtt).*\n$"//gi' xorg.conf - sed -i 's/^\s*Driver(.*)"keyboard"/Driver\1"kbd"/gi' xorg.conf - sed -i 's/^.*Option.*"XkbRules".*"(xfree86|xorg)".*\n$//gi' xorg.conf - sed -i 's#^\s*RgbPath.*$##gi' xorg.conf - - popd -} &> /dev/null || : -%endif - %files common %defattr(-,root,root,-) %{_mandir}/man1/Xserver.1* @@ -548,6 +528,17 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon May 18 2009 Adam Jackson 1.6.1.901-1 +- Rebase to 1.6.2 pre-release +- xserver-1.6.1-hush-warning.patch: Silence the prerelease warning spew. +- xserver-1.6.0-xinerama-crashes.patch: merged +- xserver-1.6.1-activate-device.patch: merged +- xserver-1.6.1-proc-cmdline.patch: Print /proc/cmdline in the log +- xserver-1.6.0-primary.patch: Don't include prehistoric PCI devices in the + candidate list for primary video. (#500057) +- Drop the %%pre scriptlet from the Xorg subpackage, it's been there since + FC5, if you haven't upgraded by now you're quite doomed. + * Mon May 11 2009 Peter Hutterer 1.6.1-14 - xserver-1.6.1-synaptics.patch: Don't synthesize a mouse section if unreferenced synaptics devices are found in the xorg.conf (#499792) diff --git a/xserver-1.6.0-primary.patch b/xserver-1.6.0-primary.patch index f410e11..e4e8b41 100644 --- a/xserver-1.6.0-primary.patch +++ b/xserver-1.6.0-primary.patch @@ -1,30 +1,32 @@ -From 69e53f2493c142ef5569af01ce52565be5b2976e Mon Sep 17 00:00:00 2001 +From b0f7839b34d4110dd08d523c01dc1d4b4c74cfb6 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 3 Mar 2009 10:58:33 -0500 Subject: [PATCH] Primary video device hack --- - hw/xfree86/common/xf86pciBus.c | 60 ++++++++++++++++++++++++++++++++-------- - 1 files changed, 48 insertions(+), 12 deletions(-) + hw/xfree86/common/xf86pciBus.c | 62 +++++++++++++++++++++++++++++++--------- + 1 files changed, 48 insertions(+), 14 deletions(-) diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c -index 467a0c3..0d2d01c 100644 +index 467a0c3..18f104f 100644 --- a/hw/xfree86/common/xf86pciBus.c +++ b/hw/xfree86/common/xf86pciBus.c -@@ -60,11 +60,7 @@ static struct pci_device ** xf86PciVideoInfo = NULL; /* PCI probe for video hw * +@@ -58,13 +58,7 @@ static struct pci_device ** xf86PciVideoInfo = NULL; /* PCI probe for video hw * + + /* PCI classes that get included in xf86PciVideoInfo */ - #define PCIINFOCLASSES(c) \ - ( (((c) & 0x00ff0000) == (PCI_CLASS_PREHISTORIC << 16)) \ +-#define PCIINFOCLASSES(c) \ +- ( (((c) & 0x00ff0000) == (PCI_CLASS_PREHISTORIC << 16)) \ - || (((c) & 0x00ff0000) == (PCI_CLASS_DISPLAY << 16)) \ - || ((((c) & 0x00ffff00) \ - == ((PCI_CLASS_MULTIMEDIA << 16) | (PCI_SUBCLASS_MULTIMEDIA_VIDEO << 8)))) \ - || ((((c) & 0x00ffff00) \ - == ((PCI_CLASS_PROCESSOR << 16) | (PCI_SUBCLASS_PROCESSOR_COPROC << 8)))) ) -+ || (((c) & 0x00ffff00) == (PCI_CLASS_DISPLAY << 16)) ) ++#define PCIINFOCLASSES(c) (((c) & 0x00ffff00) == (PCI_CLASS_DISPLAY << 16)) /* * PCI classes that have messages printed always. The others are only -@@ -341,6 +337,39 @@ restorePciBusState(BusAccPtr ptr) +@@ -341,6 +335,39 @@ restorePciBusState(BusAccPtr ptr) } #undef MASKBITS @@ -64,7 +66,7 @@ index 467a0c3..0d2d01c 100644 /* * xf86Bus.c interface -@@ -375,24 +404,31 @@ xf86PciProbe(void) +@@ -375,24 +402,31 @@ xf86PciProbe(void) } } @@ -104,5 +106,5 @@ index 467a0c3..0d2d01c 100644 } } -- -1.6.1.3 +1.6.2.2 diff --git a/xserver-1.6.0-xinerama-crashes.patch b/xserver-1.6.0-xinerama-crashes.patch deleted file mode 100644 index bb9adca..0000000 --- a/xserver-1.6.0-xinerama-crashes.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 24e682d0fcc98d7c3f63fa484cc28285df48b499 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Wed, 25 Mar 2009 13:08:27 +1000 -Subject: [PATCH] dix: ignore non-pointer events in XineramaCheckMotion (#20557) - -Note that deviceKeyButtonPointer and keyButtonPointer have the same wire -layout, so we only need to check for event types. - -X.Org Bug 20557 - -Signed-off-by: Peter Hutterer ---- - dix/events.c | 17 +++++++++++++++++ - 1 files changed, 17 insertions(+), 0 deletions(-) - -diff --git a/dix/events.c b/dix/events.c -index 6743cae..63b0674 100644 ---- a/dix/events.c -+++ b/dix/events.c -@@ -625,6 +625,23 @@ XineramaCheckMotion(xEvent *xE, DeviceIntPtr pDev) - - if (xE && !syncEvents.playingEvents) - { -+ /* GetPointerEvents() guarantees that pointer events have the correct -+ rootX/Y set already. */ -+ switch(xE->u.u.type) -+ { -+ case ButtonPress: -+ case ButtonRelease: -+ case MotionNotify: -+ break; -+ default: -+ if (xE->u.u.type == DeviceButtonPress || -+ xE->u.u.type == DeviceButtonRelease || -+ xE->u.u.type == DeviceMotionNotify) -+ break; -+ /* all other events return FALSE */ -+ return FALSE; -+ } -+ - /* Motion events entering DIX get translated to Screen 0 - coordinates. Replayed events have already been - translated since they've entered DIX before */ --- -1.6.0.6 - diff --git a/xserver-1.6.1-activate-device.patch b/xserver-1.6.1-activate-device.patch deleted file mode 100644 index deef5eb..0000000 --- a/xserver-1.6.1-activate-device.patch +++ /dev/null @@ -1,32 +0,0 @@ -From efa31092d6703397121a0ada4f7205a8ecad3d3d Mon Sep 17 00:00:00 2001 -From: Ander Conselvan de Oliveira -Date: Mon, 6 Apr 2009 16:01:20 -0300 -Subject: [PATCH] xfree86: Remove device from inputInfo.devices if ActivateDevice failed. - -After the call to xf86ActivateDevice, the new device will be added to -inputInfo.devices. However, if the subsequent call to ActivateDevice -fails, the correponding InputInfoRec for the device is deleted but an -entry still remains in inputInfo.devices. This might lead to a server -crash later on (on InitAndStartDevices for instance) when the device -control proc would be called for an invalid device. - -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 3d89e39..8d08d7e 100644 ---- a/hw/xfree86/common/xf86Xinput.c -+++ b/hw/xfree86/common/xf86Xinput.c -@@ -543,7 +543,10 @@ xf86NewInputDevice(IDevPtr idev, DeviceIntPtr *pdev, BOOL enable) - dev = pInfo->dev; - rval = ActivateDevice(dev); - if (rval != Success) -+ { -+ RemoveDevice(dev); - goto unwind; -+ } - - /* Enable it if it's properly initialised and we're currently in the VT */ - if (enable && dev->inited && dev->startup && xf86Screens[0]->vtSema) diff --git a/xserver-1.6.1-hush-warning.patch b/xserver-1.6.1-hush-warning.patch new file mode 100644 index 0000000..a0aa3d1 --- /dev/null +++ b/xserver-1.6.1-hush-warning.patch @@ -0,0 +1,25 @@ +From 7768cd35b501f4b932aa7965598f4ae9400adddb Mon Sep 17 00:00:00 2001 +From: Adam Jackson +Date: Mon, 18 May 2009 14:30:54 -0400 +Subject: [PATCH] Silence prerelease warning + +--- + hw/xfree86/common/xf86Init.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c +index 8db96f9..48c22c2 100644 +--- a/hw/xfree86/common/xf86Init.c ++++ b/hw/xfree86/common/xf86Init.c +@@ -135,7 +135,7 @@ static Bool formatsDone = FALSE; + static void + xf86PrintBanner(void) + { +-#if PRE_RELEASE ++#if 0 + ErrorF("\n" + "This is a pre-release version of the X server from " XVENDORNAME ".\n" + "It is not supported in any way.\n" +-- +1.6.2.2 + diff --git a/xserver-1.6.1-proc-cmdline.patch b/xserver-1.6.1-proc-cmdline.patch new file mode 100644 index 0000000..2474a33 --- /dev/null +++ b/xserver-1.6.1-proc-cmdline.patch @@ -0,0 +1,36 @@ +From 794214c9da2b17c3291ec53b178a035a1f117430 Mon Sep 17 00:00:00 2001 +From: Adam Jackson +Date: Thu, 7 May 2009 17:18:31 -0400 +Subject: [PATCH] Dump /proc/cmdline in the log file too. + +--- + hw/xfree86/common/xf86Init.c | 13 +++++++++++++ + 1 files changed, 13 insertions(+), 0 deletions(-) + +diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c +index 2493526..7c0937f 100644 +--- a/hw/xfree86/common/xf86Init.c ++++ b/hw/xfree86/common/xf86Init.c +@@ -193,6 +193,19 @@ xf86PrintBanner(void) + if (uname(&name) >= 0) { + ErrorF("Current Operating System: %s %s %s %s %s\n", + name.sysname, name.nodename, name.release, name.version, name.machine); ++ do { ++ char buf[80]; ++ int fd = open("/proc/cmdline", O_RDONLY); ++ if (fd != -1) { ++ ErrorF("Kernel command line: "); ++ memset(buf, 0, 80); ++ while (read(fd, buf, 80) > 0) { ++ ErrorF("%.80s", buf); ++ memset(buf, 0, 80); ++ } ++ close(fd); ++ } ++ } while (0); + } + } + #endif +-- +1.6.2.2 +