packages (DEVEL): Mesa/Mesa.spec - up to 7.5 (new feature: gallium)

[arekm]

Author: arekm                        Date: Sun Jul 19 12:22:07 2009 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- up to 7.5 (new feature: gallium)

---- Files affected:
packages/Mesa:
   Mesa.spec (1.168.2.7 -> 1.168.2.8) 

---- Diffs:

================================================================
Index: packages/Mesa/Mesa.spec
diff -u packages/Mesa/Mesa.spec:1.168.2.7 packages/Mesa/Mesa.spec:1.168.2.8
--- packages/Mesa/Mesa.spec:1.168.2.7	Sat Apr 18 12:10:13 2009
+++ packages/Mesa/Mesa.spec	Sun Jul 19 14:22:01 2009
@@ -11,7 +11,6 @@
 %bcond_with	multigl	# package libGL in a way allowing concurrent install with nvidia/fglrx drivers
 %bcond_with	static
 #
-%define		snap		20090418
 # minimal supported xserver version
 %define		xserver_ver	1.5.0
 # glapi version (glapi tables in dri drivers and libglx must be in sync);
@@ -23,14 +22,13 @@
 Summary(pl.UTF-8):	Wolnodostępna implementacja standardu OpenGL
 Name:		Mesa
 Version:	7.5
-Release:	0.%{snap}.1%{?with_multigl:.mgl}
+Release:	1%{?with_multigl:.mgl}
 License:	MIT (core), SGI (GLU,libGLw) and others - see license.html file
 Group:		X11/Libraries
-# Source0:	http://dl.sourceforge.net/mesa3d/%{name}Lib-%{version}.tar.bz2
-# Source1:	http://dl.sourceforge.net/mesa3d/%{name}Demos-%{version}.tar.bz2
-# Source1-md5:	02816f10f30b1dc5e069e0f68c177c98
-Source0:	%{name}-%{snap}.tar.bz2
-# Source0-md5:	7aa345492afc769cf91a3446c4fcb4d8
+Source0:	http://dl.sourceforge.net/mesa3d/%{name}Lib-%{version}.tar.bz2
+# Source0-md5:	459f332551f6ebb86f384d21dd15e1f0
+Source1:	http://dl.sourceforge.net/mesa3d/%{name}Demos-%{version}.tar.bz2
+# Source1-md5:	398ee8801814a00e47f6c2314e3dfddc
 Source2:	http://www.archlinux.org/~jgc/gl-manpages-1.0.1.tar.bz2
 # Source2-md5:	6ae05158e678f4594343f32c2ca50515
 Patch0:		%{name}-realclean.patch
@@ -591,8 +589,7 @@
 Sterownik X.org DRI dla rodziny kart VIA Unichrome.
 
 %prep
-# %setup -q -b1 -a2
-%setup -q -a2 -n %{name}
+%setup -q -b1 -a2
 %patch0 -p0
 
 # fix demos
@@ -652,11 +649,7 @@
 	--enable-glu \
 	--enable-glw \
 	--disable-glut \
-%if %{with gallium}
-	--with-state-trackers="dri2" \
-%else
-	--disable-gallium \
-%endif
+	--%{?with_gallium:en}%{!?with_gallium:dis}able-gallium \
 	--with-driver=dri \
 	--with-dri-drivers=${dri_drivers} \
 	--with-dri-driverdir=%{_libdir}/xorg/modules/dri
@@ -703,12 +696,11 @@
 # strip out undesirable headers
 olddir=$(pwd)
 cd $RPM_BUILD_ROOT%{_includedir}/GL 
-rm [a-fh-np-wyz]*.h gg*.h glf*.h glew.h glut*.h glxew.h
+rm [a-fh-np-wyz]*.h gg*.h glf*.h
 cd $RPM_BUILD_ROOT%{_libdir}
 %if %{without gallium}
 rm libEGL*
 %endif
-rm demodriver.so
 cd $olddir
 
 %if %{with multigl}
@@ -877,7 +869,7 @@
 
 %files dri-driver-intel-i915
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/xorg/modules/dri/i915_dri.so
+%attr(755,root,root) %{_libdir}/xorg/modules/dri/EGL_i915.so
 
 %files dri-driver-intel-i965
 %defattr(644,root,root,755)
@@ -927,6 +919,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.168.2.8  2009/07/19 12:22:01  arekm
+- up to 7.5 (new feature: gallium)
+
 Revision 1.168.2.7  2009/04/18 10:10:13  arekm
 - up to 20090418
 
================================================================

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