update to 8.0.1, drop unneeded patches, drop old-old-old drivers

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@5756 ec354946-7b23-47d6-9f5a-488ba84defc7

m/mesa/mesa-vl.spec

@@ -1,11 +1,11 @@
 # When bootstrapping an arch, omit the -demos subpackage.
 
-%define base_drivers mga,nouveau,r128,radeon,r200,savage,tdfx
+%define base_drivers nouveau,radeon,r200
 %ifarch %{ix86}
-%define ix86_drivers ,i810,i915,i965,sis,unichrome
+%define ix86_drivers ,i915,i965
 %endif
 %ifarch x86_64
-%define amd64_drivers ,i915,i965,unichrome
+%define amd64_drivers ,i915,i965
 %endif
 %define dri_drivers --with-dri-drivers=%{base_drivers}%{?ix86_drivers}%{?amd64_drivers}
 
@@ -18,8 +18,8 @@
 Summary: Mesa graphics libraries
 Summary(ja): Mesa グラフィックスライブラリ
 Name: mesa
-Version: 7.11.2
-Release: 2%{?_dist_release}
+Version: 8.0.1
+Release: 1%{?_dist_release}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -28,13 +28,7 @@ Source0: ftp://ftp.freedesktop.org/pub/mesa/%{version}/MesaLib-%{version}.tar.bz
 Source2: %{manpages}.tar.bz2
 Source3: make-git-snapshot.sh
 
-Patch3: mesa-7.11-no-mach64.patch
-Patch4: mesa-legacy-drivers.patch
-
 Patch8: mesa-7.10-llvmcore.patch
-Patch9: mesa-7.11.2-llvm-3.0.patch
-
-Patch30: mesa-7.6-hush-vblank-warning.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: pkgconfig
@@ -54,7 +48,7 @@ BuildRequires: libXi-devel
 BuildRequires: libXmu-devel
 BuildRequires: libudev-devel
 BuildRequires: llvm-devel >= 3.0
-
+BuildRequires: libxml2-python
 %description
 Mesa
 
@@ -309,14 +303,14 @@ Mesa offscreen rendering development package
 %prep
 %setup -q -n Mesa-%{version} -b2
 
-%patch3 -p1 -b .no-mach64
-%patch4 -p1 -b .legacy
 %patch8 -p1 -b .llvmcore
-%patch9 -p1 -b .llvm30
-%patch30 -p1 -b .vblank-warning
 
 %build
 
+# default to dri (not xlib) for libGL on all arches
+# XXX please fix upstream
+sed -i 's/^default_driver.*$/default_driver="dri"/' configure.ac
+
 autoreconf --install
 
 %ifarch %{ix86}
@@ -331,13 +325,9 @@ export CXXFLAGS="$RPM_OPT_FLAGS"
 # now build the rest of mesa
 %configure \
     %{common_flags} \
-    --disable-glw \
-    --disable-glut \
-    --enable-gl-osmesa \
-    --with-osmesa-bits=8 \
-    --with-driver=dri \
+    --enable-osmesa \
+    --enable-xcb \
     --with-dri-driverdir=%{_libdir}/dri \
-    --with-state-trackers=dri,xorg,glx \
     --enable-egl \
     --enable-gles1 \
     --enable-gles2 \
@@ -346,7 +336,7 @@ export CXXFLAGS="$RPM_OPT_FLAGS"
     --enable-gallium-llvm \
     %{?dri_drivers}
 
-make %{?_smp_mflags}
+make %{?_smp_mflags} MKDEP=/bin/true
 
 pushd ../%{manpages}
 autoreconf -v --install
@@ -364,7 +354,7 @@ make install DESTDIR=$RPM_BUILD_ROOT DRI_DIRS=
 install -d $RPM_BUILD_ROOT%{_libdir}/dri
 
 # use gallium driver iff built
-[ -f %{_lib}/gallium/swrastg_dri.so ] && mv %{_lib}/gallium/swrastg_dri.so %{_lib}/swrast_dri.so
+[ -f %{_lib}/gallium/swrast_dri.so ] && mv %{_lib}/gallium/swrast_dri.so %{_lib}/swrast_dri.so
 [ -f %{_lib}/gallium/r300_dri.so ] && cp %{_lib}/gallium/r300_dri.so %{_lib}/r300_dri.so
 [ -f %{_lib}/gallium/r600_dri.so ] && cp %{_lib}/gallium/r600_dri.so %{_lib}/r600_dri.so
 
@@ -483,6 +473,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/EGL/eglext.h
 %{_includedir}/EGL/egl.h
 %{_includedir}/EGL/eglplatform.h
+%{_includedir}/EGL/eglmesaext.h
 %{_includedir}/KHR/khrplatform.h
 %{_libdir}/pkgconfig/egl.pc
 %{_libdir}/libEGL.so
@@ -514,10 +505,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %files libOSMesa
 %defattr(-,root,root,-)
-%{_libdir}/libOSMesa.so.7*
+%{_libdir}/libOSMesa.so.*
 
 %files libOSMesa-devel
 %defattr(-,root,root,-)
+%dir %{_includedir}/GL
 %{_includedir}/GL/osmesa.h
 %{_libdir}/libOSMesa.so
 %{_libdir}/pkgconfig/osmesa.pc
@@ -554,7 +546,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n compat32-%{name}-libOSMesa
 %defattr(-,root,root,-)
-%{_libdir}/libOSMesa.so.7*
+%{_libdir}/libOSMesa.so.*
 
 %files -n compat32-%{name}-libOSMesa-devel
 %defattr(-,root,root,-)
@@ -592,6 +584,12 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Sat Feb 25 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 8.0.1-1
+- update to 8.0.1
+- drop unneeded patches
+- drop old-old dri drivers
+- add BR: libxml2-python
+
 * Sun Jan 22 2012 NAKAMURA Kenta <kenta@vinelinux.org> 7.11.2-2
 - rebuilt with llvm-3.0
 - added Patch9: fix build with LLVM 3.0