From 2f02d35654979d96aeaf62a309d52137c596413a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
Date: Tue, 24 Apr 2018 09:51:33 +0200
Subject: [PATCH] Disable rgb10 configs by default

rgb10 configs are not handled very well by applications using clutter,
and possibly other applications as well, so don't break those by
disabling support for rgb10 configs by default.

Also re-add python2 as a build requirement, as merge_driinfo.py
depends on it.

https://bugzilla.redhat.com/show_bug.cgi?id=1560481
---
 ...ium-Disable-rgb10-configs-by-default.patch | 27 +++++++++++++++++++
 mesa.spec                                     | 14 +++++++++-
 2 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 0001-gallium-Disable-rgb10-configs-by-default.patch

diff --git a/0001-gallium-Disable-rgb10-configs-by-default.patch b/0001-gallium-Disable-rgb10-configs-by-default.patch
new file mode 100644
index 0000000..09593a0
--- /dev/null
+++ b/0001-gallium-Disable-rgb10-configs-by-default.patch
@@ -0,0 +1,27 @@
+From b33c8b56abcc4837f96f7f106b108681858482e0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
+Date: Tue, 24 Apr 2018 09:46:41 +0200
+Subject: [PATCH] gallium: Disable rgb10 configs by default
+
+Applications tend to not handle rgb10 configs very well, so lets
+disable it for now.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1560481
+---
+ src/gallium/auxiliary/pipe-loader/driinfo_gallium.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/gallium/auxiliary/pipe-loader/driinfo_gallium.h b/src/gallium/auxiliary/pipe-loader/driinfo_gallium.h
+index 21dc599dc2..23f9194149 100644
+--- a/src/gallium/auxiliary/pipe-loader/driinfo_gallium.h
++++ b/src/gallium/auxiliary/pipe-loader/driinfo_gallium.h
+@@ -33,5 +33,5 @@ DRI_CONF_SECTION_END
+ DRI_CONF_SECTION_MISCELLANEOUS
+    DRI_CONF_ALWAYS_HAVE_DEPTH_BUFFER("false")
+    DRI_CONF_GLSL_ZERO_INIT("false")
+-   DRI_CONF_ALLOW_RGB10_CONFIGS("true")
++   DRI_CONF_ALLOW_RGB10_CONFIGS("false")
+ DRI_CONF_SECTION_END
+-- 
+2.17.0
+
diff --git a/mesa.spec b/mesa.spec
index 3a0fad5..6bd53d1 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -57,7 +57,7 @@
 Name:           mesa
 Summary:        Mesa graphics libraries
 Version:        18.0.1
-Release:        1%{?rctag:.%{rctag}}%{?dist}
+Release:        2%{?rctag:.%{rctag}}%{?dist}
 
 License:        MIT
 URL:            http://www.mesa3d.org
@@ -76,6 +76,12 @@ Patch2:         0002-hardware-gloat.patch
 Patch3:         0003-evergreen-big-endian.patch
 Patch4:         0004-bigendian-assert.patch
 
+
+# Disable rgb10 configs by default:
+# https://bugzilla.redhat.com/show_bug.cgi?id=1560481
+Patch7:         0001-gallium-Disable-rgb10-configs-by-default.patch
+
+
 # glvnd support patches
 # non-upstreamed ones
 Patch10:        glvnd-fix-gl-dot-pc.patch
@@ -104,6 +110,7 @@ BuildRequires:  libXmu-devel
 BuildRequires:  libxshmfence-devel
 BuildRequires:  elfutils
 BuildRequires:  python3
+BuildRequires:  python2
 BuildRequires:  gettext
 %if 0%{?with_llvm}
 BuildRequires: llvm-devel >= 3.4-7
@@ -113,6 +120,7 @@ BuildRequires: clang-devel >= 3.0
 %endif
 BuildRequires: elfutils-libelf-devel
 BuildRequires: python3-libxml2
+BuildRequires: python2-libxml2
 BuildRequires: libudev-devel
 BuildRequires: bison flex
 BuildRequires: pkgconfig(wayland-client)
@@ -135,6 +143,7 @@ BuildRequires: libclc-devel opencl-filesystem
 BuildRequires: vulkan-devel
 %endif
 BuildRequires: python3-mako
+BuildRequires: python2-mako
 %ifarch %{valgrind_arches}
 BuildRequires: pkgconfig(valgrind)
 %endif
@@ -672,6 +681,9 @@ popd
 %endif
 
 %changelog
+* Tue Apr 24 2018 Jonas Ådahl <jadahl@redhat.com> - 18.0.1-2
+- Disable rgb10 configs by default (rhbz 1560481)
+
 * Wed Apr 18 2018 Adam Jackson <ajax@redhat.com> - 18.0.1-1
 - Mesa 18.0.1