Author: qboosh Date: Sat Mar 10 05:49:59 2012 GMT Module: packages Tag: HEAD ---- Log message: - fixed without gallium bcond (no vdpau, XvMC nor r300/r600 drivers)
---- Files affected: packages/Mesa: Mesa.spec (1.306 -> 1.307) ---- Diffs: ================================================================ Index: packages/Mesa/Mesa.spec diff -u packages/Mesa/Mesa.spec:1.306 packages/Mesa/Mesa.spec:1.307 --- packages/Mesa/Mesa.spec:1.306 Sat Mar 10 06:21:58 2012 +++ packages/Mesa/Mesa.spec Sat Mar 10 06:49:54 2012 @@ -718,12 +718,12 @@ %if %{with gbm} %attr(755,root,root) %{_libdir}/libgbm.so.*.* %attr(755,root,root) %ghost %{_libdir}/libgbm.so.1 -%dir %{_libdir}/gbm %endif %if %{with gallium} %dir %{_libdir}/egl %attr(755,root,root) %{_libdir}/egl/egl_gallium.so %if %{with gbm} +%dir %{_libdir}/gbm %attr(755,root,root) %{_libdir}/gbm/gbm_gallium_drm.so %attr(755,root,root) %{_libdir}/gbm/pipe_r300.so %attr(755,root,root) %{_libdir}/gbm/pipe_r600.so @@ -858,6 +858,7 @@ %{_pkgconfigdir}/vg.pc %endif +%if %{with gallium} %files libXvMC %defattr(644,root,root,755) %attr(755,root,root) %ghost %{_libdir}/libXvMCnouveau.so.1 @@ -868,6 +869,7 @@ %attr(755,root,root) %{_libdir}/libXvMCr600.so.1.0 %attr(755,root,root) %ghost %{_libdir}/libXvMCsoftpipe.so.1 %attr(755,root,root) %{_libdir}/libXvMCsoftpipe.so.1.0 +%endif %files dri-driver-ati-radeon-R100 %defattr(644,root,root,755) @@ -877,6 +879,7 @@ %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/xorg/modules/dri/r200_dri.so +%if %{with gallium} %files dri-driver-ati-radeon-R300 %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/xorg/modules/dri/r300_dri.so @@ -884,6 +887,7 @@ %files dri-driver-ati-radeon-R600 %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/xorg/modules/dri/r600_dri.so +%endif %files dri-driver-intel-i915 %defattr(644,root,root,755) @@ -909,6 +913,7 @@ %attr(755,root,root) %{_libdir}/xorg/modules/dri/vmwgfx_dri.so %endif +%if %{with gallium} %files -n libvdpau-driver-mesa %defattr(644,root,root,755) # there is no ldconfig here, so package all symlinks @@ -921,9 +926,12 @@ %attr(755,root,root) %{_libdir}/vdpau/libvdpau_r600.so.1.0 %attr(755,root,root) %{_libdir}/vdpau/libvdpau_r600.so.1 %attr(755,root,root) %{_libdir}/vdpau/libvdpau_r600.so +%if %{with gallium_nouveau} %attr(755,root,root) %{_libdir}/vdpau/libvdpau_nouveau.so.1.0 %attr(755,root,root) %{_libdir}/vdpau/libvdpau_nouveau.so.1 %attr(755,root,root) %{_libdir}/vdpau/libvdpau_nouveau.so +%endif +%endif %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -931,6 +939,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.307 2012/03/10 05:49:54 qboosh +- fixed without gallium bcond (no vdpau, XvMC nor r300/r600 drivers) + Revision 1.306 2012/03/10 05:21:58 qboosh - updated intel_gallium bcond ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/Mesa/Mesa.spec?r1=1.306&r2=1.307&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit