- rel 8; fix nouveau segfaults with libdrm 2.4.23 (from gentoo)

[packages/Mesa.git] / Mesa.spec

diff --git a/Mesa.spec b/Mesa.spec
index 8720923b3ad0cbbe308feadea0099aeec0f48383..a89cd4d54ddb8fb8bf88f130dd7f3a1f4bc74f79 100644 (file)
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -6,13 +6,13 @@
 # Conditional build:
 %bcond_without egl     # 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_radeon
-%bcond_without gallium_nouveau
+%bcond_with    gallium_intel   # gallium i915 driver (but doesn't work with AIGLX)
+%bcond_with    gallium_radeon  # gallium radeon driver
+%bcond_without gallium_nouveau # gallium nouveau driver
 %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
-%bcond_with    static
+%bcond_with    static  # static libraries
 #
 # minimal supported xserver version
 %define                xserver_ver     1.5.0
@@ -29,7 +29,7 @@ Summary:      Free OpenGL implementation
 Summary(pl.UTF-8):     Wolnodostępna implementacja standardu OpenGL
 Name:          Mesa
 Version:       7.9
-Release:       3%{?with_multigl:.mgl}
+Release:       8%{?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
@@ -37,6 +37,7 @@ Source0:      ftp://ftp.freedesktop.org/pub/mesa/%{version}/%{name}Lib-%{version}.tar
 Patch0:                %{name}-realclean.patch
 Patch1:                %{name}-selinux.patch
 Patch2:                %{name}-git.patch
+Patch3:                %{name}-nouveau.patch
 URL:           http://www.mesa3d.org/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -662,11 +663,11 @@ Sterownik X.org DRI dla VMware.
 %prep
 %setup -q
 %patch0 -p0
-%patch1 -p0
+%patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
-#autoreconf --install
 %{__aclocal}
 %{__autoconf}