diff --git a/Mesa.changes b/Mesa.changes index 57a3910..deab0b2 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jul 25 15:41:25 UTC 2013 - dvaleev@suse.com + +- adjust filelist so powerpc build could succeed +- disable llvm_r600 for powerpc for now. + ------------------------------------------------------------------- Wed Jul 17 02:38:03 UTC 2013 - sndirsch@suse.com diff --git a/Mesa.spec b/Mesa.spec index 2f41239..b2311e4 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -19,6 +19,9 @@ %define glamor 1 %define egl_gallium 1 %define llvm_r600 1 +%ifarch ppc ppc64 +%define llvm_r600 0 +%endif %define _version 9.1.98.01 %define _name_archive mesa @@ -705,7 +708,7 @@ install -m 644 $RPM_SOURCE_DIR/drirc $RPM_BUILD_ROOT/etc %postun -n libvdpau_softpipe %endif -%ifarch %ix86 x86_64 +%ifarch ppc ppc64 %ix86 x86_64 %post -n libXvMC_r300 %postun -n libXvMC_r300 %endif @@ -840,13 +843,16 @@ install -m 644 $RPM_SOURCE_DIR/drirc $RPM_BUILD_ROOT/etc %_libdir/libxatracker.so %_libdir/pkgconfig/xatracker.pc +%endif + +%ifnarch s390 s390x aarch64 + %files -n libXvMC_nouveau %defattr(-,root,root) %_libdir/libXvMCnouveau.so %_libdir/libXvMCnouveau.so.1 %_libdir/libXvMCnouveau.so.1.0.0 -%ifarch %ix86 x86_64 %files -n libXvMC_r300 %defattr(-,root,root) %_libdir/libXvMCr300.so @@ -870,7 +876,6 @@ install -m 644 $RPM_SOURCE_DIR/drirc $RPM_BUILD_ROOT/etc %_libdir/vdpau/libvdpau_r600.so %_libdir/vdpau/libvdpau_r600.so.1 %_libdir/vdpau/libvdpau_r600.so.1.0.0 -%endif %files -n libXvMC_softpipe %defattr(-,root,root) @@ -884,6 +889,14 @@ install -m 644 $RPM_SOURCE_DIR/drirc $RPM_BUILD_ROOT/etc %_libdir/vdpau/libvdpau_nouveau.so.1 %_libdir/vdpau/libvdpau_nouveau.so.1.0.0 +%files -n libvdpau_softpipe +%defattr(-,root,root) +%_libdir/vdpau/libvdpau_softpipe.so +%_libdir/vdpau/libvdpau_softpipe.so.1 +%_libdir/vdpau/libvdpau_softpipe.so.1.0.0 + +%endif + %if %llvm_r600 %files -n libvdpau_radeonsi %defattr(-,root,root) @@ -892,13 +905,6 @@ install -m 644 $RPM_SOURCE_DIR/drirc $RPM_BUILD_ROOT/etc %_libdir/vdpau/libvdpau_radeonsi.so.1.0.0 %endif -%files -n libvdpau_softpipe -%defattr(-,root,root) -%_libdir/vdpau/libvdpau_softpipe.so -%_libdir/vdpau/libvdpau_softpipe.so.1 -%_libdir/vdpau/libvdpau_softpipe.so.1.0.0 -%endif - %files -n Mesa-libglapi0 %defattr(-,root,root) %_libdir/libglapi.so.0*