Don't build vmware stuff on PPC (#815444)

This commit is contained in:
Adam Jackson 2012-04-26 10:20:49 -04:00
parent bc226ca838
commit 41c41c0e31

View file

@ -11,9 +11,11 @@
%define base_drivers nouveau,radeon,r200 %define base_drivers nouveau,radeon,r200
%ifarch %{ix86} %ifarch %{ix86}
%define ix86_drivers ,i915,i965 %define ix86_drivers ,i915,i965
%define with_vmware 1
%endif %endif
%ifarch x86_64 %ifarch x86_64
%define amd64_drivers ,i915,i965 %define amd64_drivers ,i915,i965
%define with_vmware 1
%endif %endif
%ifarch ia64 %ifarch ia64
%define ia64_drivers ,i915 %define ia64_drivers ,i915
@ -30,7 +32,7 @@
Summary: Mesa graphics libraries Summary: Mesa graphics libraries
Name: mesa Name: mesa
Version: 8.0.2 Version: 8.0.2
Release: 3%{?dist} Release: 4%{?dist}
License: MIT License: MIT
Group: System Environment/Libraries Group: System Environment/Libraries
URL: http://www.mesa3d.org URL: http://www.mesa3d.org
@ -246,6 +248,7 @@ Provides: libwayland-egl-devel
%description libwayland-egl-devel %description libwayland-egl-devel
Mesa libwayland-egl development package Mesa libwayland-egl development package
%if 0%{?with_vmware}
%package libxatracker %package libxatracker
Summary: Mesa XA state tracker for vmware Summary: Mesa XA state tracker for vmware
Group: System Environment/Libraries Group: System Environment/Libraries
@ -264,6 +267,7 @@ Provides: libxatracker-devel
%description libxatracker-devel %description libxatracker-devel
Mesa XA state tracker development package Mesa XA state tracker development package
%endif
%package libglapi %package libglapi
Summary: Mesa shared glapi Summary: Mesa shared glapi
@ -313,9 +317,9 @@ export CXXFLAGS="$RPM_OPT_FLAGS"
--enable-shared-glapi \ --enable-shared-glapi \
--enable-gbm \ --enable-gbm \
%if %{with_hardware} %if %{with_hardware}
--with-gallium-drivers=svga,r300,r600,nouveau,swrast \ --with-gallium-drivers=%{?with_vmware:svga,}r300,r600,nouveau,swrast \
--enable-gallium-llvm \ --enable-gallium-llvm \
--enable-xa \ %{?with_vmware:--enable-xa} \
%else %else
--disable-gallium-llvm \ --disable-gallium-llvm \
--with-gallium-drivers=swrast \ --with-gallium-drivers=swrast \
@ -434,8 +438,10 @@ rm -rf $RPM_BUILD_ROOT
%endif %endif
%{_libdir}/dri/nouveau_dri.so %{_libdir}/dri/nouveau_dri.so
%{_libdir}/dri/nouveau_vieux_dri.so %{_libdir}/dri/nouveau_vieux_dri.so
%if 0%{?with_vmware}
%{_libdir}/dri/vmwgfx_dri.so %{_libdir}/dri/vmwgfx_dri.so
%endif %endif
%endif
%{_libdir}/dri/swrast_dri.so %{_libdir}/dri/swrast_dri.so
%files -n khrplatform-devel %files -n khrplatform-devel
@ -535,6 +541,7 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libwayland-egl.so %{_libdir}/libwayland-egl.so
%{_libdir}/pkgconfig/wayland-egl.pc %{_libdir}/pkgconfig/wayland-egl.pc
%if 0%{?with_vmware}
%files libxatracker %files libxatracker
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc docs/COPYING %doc docs/COPYING
@ -552,8 +559,12 @@ rm -rf $RPM_BUILD_ROOT
%{_includedir}/xa_context.h %{_includedir}/xa_context.h
%{_libdir}/pkgconfig/xatracker.pc %{_libdir}/pkgconfig/xatracker.pc
%endif %endif
%endif
%changelog %changelog
* Thu Apr 26 2012 Adam Jackson <ajax@redhat.com> 8.0.2-4
- Don't build vmware stuff on PPC (#815444)
* Tue Apr 10 2012 Adam Jackson <ajax@redhat.com> 8.0.2-3 * Tue Apr 10 2012 Adam Jackson <ajax@redhat.com> 8.0.2-3
- Require newer libX11 on F17+ - Require newer libX11 on F17+