SHA256
1
0
forked from pool/Mesa

Accepting request 196973 from home:namtrac:bugfix

- Enable llvmpipe and xa on s390x

OBS-URL: https://build.opensuse.org/request/show/196973
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=314
This commit is contained in:
Stefan Dirsch 2013-09-02 08:52:42 +00:00 committed by Git OBS Bridge
parent 7827ef476c
commit 9f5b38cbd4
2 changed files with 24 additions and 11 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Aug 30 09:10:22 UTC 2013 - idonmez@suse.com
- Enable llvmpipe and xa on s390x
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Aug 27 23:56:19 UTC 2013 - tobias.johannes.klausmann@mni.thm.de Tue Aug 27 23:56:19 UTC 2013 - tobias.johannes.klausmann@mni.thm.de

View File

@ -72,7 +72,7 @@ BuildRequires: pkgconfig(xext)
BuildRequires: pkgconfig(xfixes) BuildRequires: pkgconfig(xfixes)
BuildRequires: pkgconfig(xxf86vm) BuildRequires: pkgconfig(xxf86vm)
BuildRequires: pkgconfig(zlib) BuildRequires: pkgconfig(zlib)
%ifarch %arm %ix86 x86_64 %ifarch %arm s390x %ix86 x86_64
BuildRequires: llvm-devel BuildRequires: llvm-devel
%endif %endif
BuildRequires: libXvMC-devel BuildRequires: libXvMC-devel
@ -594,9 +594,15 @@ autoreconf -fi
--with-dri-drivers=nouveau,r200,radeon \ --with-dri-drivers=nouveau,r200,radeon \
--with-gallium-drivers=r300,r600,nouveau,swrast \ --with-gallium-drivers=r300,r600,nouveau,swrast \
%endif %endif
%ifarch s390 s390x aarch64 %ifarch s390 aarch64
--with-dri-drivers=swrast \ --with-dri-drivers=swrast \
--with-gallium-drivers="" \ --with-gallium-drivers="" \
%endif
%ifarch s390x
--enable-xa \
--enable-gallium-llvm \
--with-dri-drivers=swrast \
--with-gallium-drivers=swrast,svga \
%endif %endif
CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" CFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
make %{?_smp_mflags} make %{?_smp_mflags}
@ -678,7 +684,7 @@ install -m 644 $RPM_SOURCE_DIR/drirc $RPM_BUILD_ROOT/etc
%postun -n libgbm1 -p /sbin/ldconfig %postun -n libgbm1 -p /sbin/ldconfig
%ifnarch s390 s390x aarch64 %ifnarch s390 aarch64
%post -n libxatracker1 -p /sbin/ldconfig %post -n libxatracker1 -p /sbin/ldconfig
@ -832,7 +838,7 @@ install -m 644 $RPM_SOURCE_DIR/drirc $RPM_BUILD_ROOT/etc
%_libdir/libgbm.so %_libdir/libgbm.so
%_libdir/pkgconfig/gbm.pc %_libdir/pkgconfig/gbm.pc
%ifnarch s390 s390x ppc ppc64 aarch64 %ifnarch s390 ppc ppc64 aarch64
%files -n libxatracker1 %files -n libxatracker1
%defattr(-,root,root) %defattr(-,root,root)
@ -878,24 +884,26 @@ install -m 644 $RPM_SOURCE_DIR/drirc $RPM_BUILD_ROOT/etc
%_libdir/vdpau/libvdpau_r600.so.1 %_libdir/vdpau/libvdpau_r600.so.1
%_libdir/vdpau/libvdpau_r600.so.1.0.0 %_libdir/vdpau/libvdpau_r600.so.1.0.0
%files -n libXvMC_softpipe
%defattr(-,root,root)
%_libdir/libXvMCsoftpipe.so
%_libdir/libXvMCsoftpipe.so.1
%_libdir/libXvMCsoftpipe.so.1.0.0
%files -n libvdpau_nouveau %files -n libvdpau_nouveau
%defattr(-,root,root) %defattr(-,root,root)
%_libdir/vdpau/libvdpau_nouveau.so %_libdir/vdpau/libvdpau_nouveau.so
%_libdir/vdpau/libvdpau_nouveau.so.1 %_libdir/vdpau/libvdpau_nouveau.so.1
%_libdir/vdpau/libvdpau_nouveau.so.1.0.0 %_libdir/vdpau/libvdpau_nouveau.so.1.0.0
%endif
%ifnarch s390 aarch64
%files -n libXvMC_softpipe
%defattr(-,root,root)
%_libdir/libXvMCsoftpipe.so
%_libdir/libXvMCsoftpipe.so.1
%_libdir/libXvMCsoftpipe.so.1.0.0
%files -n libvdpau_softpipe %files -n libvdpau_softpipe
%defattr(-,root,root) %defattr(-,root,root)
%_libdir/vdpau/libvdpau_softpipe.so %_libdir/vdpau/libvdpau_softpipe.so
%_libdir/vdpau/libvdpau_softpipe.so.1 %_libdir/vdpau/libvdpau_softpipe.so.1
%_libdir/vdpau/libvdpau_softpipe.so.1.0.0 %_libdir/vdpau/libvdpau_softpipe.so.1.0.0
%endif %endif
%if %llvm_r600 %if %llvm_r600