packages (DEVEL): Mesa/Mesa.spec - up to 20110629

[arekm]

Author: arekm                        Date: Wed Jun 29 17:15:12 2011 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- up to 20110629

---- Files affected:
packages/Mesa:
   Mesa.spec (1.263.2.17 -> 1.263.2.18) 

---- Diffs:

================================================================
Index: packages/Mesa/Mesa.spec
diff -u packages/Mesa/Mesa.spec:1.263.2.17 packages/Mesa/Mesa.spec:1.263.2.18
--- packages/Mesa/Mesa.spec:1.263.2.17	Sat Jun  4 22:29:31 2011
+++ packages/Mesa/Mesa.spec	Wed Jun 29 19:15:06 2011
@@ -26,7 +26,7 @@
 %define		dri2proto_ver	2.1
 %define		glproto_ver	1.4.11
 #
-%define		snap		20110604
+%define		snap		20110629
 # for snapshots ONLY!
 %define		no_install_post_check_so	1
 #
@@ -38,7 +38,7 @@
 License:	MIT (core), SGI (GLU,libGLw) and others - see license.html file
 Group:		X11/Libraries
 Source0:	%{name}Lib-%{snap}.tar.bz2
-# Source0-md5:	54ea64bc99ca1d6477b486f26fadff05
+# Source0-md5:	e777531d9defa041d13de82b81f735fc
 Patch0:		%{name}-realclean.patch
 Patch1:		%{name}-selinux.patch
 Patch2:		%{name}-git.patch
@@ -759,6 +759,22 @@
 
 dri_drivers=$(echo $dri_drivers | xargs | tr ' ' ',')
 
+gallium_drivers="svga swrast \
+%if %{with gallium_intel}
+i915 \
+i965 \
+%endif
+%if %{with gallium_radeon}
+radeon \
+r600 \
+%endif
+%if %{with gallium_nouveau}
+nouveau \
+%endif
+"
+
+gallium_drivers=$(echo $gallium_drivers | xargs | tr ' ' ',')
+
 common_flags="\
 	--enable-shared \
 	--enable-selinux \
@@ -788,21 +804,9 @@
 
 %configure $common_flags \
 %if %{with gallium}
-	--enable-gallium \
 	--enable-openvg \
-%if %{with gallium_intel}
-	--enable-gallium-i915 \
-	--enable-gallium-i965 \
-%endif
-%if %{with gallium_radeon}
-	--enable-gallium-radeon \
-	--enable-gallium-r600 \
-%endif
-	--enable-gallium-svga \
 	--enable-gallium-egl \
-	--enable-gallium-swrast \
-	%{?with_gallium_nouveau:--enable-gallium-nouveau} \
-	--with-state-trackers=dri,glx,egl,xorg,vega \
+	--with-gallium-drivers=${gallium_drivers} \
 %else
 	--disable-gallium \
 %endif
@@ -882,12 +886,12 @@
 %if %{with gallium}
 %dir %{_libdir}/egl
 %attr(755,root,root) %{_libdir}/egl/egl_gallium.so
-%attr(755,root,root) %{_libdir}/egl/pipe_swrast.so
-%attr(755,root,root) %{_libdir}/egl/pipe_vmwgfx.so
+#%attr(755,root,root) %{_libdir}/egl/pipe_swrast.so
+#%attr(755,root,root) %{_libdir}/egl/pipe_vmwgfx.so
 %attr(755,root,root) %{_libdir}/egl/st_GL.so
-%attr(755,root,root) %{_libdir}/egl/st_OpenVG.so
+#%attr(755,root,root) %{_libdir}/egl/st_OpenVG.so
 %if %{with gallium_nouveau}
-%attr(755,root,root) %{_libdir}/egl/pipe_nouveau.so
+#%attr(755,root,root) %{_libdir}/egl/pipe_nouveau.so
 %endif
 %if %{with gallium_radeon}
 %attr(755,root,root) %{_libdir}/egl/pipe_r300.so
@@ -1104,7 +1108,7 @@
 %if %{with gallium_nouveau}
 %files dri-driver-nouveau
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/xorg/modules/drivers/modesetting_drv.so
+#%attr(755,root,root) %{_libdir}/xorg/modules/drivers/modesetting_drv.so
 %attr(755,root,root) %{_libdir}/xorg/modules/dri/nouveau_dri.so
 %endif
 %endif
@@ -1135,7 +1139,7 @@
 %files dri-driver-vmwgfx
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/xorg/modules/dri/vmwgfx_dri.so
-%attr(755,root,root) %{_libdir}/xorg/modules/drivers/vmwgfx_drv.so
+#%attr(755,root,root) %{_libdir}/xorg/modules/drivers/vmwgfx_drv.so
 %endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -1144,6 +1148,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.263.2.18  2011/06/29 17:15:06  arekm
+- up to 20110629
+
 Revision 1.263.2.17  2011/06/04 20:29:31  arekm
 - up to 20110604
 
================================================================

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