packages (MESA_7_7): Mesa/Mesa.spec - rel 3; disable nouveau

[arekm]

Author: arekm                        Date: Thu Feb 25 10:41:33 2010 GMT
Module: packages                      Tag: MESA_7_7
---- Log message:
- rel 3; disable nouveau

---- Files affected:
packages/Mesa:
   Mesa.spec (1.239 -> 1.239.2.1) 

---- Diffs:

================================================================
Index: packages/Mesa/Mesa.spec
diff -u packages/Mesa/Mesa.spec:1.239 packages/Mesa/Mesa.spec:1.239.2.1
--- packages/Mesa/Mesa.spec:1.239	Mon Feb 22 21:20:24 2010
+++ packages/Mesa/Mesa.spec	Thu Feb 25 11:41:28 2010
@@ -10,6 +10,7 @@
 %bcond_with	egl	# don't build egl
 %bcond_without	gallium	# don't build gallium
 %bcond_with	gallium_intel # gallium i915 driver (but doesn't work with AIGLX)
+%bcond_with	gallium_nouveau # doesn't build due to libdrm API changes (fixed in Mesa 7.8)
 %bcond_without	motif	# build static libGLw without Motif interface
 %bcond_with	multigl	# package libGL in a way allowing concurrent install with nvidia/fglrx drivers
 %bcond_without	osmesa	# don't build osmesa
@@ -29,7 +30,7 @@
 Summary(pl.UTF-8):	Wolnodostępna implementacja standardu OpenGL
 Name:		Mesa
 Version:	7.7
-Release:	2%{?with_multigl:.mgl}
+Release:	3%{?with_multigl:.mgl}
 License:	MIT (core), SGI (GLU,libGLw) and others - see license.html file
 Group:		X11/Libraries
 Source0:	ftp://ftp.freedesktop.org/pub/mesa/%{version}/%{name}Lib-%{version}.tar.bz2
@@ -698,7 +699,7 @@
 	--enable-gallium \
 	--%{?with_gallium_intel:en}%{!?with_gallium_intel:dis}able-gallium-intel \
 	--enable-gallium-svga \
-	--enable-gallium-nouveau \
+	--%{?with_gallium_nouveau:en}%{!?with_gallium_nouveau:dis}able-gallium-nouveau \
 	--with-state-trackers=dri \
 %else
 	--disable-gallium \
@@ -925,10 +926,12 @@
 %attr(755,root,root) %{_libdir}/xorg/modules/dri/mga_dri.so
 
 %if %{with gallium}
+%if %{with gallium_nouveau}
 %files dri-driver-nouveau
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/xorg/modules/dri/nouveau_dri.so
 %endif
+%endif
 
 %files dri-driver-savage
 %defattr(644,root,root,755)
@@ -970,6 +973,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.239.2.1  2010/02/25 10:41:28  arekm
+- rel 3; disable nouveau
+
 Revision 1.239  2010/02/22 20:20:24  arekm
 - rel 2; rebuild with latest libdrm (nouveau abi changes)
 
================================================================

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