From 0ccd64bb3f92ae1ac64aecd1f05cc3395ccfed72c259094eb04a36c327684b0c Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Wed, 30 May 2012 20:23:12 +0000 Subject: [PATCH] Accepting request 122957 from home:fcrozat:branches:X11:XOrg - Add mesa-8.0.1-fix-16bpp.patch (Fedora): fix 16bpp mode under llvmpipe. OBS-URL: https://build.opensuse.org/request/show/122957 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=221 --- Mesa.changes | 6 ++++++ Mesa.spec | 3 +++ mesa-8.0.1-fix-16bpp.patch | 13 +++++++++++++ 3 files changed, 22 insertions(+) create mode 100644 mesa-8.0.1-fix-16bpp.patch diff --git a/Mesa.changes b/Mesa.changes index eabc47f..f9feae0 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed May 30 16:56:11 UTC 2012 - fcrozat@suse.com + +- Add mesa-8.0.1-fix-16bpp.patch (Fedora): fix 16bpp mode under + llvmpipe. + ------------------------------------------------------------------- Sat May 26 22:29:41 UTC 2012 - sndirsch@suse.com diff --git a/Mesa.spec b/Mesa.spec index a0fd8c2..ade8c0c 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -90,6 +90,8 @@ Patch1: Mesa-nodate.diff Patch11: u_Fix-crash-in-swrast-when-setting-a-texture-for-a-pix.patch # Patch from upstream master to resolve build issues with llvm 3.1 Patch12: upstream-llvm-patch.diff +# Patch from Fedora, fix 16bpp in llvmpipe +Patch13: mesa-8.0.1-fix-16bpp.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -398,6 +400,7 @@ packages. rm -rf docs/README.{VMS,WIN32,OS2} #%patch11 -p1 %patch12 -p1 +%patch13 -p1 %build diff --git a/mesa-8.0.1-fix-16bpp.patch b/mesa-8.0.1-fix-16bpp.patch new file mode 100644 index 0000000..4ca5313 --- /dev/null +++ b/mesa-8.0.1-fix-16bpp.patch @@ -0,0 +1,13 @@ +diff -up Mesa-8.0.1/src/mesa/state_tracker/st_manager.c.jx Mesa-8.0.1/src/mesa/state_tracker/st_manager.c +--- Mesa-8.0.1/src/mesa/state_tracker/st_manager.c.jx 2012-02-14 18:44:00.000000000 -0500 ++++ Mesa-8.0.1/src/mesa/state_tracker/st_manager.c 2012-04-02 12:02:14.613964417 -0400 +@@ -528,6 +528,9 @@ st_context_teximage(struct st_context_if + if (util_format_get_component_bits(internal_format, + UTIL_FORMAT_COLORSPACE_RGB, 3) > 0) + internalFormat = GL_RGBA; ++ else if (util_format_get_component_bits(internal_format, ++ UTIL_FORMAT_COLORSPACE_RGB, 0) == 5) ++ internalFormat = GL_RGB5; + else + internalFormat = GL_RGB; +