packages: Mesa/Mesa.spec - disable nouveau (doesn't build)

arekm arekm at pld-linux.org
Tue Jun 22 22:30:07 CEST 2010


Author: arekm                        Date: Tue Jun 22 20:30:07 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- disable nouveau (doesn't build)

---- Files affected:
packages/Mesa:
   Mesa.spec (1.249 -> 1.250) 

---- Diffs:

================================================================
Index: packages/Mesa/Mesa.spec
diff -u packages/Mesa/Mesa.spec:1.249 packages/Mesa/Mesa.spec:1.250
--- packages/Mesa/Mesa.spec:1.249	Tue Jun 22 22:11:19 2010
+++ packages/Mesa/Mesa.spec	Tue Jun 22 22:30:02 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	galliun_nouveau
 %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
@@ -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:--enable-gallium-nouveau} \
 	--with-state-trackers=dri,xorg,glx \
 %else
 	--disable-gallium \
@@ -926,11 +927,13 @@
 %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/drivers/modesetting_drv.so
 %attr(755,root,root) %{_libdir}/xorg/modules/dri/nouveau_dri.so
 %endif
+%endif
 
 %files dri-driver-savage
 %defattr(644,root,root,755)
@@ -973,6 +976,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.250  2010/06/22 20:30:02  arekm
+- disable nouveau (doesn't build)
+
 Revision 1.249  2010/06/22 20:11:19  arekm
 - up to 7.8.2
 
================================================================

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



More information about the pld-cvs-commit mailing list