- up to 20110714; gallium swrast again as swrastg

Changed files:
    Mesa-selinux.patch -> 1.2.2.2
    Mesa.spec -> 1.263.2.21

diff --git a/Mesa-selinux.patch b/Mesa-selinux.patch
deleted file mode 100644 (file)
index c6af4bc..0000000
--- a/Mesa-selinux.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- Mesa-7.9/configure.ac.orig 2010-10-05 03:58:00.000000000 +0200
-+++ Mesa-7.9/configure.ac      2010-10-27 08:04:55.739734339 +0200
-@@ -667,8 +667,8 @@
-     fi
- 
-     # need DRM libs, -lpthread, etc.
--    GL_LIB_DEPS="$GL_LIB_DEPS $LIBDRM_LIBS -lm -lpthread $DLOPEN_LIBS"
--    GL_PC_LIB_PRIV="-lm -lpthread $DLOPEN_LIBS"
-+    GL_LIB_DEPS="$GL_LIB_DEPS $SELINUX_LIBS $LIBDRM_LIBS -lm -lpthread $DLOPEN_LIBS"
-+    GL_PC_LIB_PRIV="$SELINUX_LIBS -lm -lpthread $DLOPEN_LIBS"
-     ;;
- esac
- 

diff --git a/Mesa.spec b/Mesa.spec
index 76f4f8babb77fa9646adcfc8c222c1f448e9e641..ac00eb1a54d1c337b9800254b26a0af2a7bfc5fa 100644 (file)
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -25,7 +25,7 @@
 %define                dri2proto_ver   2.6
 %define                glproto_ver     1.4.11
 #
-%define                snap            20110714
+%define                snap            20110717
 # for snapshots ONLY!
 %define                no_install_post_check_so        1
 #
@@ -37,10 +37,9 @@ Release:     0.%{snap}.1%{?with_multigl:.mgl}
 License:       MIT (core), SGI (GLU,libGLw) and others - see license.html file
 Group:         X11/Libraries
 Source0:       %{name}Lib-%{snap}.tar.bz2
-# Source0-md5: 99c87d2af2b8217ce23fe8525ab79f79
+# Source0-md5: db0591e831b4a9cf7b5e0838ba5a667c
 Patch0:                %{name}-realclean.patch
-Patch1:                %{name}-selinux.patch
-Patch2:                %{name}-git.patch
+Patch1:                %{name}-git.patch
 URL:           http://www.mesa3d.org/
 BuildRequires: autoconf >= 2.59
 BuildRequires: automake
@@ -729,7 +728,6 @@ Sterownik X.org DRI dla VMware.
 %setup -q
 %patch0 -p0
 %patch1 -p1
-%patch2 -p1
 
 %build
 %{__aclocal}
@@ -832,6 +830,11 @@ rm [a-fh-np-wyz]*.h glf*.h
 cd $RPM_BUILD_ROOT%{_libdir}
 cd $olddir
 
+%if %{with gallium}
+# use gallium swrastg as swrast
+mv $RPM_BUILD_ROOT%{_libdir}/xorg/modules/dri/swrastg_dri.so $RPM_BUILD_ROOT%{_libdir}/xorg/modules/dri/swrast_dri.so
+%endif
+
 %if %{with multigl}
 install -d $RPM_BUILD_ROOT{%{_libdir}/Mesa,%{_sysconfdir}/ld.so.conf.d}