rpms/mesa
7
0
Fork 0
mirror of https://src.fedoraproject.org/rpms/mesa.git synced 2024-11-28 19:06:52 +00:00
Code Issues 12 Projects Releases Packages Wiki Activity Actions

revert disabling of hardware drivers, disable only llvm on PPC* (#819060)

Browse source
This commit is contained in:
Karsten Hopp 2012-05-09 15:49:21 +02:00
parent 341fd4a78c
commit 96823333b1
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
mesa.spec
View file

@ -1,5 +1,5 @@
%if 0%{?rhel} %if 0%{?rhel}
%define rhel_no_hw_arches ppc ppc64 %define rhel_no_hw_arches ppc ppc64 ppc64p7
%endif %endif
# S390 doesn't have video cards, but we need swrast for xserver's GLX # S390 doesn't have video cards, but we need swrast for xserver's GLX
@ -7,6 +7,10 @@
%define with_hardware 0 %define with_hardware 0
%define dri_drivers --with-dri-drivers=swrast %define dri_drivers --with-dri-drivers=swrast
%else %else
# llvm has some serious issues on PPC*, disable usage
%ifnarch ppc ppc64 ppc64p7
%define with_llvm 1
%endif
%define with_hardware 1 %define with_hardware 1
%define base_drivers nouveau,radeon,r200 %define base_drivers nouveau,radeon,r200
%ifarch %{ix86} %ifarch %{ix86}
@ -32,7 +36,7 @@
Summary: Mesa graphics libraries Summary: Mesa graphics libraries
Name: mesa Name: mesa
Version: 8.0.2 Version: 8.0.2
Release: 4%{?dist} Release: 6%{?dist}
License: MIT License: MIT
Group: System Environment/Libraries Group: System Environment/Libraries
URL: http://www.mesa3d.org URL: http://www.mesa3d.org
@ -70,8 +74,10 @@ BuildRequires: libXmu-devel
BuildRequires: elfutils BuildRequires: elfutils
BuildRequires: python BuildRequires: python
%if %{with_hardware} %if %{with_hardware}
%if 0%{?with_llvm}
BuildRequires: llvm-devel >= 3.0 BuildRequires: llvm-devel >= 3.0
%endif %endif
%endif
BuildRequires: libxml2-python BuildRequires: libxml2-python
BuildRequires: libudev-devel BuildRequires: libudev-devel
BuildRequires: libtalloc-devel BuildRequires: libtalloc-devel
@ -318,7 +324,7 @@ export CXXFLAGS="$RPM_OPT_FLAGS"
--enable-gbm \ --enable-gbm \
%if %{with_hardware} %if %{with_hardware}
--with-gallium-drivers=%{?with_vmware:svga,}r300,r600,nouveau,swrast \ --with-gallium-drivers=%{?with_vmware:svga,}r300,r600,nouveau,swrast \
--enable-gallium-llvm \ %{?with_llvm:--enable-gallium-llvm} \
%{?with_vmware:--enable-xa} \ %{?with_vmware:--enable-xa} \
%else %else
--disable-gallium-llvm \ --disable-gallium-llvm \
@ -562,6 +568,10 @@ rm -rf $RPM_BUILD_ROOT
%endif %endif
%changelog %changelog
* Wed May 09 2012 Karsten Hopp <karsten@redhat.com> 8.0.2-6
- revert disabling of hardware drivers, disable only llvm on PPC*
(#819060)
* Thu Apr 26 2012 Adam Jackson <ajax@redhat.com> 8.0.2-4 * Thu Apr 26 2012 Adam Jackson <ajax@redhat.com> 8.0.2-4
- Don't build vmware stuff on PPC (#815444) - Don't build vmware stuff on PPC (#815444)