- rel 3; disable nouveau

Changed files:
    Mesa.spec -> 1.239.2.1

diff --git a/Mesa.spec b/Mesa.spec
index bfda65c2a569d89e1f250281d129bd72aa1270ea..162c55527c6811f45dcbe3f55704595c5d14cb97 100644 (file)
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -9,6 +9,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
@@ -28,7 +29,7 @@ Summary:      Free OpenGL implementation
 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
@@ -697,7 +698,7 @@ mv %{_lib} osmesa32
        --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 \
@@ -924,10 +925,12 @@ rm -rf $RPM_BUILD_ROOT
 %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)