From 31a4dee79d14183ca44d1f1fe7670ff25607b4f1 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Apr 08 2008 20:59:51 +0000 Subject: the revenge of the importatron --- diff --git a/.cvsignore b/.cvsignore index acb5344..8733459 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1 @@ -xorg-server-20080331.tar.bz2 -xorg-server-20080401.tar.bz2 +xorg-server-20080407.tar.bz2 diff --git a/commitid b/commitid index e2509ee..5ae22c2 100644 --- a/commitid +++ b/commitid @@ -1 +1 @@ -2156bdf3b7b5b7d3ee4d3278eac0f28c7bff830a +85b855f26f1578d52e9ed1dd0e3a9a1340ef1a2d diff --git a/sources b/sources index ba09629..6834cce 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e858611812f37e34092e13c51094e2ce xorg-server-20080401.tar.bz2 +3a69d1948a47ecd77d8e2adc9d34179a xorg-server-20080407.tar.bz2 diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index c9b7c02..6fc3ca5 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -15,12 +15,12 @@ # RHEL5 bugfix sync %define pkgname xorg-server -%define gitdate 20080401 +%define gitdate 20080407 Summary: X.Org X11 X server Name: xorg-x11-server Version: 1.4.99.901 -Release: 18.%{gitdate}%{?dist} +Release: 19.%{gitdate}%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X @@ -60,16 +60,9 @@ Patch5001: xserver-1.4.99-alloca-poison.patch # This really could be done prettier. Patch5002: xserver-1.4.99-ssh-isnt-local.patch -Patch5004: xserver-1.5.0-wfs.patch -Patch5005: xserver-1.5.0-unselinux.patch Patch5007: xserver-1.5.0-bad-fbdev-thats-mine.patch Patch5008: xserver-1.5.0-xaa-sucks.patch Patch5009: xserver-1.5.0-no-evdev-keyboards-kthnx.patch -Patch5011: xserver-1.5.0-fix-lsl-quirk.patch -Patch5012: xserver-1.5.0-fix-dri2-crash-on-fail.patch -Patch5013: xserver-1.5.0-unbreak-dri2-glcore-visuals.patch -Patch5014: xserver-1.5.0-dont-bitch-about-record.patch -Patch5015: xserver-1.5.0-handle-failing-dri-create-screen.patch %define moduledir %{_libdir}/xorg/modules %define drimoduledir %{_libdir}/dri @@ -96,6 +89,7 @@ BuildRequires: xorg-x11-util-macros >= 1.1.5 BuildRequires: xorg-x11-proto-devel >= 7.3-10 BuildRequires: damageproto >= 1.1 +BuildRequires: dri2proto >= 1.1 BuildRequires: fixesproto >= 4.0 BuildRequires: glproto >= 1.4.9 BuildRequires: kbproto >= 1.0.3 @@ -304,6 +298,7 @@ git-am -p1 $(awk '/^Patch.*:/ { print "%{_sourcedir}/"$2 }' %{_specdir}/%{name}. # --with-rgb-path should be superfluous now ? # --with-pie ? autoreconf -v --install || exit 1 +export CFLAGS="${RPM_OPT_FLAGS} -Wstrict-overflow" %configure --enable-maintainer-mode %{xservers} \ --disable-static \ --with-pic \ @@ -518,6 +513,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Apr 08 2008 Adam Jackson 1.4.99.901-19.20080407 +- Today's rebase. Patch merge, some int10 fixes. + * Mon Apr 07 2008 Adam Jackson 1.4.99.901-18.20080401 - xorg-x11-server-Red-Hat-extramodes.patch: Remove some of the more implausible modes. Cargo cult programming woo. diff --git a/xserver-1.5.0-dont-bitch-about-record.patch b/xserver-1.5.0-dont-bitch-about-record.patch deleted file mode 100644 index 0580620..0000000 --- a/xserver-1.5.0-dont-bitch-about-record.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 16a8ce75585ea360c39e0ffce4f7bb26a359b754 Mon Sep 17 00:00:00 2001 -From: =?utf-8?q?Kristian=20H=C3=B8gsberg?= -Date: Thu, 3 Apr 2008 16:44:32 -0400 -Subject: [PATCH] Only autoload RECORD if it was enabled. - ---- - hw/xfree86/common/xf86Config.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c -index 8de7426..208e23d 100644 ---- a/hw/xfree86/common/xf86Config.c -+++ b/hw/xfree86/common/xf86Config.c -@@ -119,7 +119,9 @@ static ModuleDefault ModuleDefaults[] = { - {.name = "dbe", .toLoad = TRUE, .load_opt=NULL}, - {.name = "glx", .toLoad = TRUE, .load_opt=NULL}, - {.name = "freetype", .toLoad = TRUE, .load_opt=NULL}, -+#ifdef XRECORD - {.name = "record", .toLoad = TRUE, .load_opt=NULL}, -+#endif - {.name = "dri", .toLoad = TRUE, .load_opt=NULL}, - {.name = "dri2", .toLoad = TRUE, .load_opt=NULL}, - {.name = NULL, .toLoad = FALSE, .load_opt=NULL} --- -1.5.4.5 - diff --git a/xserver-1.5.0-fix-dri2-crash-on-fail.patch b/xserver-1.5.0-fix-dri2-crash-on-fail.patch deleted file mode 100644 index 7c082d9..0000000 --- a/xserver-1.5.0-fix-dri2-crash-on-fail.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 7d97c19c2d530c8db16b01de9b168dd910059b4e Mon Sep 17 00:00:00 2001 -From: Xiang, Haihao -Date: Wed, 2 Apr 2008 16:29:30 +1000 -Subject: [PATCH] dri2: fix crasher if DRI2Connect fails - ---- - hw/xfree86/dri2/dri2ext.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/hw/xfree86/dri2/dri2ext.c b/hw/xfree86/dri2/dri2ext.c -index ca2e029..d1d52a4 100644 ---- a/hw/xfree86/dri2/dri2ext.c -+++ b/hw/xfree86/dri2/dri2ext.c -@@ -114,7 +114,7 @@ ProcDRI2Connect(ClientPtr client) - ScreenPtr pScreen; - int fd; - const char *driverName; -- char *busId; -+ char *busId = NULL; - unsigned int sareaHandle; - - REQUEST_SIZE_MATCH(xDRI2ConnectReq); --- -1.5.4.5 - diff --git a/xserver-1.5.0-fix-lsl-quirk.patch b/xserver-1.5.0-fix-lsl-quirk.patch deleted file mode 100644 index 274d3ca..0000000 --- a/xserver-1.5.0-fix-lsl-quirk.patch +++ /dev/null @@ -1,43 +0,0 @@ -From c747030a49dd289e873e2b686cd129d840e55468 Mon Sep 17 00:00:00 2001 -From: Dave Airlie -Date: Thu, 27 Mar 2008 15:18:39 +1000 -Subject: [PATCH] quirk: fix LPL monitors properly. - -no point having a h cm fix when we really want to copy the sizes from the -other place. - -RH BZ 435216 ---- - hw/xfree86/modes/xf86EdidModes.c | 9 +-------- - 1 files changed, 1 insertions(+), 8 deletions(-) - -diff --git a/hw/xfree86/modes/xf86EdidModes.c b/hw/xfree86/modes/xf86EdidModes.c -index 2d1a6ab..777bb70 100644 ---- a/hw/xfree86/modes/xf86EdidModes.c -+++ b/hw/xfree86/modes/xf86EdidModes.c -@@ -108,13 +108,6 @@ static Bool quirk_prefer_large_75 (int scrnIndex, xf86MonPtr DDC) - - static Bool quirk_detailed_h_in_cm (int scrnIndex, xf86MonPtr DDC) - { -- /* Bug #10304: "LGPhilipsLCD LP154W01-A5" */ -- /* Bug #12784: "LGPhilipsLCD LP154W01-TLA2" */ -- /* Red Hat #435216 "LGPhilipsLCD LP154W01-TLAE" */ -- if (memcmp (DDC->vendor.name, "LPL", 4) == 0 && -- (DDC->vendor.prod_id == 0 || DDC->vendor.prod_id == 0x2a00)) -- return TRUE; -- - /* Bug #11603: Funai Electronics PM36B */ - if (memcmp (DDC->vendor.name, "FCM", 4) == 0 && - DDC->vendor.prod_id == 13600) -@@ -137,7 +130,7 @@ static Bool quirk_detailed_use_maximum_size (int scrnIndex, xf86MonPtr DDC) - { - /* Bug #10304: LGPhilipsLCD LP154W01-A5 */ - if (memcmp (DDC->vendor.name, "LPL", 4) == 0 && -- DDC->vendor.prod_id == 0) -+ (DDC->vendor.prod_id == 0 || DDC->vendor.prod_id == 0x2a00)) - return TRUE; - - return FALSE; --- -1.5.3.7 - diff --git a/xserver-1.5.0-handle-failing-dri-create-screen.patch b/xserver-1.5.0-handle-failing-dri-create-screen.patch deleted file mode 100644 index a177dbc..0000000 --- a/xserver-1.5.0-handle-failing-dri-create-screen.patch +++ /dev/null @@ -1,32 +0,0 @@ -From ec17900f52bbd25d07566834756e5c7e832e0463 Mon Sep 17 00:00:00 2001 -From: =?utf-8?q?Kristian=20H=C3=B8gsberg?= -Date: Fri, 4 Apr 2008 10:46:45 -0400 -Subject: [PATCH] Convert __DRIconfigs after we've made sure createNewScreen succeeded. - ---- - GL/glx/glxdri.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/GL/glx/glxdri.c b/GL/glx/glxdri.c -index ffa9a0b..9cd0738 100644 ---- a/GL/glx/glxdri.c -+++ b/GL/glx/glxdri.c -@@ -1117,13 +1117,13 @@ __glXDRIscreenProbe(ScreenPtr pScreen) - &driConfigs, - screen); - -- screen->base.fbconfigs = glxConvertConfigs(screen->core, driConfigs); -- - if (screen->driScreen == NULL) { - LogMessage(X_ERROR, "AIGLX error: Calling driver entry point failed"); - goto handle_error; - } - -+ screen->base.fbconfigs = glxConvertConfigs(screen->core, driConfigs); -+ - initializeExtensions(screen); - - DRIGetTexOffsetFuncs(pScreen, &screen->texOffsetStart, --- -1.5.4.5 - diff --git a/xserver-1.5.0-unbreak-dri2-glcore-visuals.patch b/xserver-1.5.0-unbreak-dri2-glcore-visuals.patch deleted file mode 100644 index 23a8b3a..0000000 --- a/xserver-1.5.0-unbreak-dri2-glcore-visuals.patch +++ /dev/null @@ -1,37 +0,0 @@ -From b13ab156894074fb38cc812738bc7aeeebd9614d Mon Sep 17 00:00:00 2001 -From: =?utf-8?q?Kristian=20H=C3=B8gsberg?= -Date: Wed, 2 Apr 2008 12:38:36 -0400 -Subject: [PATCH] dri2: Unbreak glcore visual setup. - ---- - GL/glx/glxglcore.c | 5 ++--- - 1 files changed, 2 insertions(+), 3 deletions(-) - -diff --git a/GL/glx/glxglcore.c b/GL/glx/glxglcore.c -index bbfa02b..972ab88 100644 ---- a/GL/glx/glxglcore.c -+++ b/GL/glx/glxglcore.c -@@ -308,10 +308,9 @@ static const int glx_visual_types[] = { - - static __GLXconfig * - createFBConfigsForVisual(__GLXscreen *screen, ScreenPtr pScreen, -- VisualPtr visual, __GLXconfig *tail) -+ VisualPtr visual, __GLXconfig *config) - { - int back, depth, stencil; -- __GLXconfig *config; - - /* FIXME: Ok, I'm making all this up... anybody has a better idea? */ - -@@ -347,7 +346,7 @@ createFBConfigsForVisual(__GLXscreen *screen, ScreenPtr pScreen, - config->indexBits = config->colorIndexMode ? visual->nplanes : 0; - } - -- return tail; -+ return config; - } - - static void --- -1.5.4.5 - diff --git a/xserver-1.5.0-unselinux.patch b/xserver-1.5.0-unselinux.patch deleted file mode 100644 index b542735..0000000 --- a/xserver-1.5.0-unselinux.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 39ac27c473816c66faa43ae00b4fd34b6688ff12 Mon Sep 17 00:00:00 2001 -From: Adam Jackson -Date: Wed, 12 Mar 2008 19:33:37 -0400 -Subject: [PATCH] Disable the selinux extension for now. - -We'll still build the infrastructure but not turn on the extension. This -wants a better solution, please don't ship me like this. ---- - hw/xfree86/dixmods/extmod/modinit.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/hw/xfree86/dixmods/extmod/modinit.c b/hw/xfree86/dixmods/extmod/modinit.c -index d0d892a..5fa5456 100644 ---- a/hw/xfree86/dixmods/extmod/modinit.c -+++ b/hw/xfree86/dixmods/extmod/modinit.c -@@ -38,7 +38,7 @@ static MODULESETUPPROTO(extmodSetup); - * Array describing extensions to be initialized - */ - static ExtensionModule extensionModules[] = { --#ifdef XSELINUX -+#if 0 - { - SELinuxExtensionInit, - SELINUX_EXTENSION_NAME, --- -1.5.4.3 - diff --git a/xserver-1.5.0-vmmouse.patch b/xserver-1.5.0-vmmouse.patch deleted file mode 100644 index a5ae2b9..0000000 --- a/xserver-1.5.0-vmmouse.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 6f3a12d390eb67856f2a32a83f72eed3aea99e70 Mon Sep 17 00:00:00 2001 -From: Adam Jackson -Date: Thu, 27 Mar 2008 09:50:34 -0400 -Subject: [PATCH] Use vmmouse, not mouse, for automatic mouse sections. - ---- - hw/xfree86/common/xf86Config.c | 8 ++++++++ - 1 files changed, 8 insertions(+), 0 deletions(-) - -diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c -index 4a4aabc..0c579fb 100644 ---- a/hw/xfree86/common/xf86Config.c -+++ b/hw/xfree86/common/xf86Config.c -@@ -1336,7 +1336,11 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout) - if (!foundPointer) { - bzero(&defPtr, sizeof(defPtr)); - defPtr.inp_identifier = ""; -+#if defined(__i386__) || defined (__amd64__) -+ defPtr.inp_driver = "vmmouse"; -+#else - defPtr.inp_driver = "mouse"; -+#endif - confInput = &defPtr; - foundPointer = TRUE; - from = X_DEFAULT; -@@ -1383,7 +1387,11 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout) - xf86Msg(X_INFO, "No default mouse found, adding one\n"); - bzero(&defPtr, sizeof(defPtr)); - defPtr.inp_identifier = ""; -+#if defined(__i386__) || defined (__amd64__) -+ defPtr.inp_driver = "vmmouse"; -+#else - defPtr.inp_driver = "mouse"; -+#endif - confInput = &defPtr; - foundPointer = configInput(&Pointer, confInput, from); - if (foundPointer) { --- -1.5.4.3 - diff --git a/xserver-1.5.0-wfs.patch b/xserver-1.5.0-wfs.patch deleted file mode 100644 index 42783c4..0000000 --- a/xserver-1.5.0-wfs.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 2939645164d6825f571c83c419e3ec61a7dc6279 Mon Sep 17 00:00:00 2001 -From: Adam Jackson -Date: Wed, 12 Mar 2008 19:21:08 -0400 -Subject: [PATCH] Additional input readiness check in WaitForSomething. - ---- - os/WaitFor.c | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -diff --git a/os/WaitFor.c b/os/WaitFor.c -index 36e01ca..0203d6e 100644 ---- a/os/WaitFor.c -+++ b/os/WaitFor.c -@@ -332,13 +332,11 @@ WaitForSomething(int *pClientsReady) - - if (XFD_ANYSET (&devicesReadable) || XFD_ANYSET (&clientsReadable)) - break; --#ifdef WIN32 - /* Windows keyboard and mouse events are added to the input queue - in Block- and WakupHandlers. There is no device to check if - data is ready. So check here if new input is available */ - if (*checkForInput[0] != *checkForInput[1]) - return 0; --#endif - } - } - --- -1.5.4.3 -