packages (DEVEL): Mesa/Mesa.spec, Mesa/Mesa-selinux.patch (REMOVED) - up to...

[arekm]

Author: arekm                        Date: Sun Jul 17 16:20:25 2011 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- up to 20110714; gallium swrast again as swrastg

---- Files affected:
packages/Mesa:
   Mesa.spec (1.263.2.20 -> 1.263.2.21) , Mesa-selinux.patch (1.2.2.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/Mesa/Mesa.spec
diff -u packages/Mesa/Mesa.spec:1.263.2.20 packages/Mesa/Mesa.spec:1.263.2.21
--- packages/Mesa/Mesa.spec:1.263.2.20	Thu Jul 14 13:29:14 2011
+++ packages/Mesa/Mesa.spec	Sun Jul 17 18:20:19 2011
@@ -26,7 +26,7 @@
 %define		dri2proto_ver	2.6
 %define		glproto_ver	1.4.11
 #
-%define		snap		20110714
+%define		snap		20110717
 # for snapshots ONLY!
 %define		no_install_post_check_so	1
 #
@@ -38,10 +38,9 @@
 License:	MIT (core), SGI (GLU,libGLw) and others - see license.html file
 Group:		X11/Libraries
 Source0:	%{name}Lib-%{snap}.tar.bz2
-# Source0-md5:	99c87d2af2b8217ce23fe8525ab79f79
+# Source0-md5:	db0591e831b4a9cf7b5e0838ba5a667c
 Patch0:		%{name}-realclean.patch
-Patch1:		%{name}-selinux.patch
-Patch2:		%{name}-git.patch
+Patch1:		%{name}-git.patch
 URL:		http://www.mesa3d.org/
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake
@@ -730,7 +729,6 @@
 %setup -q
 %patch0 -p0
 %patch1 -p1
-%patch2 -p1
 
 %build
 %{__aclocal}
@@ -833,6 +831,11 @@
 cd $RPM_BUILD_ROOT%{_libdir}
 cd $olddir
 
+%if %{with gallium}
+# use gallium swrastg as swrast
+mv $RPM_BUILD_ROOT%{_libdir}/xorg/modules/dri/swrastg_dri.so $RPM_BUILD_ROOT%{_libdir}/xorg/modules/dri/swrast_dri.so
+%endif
+
 %if %{with multigl}
 install -d $RPM_BUILD_ROOT{%{_libdir}/Mesa,%{_sysconfdir}/ld.so.conf.d}
 
@@ -1138,6 +1141,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.263.2.21  2011/07/17 16:20:19  arekm
+- up to 20110714; gallium swrast again as swrastg
+
 Revision 1.263.2.20  2011/07/14 11:29:14  patrys
 - 20110714
 - swrastg is now swrast
================================================================

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