packages: Mesa/Mesa.spec - rel 5; disable i915 gallium - use standard one i...

[arekm]

Author: arekm                        Date: Mon Jul 20 19:33:03 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 5; disable i915 gallium - use standard one instead (gallium has problems with AIGLX)

---- Files affected:
packages/Mesa:
   Mesa.spec (1.211 -> 1.212) 

---- Diffs:

================================================================
Index: packages/Mesa/Mesa.spec
diff -u packages/Mesa/Mesa.spec:1.211 packages/Mesa/Mesa.spec:1.212
--- packages/Mesa/Mesa.spec:1.211	Mon Jul 20 20:00:37 2009
+++ packages/Mesa/Mesa.spec	Mon Jul 20 21:32:58 2009
@@ -7,6 +7,7 @@
 # Conditional build:
 %bcond_without	motif	# build static libGLw without Motif interface
 %bcond_without	gallium
+%bcond_with	gallium_intel # gallium i915 driver (but doesn't work with AIGLX)
 %bcond_with	multigl	# package libGL in a way allowing concurrent install with nvidia/fglrx drivers
 %bcond_with	static
 #
@@ -21,7 +22,7 @@
 Summary(pl.UTF-8):	Wolnodostępna implementacja standardu OpenGL
 Name:		Mesa
 Version:	7.5
-Release:	4%{?with_multigl:.mgl}
+Release:	5%{?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
@@ -50,6 +51,10 @@
 BuildRequires:	xorg-util-makedepend
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%if %{without gallium}
+%undefine	with_gallium_intel
+%endif
+
 %description
 Mesa is a 3-D graphics library with an API which is very similar to
 that of OpenGL(R). To the extent that Mesa utilizes the OpenGL command
@@ -614,7 +619,7 @@
 [ ! -f configure ] && ./autogen.sh
 
 dri_drivers="i810 i965 mach64 mga r128 r200 r300 radeon savage s3v trident \
-%if %{without gallium}
+%if %{without gallium_intel}
 i915 \
 %endif
 %ifarch sparc sparcv9 sparc64
@@ -667,7 +672,7 @@
 	--disable-glut \
 %if %{with gallium}
 	--enable-gallium \
-	--enable-gallium-intel \
+	--%{?with_gallium_intel:en}%{!?with_gallium_intel:dis}able-gallium-intel \
 	--enable-gallium-nouveau \
 	--with-state-trackers=dri \
 %else
@@ -943,6 +948,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.212  2009/07/20 19:32:58  arekm
+- rel 5; disable i915 gallium - use standard one instead (gallium has problems with AIGLX)
+
 Revision 1.211  2009/07/20 18:00:37  lmasko
 - Disabling gallium preserves nouveau from building, so files for package
   dri-driver-nouveau are not built. Added proper conditions to have other
================================================================

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