- gallium i965 has been dropped

[packages/Mesa.git] / Mesa.spec

diff --git a/Mesa.spec b/Mesa.spec
index a047dafe2b4de341989225c2316e943428c8754d..94e3bbd5e549f6798250f67f04f219360a381c81 100644 (file)
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -76,6 +76,7 @@ BuildRoot:    %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %if %{without gallium}
 %undefine      with_gallium_intel
+%undefine      with_gallium_nouveau
 %endif
 
 %if %{without egl}
@@ -605,7 +606,6 @@ dri_drivers=$(echo $dri_drivers | xargs | tr ' ' ',')
 gallium_drivers="svga swrast \
 %if %{with gallium_intel}
 i915 \
-i965 \
 %endif
 r300 \
 r600 \
@@ -641,18 +641,18 @@ cp -p src/mesa/osmesa.pc osmesa8
 %endif
 
 %configure $common_flags \
-       --enable-shared-glapi \
        %{__enable gbm} \
+       --enable-shared-glapi \
 %if %{with egl}
        --enable-egl \
        --enable-gles1 \
        --enable-gles2 \
 %endif
 %if %{with gallium}
-       --enable-openvg \
        --enable-gallium-llvm \
        %{__enable egl gallium-egl} \
        %{__enable gbm gallium-gbm} \
+       --enable-openvg \
        --enable-vdpau \
        --enable-xvmc \
        --with-gallium-drivers=${gallium_drivers} \
@@ -668,12 +668,11 @@ cp -p src/mesa/osmesa.pc osmesa8
 %install
 rm -rf $RPM_BUILD_ROOT
 
-# libs without drivers
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
 %if %{with osmesa}
-cp -p osmesa8/libOSMesa* $RPM_BUILD_ROOT%{_libdir}
+cp -dp osmesa8/libOSMesa* $RPM_BUILD_ROOT%{_libdir}
 cp -p osmesa8/osmesa.pc $RPM_BUILD_ROOT%{_pkgconfigdir}
 %endif
 
@@ -716,25 +715,24 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libglapi.so.*.*
 %attr(755,root,root) %ghost %{_libdir}/libglapi.so.0
 %if %{with gbm}
-%dir %{_libdir}/gbm
 %attr(755,root,root) %{_libdir}/libgbm.so.*.*
 %attr(755,root,root) %ghost %{_libdir}/libgbm.so.1
 %endif
 %if %{with gallium}
 %dir %{_libdir}/egl
 %attr(755,root,root) %{_libdir}/egl/egl_gallium.so
-%attr(755,root,root) %{_libdir}/gbm/pipe_r300.so
-%attr(755,root,root) %{_libdir}/gbm/pipe_r600.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
 %attr(755,root,root) %{_libdir}/gbm/pipe_vmwgfx.so
+%if %{with gallium_intel}
+%attr(755,root,root) %{_libdir}/gbm/pipe_i915.so
+%endif
 %if %{with gallium_nouveau}
 %attr(755,root,root) %{_libdir}/gbm/pipe_nouveau.so
 %endif
-%if %{with gallium_intel}
-%attr(755,root,root) %{_libdir}/egl/pipe_i915.so
-%attr(755,root,root) %{_libdir}/egl/pipe_i965.so
-%endif
 %endif
 %endif
 
@@ -859,6 +857,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_pkgconfigdir}/vg.pc
 %endif
 
+%if %{with gallium}
 %files libXvMC
 %defattr(644,root,root,755)
 %attr(755,root,root) %ghost %{_libdir}/libXvMCnouveau.so.1
@@ -869,6 +868,7 @@ rm -rf $RPM_BUILD_ROOT
 %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)
@@ -878,6 +878,7 @@ rm -rf $RPM_BUILD_ROOT
 %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
@@ -885,16 +886,16 @@ rm -rf $RPM_BUILD_ROOT
 %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)
 %attr(755,root,root) %{_libdir}/xorg/modules/dri/i915_dri.so
 
+%if %{without gallium}
 %files dri-driver-intel-i965
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/xorg/modules/dri/i965_dri.so
-%if %{with gallium_intel}
-%attr(755,root,root) %{_libdir}/xorg/modules/drivers/i965g_drv.so
 %endif
 
 %if %{with gallium_nouveau}
@@ -913,9 +914,10 @@ rm -rf $RPM_BUILD_ROOT
 %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
+# there is no ldconfig here, so package all symlinks
 %attr(755,root,root) %{_libdir}/vdpau/libvdpau_softpipe.so.1.0
 %attr(755,root,root) %{_libdir}/vdpau/libvdpau_softpipe.so.1
 %attr(755,root,root) %{_libdir}/vdpau/libvdpau_softpipe.so
@@ -925,6 +927,9 @@ rm -rf $RPM_BUILD_ROOT
 %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