Fix building on platforms with HW and without LLVM
This commit is contained in:
parent
ee01f24799
commit
131d1d7800
17
mesa.spec
17
mesa.spec
@ -36,7 +36,7 @@
|
|||||||
Summary: Mesa graphics libraries
|
Summary: Mesa graphics libraries
|
||||||
Name: mesa
|
Name: mesa
|
||||||
Version: 8.1
|
Version: 8.1
|
||||||
Release: 0.14%{?dist}
|
Release: 0.15%{?dist}
|
||||||
License: MIT
|
License: MIT
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
URL: http://www.mesa3d.org
|
URL: http://www.mesa3d.org
|
||||||
@ -308,10 +308,14 @@ export CXXFLAGS="$RPM_OPT_FLAGS"
|
|||||||
--enable-shared-glapi \
|
--enable-shared-glapi \
|
||||||
--enable-gbm \
|
--enable-gbm \
|
||||||
%if %{with_hardware}
|
%if %{with_hardware}
|
||||||
--with-gallium-drivers=%{?with_vmware:svga,}r300,r600,radeonsi,nouveau,swrast \
|
|
||||||
%{?with_llvm:--enable-gallium-llvm} \
|
|
||||||
%{?with_vmware:--enable-xa} \
|
%{?with_vmware:--enable-xa} \
|
||||||
%{?with_llvm:--with-llvm-shared-libs} \
|
%if 0%{?with_llvm}
|
||||||
|
--with-gallium-drivers=%{?with_vmware:svga,}r300,r600,radeonsi,nouveau,swrast \
|
||||||
|
--enable-gallium-llvm \
|
||||||
|
--with-llvm-shared-libs \
|
||||||
|
%else
|
||||||
|
--with-gallium-drivers=%{?with_vmware:svga,}r300,r600,nouveau,swrast \
|
||||||
|
%endif
|
||||||
%else
|
%else
|
||||||
--disable-gallium-llvm \
|
--disable-gallium-llvm \
|
||||||
--with-gallium-drivers=swrast \
|
--with-gallium-drivers=swrast \
|
||||||
@ -430,7 +434,9 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%endif
|
%endif
|
||||||
%{_libdir}/dri/r300_dri.so
|
%{_libdir}/dri/r300_dri.so
|
||||||
%{_libdir}/dri/r600_dri.so
|
%{_libdir}/dri/r600_dri.so
|
||||||
|
%if 0%{?with_llvm}
|
||||||
%{_libdir}/dri/radeonsi_dri.so
|
%{_libdir}/dri/radeonsi_dri.so
|
||||||
|
%endif
|
||||||
%ifarch %{ix86} x86_64 ia64
|
%ifarch %{ix86} x86_64 ia64
|
||||||
%{_libdir}/dri/i915_dri.so
|
%{_libdir}/dri/i915_dri.so
|
||||||
%ifnarch ia64
|
%ifnarch ia64
|
||||||
@ -565,6 +571,9 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Jul 25 2012 Peter Robinson <pbrobinson@fedoraproject.org> 8.1-0.15
|
||||||
|
- Fix building on platforms with HW and without LLVM
|
||||||
|
|
||||||
* Tue Jul 24 2012 Adam Jackson <ajax@redhat.com> 8.1-0.14
|
* Tue Jul 24 2012 Adam Jackson <ajax@redhat.com> 8.1-0.14
|
||||||
- Re-enable llvm on ppc, being worked on
|
- Re-enable llvm on ppc, being worked on
|
||||||
- Don't BuildReq on wayland things in RHEL
|
- Don't BuildReq on wayland things in RHEL
|
||||||
|
Loading…
Reference in New Issue
Block a user