mesa: update to 9.2.2

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

m/mesa/mesa-vl.spec

@@ -15,8 +15,8 @@
 Summary: Mesa graphics libraries
 Summary(ja): Mesa グラフィックスライブラリ
 Name: mesa
-Version: 9.0.1
-Release: 3%{?_dist_release}
+Version: 9.2.2
+Release: 1%{?_dist_release}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -24,15 +24,15 @@ URL: http://www.mesa3d.org
 Source0: ftp://ftp.freedesktop.org/pub/mesa/%{version}/MesaLib-%{version}.tar.bz2
 Source3: make-git-snapshot.sh
 
-# fix CVE-2013-1993
-Patch0: mesa-9.0-CVE-2013-1993.patch
-
-Patch11: mesa-8.0-nouveau-tfp-blacklist.patch
+Patch1: nv50-fix-build.patch
+Patch15: mesa-9.2-hardware-float.patch
+Patch16: mesa-9.2-no-useless-vdpau.patch
+Patch20: mesa-9.2-evergreen-big-endian.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: pkgconfig
 BuildRequires: flex, bison
-BuildRequires: libdrm-devel >= 2.4.40
+BuildRequires: libdrm-devel >= 2.4.46
 BuildRequires: libXxf86vm-devel
 BuildRequires: expat-devel >= 2.0
 BuildRequires: xorg-x11-proto-devel >= 7.4
@@ -45,8 +45,11 @@ BuildRequires: libXdamage-devel
 BuildRequires: libXi-devel
 BuildRequires: libXmu-devel
 BuildRequires: libudev-devel
-BuildRequires: llvm-devel >= 3.1
+BuildRequires: llvm-devel >= 3.3
 BuildRequires: libxml2-python
+BuildRequires: libvdpau-devel
+BuildRequires: elfutils-libelf-devel
+BuildRequires: zlib-devel
 %description
 Mesa
 
@@ -90,6 +93,15 @@ Obsoletes: mesa-libGL < 8.0.4
 %description dri-drivers
 Mesa-based DRI drivers.
 
+%package vdpau-drivers
+Summary: Mesa-based VDPAU drivers
+Summary: MesaベースのVDPAUドライバ
+Group: User Interface/X Hardware Support
+Requires: mesa-filesystem%{?_isa}
+
+%description vdpau-drivers
+Mesa-based VDPAU drivers.
+
 
 %package libEGL
 Summary: Mesa libEGL runtime libraries
@@ -337,8 +349,12 @@ Mesa shared glapi
 %prep
 %setup -q -n Mesa-%{version}
 
-%patch0 -p1
-%patch11 -p1 -b .nouveau
+%patch1 -p1 -b .nv50rtti
+
+%patch15 -p1 -b .hwfloat
+%patch16 -p1 -b .vdpau
+%patch20 -p1 -b .egbe
+
 
 %build
 
@@ -360,6 +376,7 @@ export CXXFLAGS="$RPM_OPT_FLAGS"
 # now build the rest of mesa
 %configure \
     %{common_flags} \
+    --disable-selinux \
     --enable-osmesa \
     --enable-xcb \
     --with-dri-driverdir=%{_libdir}/dri \
@@ -367,13 +384,19 @@ export CXXFLAGS="$RPM_OPT_FLAGS"
     --enable-gles1 \
     --enable-gles2 \
     --disable-gallium-egl \
+    --disable-xvmc \
+    --enable-vdpau \
     --with-egl-platforms=x11,drm \
     --enable-shared-glapi \
     --enable-gbm \
+    --disable-opencl \
+    --enable-glx-tls \
+    --enable-texture-float=yes \
     --enable-xa \
     --with-gallium-drivers=svga,r300,r600,radeonsi,nouveau,swrast \
     --enable-gallium-llvm \
     --with-llvm-shared-libs \
+    --enable-dri \
     %{?dri_drivers}
 
 make %{?_smp_mflags} MKDEP=/bin/true
@@ -397,6 +420,9 @@ pushd $RPM_BUILD_ROOT%{_libdir}
 rm -f xorg/modules/drivers/modesetting_drv.so
 popd
 
+# libvdpau opens the versioned name, don't bother including the unversioned
+rm -f $RPM_BUILD_ROOT%{_libdir}/vdpau/*.so
+
 # remove .la files
 find $RPM_BUILD_ROOT -name \*.la | xargs rm -f
 
@@ -461,6 +487,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_includedir}/GL/internal
 %{_includedir}/GL/internal/dri_interface.h
 %{_libdir}/libGL.so
+%{_libdir}/libglapi.so
 %{_libdir}/pkgconfig/gl.pc
 %{_libdir}/pkgconfig/dri.pc
 
@@ -470,6 +497,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/dri/*_dri.so
 %{_libdir}/libdricore*.so*
 
+%files vdpau-drivers
+%defattr(-,root,root,-)
+%{_libdir}/vdpau/libvdpau_nouveau.so.1*
+%{_libdir}/vdpau/libvdpau_r600.so.1*
+%{_libdir}/vdpau/libvdpau_radeonsi.so.1*
+
 %files libEGL
 %defattr(-,root,root,-)
 %doc docs/COPYING
@@ -509,11 +542,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/GLES2/gl2platform.h
 %{_includedir}/GLES2/gl2.h
 %{_includedir}/GLES2/gl2ext.h
+%dir %{_includedir}/GLES3
+%{_includedir}/GLES3/gl3platform.h
+%{_includedir}/GLES3/gl3.h
+%{_includedir}/GLES3/gl3ext.h
 %{_libdir}/pkgconfig/glesv1_cm.pc
 %{_libdir}/pkgconfig/glesv2.pc
 %{_libdir}/libGLESv1_CM.so
 %{_libdir}/libGLESv2.so
-%{_libdir}/libglapi.so
 
 %files libOSMesa
 %defattr(-,root,root,-)
@@ -630,6 +666,11 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Oct 28 2013 Daisuke SUZUKI <daisuke@linux.or.jp> 9.2.2-1
+- update to 9.2.2
+- add BR: libvdpau-devel, elfutils-libelf-devel, zlib-devel
+- add BR: llvm-devel >= 3.3, libdrm-devel >= 2.4.46
+
 * Sun Jun 02 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 9.0.1-3
 - add Patch0 (mesa-9.0-CVE-2013-1993.patch)