diff --git a/.cvsignore b/.cvsignore index 4356de0..5a091eb 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xorg-server-20080415.tar.bz2 +xorg-server-20080519.tar.bz2 diff --git a/commitid b/commitid index 2ca8d23..09421c2 100644 --- a/commitid +++ b/commitid @@ -1 +1 @@ -5a2b538c1bc020af5bc33027ba0d9698338dca46 +e644d2e73f72e7a3e1a9525bdde0de2012efec59 diff --git a/sources b/sources index 9993edb..86b2b2c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2552f3c3b3c2c61ca85fd3d1515efcff xorg-server-20080415.tar.bz2 +71e99c6d8ca2caf9923f6645f03e9b83 xorg-server-20080519.tar.bz2 diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index ac5613f..b646696 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -15,12 +15,12 @@ # RHEL5 bugfix sync %define pkgname xorg-server -%define gitdate 20080415 +%define gitdate 20080519 Summary: X.Org X11 X server Name: xorg-x11-server Version: 1.4.99.901 -Release: 29.%{gitdate}%{?dist} +Release: 30.%{gitdate}%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X @@ -50,13 +50,6 @@ Patch1010: xserver-1.3.0-no-prerelease-warning.patch Patch1014: xserver-1.4.99-xaa-evict-pixmaps.patch Patch2013: xserver-1.4.99-document-fontpath-correctly.patch -Patch2014: xserver-1.5.0-compiz-clip-fix.patch - -# Trivial things to maybe merge upstream at next rebase -Patch3000: xserver-1.5.0-stenciled-visuals.patch -Patch3001: xserver-1.5.0-glcore-swap-no-crashy.patch -Patch3002: xserver-1.5.0-f-spot-screws-glx.patch -Patch3003: xserver-1.5.0-hal-closedown.patch # Trivial things to never merge upstream ever # Don't merge this without protecting the gccisms. @@ -67,7 +60,6 @@ Patch5002: xserver-1.4.99-ssh-isnt-local.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 -Patch5010: xserver-1.5.0-selinux-off-by-default.patch %define moduledir %{_libdir}/xorg/modules %define drimoduledir %{_libdir}/dri diff --git a/xserver-1.5.0-compiz-clip-fix.patch b/xserver-1.5.0-compiz-clip-fix.patch deleted file mode 100644 index 627416d..0000000 --- a/xserver-1.5.0-compiz-clip-fix.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 9cf87d6608436ae4e189f513fa72eb33ebf5ad81 Mon Sep 17 00:00:00 2001 -From: Adam Jackson -Date: Mon, 5 May 2008 15:18:12 -0400 -Subject: [PATCH] Fix compiz blinkyblink. - ---- - mi/mivaltree.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -diff --git a/mi/mivaltree.c b/mi/mivaltree.c -index 74483e3..d9d07ca 100644 ---- a/mi/mivaltree.c -+++ b/mi/mivaltree.c -@@ -255,7 +255,11 @@ miComputeClips ( - if (pParent->redirectDraw != RedirectDrawNone) - { - if (miSetRedirectBorderClipProc) -+ { -+ if (TreatAsTransparent (pParent)) -+ REGION_EMPTY (pScreen, universe); - (*miSetRedirectBorderClipProc) (pParent, universe); -+ } - REGION_COPY(pScreen, universe, &pParent->borderSize); - } - #endif --- -1.5.4.5 - diff --git a/xserver-1.5.0-f-spot-screws-glx.patch b/xserver-1.5.0-f-spot-screws-glx.patch deleted file mode 100644 index 743e1a5..0000000 --- a/xserver-1.5.0-f-spot-screws-glx.patch +++ /dev/null @@ -1,86 +0,0 @@ -From ae982a27e4059fecd4048d245e6aa02f8dcc97d0 Mon Sep 17 00:00:00 2001 -From: Dave Airlie -Date: Thu, 24 Apr 2008 16:37:29 +1000 -Subject: [PATCH] glx: test for valid read and draw privates before using them - -this should fix a bug where f-spot exiting blows up the X server ---- - GL/glx/glxutil.c | 58 +++++++++++++++++++++++++++-------------------------- - 1 files changed, 30 insertions(+), 28 deletions(-) - -diff --git a/GL/glx/glxutil.c b/GL/glx/glxutil.c -index 11e9f89..aa23a95 100644 ---- a/GL/glx/glxutil.c -+++ b/GL/glx/glxutil.c -@@ -81,38 +81,40 @@ __glXDeassociateContext(__GLXcontext *glxc) - __GLXcontext *curr, *prev; - - prev = NULL; -- for ( curr = glxc->drawPriv->drawGlxc -- ; curr != NULL -- ; prev = curr, curr = curr->nextDrawPriv ) { -- if (curr == glxc) { -- /* found context. Deassociate. */ -- if (prev == NULL) { -- glxc->drawPriv->drawGlxc = curr->nextDrawPriv; -- } else { -- prev->nextDrawPriv = curr->nextDrawPriv; -+ if (glxc->drawPriv) { -+ for ( curr = glxc->drawPriv->drawGlxc; curr != NULL -+ ; prev = curr, curr = curr->nextDrawPriv ) { -+ if (curr == glxc) { -+ /* found context. Deassociate. */ -+ if (prev == NULL) { -+ glxc->drawPriv->drawGlxc = curr->nextDrawPriv; -+ } else { -+ prev->nextDrawPriv = curr->nextDrawPriv; -+ } -+ curr->nextDrawPriv = NULL; -+ __glXUnrefDrawable(glxc->drawPriv); -+ break; - } -- curr->nextDrawPriv = NULL; -- __glXUnrefDrawable(glxc->drawPriv); -- break; -- } -+ } - } - -- - prev = NULL; -- for ( curr = glxc->readPriv->readGlxc -- ; curr != NULL -- ; prev = curr, curr = curr->nextReadPriv ) { -- if (curr == glxc) { -- /* found context. Deassociate. */ -- if (prev == NULL) { -- glxc->readPriv->readGlxc = curr->nextReadPriv; -- } else { -- prev->nextReadPriv = curr->nextReadPriv; -- } -- curr->nextReadPriv = NULL; -- __glXUnrefDrawable(glxc->readPriv); -- break; -- } -+ if (glxc->readPriv) { -+ for ( curr = glxc->readPriv->readGlxc -+ ; curr != NULL -+ ; prev = curr, curr = curr->nextReadPriv ) { -+ if (curr == glxc) { -+ /* found context. Deassociate. */ -+ if (prev == NULL) { -+ glxc->readPriv->readGlxc = curr->nextReadPriv; -+ } else { -+ prev->nextReadPriv = curr->nextReadPriv; -+ } -+ curr->nextReadPriv = NULL; -+ __glXUnrefDrawable(glxc->readPriv); -+ break; -+ } -+ } - } - } - --- -1.5.4.1 - diff --git a/xserver-1.5.0-glcore-swap-no-crashy.patch b/xserver-1.5.0-glcore-swap-no-crashy.patch deleted file mode 100644 index 6e95040..0000000 --- a/xserver-1.5.0-glcore-swap-no-crashy.patch +++ /dev/null @@ -1,26 +0,0 @@ -From a368ab757edf36ed7bbda023673d28883ce11231 Mon Sep 17 00:00:00 2001 -From: Dave Airlie -Date: Tue, 22 Apr 2008 05:13:57 +0000 -Subject: GLcore: make googleearth not crash the server on sw-rendering. - -I don't think this is the 100% correct answer as I get log spam saying -(EE) DoSwapInterval: cx = 0x98b8998, GLX screen = 0x96dd780 -(EE) AIGLX: cx->pGlxScreen->swapInterval == NULL - -but thats better than X exiting in my book. ---- -diff --git a/GL/glx/glxglcore.c b/GL/glx/glxglcore.c -index 1eac0eb..c8a2514 100644 ---- a/GL/glx/glxglcore.c -+++ b/GL/glx/glxglcore.c -@@ -432,6 +432,7 @@ __glXMesaScreenProbe(ScreenPtr pScreen) - screen->base.destroy = __glXMesaScreenDestroy; - screen->base.createContext = __glXMesaScreenCreateContext; - screen->base.createDrawable = __glXMesaScreenCreateDrawable; -+ screen->base.swapInterval = NULL; - screen->base.pScreen = pScreen; - - return &screen->base; --- -cgit v0.7.2-37-g538c - diff --git a/xserver-1.5.0-hal-closedown.patch b/xserver-1.5.0-hal-closedown.patch deleted file mode 100644 index 3cee718..0000000 --- a/xserver-1.5.0-hal-closedown.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 7985ebda80acb02f2d763904743665e470300d6c Mon Sep 17 00:00:00 2001 -From: Adam Jackson -Date: Mon, 5 May 2008 14:37:07 -0400 -Subject: [PATCH] Fix hal shutdown crash - ---- - config/hal.c | 8 +++++--- - 1 files changed, 5 insertions(+), 3 deletions(-) - -diff --git a/config/hal.c b/config/hal.c -index 1575422..6534408 100644 ---- a/config/hal.c -+++ b/config/hal.c -@@ -63,7 +63,7 @@ remove_device(DeviceIntPtr dev) - static void - device_removed(LibHalContext *ctx, const char *udi) - { -- DeviceIntPtr dev; -+ DeviceIntPtr dev, next; - char *value; - - value = xalloc(strlen(udi) + 5); /* "hal:" + NULL */ -@@ -71,11 +71,13 @@ device_removed(LibHalContext *ctx, const char *udi) - return; - sprintf(value, "hal:%s", udi); - -- for (dev = inputInfo.devices; dev; dev = dev->next) { -+ for (dev = inputInfo.devices; dev; dev = next) { -+ next = dev->next; - if (dev->config_info && strcmp(dev->config_info, value) == 0) - remove_device(dev); - } -- for (dev = inputInfo.off_devices; dev; dev = dev->next) { -+ for (dev = inputInfo.off_devices; dev; dev = next) { -+ next = dev->next; - if (dev->config_info && strcmp(dev->config_info, value) == 0) - remove_device(dev); - } --- -1.5.4.5 - diff --git a/xserver-1.5.0-selinux-off-by-default.patch b/xserver-1.5.0-selinux-off-by-default.patch deleted file mode 100644 index df4f0c4..0000000 --- a/xserver-1.5.0-selinux-off-by-default.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 7007f29215604b2d16c4bda25ec2b752ca05d75f Mon Sep 17 00:00:00 2001 -From: Adam Jackson -Date: Wed, 9 Apr 2008 13:55:25 -0400 -Subject: [PATCH] Default X-SELinux to off. - ---- - os/utils.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/os/utils.c b/os/utils.c -index d785d46..f58c763 100644 ---- a/os/utils.c -+++ b/os/utils.c -@@ -233,7 +233,7 @@ _X_EXPORT Bool noXInputExtension = FALSE; - _X_EXPORT Bool noXIdleExtension = FALSE; - #endif - #ifdef XSELINUX --_X_EXPORT Bool noSELinuxExtension = FALSE; -+_X_EXPORT Bool noSELinuxExtension = TRUE; - _X_EXPORT int selinuxEnforcingState = SELINUX_MODE_DEFAULT; - #endif - #ifdef XV --- -1.5.4.5 - diff --git a/xserver-1.5.0-stenciled-visuals.patch b/xserver-1.5.0-stenciled-visuals.patch deleted file mode 100644 index 71b6000..0000000 --- a/xserver-1.5.0-stenciled-visuals.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 45be1e933f5a3e21b32dc1d1141b6261154faa31 Mon Sep 17 00:00:00 2001 -From: Hans de Goede -Date: Tue, 22 Apr 2008 14:18:57 -0400 -Subject: [PATCH] Prefer GLX visuals with stencil buffer for the default visual. - ---- - GL/glx/glxscreens.c | 13 ++++++++++--- - 1 files changed, 10 insertions(+), 3 deletions(-) - -diff --git a/GL/glx/glxscreens.c b/GL/glx/glxscreens.c -index 41ee029..5859de0 100644 ---- a/GL/glx/glxscreens.c -+++ b/GL/glx/glxscreens.c -@@ -437,6 +437,7 @@ initGlxVisual(VisualPtr visual, __GLXconfig *config) - typedef struct { - GLboolean doubleBuffer; - GLboolean depthBuffer; -+ GLboolean stencilBuffer; - } FBConfigTemplateRec, *FBConfigTemplatePtr; - - static __GLXconfig * -@@ -453,6 +454,8 @@ pickFBConfig(__GLXscreen *pGlxScreen, FBConfigTemplatePtr template, int class) - continue; - if ((config->depthBits > 0) != template->depthBuffer) - continue; -+ if ((config->stencilBits > 0) != template->stencilBuffer) -+ continue; - - return config; - } -@@ -466,8 +469,9 @@ addMinimalSet(__GLXscreen *pGlxScreen) - __GLXconfig *config; - VisualPtr visuals; - int i, j; -- FBConfigTemplateRec best = { GL_TRUE, GL_TRUE }; -- FBConfigTemplateRec minimal = { GL_FALSE, GL_FALSE }; -+ FBConfigTemplateRec best = { GL_TRUE, GL_TRUE, GL_TRUE }; -+ FBConfigTemplateRec good = { GL_TRUE, GL_TRUE, GL_FALSE }; -+ FBConfigTemplateRec minimal = { GL_FALSE, GL_FALSE, GL_FALSE }; - - pGlxScreen->visuals = xcalloc(pGlxScreen->pScreen->numVisuals, - sizeof (__GLXconfig *)); -@@ -480,8 +484,11 @@ addMinimalSet(__GLXscreen *pGlxScreen) - for (i = 0, j = 0; i < pGlxScreen->pScreen->numVisuals; i++) { - if (visuals[i].nplanes == 32) - config = pickFBConfig(pGlxScreen, &minimal, visuals[i].class); -- else -+ else { - config = pickFBConfig(pGlxScreen, &best, visuals[i].class); -+ if (config == NULL) -+ config = pickFBConfig(pGlxScreen, &good, visuals[i].class); -+ } - if (config == NULL) - config = pGlxScreen->fbconfigs; - if (config == NULL) --- -1.5.4.5 -