packages: Mesa/Mesa.spec - updated intel_gallium bcond

[qboosh]

Author: qboosh                       Date: Sat Mar 10 05:22:03 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated intel_gallium bcond

---- Files affected:
packages/Mesa:
   Mesa.spec (1.305 -> 1.306) 

---- Diffs:

================================================================
Index: packages/Mesa/Mesa.spec
diff -u packages/Mesa/Mesa.spec:1.305 packages/Mesa/Mesa.spec:1.306
--- packages/Mesa/Mesa.spec:1.305	Fri Mar  9 21:13:03 2012
+++ packages/Mesa/Mesa.spec	Sat Mar 10 06:21:58 2012
@@ -77,6 +77,7 @@
 
 %if %{without gallium}
 %undefine	with_gallium_intel
+%undefine	with_gallium_nouveau
 %endif
 
 %if %{without egl}
@@ -606,7 +607,6 @@
 gallium_drivers="svga swrast \
 %if %{with gallium_intel}
 i915 \
-i965 \
 %endif
 r300 \
 r600 \
@@ -669,7 +669,6 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-# libs without drivers
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
@@ -729,13 +728,12 @@
 %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
 
@@ -894,9 +892,6 @@
 %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}
 %files dri-driver-nouveau
@@ -916,7 +911,7 @@
 
 %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
@@ -936,6 +931,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.306  2012/03/10 05:21:58  qboosh
+- updated intel_gallium bcond
+
 Revision 1.305  2012/03/09 20:13:03  qboosh
 - moved gbm r300/r600 drivers to proper bcond
 - fixed libOSMesa symlinks packaging
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/Mesa/Mesa.spec?r1=1.305&r2=1.306&f=u