summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2014-04-15 17:32:50 -0400
committerAdam Jackson <ajax@redhat.com>2014-04-15 17:32:50 -0400
commit4077056057fa8727789dc8d9cf31f74dc883b84d (patch)
tree83edeca21a66b549a80dbc4c14a8a903ddad8a9a
parente0b1553edf435d414b50a4ee6095323d976e4eff (diff)
parent223fa3afe7198fb5da637e0baba3b20d4717bb5f (diff)
downloadmesa-4077056057fa8727789dc8d9cf31f74dc883b84d.tar.gz
mesa-4077056057fa8727789dc8d9cf31f74dc883b84d.tar.xz
mesa-4077056057fa8727789dc8d9cf31f74dc883b84d.zip
Merge branch 'master' into f20
-rw-r--r--mesa.spec8
1 files changed, 7 insertions, 1 deletions
diff --git a/mesa.spec b/mesa.spec
index 58ba2aa..8d08212 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -55,7 +55,7 @@
Summary: Mesa graphics libraries
Name: mesa
Version: 10.1
-Release: 5.%{gitdate}%{?dist}
+Release: 6.%{gitdate}%{?dist}
License: MIT
Group: System Environment/Libraries
URL: http://www.mesa3d.org
@@ -391,6 +391,9 @@ export CXXFLAGS="$RPM_OPT_FLAGS %{?with_opencl:-frtti -fexceptions} %{!?with_ope
%else
--with-gallium-drivers=%{?with_llvm:swrast} \
%endif
+%if 0%{?fedora} < 21
+ --disable-dri3
+%endif
%{?dri_drivers}
# this seems to be neccessary for s390
@@ -642,6 +645,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Tue Apr 15 2014 Adam Jackson <ajax@redhat.com> 10.1-6.20140305
+- Disable DRI3 in F20, it requires libxcb bits we haven't backported.
+
* Wed Mar 26 2014 Adam Jackson <ajax@redhat.com> 10.1-5.20140305
- Initial ppc64le enablement (no hardware drivers or vdpau yet)