rpms/mesa
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into f16

Browse Source 
Conflicts:
	mesa.spec
This commit is contained in:
Adam Jackson 2011-10-28 20:30:37 -04:00
commit 9143bb16de
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mesa-7.11-intel-swap-event.patch Normal file
View File

@ -0,0 +1,12 @@
diff -up Mesa-7.11/src/glx/glxextensions.c.jx Mesa-7.11/src/glx/glxextensions.c
--- Mesa-7.11/src/glx/glxextensions.c.jx 2011-07-08 21:37:10.000000000 -0400
+++ Mesa-7.11/src/glx/glxextensions.c 2011-10-28 20:26:49.172259452 -0400
@@ -139,7 +139,7 @@ static const struct extension_info known
{ GLX(SGIX_visual_select_group), VER(0,0), Y, Y, N, N },
{ GLX(EXT_texture_from_pixmap), VER(0,0), Y, N, N, N },
#endif
- { GLX(INTEL_swap_event), VER(1,4), Y, Y, N, N },
+ { GLX(INTEL_swap_event), VER(1,4), Y, N, N, N },
{ NULL }
};

7
mesa.spec
View File

@ -50,6 +50,7 @@ Patch31: mesa-7.10-swrastg.patch
Patch32: mesa-7.11-generic-wmb.patch
Patch33: mesa-7.11-drisw-glx13.patch
Patch34: 0001-nv50-fix-max-texture-levels.patch
Patch35: mesa-7.11-intel-swap-event.patch
BuildRequires: pkgconfig autoconf automake libtool
%if %{with_hardware}
@ -226,6 +227,7 @@ Mesa offscreen rendering development package
%patch32 -p1 -b .wmb
%patch33 -p1 -b .glx13
%patch34 -p1 -b .nv50-texlevel
%patch35 -p1 -b .ise
%build
@ -464,8 +466,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pkgconfig/osmesa.pc
%changelog
* Thu Oct 27 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 7.11-6
- Rebuilt for glibc bug#747377
* Fri Oct 28 2011 Adam Jackson <ajax@redhat.com> 7.11-7
- mesa-7.11-intel-swap-event.patch: Disable GLX_INTEL_swap_event by default;
DRI2 enables it explicitly, but swrast doesn't and oughtn't. (#748747)
* Mon Oct 24 2011 Adam Jackson <ajax@redhat.com> 7.11-6
- 0001-nv50-fix-max-texture-levels.patch: Fix maximum texture size on