- Add a patch that fixes SGI_video_sync being reported as an extension onmesa-7_8_1-6_fc13

    Radeon but doing nothing

2 files changed, 50 insertions, 1 deletions

diff --git a/Mark-MESA_swap_control-and-SGI_video_sync-as-not-dir.patch b/Mark-MESA_swap_control-and-SGI_video_sync-as-not-dir.patch
new file mode 100644
index 0000000..3e8564c
--- /dev/null
+++ b/Mark-MESA_swap_control-and-SGI_video_sync-as-not-dir.patch
@@ -0,0 +1,41 @@
+From 3905bc49a072fb99916ffea17d9b970f20b7c224 Mon Sep 17 00:00:00 2001
+From: Owen W. Taylor <otaylor@fishsoup.net>
+Date: Fri, 30 Apr 2010 19:27:35 -0400
+Subject: [PATCH] Mark MESA_swap_control and SGI_video_sync as not "direct only"
+
+With DRI2, MESA_swap_control and SGI_video_sync are done on the
+X server side, so shouldn't be marked direct_only - they only
+can be supported if the server supports them.
+
+This fix is not completely right because with DRI1, which is still
+supported in some of the drivers, these are in fact direct_only
+extensions and could conceivably not be advertised by the server.
+---
+ src/glx/glxextensions.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/glx/glxextensions.c b/src/glx/glxextensions.c
+index e58c296..56239e5 100644
+--- a/src/glx/glxextensions.c
++++ b/src/glx/glxextensions.c
+@@ -98,7 +98,7 @@ static const struct extension_info known_glx_extensions[] = {
+    { GLX(MESA_swap_control),           VER(0,0), N, N, N, N },
+    { GLX(MESA_swap_frame_usage),       VER(0,0), N, N, N, N },
+ #else
+-   { GLX(MESA_swap_control),           VER(0,0), Y, N, N, Y },
++   { GLX(MESA_swap_control),           VER(0,0), Y, N, N, N },
+    { GLX(MESA_swap_frame_usage),       VER(0,0), Y, N, N, Y },
+ #endif
+    { GLX(NV_float_buffer),             VER(0,0), N, N, N, N },
+@@ -117,7 +117,7 @@ static const struct extension_info known_glx_extensions[] = {
+    { GLX(OML_sync_control),            VER(0,0), Y, N, N, Y },
+    { GLX(SGI_make_current_read),       VER(1,3), Y, N, N, N },
+    { GLX(SGI_swap_control),            VER(0,0), Y, N, N, N },
+-   { GLX(SGI_video_sync),              VER(0,0), Y, N, N, Y },
++   { GLX(SGI_video_sync),              VER(0,0), Y, N, N, N },
+ #endif
+    { GLX(SGIS_blended_overlay),        VER(0,0), N, N, N, N },
+    { GLX(SGIS_color_range),            VER(0,0), N, N, N, N },
+-- 
+1.7.0.1
+
diff --git a/mesa.spec b/mesa.spec
index 1953c20..7006869 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -21,7 +21,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 7.8.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -48,6 +48,7 @@ Patch5: nouveau-legacy-update.patch
 Patch30: mesa-7.6-hush-vblank-warning.patch
 Patch31: mesa-7.8.1-intel-dri2-damage.patch
 Patch32: radeon-fix-glCopyTex-Sub-Image-if-user-FBO-is-bound.patch
+Patch33: Mark-MESA_swap_control-and-SGI_video_sync-as-not-dir.patch
 
 BuildRequires: pkgconfig autoconf automake
 %if %{with_hardware}
@@ -193,6 +194,9 @@ Group: User Interface/X Hardware Support
 # Fix for glCopyTexSubImage from master. Needed to fix corruption
 # issues with Clutter's texture atlases
 %patch32 -p1 -b .fbo-copy-tex-image
+# MESA_swap_control and SGI_video_sync shouldn't be direct_only
+# http://lists.freedesktop.org/archives/mesa-dev/2010-April/000389.html
+%patch33 -p1 -b .direct-only-extensions
 
 
 # Hack the demos to use installed data files
@@ -410,6 +414,10 @@ rm -rf $RPM_BUILD_ROOT
 %{demodir}
 
 %changelog
+* Fri Apr 30 2010 Owen Taylor <otaylor@redhat.com> - 7.8.1-6
+- Add a patch that fixes SGI_video_sync being reported as an extension
+  on Radeon but doing nothing
+
 * Thu Apr 30 2010 Owen Taylor <otaylor@redhat.com> - 7.8.1-4
 - Backport fix for glCopyTexSubImage from master. Needed to fix corruption
   issues with Clutter's texture atlases