From 77cc6406850b1870904b0b2c5f163f756e6374e1 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 25 Nov 2010 09:49:36 +1000 Subject: [PATCH] =?UTF-8?q?-=20Today's=20git=20snapshot=20-=20Drop=20hal?= =?UTF-8?q?=E2=86=92udev=20migration=20warning.=20Two=20releases=20later?= =?UTF-8?q?=20should=20be=20enough.=20-=20xserver-1.8.0-no-xorg.patch:=20d?= =?UTF-8?q?rop,=20upstream=20-=20xserver-1.7.0-randr-gamma-restore.patch:?= =?UTF-8?q?=20drop,=20upstream=20-=20xserver-1.7.1-gamma-kdm-fix.patch:=20?= =?UTF-8?q?drop,=20upstream=20-=20xserver-1.9.0-tcflush-fix.patch:=20drop,?= =?UTF-8?q?=20upstream=20-=20xserver-1.9.1-pxtc-crash.patch:=20drop,=20ups?= =?UTF-8?q?tream=20-=20xserver-1.9.0-vbe-panelid-sanity.patch:=20drop,=20u?= =?UTF-8?q?pstream=20-=20xserver-1.9.0-classic-default-mode.patch:=20drop,?= =?UTF-8?q?=20upstream?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 + commitid | 2 +- sources | 2 +- xorg-x11-server.spec | 37 ++++++------ xserver-1.4.99-pic-libxf86config.patch | 10 ++-- xserver-1.4.99-ssh-isnt-local.patch | 12 ++-- xserver-1.6.0-displayfd.patch | 37 ++++++------ xserver-1.6.0-less-acpi-brokenness.patch | 10 ++-- xserver-1.6.1-nouveau.patch | 26 ++++----- xserver-1.6.99-default-modes.patch | 10 ++-- xserver-1.6.99-right-of.patch | 34 ++++++------ xserver-1.7.0-randr-gamma-restore.patch | 36 ------------ xserver-1.7.1-gamma-kdm-fix.patch | 34 ------------ xserver-1.7.1-multilib.patch | 8 +-- xserver-1.8-disable-vboxvideo.patch | 10 ++-- xserver-1.8-udev-warning.patch | 37 ------------ xserver-1.9.0-classic-default-mode.patch | 71 ------------------------ xserver-1.9.0-qxl-fallback.patch | 8 +-- xserver-1.9.0-tcflush-fix.patch | 35 ------------ xserver-1.9.0-vbe-panelid-sanity.patch | 29 ---------- xserver-1.9.1-pxtc-crash.patch | 25 --------- 21 files changed, 106 insertions(+), 369 deletions(-) delete mode 100644 xserver-1.7.0-randr-gamma-restore.patch delete mode 100644 xserver-1.7.1-gamma-kdm-fix.patch delete mode 100644 xserver-1.8-udev-warning.patch delete mode 100644 xserver-1.9.0-classic-default-mode.patch delete mode 100644 xserver-1.9.0-tcflush-fix.patch delete mode 100644 xserver-1.9.0-vbe-panelid-sanity.patch delete mode 100644 xserver-1.9.1-pxtc-crash.patch diff --git a/.gitignore b/.gitignore index df4e366..59f4f11 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ xorg-server-1.9.1.tar.bz2 +/xorg-server-20101125.tar.xz +/xorg-server-20101201.tar.xz diff --git a/commitid b/commitid index dad3ff9..6f8c877 100644 --- a/commitid +++ b/commitid @@ -1 +1 @@ -a2c13f0d6548310e3cd115cf486d3e43edf23dcc +02449ee24b484c9fea501df5274d95a9f87cab23 diff --git a/sources b/sources index ccf4ffb..f32b492 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -64f2a021667ac3a2bc007f2567170f03 xorg-server-1.9.1.tar.bz2 +a10a02ef4eaae212974b410eeb54a3e3 xorg-server-20101201.tar.xz diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index aae79f3..73ebd3a 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -17,20 +17,20 @@ # because rpm is a terrible language. HTFU. %define ansic_major 0 %define ansic_minor 4 -%define videodrv_major 8 +%define videodrv_major 9 %define videodrv_minor 0 -%define xinput_major 11 +%define xinput_major 12 %define xinput_minor 0 %define extension_major 4 %define extension_minor 0 %define pkgname xorg-server -#define gitdate 20100716 +%define gitdate 20101201 Summary: X.Org X11 X server Name: xorg-x11-server -Version: 1.9.1 -Release: 6%{?gitdate:.%{gitdate}}%{dist} +Version: 1.9.99.1 +Release: 1%{?gitdate:.%{gitdate}}%{dist} URL: http://www.x.org License: MIT Group: User Interface/X @@ -61,7 +61,8 @@ Source30: xserver-sdk-abi-requires Patch5: xserver-1.4.99-pic-libxf86config.patch # OpenGL compositing manager feature/optimization patches. -Patch103: xserver-1.5.0-bg-none-root.patch +# FIXME: who calls this? +#Patch103: xserver-1.5.0-bg-none-root.patch # Trivial things to never merge upstream ever: # This really could be done prettier. @@ -78,28 +79,15 @@ Patch6027: xserver-1.6.0-displayfd.patch Patch6030: xserver-1.6.99-right-of.patch Patch6033: xserver-1.6.99-default-modes.patch #Patch6044: xserver-1.6.99-hush-prerelease-warning.patch -Patch6045: xserver-1.7.0-randr-gamma-restore.patch Patch6049: xserver-1.7.1-multilib.patch -Patch6051: xserver-1.7.1-gamma-kdm-fix.patch - -# Remove this some day. Not today though. -Patch6052: xserver-1.8-udev-warning.patch # Use vesa for VirtualBox, since we don't ship vboxvideo and the # fallback to vesa when module is missing seems broken Patch6053: xserver-1.8-disable-vboxvideo.patch -# https://bugs.freedesktop.org/show_bug.cgi?id=28672 -Patch7000: xserver-1.8.0-no-xorg.patch - -Patch7001: xserver-1.9.0-tcflush-fix.patch -# 632805 -Patch7002: xserver-1.9.0-vbe-panelid-sanity.patch # misc -Patch7004: xserver-1.9.0-classic-default-mode.patch Patch7005: xserver-1.9.0-qxl-fallback.patch -Patch7006: xserver-1.9.1-pxtc-crash.patch %define moduledir %{_libdir}/xorg/modules %define drimoduledir %{_libdir}/dri @@ -558,6 +546,17 @@ rm -rf $RPM_BUILD_ROOT %{xserver_source_dir} %changelog +* Wed Dec 01 2010 Peter Hutterer 1.9.99.1-1 +- Today's git snapshot +- Drop hal→udev migration warning. Two releases later should be enough. +- xserver-1.8.0-no-xorg.patch: drop, upstream +- xserver-1.7.0-randr-gamma-restore.patch: drop, upstream +- xserver-1.7.1-gamma-kdm-fix.patch: drop, upstream +- xserver-1.9.0-tcflush-fix.patch: drop, upstream +- xserver-1.9.1-pxtc-crash.patch: drop, upstream +- xserver-1.9.0-vbe-panelid-sanity.patch: drop, upstream +- xserver-1.9.0-classic-default-mode.patch: drop, upstream + * Tue Nov 23 2010 Adam Jackson 1.9.1-6 - xserver-1.5.0-projector-fb-size.patch: Drop. diff --git a/xserver-1.4.99-pic-libxf86config.patch b/xserver-1.4.99-pic-libxf86config.patch index 3305fc0..b8123d2 100644 --- a/xserver-1.4.99-pic-libxf86config.patch +++ b/xserver-1.4.99-pic-libxf86config.patch @@ -1,14 +1,14 @@ -From d88b91cd4fa9f93b91824b00a61b64ecac752bb1 Mon Sep 17 00:00:00 2001 +From 81b45563f169cb131fe22042c1f4b3b24a49d82f Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Mon, 10 Dec 2007 11:26:57 -0500 -Subject: [PATCH 01/17] Build libxf86config with -fPIC. +Subject: [PATCH] Build libxf86config with -fPIC. --- hw/xfree86/parser/Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/xfree86/parser/Makefile.am b/hw/xfree86/parser/Makefile.am -index caf7079..655e73f 100644 +index caf7079..3bda51e 100644 --- a/hw/xfree86/parser/Makefile.am +++ b/hw/xfree86/parser/Makefile.am @@ -32,7 +32,7 @@ libxf86config_internal_la_SOURCES = \ @@ -16,10 +16,10 @@ index caf7079..655e73f 100644 libxf86config_a_SOURCES = \ $(INTERNAL_SOURCES) -libxf86config_a_CFLAGS = $(AM_CFLAGS) -+libxf86config_a_CFLAGS = $(AM_CFLAGS) -fPIC -fvisibility=hidden ++libxf86config_a_CFLAGS = $(AM_CFLAGS) -fPIC AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) \ -DSYSCONFDIR=\"$(sysconfdir)\" \ -- -1.7.1 +1.7.3.2 diff --git a/xserver-1.4.99-ssh-isnt-local.patch b/xserver-1.4.99-ssh-isnt-local.patch index 7b4b8a7..d0b95a0 100644 --- a/xserver-1.4.99-ssh-isnt-local.patch +++ b/xserver-1.4.99-ssh-isnt-local.patch @@ -1,17 +1,17 @@ -From b7979b8521272d53531ffd1cf3566ce4e5c0469b Mon Sep 17 00:00:00 2001 +From a02009f81a8ee019b0642716eb68475c75eca5ec Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Mon, 10 Dec 2007 11:26:57 -0500 -Subject: [PATCH 04/17] Hack for proper MIT-SHM rejection for ssh-forwarded clients. +Subject: [PATCH] Hack for proper MIT-SHM rejection for ssh-forwarded clients. --- Xext/shm.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/Xext/shm.c b/Xext/shm.c -index 3230d83..7f0ad91 100644 +index 23afe6b..1e2f9f5 100644 --- a/Xext/shm.c +++ b/Xext/shm.c -@@ -389,8 +389,21 @@ shm_access(ClientPtr client, SHMPERM_TYPE *perm, int readonly) +@@ -325,8 +325,21 @@ shm_access(ClientPtr client, SHMPERM_TYPE *perm, int readonly) mode_t mask; int uidset = 0, gidset = 0; LocalClientCredRec *lcc; @@ -33,7 +33,7 @@ index 3230d83..7f0ad91 100644 if (lcc->fieldsSet & LCC_UID_SET) { uid = lcc->euid; -@@ -409,6 +422,9 @@ shm_access(ClientPtr client, SHMPERM_TYPE *perm, int readonly) +@@ -345,6 +358,9 @@ shm_access(ClientPtr client, SHMPERM_TYPE *perm, int readonly) } #endif FreeLocalClientCreds(lcc); @@ -44,5 +44,5 @@ index 3230d83..7f0ad91 100644 if (uidset) { /* User id 0 always gets access */ -- -1.7.1 +1.7.3.2 diff --git a/xserver-1.6.0-displayfd.patch b/xserver-1.6.0-displayfd.patch index 7b18d5f..5fc1f08 100644 --- a/xserver-1.6.0-displayfd.patch +++ b/xserver-1.6.0-displayfd.patch @@ -1,20 +1,20 @@ -From e947d22be5c559c9c19e13a42b8f39a2e3746ae3 Mon Sep 17 00:00:00 2001 +From 47c3d565596ad3d5c837fb6909a40f7a251c248d Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Thu, 18 Jun 2009 16:56:41 +1000 -Subject: [PATCH 08/17] displayfd hack +Subject: [PATCH] displayfd hack --- dix/globals.c | 1 + include/opaque.h | 1 + - os/connection.c | 72 ++++++++++++++++++++++++++++++++++++----------------- + os/connection.c | 73 +++++++++++++++++++++++++++++++++++++----------------- os/utils.c | 11 ++++++++ - 4 files changed, 62 insertions(+), 23 deletions(-) + 4 files changed, 63 insertions(+), 23 deletions(-) diff --git a/dix/globals.c b/dix/globals.c -index 95dde2d..2ea9480 100644 +index 0a6b170..0ee83c0 100644 --- a/dix/globals.c +++ b/dix/globals.c -@@ -131,6 +131,7 @@ int defaultColorVisualClass = -1; +@@ -126,6 +126,7 @@ int defaultColorVisualClass = -1; int monitorResolution = 0; char *display; @@ -23,7 +23,7 @@ index 95dde2d..2ea9480 100644 CARD32 TimeOutValue = DEFAULT_TIMEOUT * MILLI_PER_SECOND; diff --git a/include/opaque.h b/include/opaque.h -index fcc8c95..2a08e2d 100644 +index 5c70717..f23203f 100644 --- a/include/opaque.h +++ b/include/opaque.h @@ -50,6 +50,7 @@ extern _X_EXPORT int ScreenSaverAllowExposures; @@ -35,23 +35,26 @@ index fcc8c95..2a08e2d 100644 extern _X_EXPORT int defaultBackingStore; extern _X_EXPORT Bool disableBackingStore; diff --git a/os/connection.c b/os/connection.c -index c143fb6..0d1e1de 100644 +index 5452ae1..9c20ef1 100644 --- a/os/connection.c +++ b/os/connection.c -@@ -146,6 +146,7 @@ Bool NewOutputPending; /* not yet attempted to write some new output */ - Bool AnyClientsWriteBlocked; /* true if some client blocked on write */ - +@@ -145,6 +145,7 @@ Bool AnyClientsWriteBlocked; /* true if some client blocked on write */ static Bool RunFromSmartParent; /* send SIGUSR1 to parent process */ + Bool RunFromSigStopParent; /* send SIGSTOP to our own process; Upstart (or + equivalent) will send SIGCONT back. */ +static char dynamic_display[7]; Bool PartialNetwork; /* continue even if unable to bind all addrs */ static Pid_t ParentProcess; -@@ -357,9 +358,23 @@ NotifyParentProcess(void) +@@ -356,11 +357,26 @@ NotifyParentProcess(void) kill (ParentProcess, SIGUSR1); } } + if (dynamic_display[0]) + write(displayfd, dynamic_display, strlen(dynamic_display)); ++ + if (RunFromSigStopParent) + raise (SIGSTOP); #endif } @@ -70,7 +73,7 @@ index c143fb6..0d1e1de 100644 /***************** * CreateWellKnownSockets * At initialization, create the sockets to listen on for new clients. -@@ -370,7 +385,6 @@ CreateWellKnownSockets(void) +@@ -371,7 +387,6 @@ CreateWellKnownSockets(void) { int i; int partial; @@ -78,7 +81,7 @@ index c143fb6..0d1e1de 100644 FD_ZERO(&AllSockets); FD_ZERO(&AllClients); -@@ -385,32 +399,44 @@ CreateWellKnownSockets(void) +@@ -386,32 +401,44 @@ CreateWellKnownSockets(void) FD_ZERO (&WellKnownConnections); @@ -146,10 +149,10 @@ index c143fb6..0d1e1de 100644 } diff --git a/os/utils.c b/os/utils.c -index 64810cf..c292702 100644 +index afdff0c..6866740 100644 --- a/os/utils.c +++ b/os/utils.c -@@ -660,6 +660,17 @@ ProcessCommandLine(int argc, char *argv[]) +@@ -657,6 +657,17 @@ ProcessCommandLine(int argc, char *argv[]) else UseMsg(); } @@ -168,5 +171,5 @@ index 64810cf..c292702 100644 else if ( strcmp( argv[i], "dpms") == 0) /* ignored for compatibility */ ; -- -1.7.1 +1.7.3.2 diff --git a/xserver-1.6.0-less-acpi-brokenness.patch b/xserver-1.6.0-less-acpi-brokenness.patch index 7540c40..eb82e19 100644 --- a/xserver-1.6.0-less-acpi-brokenness.patch +++ b/xserver-1.6.0-less-acpi-brokenness.patch @@ -1,7 +1,7 @@ -From 9a399f86295b571812133ccb06618c7befa36ad6 Mon Sep 17 00:00:00 2001 +From 86c8a64b29a97a0562b6725ed163a6beac93fa12 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Wed, 11 Mar 2009 14:02:11 -0400 -Subject: [PATCH 06/17] Don't build the ACPI code. +Subject: [PATCH] Don't build the ACPI code. No good can come of this. --- @@ -9,10 +9,10 @@ No good can come of this. 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac -index b3b752c..8d874cb 100644 +index bd027cd..9adbdc5 100644 --- a/configure.ac +++ b/configure.ac -@@ -1624,13 +1624,11 @@ if test "x$XORG" = xyes; then +@@ -1623,13 +1623,11 @@ if test "x$XORG" = xyes; then case $host_cpu in ia64*) linux_ia64=yes @@ -27,5 +27,5 @@ index b3b752c..8d874cb 100644 *) ;; -- -1.7.1 +1.7.3.2 diff --git a/xserver-1.6.1-nouveau.patch b/xserver-1.6.1-nouveau.patch index 86ff96c..938bb7a 100644 --- a/xserver-1.6.1-nouveau.patch +++ b/xserver-1.6.1-nouveau.patch @@ -1,7 +1,7 @@ -From 9edb8ba5f8217f6f8ed80e064d57a97f4f3e9201 Mon Sep 17 00:00:00 2001 +From 2e79f2eb5a0fbef5f0698b066938d8f1ada44698 Mon Sep 17 00:00:00 2001 From: Fedora X Ninjas Date: Tue, 16 Feb 2010 11:38:17 +1000 -Subject: [PATCH 07/17] autoconfig: select nouveau by default for NVIDIA GPUs +Subject: [PATCH] autoconfig: select nouveau by default for NVIDIA GPUs Also, don't treat DRI setup failure as an error for nouveau. --- @@ -11,10 +11,10 @@ Also, don't treat DRI setup failure as an error for nouveau. 3 files changed, 27 insertions(+), 5 deletions(-) diff --git a/glx/glxdri.c b/glx/glxdri.c -index 32b35db..f3a501e 100644 +index db3fcd5..82cdb87 100644 --- a/glx/glxdri.c +++ b/glx/glxdri.c -@@ -968,6 +968,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen) +@@ -979,6 +979,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen) const __DRIconfig **driConfigs; const __DRIextension **extensions; int i; @@ -22,7 +22,7 @@ index 32b35db..f3a501e 100644 if (!xf86LoaderCheckSymbol("DRIQueryDirectRenderingCapable") || !DRIQueryDirectRenderingCapable(pScreen, &isCapable) || -@@ -1047,7 +1048,9 @@ __glXDRIscreenProbe(ScreenPtr pScreen) +@@ -1058,7 +1059,9 @@ __glXDRIscreenProbe(ScreenPtr pScreen) screen->driver = dlopen(filename, RTLD_LAZY | RTLD_LOCAL); if (screen->driver == NULL) { @@ -33,7 +33,7 @@ index 32b35db..f3a501e 100644 filename, dlerror()); goto handle_error; } -@@ -1185,7 +1188,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen) +@@ -1194,7 +1197,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen) free(screen); @@ -43,10 +43,10 @@ index 32b35db..f3a501e 100644 return NULL; } diff --git a/glx/glxdri2.c b/glx/glxdri2.c -index 970a51a..c78d4b3 100644 +index 0b69201..1c58023 100644 --- a/glx/glxdri2.c +++ b/glx/glxdri2.c -@@ -696,6 +696,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen) +@@ -709,6 +709,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen) const __DRIextension **extensions; const __DRIconfig **driConfigs; int i; @@ -54,7 +54,7 @@ index 970a51a..c78d4b3 100644 screen = calloc(1, sizeof *screen); if (screen == NULL) -@@ -722,7 +723,9 @@ __glXDRIscreenProbe(ScreenPtr pScreen) +@@ -735,7 +736,9 @@ __glXDRIscreenProbe(ScreenPtr pScreen) screen->driver = dlopen(filename, RTLD_LAZY | RTLD_LOCAL); if (screen->driver == NULL) { @@ -65,7 +65,7 @@ index 970a51a..c78d4b3 100644 filename, dlerror()); goto handle_error; } -@@ -816,7 +819,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen) +@@ -827,7 +830,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen) free(screen); @@ -75,10 +75,10 @@ index 970a51a..c78d4b3 100644 return NULL; } diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c -index 74016af..9c296f5 100644 +index 3e9c455..e34e6d6 100644 --- a/hw/xfree86/common/xf86pciBus.c +++ b/hw/xfree86/common/xf86pciBus.c -@@ -1118,7 +1118,23 @@ videoPtrToDriverList(struct pci_device *dev, +@@ -1123,7 +1123,23 @@ videoPtrToDriverList(struct pci_device *dev, break; case 0x102b: driverList[0] = "mga"; break; case 0x10c8: driverList[0] = "neomagic"; break; @@ -104,5 +104,5 @@ index 74016af..9c296f5 100644 case 0x1b36: driverList[0] = "qxl"; break; case 0x1163: driverList[0] = "rendition"; break; -- -1.7.1 +1.7.3.2 diff --git a/xserver-1.6.99-default-modes.patch b/xserver-1.6.99-default-modes.patch index e442326..e2d646d 100644 --- a/xserver-1.6.99-default-modes.patch +++ b/xserver-1.6.99-default-modes.patch @@ -1,17 +1,17 @@ -From 92a02d58bf4e1d0b4779d37401d40c28e3a4ba2a Mon Sep 17 00:00:00 2001 +From db7547ab7f43f36f2eb38bc9ea29cbfa691ed7f0 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Thu, 4 Mar 2010 15:18:38 +1000 -Subject: [PATCH 11/17] tweak default mode list yet again +Subject: [PATCH] tweak default mode list yet again --- hw/xfree86/modes/xf86Crtc.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c -index d907eb2..dc159a1 100644 +index 5875731..adae031 100644 --- a/hw/xfree86/modes/xf86Crtc.c +++ b/hw/xfree86/modes/xf86Crtc.c -@@ -1630,6 +1630,9 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn, int maxX, int maxY) +@@ -1621,6 +1621,9 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn, int maxX, int maxY) } output_modes = (*output->funcs->get_modes) (output); @@ -22,5 +22,5 @@ index d907eb2..dc159a1 100644 edid_monitor = output->MonInfo; -- -1.7.1 +1.7.3.2 diff --git a/xserver-1.6.99-right-of.patch b/xserver-1.6.99-right-of.patch index eba0e6a..3a1d075 100644 --- a/xserver-1.6.99-right-of.patch +++ b/xserver-1.6.99-right-of.patch @@ -1,7 +1,7 @@ -From 1897cfb0c09b11ebc5e3de3391150cfa6666d901 Mon Sep 17 00:00:00 2001 +From 2cf7928ed74cbd94e423788a8341bf9a647d0dd9 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 28 Jul 2009 11:07:13 -0400 -Subject: [PATCH 10/17] RANDR: right-of placement by default +Subject: [PATCH] RANDR: right-of placement by default [Enhanced to add a new prefer clone option for drivers. This allows for servers like RN50 where two heads are disjoint. - airlied] @@ -11,15 +11,15 @@ allows for servers like RN50 where two heads are disjoint. - airlied] 2 files changed, 74 insertions(+), 9 deletions(-) diff --git a/hw/xfree86/common/xf86str.h b/hw/xfree86/common/xf86str.h -index f96fc5d..c47601a 100644 +index ce6b07f..dbac7c5 100644 --- a/hw/xfree86/common/xf86str.h +++ b/hw/xfree86/common/xf86str.h -@@ -502,10 +502,13 @@ typedef struct _confdrirec { +@@ -496,10 +496,13 @@ typedef struct _confdrirec { } confDRIRec, *confDRIPtr; /* These values should be adjusted when new fields are added to ScrnInfoRec */ --#define NUM_RESERVED_INTS 15 -+#define NUM_RESERVED_INTS 14 +-#define NUM_RESERVED_INTS 16 ++#define NUM_RESERVED_INTS 15 #define NUM_RESERVED_POINTERS 14 #define NUM_RESERVED_FUNCS 11 @@ -29,7 +29,7 @@ index f96fc5d..c47601a 100644 typedef pointer (*funcPointer)(void); /* flags for depth 24 pixmap options */ -@@ -671,7 +674,6 @@ typedef void xf86SetOverscanProc (ScrnInfoPtr, int); +@@ -665,7 +668,6 @@ typedef void xf86SetOverscanProc (ScrnInfoPtr, int); * are to be dependent on compile-time defines. */ @@ -37,9 +37,9 @@ index f96fc5d..c47601a 100644 typedef struct _ScrnInfoRec { int driverVersion; char * driverName; /* canonical name used in */ -@@ -777,6 +779,9 @@ typedef struct _ScrnInfoRec { - /* -nr support */ - int canDoBGNoneRoot; +@@ -767,6 +769,9 @@ typedef struct _ScrnInfoRec { + ClockRangePtr clockRanges; + int adjustFlags; + /* initial rightof support disable */ + int preferClone; @@ -48,10 +48,10 @@ index f96fc5d..c47601a 100644 * These can be used when the minor ABI version is incremented. * The NUM_* parameters must be reduced appropriately to keep the diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c -index 883bf3b..d907eb2 100644 +index 7fc2a60..5875731 100644 --- a/hw/xfree86/modes/xf86Crtc.c +++ b/hw/xfree86/modes/xf86Crtc.c -@@ -1148,6 +1148,15 @@ xf86InitialOutputPositions (ScrnInfoPtr scrn, DisplayModePtr *modes) +@@ -1139,6 +1139,15 @@ xf86InitialOutputPositions (ScrnInfoPtr scrn, DisplayModePtr *modes) int o; int min_x, min_y; @@ -67,7 +67,7 @@ index 883bf3b..d907eb2 100644 for (o = 0; o < config->num_output; o++) { xf86OutputPtr output = config->output[o]; -@@ -2032,6 +2041,57 @@ bestModeForAspect(xf86CrtcConfigPtr config, Bool *enabled, float aspect) +@@ -2023,6 +2032,57 @@ bestModeForAspect(xf86CrtcConfigPtr config, Bool *enabled, float aspect) return match; } @@ -125,7 +125,7 @@ index 883bf3b..d907eb2 100644 static Bool xf86TargetPreferred(ScrnInfoPtr scrn, xf86CrtcConfigPtr config, DisplayModePtr *modes, Bool *enabled, -@@ -2089,13 +2149,9 @@ xf86TargetPreferred(ScrnInfoPtr scrn, xf86CrtcConfigPtr config, +@@ -2080,13 +2140,9 @@ xf86TargetPreferred(ScrnInfoPtr scrn, xf86CrtcConfigPtr config, * biggest mode for its aspect ratio, assuming one exists. */ if (!ret) do { @@ -140,7 +140,7 @@ index 883bf3b..d907eb2 100644 break; p = -1; -@@ -2388,6 +2444,8 @@ xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow) +@@ -2380,6 +2436,8 @@ xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow) } else { if (xf86TargetUserpref(scrn, config, modes, enabled, width, height)) xf86DrvMsg(i, X_INFO, "Using user preference for initial modes\n"); @@ -149,7 +149,7 @@ index 883bf3b..d907eb2 100644 else if (xf86TargetPreferred(scrn, config, modes, enabled, width, height)) xf86DrvMsg(i, X_INFO, "Using exact sizes for initial modes\n"); else if (xf86TargetAspect(scrn, config, modes, enabled, width, height)) -@@ -2405,8 +2463,10 @@ xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow) +@@ -2397,8 +2455,10 @@ xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow) config->output[o]->name); else xf86DrvMsg (scrn->scrnIndex, X_INFO, @@ -163,5 +163,5 @@ index 883bf3b..d907eb2 100644 /* -- -1.7.1 +1.7.3.2 diff --git a/xserver-1.7.0-randr-gamma-restore.patch b/xserver-1.7.0-randr-gamma-restore.patch deleted file mode 100644 index d26c80b..0000000 --- a/xserver-1.7.0-randr-gamma-restore.patch +++ /dev/null @@ -1,36 +0,0 @@ -From a4d1b05d1f8e98d4ecc332d9573f207e86234e18 Mon Sep 17 00:00:00 2001 -From: Fedora X Ninjas -Date: Thu, 8 Oct 2009 15:25:24 -0400 -Subject: [PATCH 12/17] randr gamma reload hack - ---- - hw/xfree86/modes/xf86RandR12.c | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c -index 043ceee..a73b003 100644 ---- a/hw/xfree86/modes/xf86RandR12.c -+++ b/hw/xfree86/modes/xf86RandR12.c -@@ -1775,6 +1775,7 @@ xf86RandR12EnterVT (int screen_index, int flags) - ScreenPtr pScreen = screenInfo.screens[screen_index]; - ScrnInfoPtr pScrn = xf86Screens[screen_index]; - XF86RandRInfoPtr randrp = XF86RANDRINFO(pScreen); -+ rrScrPrivPtr rp = rrGetScrPriv(pScreen); - Bool ret; - - if (randrp->orig_EnterVT) { -@@ -1786,6 +1787,11 @@ xf86RandR12EnterVT (int screen_index, int flags) - return FALSE; - } - -+ /* reload gamma */ -+ int i; -+ for (i = 0; i < rp->numCrtcs; i++) -+ xf86RandR12CrtcSetGamma(pScreen, rp->crtcs[i]); -+ - return RRGetInfo (pScreen, TRUE); /* force a re-probe of outputs and notify clients about changes */ - } - --- -1.7.1 - diff --git a/xserver-1.7.1-gamma-kdm-fix.patch b/xserver-1.7.1-gamma-kdm-fix.patch deleted file mode 100644 index a57e66f..0000000 --- a/xserver-1.7.1-gamma-kdm-fix.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 0087041fe9315e7f1e04c485cbdb885752181502 Mon Sep 17 00:00:00 2001 -From: Bill Nottingham -Date: Fri, 6 Nov 2009 10:32:27 +1000 -Subject: [PATCH 14/17] fix KDM gamma issue on vt switch - ---- - hw/xfree86/modes/xf86RandR12.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c -index a73b003..6db73bd 100644 ---- a/hw/xfree86/modes/xf86RandR12.c -+++ b/hw/xfree86/modes/xf86RandR12.c -@@ -1801,6 +1801,7 @@ xf86RandR12Init12 (ScreenPtr pScreen) - ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; - rrScrPrivPtr rp = rrGetScrPriv(pScreen); - XF86RandRInfoPtr randrp = XF86RANDRINFO(pScreen); -+ int i; - - rp->rrGetInfo = xf86RandR12GetInfo12; - rp->rrScreenSetSize = xf86RandR12ScreenSetSize; -@@ -1830,6 +1831,9 @@ xf86RandR12Init12 (ScreenPtr pScreen) - */ - if (!xf86RandR12SetInfo12 (pScreen)) - return FALSE; -+ for (i = 0; i < rp->numCrtcs; i++) { -+ xf86RandR12CrtcGetGamma(pScreen, rp->crtcs[i]); -+ } - return TRUE; - } - --- -1.7.1 - diff --git a/xserver-1.7.1-multilib.patch b/xserver-1.7.1-multilib.patch index bd90769..8e0d0a0 100644 --- a/xserver-1.7.1-multilib.patch +++ b/xserver-1.7.1-multilib.patch @@ -1,7 +1,7 @@ -From 450e2e95f0f15e983f6a8f01bdd3a7b5ba91f5b8 Mon Sep 17 00:00:00 2001 +From d9b6e996135efb8a8e23605665aab5c3c1f0f941 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Thu, 29 Oct 2009 19:04:10 -0400 -Subject: [PATCH 13/17] multilib fix for -devel subpackage +Subject: [PATCH] multilib fix for -devel subpackage --- include/colormapst.h | 4 ++-- @@ -9,7 +9,7 @@ Subject: [PATCH 13/17] multilib fix for -devel subpackage 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/include/colormapst.h b/include/colormapst.h -index f1fc8eb..274cd65 100644 +index 0ba5bd0..d24ea58 100644 --- a/include/colormapst.h +++ b/include/colormapst.h @@ -103,12 +103,12 @@ typedef struct _ColormapRec @@ -51,5 +51,5 @@ index 76cab16..d12fd23 100644 + #endif /* _XORG_SERVER_H_ */ -- -1.7.1 +1.7.3.2 diff --git a/xserver-1.8-disable-vboxvideo.patch b/xserver-1.8-disable-vboxvideo.patch index 7a1f3da..13dfccc 100644 --- a/xserver-1.8-disable-vboxvideo.patch +++ b/xserver-1.8-disable-vboxvideo.patch @@ -1,17 +1,17 @@ -From 8b4ebd77eef247d85091a1f66c61a7bb1d17948d Mon Sep 17 00:00:00 2001 +From b0ca931d1ecd03bce114964a57da5e33f81dc46d Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Thu, 25 Feb 2010 10:34:49 -0800 -Subject: [PATCH 16/17] disable vboxvideo driver in autodetect code +Subject: [PATCH] disable vboxvideo driver in autodetect code --- hw/xfree86/common/xf86pciBus.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c -index 9c296f5..001625c 100644 +index e34e6d6..aaacf42 100644 --- a/hw/xfree86/common/xf86pciBus.c +++ b/hw/xfree86/common/xf86pciBus.c -@@ -1162,7 +1162,7 @@ videoPtrToDriverList(struct pci_device *dev, +@@ -1167,7 +1167,7 @@ videoPtrToDriverList(struct pci_device *dev, case 0x1011: driverList[0] = "tga"; break; case 0x1023: driverList[0] = "trident"; break; case 0x100c: driverList[0] = "tseng"; break; @@ -21,5 +21,5 @@ index 9c296f5..001625c 100644 case 0x18ca: if (dev->device_id == 0x47) -- -1.7.1 +1.7.3.2 diff --git a/xserver-1.8-udev-warning.patch b/xserver-1.8-udev-warning.patch deleted file mode 100644 index a80328d..0000000 --- a/xserver-1.8-udev-warning.patch +++ /dev/null @@ -1,37 +0,0 @@ -From d955517a5005e02b16fc6a5945d8d0de8937aa18 Mon Sep 17 00:00:00 2001 -From: Fedora X Ninjas -Date: Wed, 17 Feb 2010 11:12:36 +1000 -Subject: [PATCH 15/17] Stick giant warning into logfiles about udev configuration changes. - -Signed-off-by: Fedora X Ninjas ---- - hw/xfree86/common/xf86Config.c | 13 +++++++++++++ - 1 files changed, 13 insertions(+), 0 deletions(-) - -diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c -index 28786ba..26adf0b 100644 ---- a/hw/xfree86/common/xf86Config.c -+++ b/hw/xfree86/common/xf86Config.c -@@ -1455,6 +1455,19 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout) - "input devices.\n\tIf no devices become available, " - "reconfigure %s or disable AutoAddDevices.\n", - config_backend, config_backend); -+ -+ xf86Msg(X_INFO, "\n" -+ "***************************************************************\n" -+ "***************************************************************\n" -+ "** Fedora switched to udev-based device detection with **\n" -+ "** xorg-x11-server-1.7.99.901-1. Custom HAL configuration **\n" -+ "** stored in /etc/hal/fdi/policy will not be seen by this **\n" -+ "** server version. If you have such configuration you will **\n" -+ "** need to update it to the new format. **\n" -+ "** For more information, see the Fedora wiki page **\n" -+ "** https://fedoraproject.org/wiki/Input_device_configuration **\n" -+ "***************************************************************\n" -+ "***************************************************************\n"); - #else - xf86Msg(X_INFO, "Hotplugging is disabled and no input devices were configured.\n" - "\tTry disabling AllowEmptyInput.\n"); --- -1.7.1 - diff --git a/xserver-1.9.0-classic-default-mode.patch b/xserver-1.9.0-classic-default-mode.patch deleted file mode 100644 index 2650ec3..0000000 --- a/xserver-1.9.0-classic-default-mode.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 69603b8dea3a165daaf3d04c1281918626e68956 Mon Sep 17 00:00:00 2001 -From: Adam Jackson -Date: Mon, 11 Oct 2010 17:09:19 -0400 -Subject: [PATCH] xfree86: Bump classic driver default to 1024x768 - -Signed-off-by: Adam Jackson ---- - hw/xfree86/common/xf86Mode.c | 21 ++++++++++++++++----- - 1 files changed, 16 insertions(+), 5 deletions(-) - -diff --git a/hw/xfree86/common/xf86Mode.c b/hw/xfree86/common/xf86Mode.c -index 7bdf79a..a167df1 100644 ---- a/hw/xfree86/common/xf86Mode.c -+++ b/hw/xfree86/common/xf86Mode.c -@@ -1402,6 +1402,7 @@ xf86ValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes, - strategy &= ~LOOKUP_OPTIONAL_TOLERANCES; - } else { - const char *type = ""; -+ Bool specified = FALSE; - - if (scrp->monitor->nHsync <= 0) { - if (numTimings > 0) { -@@ -1412,11 +1413,13 @@ xf86ValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes, - } - } else { - scrp->monitor->hsync[0].lo = 31.5; -- scrp->monitor->hsync[0].hi = 37.9; -+ scrp->monitor->hsync[0].hi = 48.0; - scrp->monitor->nHsync = 1; - } - type = "default "; -- } -+ } else { -+ specified = TRUE; -+ } - for (i = 0; i < scrp->monitor->nHsync; i++) { - if (scrp->monitor->hsync[i].lo == scrp->monitor->hsync[i].hi) - xf86DrvMsg(scrp->scrnIndex, X_INFO, -@@ -1445,7 +1448,9 @@ xf86ValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes, - scrp->monitor->nVrefresh = 1; - } - type = "default "; -- } -+ } else { -+ specified = TRUE; -+ } - for (i = 0; i < scrp->monitor->nVrefresh; i++) { - if (scrp->monitor->vrefresh[i].lo == scrp->monitor->vrefresh[i].hi) - xf86DrvMsg(scrp->scrnIndex, X_INFO, -@@ -1459,10 +1464,16 @@ xf86ValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes, - scrp->monitor->vrefresh[i].lo, - scrp->monitor->vrefresh[i].hi); - } -+ -+ type = ""; -+ if (!scrp->monitor->maxPixClock && !specified) { -+ type = "default "; -+ scrp->monitor->maxPixClock = 65000.0; -+ } - if (scrp->monitor->maxPixClock) { - xf86DrvMsg(scrp->scrnIndex, X_INFO, -- "%s: Using maximum pixel clock of %.2f MHz\n", -- scrp->monitor->id, -+ "%s: Using %smaximum pixel clock of %.2f MHz\n", -+ scrp->monitor->id, type, - (float)scrp->monitor->maxPixClock / 1000.0); - } - } --- -1.7.3.1 - diff --git a/xserver-1.9.0-qxl-fallback.patch b/xserver-1.9.0-qxl-fallback.patch index e1cd0c6..538a323 100644 --- a/xserver-1.9.0-qxl-fallback.patch +++ b/xserver-1.9.0-qxl-fallback.patch @@ -1,4 +1,4 @@ -From 677e7a9f0e58c3b9e6598104934da68ac12bc32c Mon Sep 17 00:00:00 2001 +From 18e7738eb03f131598e1613ce8bf0bff4ab1ecdf Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Wed, 13 Oct 2010 11:16:31 -0400 Subject: [PATCH] qxl v1 fallback @@ -8,10 +8,10 @@ Subject: [PATCH] qxl v1 fallback 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c -index 001625c..0d23f6a 100644 +index aaacf42..048a410 100644 --- a/hw/xfree86/common/xf86pciBus.c +++ b/hw/xfree86/common/xf86pciBus.c -@@ -1136,7 +1136,12 @@ videoPtrToDriverList(struct pci_device *dev, +@@ -1141,7 +1141,12 @@ videoPtrToDriverList(struct pci_device *dev, } break; case 0x1106: driverList[0] = "openchrome"; break; @@ -26,5 +26,5 @@ index 001625c..0d23f6a 100644 case 0x5333: switch (dev->device_id) -- -1.7.2.3 +1.7.3.2 diff --git a/xserver-1.9.0-tcflush-fix.patch b/xserver-1.9.0-tcflush-fix.patch deleted file mode 100644 index 86462dc..0000000 --- a/xserver-1.9.0-tcflush-fix.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 20e32420a2f75b58603eb1578c151d63e6b2e8ac Mon Sep 17 00:00:00 2001 -From: Adam Jackson -Date: Wed, 25 Aug 2010 11:06:38 -0400 -Subject: [PATCH] linux: Fix CPU usage bug in console fd flushing - -If the vt gets a vhangup from under us, then the tty will appear ready -in select(), but trying to tcflush() it will return -EIO, so we'll spin -around at 100% CPU for no reason. Notice this condition and unregister -the handler if it happens. - -Signed-off-by: Adam Jackson ---- - hw/xfree86/os-support/linux/lnx_init.c | 6 +++++- - 1 files changed, 5 insertions(+), 1 deletions(-) - -diff --git a/hw/xfree86/os-support/linux/lnx_init.c b/hw/xfree86/os-support/linux/lnx_init.c -index c8cec2e..21f2220 100644 ---- a/hw/xfree86/os-support/linux/lnx_init.c -+++ b/hw/xfree86/os-support/linux/lnx_init.c -@@ -85,7 +85,11 @@ static void *console_handler; - static void - drain_console(int fd, void *closure) - { -- tcflush(fd, TCIOFLUSH); -+ errno = 0; -+ if (tcflush(fd, TCIOFLUSH) == -1 && errno == EIO) { -+ xf86RemoveGeneralHandler(console_handler); -+ console_handler = NULL; -+ } - } - - void --- -1.7.2.1 - diff --git a/xserver-1.9.0-vbe-panelid-sanity.patch b/xserver-1.9.0-vbe-panelid-sanity.patch deleted file mode 100644 index bc12359..0000000 --- a/xserver-1.9.0-vbe-panelid-sanity.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 6f9b0496f919178720a7f99049d8ab9ff16d3575 Mon Sep 17 00:00:00 2001 -From: Adam Jackson -Date: Mon, 13 Sep 2010 11:34:28 -0400 -Subject: [PATCH] vbe: Refuse to believe tiny (or negative) panel sizes from PanelID - -Signed-off-by: Adam Jackson ---- - hw/xfree86/vbe/vbe.c | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -diff --git a/hw/xfree86/vbe/vbe.c b/hw/xfree86/vbe/vbe.c -index 0b34648..1defd9a 100644 ---- a/hw/xfree86/vbe/vbe.c -+++ b/hw/xfree86/vbe/vbe.c -@@ -1088,6 +1088,11 @@ VBEInterpretPanelID(int scrnIndex, struct vbePanelID *data) - if (pScrn->monitor->nHsync || pScrn->monitor->nVrefresh) - return; - -+ if (data->hsize < 320 || data->vsize < 240) { -+ xf86DrvMsg(scrnIndex, X_INFO, "... which I refuse to believe\n"); -+ return; -+ } -+ - mode = xf86CVTMode(data->hsize, data->vsize, PANEL_HZ, 1, 0); - - pScrn->monitor->nHsync = 1; --- -1.7.2.2 - diff --git a/xserver-1.9.1-pxtc-crash.patch b/xserver-1.9.1-pxtc-crash.patch deleted file mode 100644 index 3a5776f..0000000 --- a/xserver-1.9.1-pxtc-crash.patch +++ /dev/null @@ -1,25 +0,0 @@ -From d8df4c83537cd2041141478b0fdc512f4b46219b Mon Sep 17 00:00:00 2001 -From: Linus Arver -Date: Tue, 9 Nov 2010 15:01:06 -0500 -Subject: [PATCH] http://lists.x.org/archives/xorg-devel/2010-October/014150.html - ---- - Xext/panoramiXprocs.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/Xext/panoramiXprocs.c b/Xext/panoramiXprocs.c -index 67b4030..d843168 100644 ---- a/Xext/panoramiXprocs.c -+++ b/Xext/panoramiXprocs.c -@@ -634,7 +634,7 @@ int PanoramiXTranslateCoords(ClientPtr client) - rep.dstX = x - pDst->drawable.x; - rep.dstY = y - pDst->drawable.y; - if((pDst == screenInfo.screens[0]->root) || -- (pWin->drawable.id == screenInfo.screens[0]->screensaver.wid)) -+ (pDst->drawable.id == screenInfo.screens[0]->screensaver.wid)) - { - rep.dstX += screenInfo.screens[0]->x; - rep.dstY += screenInfo.screens[0]->y; --- -1.7.2.3 -