commit a6ad2c0f62b0d1eb7cf992a3dfed73dfbe37d4a5 Author: Tilman Sauerbeck <tilman@crux.nu> Date: Fri Jun 1 18:52:07 2007 +0200 xorg-server: applied xinerama/randr patch. diff --git a/xorg-server/.md5sum b/xorg-server/.md5sum index 0192857..3ee1a50 100644 --- a/xorg-server/.md5sum +++ b/xorg-server/.md5sum @@ -1,2 +1,3 @@ e4d894181f1859651658b3704633e10d MesaLib-6.5.2.tar.bz2 a51a7d482e3c689394755bb17bda8526 xorg-server-1.3.0.0.tar.bz2 +75c7265107d9c31227491eb5195f35a9 xorg-server.diff diff --git a/xorg-server/Pkgfile b/xorg-server/Pkgfile index b0309b0..0755edf 100644 --- a/xorg-server/Pkgfile +++ b/xorg-server/Pkgfile @@ -5,14 +5,17 @@ name=xorg-server version=1.3.0.0 -release=1 +release=2 source=(http://xorg.freedesktop.org/releases/individual/xserver/$name-$version.tar.b... \ - http://dl.sourceforge.net/mesa3d/MesaLib-6.5.2.tar.bz2) + http://dl.sourceforge.net/mesa3d/MesaLib-6.5.2.tar.bz2 \ + $name.diff) build() { cd $name-$version + patch -Np1 -i $SRC/$name.diff + # fix man page suffixes sed -i -e '33891d' -e '33917d' configure diff --git a/xorg-server/xorg-server.diff b/xorg-server/xorg-server.diff new file mode 100644 index 0000000..f2553a6 --- /dev/null +++ b/xorg-server/xorg-server.diff @@ -0,0 +1,35 @@ +From 9c80eda826448822328bb678a7d284cc43fffb17 Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax@benzedrine.nwnk.net> +Date: Wed, 25 Apr 2007 16:35:04 -0400 +Subject: Disable RANDR's fake Xinerama protocol when there's more than one screen. + +... in the protocol sense. Xinerama doesn't have any provision for more +than one protocol screen each with its own geometry. + +Red Hat bug #231257. +--- + randr/rrxinerama.c | 8 ++++++++ + 1 files changed, 8 insertions(+), 0 deletions(-) + +diff --git a/randr/rrxinerama.c b/randr/rrxinerama.c +index 1db27f1..2a57e4e 100644 +--- a/randr/rrxinerama.c ++++ b/randr/rrxinerama.c +@@ -428,6 +428,14 @@ RRXineramaExtensionInit(void) + return; + #endif + ++ /* ++ * Xinerama isn't capable enough to have multiple protocol screens each ++ * with their own output geometry. So if there's more than one protocol ++ * screen, just don't even try. ++ */ ++ if (screenInfo.numScreens > 1) ++ return; ++ + (void) AddExtension(PANORAMIX_PROTOCOL_NAME, 0,0, + ProcRRXineramaDispatch, + SProcRRXineramaDispatch, +-- +1.5.2 +