diff --git a/.cvsignore b/.cvsignore index 9af58ab..954358d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xorg-server-20090814.tar.xz +xorg-server-20090820.tar.xz diff --git a/commitid b/commitid index 1031e79..2c84ebb 100644 --- a/commitid +++ b/commitid @@ -1 +1 @@ -db568f9eabf3450d8a023597ff007df355b13ea8 +9d8fc33cae2fee7777edd20658dbf6a3ffb3d557 diff --git a/sources b/sources index 8fe250c..bcadab2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c42f978865f2d6be46770eeb0122afee xorg-server-20090814.tar.xz +ea807505ea5c7e6c2d1a7f1cadce4f6f xorg-server-20090820.tar.xz diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 3158e42..96da4be 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -14,12 +14,12 @@ # Fix rhpxl to no longer need vesamodes/extramodes %define pkgname xorg-server -%define gitdate 20090814 +%define gitdate 20090820 Summary: X.Org X11 X server Name: xorg-x11-server Version: 1.6.99 -Release: 36.%{gitdate}%{?dist} +Release: 37.%{gitdate}%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X @@ -47,7 +47,6 @@ Source30: find-provides #define __find_provides {nil} Patch5: xserver-1.4.99-pic-libxf86config.patch -Patch10: xserver-1.6.99-linkmap.patch # airlied to upstream for 1.7 Patch100: xserver-1.6.99-vga-arb.patch @@ -78,14 +77,9 @@ Patch6016: xserver-1.6.1-nouveau.patch # ajax needs to upstream this Patch6027: xserver-1.6.0-displayfd.patch Patch6028: xserver-1.6.99-randr-error-debugging.patch -Patch6029: xserver-1.6.1-proc-cmdline.patch Patch6030: xserver-1.6.99-right-of.patch Patch6031: xserver-1.6.99-dri2-crash-fixes.patch - -# dpms/idlecounter race condition. upstream -Patch6032: xserver-1.6.99-dpms.patch -# screen saver/idlecounter race condition. upstream -Patch6033: xserver-1.6.99-eventtime.patch +Patch6032: xserver-1.6.99-dri2-swapbuffers-fallback.patch %define moduledir %{_libdir}/xorg/modules %define drimoduledir %{_libdir}/dri @@ -512,6 +506,13 @@ rm -rf $RPM_BUILD_ROOT %{xserver_source_dir} %changelog +* Thu Aug 20 2009 Adam Jackson 1.6.99-37.20090820 +- Today's git snapshot. +- xserver-1.6.99-dri2-swapbuffers-fallback.patch: Fix SwapBuffers crash. +- xserver-1.6.99-linkmap.patch: Drop, superceded upstream. +- xserver-1.6.1-proc-cmdline.patch, xserver-1.6.99-dpms.patch, + xserver-1.6.99-eventtime.patch: Drop, merged. + * Wed Aug 19 2009 Peter Hutterer 1.6.99-36.20090814 - xserver-1.6.99-eventtime.patch: don't reset the last event time when the screen saver activates. diff --git a/xserver-1.6.1-proc-cmdline.patch b/xserver-1.6.1-proc-cmdline.patch deleted file mode 100644 index 2474a33..0000000 --- a/xserver-1.6.1-proc-cmdline.patch +++ /dev/null @@ -1,36 +0,0 @@ -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 - diff --git a/xserver-1.6.99-dpms.patch b/xserver-1.6.99-dpms.patch deleted file mode 100644 index aaa769a..0000000 --- a/xserver-1.6.99-dpms.patch +++ /dev/null @@ -1,47 +0,0 @@ -From c1d901d723c3bee523736eacc15b44a7dff484fe Mon Sep 17 00:00:00 2001 -From: Richard Hughes -Date: Fri, 14 Aug 2009 11:44:35 +0100 -Subject: [PATCH] Don't reset the lastDeviceEventTime when doing DPMS actions - -When we change the DPMS mode, don't play games with the last event time as -this breaks applications using IDLETIME to turn the backlight off after a -preset time. - -This patch fixes gnome-power-manager and xfce-power-manager - -Signed-off-by: Peter Hutterer ---- - Xext/dpms.c | 17 ++++------------- - 1 files changed, 4 insertions(+), 13 deletions(-) - -diff --git a/Xext/dpms.c b/Xext/dpms.c -index 21ba923..df63a8b 100644 ---- a/Xext/dpms.c -+++ b/Xext/dpms.c -@@ -177,19 +177,10 @@ ProcDPMSForceLevel(ClientPtr client) - if (!DPMSEnabled) - return BadMatch; - -- if (stuff->level == DPMSModeOn) { -- lastDeviceEventTime.milliseconds = -- GetTimeInMillis(); -- } else if (stuff->level == DPMSModeStandby) { -- lastDeviceEventTime.milliseconds = -- GetTimeInMillis() - DPMSStandbyTime; -- } else if (stuff->level == DPMSModeSuspend) { -- lastDeviceEventTime.milliseconds = -- GetTimeInMillis() - DPMSSuspendTime; -- } else if (stuff->level == DPMSModeOff) { -- lastDeviceEventTime.milliseconds = -- GetTimeInMillis() - DPMSOffTime; -- } else { -+ if (stuff->level != DPMSModeOn && -+ stuff->level != DPMSModeStandby && -+ stuff->level != DPMSModeSuspend && -+ stuff->level != DPMSModeOff) { - client->errorValue = stuff->level; - return BadValue; - } --- -1.6.3.rc1.2.g0164.dirty - diff --git a/xserver-1.6.99-dri2-swapbuffers-fallback.patch b/xserver-1.6.99-dri2-swapbuffers-fallback.patch new file mode 100644 index 0000000..86174a4 --- /dev/null +++ b/xserver-1.6.99-dri2-swapbuffers-fallback.patch @@ -0,0 +1,36 @@ +From 5f566bed4abd8d5efedd36fa41a9aebbba2c93ef Mon Sep 17 00:00:00 2001 +From: Adam Jackson +Date: Thu, 20 Aug 2009 14:17:05 -0400 +Subject: [PATCH] dri2: Don't crash in SwapBuffers for non DRI2_Flush drivers + +--- + glx/glxdri2.c | 13 +++++++++---- + 1 files changed, 9 insertions(+), 4 deletions(-) + +diff --git a/glx/glxdri2.c b/glx/glxdri2.c +index f0df040..b408c2f 100644 +--- a/glx/glxdri2.c ++++ b/glx/glxdri2.c +@@ -173,10 +173,15 @@ __glXDRIdrawableSwapBuffers(__GLXdrawable *drawable) + __GLXDRIdrawable *priv = (__GLXDRIdrawable *) drawable; + __GLXDRIscreen *screen = priv->screen; + +- (*screen->flush->flushInvalidate)(priv->driDrawable); +- +- if (DRI2SwapBuffers(drawable->pDraw) != Success) +- return FALSE; ++ if (screen->flush) { ++ (*screen->flush->flushInvalidate)(priv->driDrawable); ++ ++ if (DRI2SwapBuffers(drawable->pDraw) != Success) ++ return FALSE; ++ } else { ++ __glXDRIdrawableCopySubBuffer(drawable, 0, 0, ++ priv->width, priv->height); ++ } + + return TRUE; + } +-- +1.6.4 + diff --git a/xserver-1.6.99-eventtime.patch b/xserver-1.6.99-eventtime.patch deleted file mode 100644 index e44ed20..0000000 --- a/xserver-1.6.99-eventtime.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 6b5978dcf1f7ac3ecc2f22df06f7000f360e2066 Mon Sep 17 00:00:00 2001 -From: Richard Hughes -Date: Mon, 17 Aug 2009 09:15:32 +0100 -Subject: [PATCH] Do not reset lastDeviceEventTime when we do dixSaveScreens - -When we turn off DPMS with DPMSModeOff and do dixSaveScreens, don't reset the -event time else session clients using IDLETIME will be reset. - -Signed-off-by: Peter Hutterer ---- - dix/window.c | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -diff --git a/dix/window.c b/dix/window.c -index 32e26d9..1a645f6 100644 ---- a/dix/window.c -+++ b/dix/window.c -@@ -3128,8 +3128,6 @@ dixSaveScreens(ClientPtr client, int on, int mode) - - if (on == SCREEN_SAVER_FORCER) - { -- UpdateCurrentTimeIf(); -- lastDeviceEventTime = currentTime; - if (mode == ScreenSaverReset) - what = SCREEN_SAVER_OFF; - else --- -1.6.3.rc1.2.g0164.dirty - diff --git a/xserver-1.6.99-linkmap.patch b/xserver-1.6.99-linkmap.patch deleted file mode 100644 index d55a159..0000000 --- a/xserver-1.6.99-linkmap.patch +++ /dev/null @@ -1,51 +0,0 @@ -From edf055d2733a0e012dfd97daf1906c407c47ff88 Mon Sep 17 00:00:00 2001 -From: Adam Jackson -Date: Thu, 23 Jul 2009 14:43:30 -0400 -Subject: [PATCH] dix: Print load map on backtrace - ---- - os/backtrace.c | 16 ++++++++++++++++ - 1 files changed, 16 insertions(+), 0 deletions(-) - -diff --git a/os/backtrace.c b/os/backtrace.c -index 3cfae3e..af67301 100644 ---- a/os/backtrace.c -+++ b/os/backtrace.c -@@ -30,18 +30,34 @@ - - #ifdef HAVE_BACKTRACE - #include -+#include -+#include - - void xorg_backtrace(void) - { - void *array[32]; /* deeper nesting than this means something's wrong */ - int size, i; - char **strings; -+ struct link_map *lm; -+ void *self; -+ - ErrorF("\nBacktrace:\n"); - size = backtrace(array, 32); - strings = backtrace_symbols(array, size); - for (i = 0; i < size; i++) - ErrorF("%d: %s\n", i, strings[i]); - free(strings); -+ -+ self = dlopen(NULL, RTLD_LAZY); -+ dlinfo(self, RTLD_DI_LINKMAP, &lm); -+ -+ ErrorF("\nLink map:\n"); -+ while (lm) { -+ if (lm->l_addr) -+ ErrorF("%p: %s\n", (void *)lm->l_addr, -+ lm->l_name[0] ? lm->l_name : "(vdso)"); -+ lm = lm->l_next; -+ } - } - - #else /* not glibc or glibc < 2.1 */ --- -1.6.3.3 -