rpms/xorg-x11-server/devel xserver-1.6.99-dri2-swapbuffers-fallback.patch, NONE, 1.1 .cvsignore, 1.68, 1.69 commitid, 1.31, 1.32 sources, 1.63, 1.64 xorg-x11-server.spec, 1.473, 1.474 xserver-1.6.1-proc-cmdline.patch, 1.1, NONE xserver-1.6.99-dpms.patch, 1.1, NONE xserver-1.6.99-eventtime.patch, 1.1, NONE xserver-1.6.99-linkmap.patch, 1.1, NONE
Adam Jackson
ajax at fedoraproject.org
Thu Aug 20 21:40:50 UTC 2009
Author: ajax
Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6630
Modified Files:
.cvsignore commitid sources xorg-x11-server.spec
Added Files:
xserver-1.6.99-dri2-swapbuffers-fallback.patch
Removed Files:
xserver-1.6.1-proc-cmdline.patch xserver-1.6.99-dpms.patch
xserver-1.6.99-eventtime.patch xserver-1.6.99-linkmap.patch
Log Message:
* Thu Aug 20 2009 Adam Jackson <ajax at redhat.com> 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.
xserver-1.6.99-dri2-swapbuffers-fallback.patch:
glxdri2.c | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
--- NEW FILE xserver-1.6.99-dri2-swapbuffers-fallback.patch ---
>From 5f566bed4abd8d5efedd36fa41a9aebbba2c93ef Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax at redhat.com>
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
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/.cvsignore,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- .cvsignore 13 Aug 2009 23:01:32 -0000 1.68
+++ .cvsignore 20 Aug 2009 21:40:48 -0000 1.69
@@ -1 +1 @@
-xorg-server-20090814.tar.xz
+xorg-server-20090820.tar.xz
Index: commitid
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/commitid,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- commitid 13 Aug 2009 23:01:32 -0000 1.31
+++ commitid 20 Aug 2009 21:40:48 -0000 1.32
@@ -1 +1 @@
-db568f9eabf3450d8a023597ff007df355b13ea8
+9d8fc33cae2fee7777edd20658dbf6a3ffb3d557
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/sources,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- sources 13 Aug 2009 23:01:32 -0000 1.63
+++ sources 20 Aug 2009 21:40:48 -0000 1.64
@@ -1 +1 @@
-c42f978865f2d6be46770eeb0122afee xorg-server-20090814.tar.xz
+ea807505ea5c7e6c2d1a7f1cadce4f6f xorg-server-20090820.tar.xz
Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.473
retrieving revision 1.474
diff -u -p -r1.473 -r1.474
--- xorg-x11-server.spec 19 Aug 2009 04:50:35 -0000 1.473
+++ xorg-x11-server.spec 20 Aug 2009 21:40:48 -0000 1.474
@@ -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 <ajax at redhat.com> 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 <peter.hutterer at redhat.com> 1.6.99-36.20090814
- xserver-1.6.99-eventtime.patch: don't reset the last event time when the
screen saver activates.
--- xserver-1.6.1-proc-cmdline.patch DELETED ---
--- xserver-1.6.99-dpms.patch DELETED ---
--- xserver-1.6.99-eventtime.patch DELETED ---
--- xserver-1.6.99-linkmap.patch DELETED ---
More information about the fedora-extras-commits
mailing list