mesa:

- update to mesa-9.0
- split off libGLU and gl-manpages to external package
- add libxatracker, libgbm

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

m/mesa/mesa-vl.spec

@@ -10,30 +10,26 @@
 %define dri_drivers --with-dri-drivers=%{base_drivers}%{?ix86_drivers}%{?amd64_drivers}
 
 
-%define manpages gl-manpages-1.0.1
-#%define gitdate 20100217
-
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 
 Summary: Mesa graphics libraries
 Summary(ja): Mesa グラフィックスライブラリ
 Name: mesa
-Version: 8.0.4
+Version: 9.0
 Release: 1%{?_dist_release}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
 
 Source0: ftp://ftp.freedesktop.org/pub/mesa/%{version}/MesaLib-%{version}.tar.bz2
-Source2: %{manpages}.tar.bz2
 Source3: make-git-snapshot.sh
 
-Patch8: mesa-7.10-llvmcore.patch
+Patch11: mesa-8.0-nouveau-tfp-blacklist.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: pkgconfig
 BuildRequires: flex, bison
-BuildRequires: libdrm-devel
+BuildRequires: libdrm-devel >= 2.4.40
 BuildRequires: libXxf86vm-devel
 BuildRequires: expat-devel >= 2.0
 BuildRequires: xorg-x11-proto-devel >= 7.4
@@ -92,32 +88,6 @@ Obsoletes: mesa-libGL < 8.0.4
 Mesa-based DRI drivers.
 
 
-%package libGLU
-Summary: Mesa libGLU runtime library
-Summary(ja): Mesa libGLU ランタイムライブラリ
-Group: System Environment/Libraries
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-Provides: libGLU
-Obsoletes: Mesa, XFree86-gl, XOrg-gl
-
-%description libGLU
-Mesa libGLU runtime library
-
-
-%package libGLU-devel
-Summary: Mesa libGLU development package
-Summary(ja): Mesa libGLU 開発パッケージ
-Group: Development/Libraries
-Requires: mesa-libGLU = %{version}-%{release}
-Requires: libGL-devel
-Provides: libGLU-devel
-Obsoletes: Mesa-devel, XFree86-gl-devel, XOrg-gl-devel
-
-%description libGLU-devel
-Mesa libGLU development package
-
-
 %package libEGL
 Summary: Mesa libEGL runtime libraries
 Summary(ja): Mesa libEGL ランタイムライブラリ
@@ -182,6 +152,53 @@ Requires: mesa-libOSMesa = %{version}-%{release}
 Mesa offscreen rendering development package
 
 
+%package libgbm
+Summary: Mesa gbm library
+Group: System Environment/Libraries
+Provides: libgbm
+
+%description libgbm
+Mesa gbm runtime library.
+
+
+%package libgbm-devel
+Summary: Mesa libgbm development package
+Group: Development/Libraries
+Provides: libgbm-devel
+Requires: mesa-libgbm = %{version}-%{release}
+
+%description libgbm-devel
+Mesa libgbm development package
+
+
+%package libglapi
+Summary: Mesa shared glapi
+Group: System Environment/Libraries
+Provides: libglapi
+
+%description libglapi
+Mesa shared glapi
+
+
+%package libxatracker
+Summary: Mesa XA state tracker for vmware
+Summary(ja): VMware 用 Mesa XA ステートトラッカー
+Group: System Environment/Libraries
+Provides: libxatracker
+
+%description libxatracker
+Mesa XA state tracker for vmware
+
+%package libxatracker-devel
+Summary: Mesa XA state tracker development package
+Group: Development/Libraries
+Requires: mesa-libxatracker = %{version}-%{release}
+Provides: libxatracker-devel
+
+%description libxatracker-devel
+Mesa XA state tracker development package
+
+
 %package source
 Summary: Mesa source code required to build X server
 Summary(ja): X サーバをビルドするために必要な Mesa ソースコード
@@ -218,31 +235,6 @@ Requires: compat32-libdrm-devel
 Mesa libGL development package
 
 
-%package -n compat32-%{name}-libGLU
-Summary: Mesa libGLU runtime library
-Summary(ja): Mesa libGLU ランタイムライブラリ
-Group: System Environment/Libraries
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-Requires: %{name}-libGLU = %{version}-%{release}
-
-%description -n compat32-%{name}-libGLU
-Mesa libGLU runtime library
-
-
-%package -n compat32-%{name}-libGLU-devel
-Summary: Mesa libGLU development package
-Summary(ja): Mesa libGLU 開発パッケージ
-Group: Development/Libraries
-Requires: compat32-%{name}-libGL  = %{version}-%{release}
-Requires: compat32-%{name}-libGLU = %{version}-%{release}
-Requires: %{name}-libGL-devel  = %{version}-%{release}
-Requires: %{name}-libGLU-devel = %{version}-%{release}
-
-%description -n compat32-%{name}-libGLU-devel
-Mesa libGLU development package
-
-
 %package -n compat32-%{name}-libEGL
 Summary: Mesa libEGL runtime libraries
 Summary(ja): Mesa libEGL ランタイムライブラリ
@@ -308,10 +300,41 @@ Requires: %{name}-libOSMesa-devel = %{version}-%{release}
 %description -n compat32-%{name}-libOSMesa-devel
 Mesa offscreen rendering development package
 
+
+%package -n compat32-%{name}-libxatracker
+Summary: Mesa XA state tracker for vmware
+Summary(ja): VMware 用 Mesa XA ステートトラッカー
+Group: System Environment/Libraries
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+Requires: %{name}-libxatracker
+
+%description -n compat32-%{name}-libxatracker
+Mesa XA state tracker for vmware
+
+
+%package -n compat32-%{name}-libgbm
+Summary: Mesa gbm library
+Group: System Environment/Libraries
+Requires: %{name}-libgbm
+
+%description -n compat32-%{name}-libgbm
+Mesa gbm runtime library.
+
+
+%package -n compat32-%{name}-libglapi
+Summary: Mesa shared glapi
+Group: System Environment/Libraries
+Requires: %{name}-libglapi
+
+%description -n compat32-%{name}-libglapi
+Mesa shared glapi
+
+
 %prep
-%setup -q -n Mesa-%{version} -b2
+%setup -q -n Mesa-%{version}
 
-%patch8 -p1 -b .llvmcore
+%patch11 -p1 -b .nouveau
 
 %build
 
@@ -340,51 +363,38 @@ export CXXFLAGS="$RPM_OPT_FLAGS"
     --enable-gles1 \
     --enable-gles2 \
     --disable-gallium-egl \
-    --with-gallium-drivers=r300,r600,nouveau,swrast \
+    --with-egl-platforms=x11,drm \
+    --enable-shared-glapi \
+    --enable-gbm \
+    --enable-xa \
+    --with-gallium-drivers=svga,r300,r600,nouveau,swrast \
     --enable-gallium-llvm \
+    --with-llvm-shared-libs \
     %{?dri_drivers}
 
 make %{?_smp_mflags} MKDEP=/bin/true
 
-pushd ../%{manpages}
-autoreconf -v --install
-%configure
-make %{?_smp_mflags}
-popd
-
 %install
 rm -rf $RPM_BUILD_ROOT
 
 # core libs and headers, but not drivers.
 make install DESTDIR=$RPM_BUILD_ROOT DRI_DIRS=
 
-# just the DRI drivers that are sane
-install -d $RPM_BUILD_ROOT%{_libdir}/dri
-
-# use gallium driver iff built
-[ -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
-
-for f in i810 i915 i965 mach64 mga r128 r200 r300 r600 radeon savage sis swrast tdfx unichrome nouveau_vieux gallium/vmwgfx; do
-    so=%{_lib}/${f}_dri.so
-    test -e $so && echo $so
-done | xargs install -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/dri >& /dev/null || :
-
+# not installed by make install, grr
+mkdir -p $RPM_BUILD_ROOT%{_includedir}/KHR
+install -m 0644 include/KHR/*.h $RPM_BUILD_ROOT%{_includedir}/KHR
 
 # strip out undesirable headers
 pushd $RPM_BUILD_ROOT%{_includedir}/GL 
-rm -f [a-fh-np-wyz]*.h glf*.h glut*.h
+rm -f [vw]*.h
 popd
 
 pushd $RPM_BUILD_ROOT%{_libdir}
 rm -f xorg/modules/drivers/modesetting_drv.so
 popd
 
-# man pages
-pushd ../%{manpages}
-make %{?_smp_mflags} install DESTDIR=$RPM_BUILD_ROOT
-popd
+# remove .la files
+find $RPM_BUILD_ROOT -name \*.la | xargs rm -f
 
 # Install the source needed to build the X server.  The egreps are just
 # stripping out unnecessary dirs; only tricky bit is the [^c] to make sure
@@ -413,19 +423,17 @@ rm -rf $RPM_BUILD_ROOT
 
 %post libGL -p /sbin/ldconfig
 %postun libGL -p /sbin/ldconfig
-%post libGLU -p /sbin/ldconfig
-%postun libGLU -p /sbin/ldconfig
 %post libOSMesa -p /sbin/ldconfig
 %postun libOSMesa -p /sbin/ldconfig
 %post libEGL -p /sbin/ldconfig
 %postun libEGL -p /sbin/ldconfig
 %post libGLES -p /sbin/ldconfig
 %postun libGLES -p /sbin/ldconfig
+%post libxatracker -p /sbin/ldconfig
+%postun libxatracker -p /sbin/ldconfig
 
 %post -n compat32-%{name}-libGL -p /sbin/ldconfig
 %postun -n compat32-%{name}-libGL -p /sbin/ldconfig
-%post -n compat32-%{name}-libGLU -p /sbin/ldconfig
-%postun -n compat32-%{name}-libGLU -p /sbin/ldconfig
 %post -n compat32-%{name}-libOSMesa -p /sbin/ldconfig
 %postun -n compat32-%{name}-libOSMesa -p /sbin/ldconfig
 %post -n compat32-%{name}-libEGL -p /sbin/ldconfig
@@ -436,7 +444,7 @@ rm -rf $RPM_BUILD_ROOT
 %files libGL
 %defattr(-,root,root,-)
 %{_libdir}/libGL.so.1
-%{_libdir}/libGL.so.1.2
+%{_libdir}/libGL.so.1.2*
 
 %files libGL-devel
 %defattr(-,root,root,-)
@@ -451,25 +459,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libGL.so
 %{_libdir}/pkgconfig/gl.pc
 %{_libdir}/pkgconfig/dri.pc
-%{_datadir}/man/man3/gl[^uX]*.3gl*
-%{_datadir}/man/man3/glX*.3gl*
 
 %files dri-drivers
+%config(noreplace) %{_sysconfdir}/drirc
 %dir %{_libdir}/dri
 %{_libdir}/dri/*_dri.so
-
-%files libGLU
-%defattr(-,root,root,-)
-%{_libdir}/libGLU.so.1
-%{_libdir}/libGLU.so.1.3.*
-
-%files libGLU-devel
-%defattr(-,root,root,-)
-%{_libdir}/libGLU.so
-%{_libdir}/pkgconfig/glu.pc
-%{_includedir}/GL/glu.h
-%{_includedir}/GL/glu_mangle.h
-%{_datadir}/man/man3/glu*.3gl*
+%{_libdir}/libdricore*.so*
 
 %files libEGL
 %defattr(-,root,root,-)
@@ -479,11 +474,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %files libEGL-devel
 %defattr(-,root,root,-)
+%dir %{_includedir}/EGL
 %{_includedir}/EGL/eglext.h
 %{_includedir}/EGL/egl.h
 %{_includedir}/EGL/eglplatform.h
 %{_includedir}/EGL/eglmesaext.h
-%{_includedir}/KHR/khrplatform.h
+%dir %{_includedir}/KHR
+%{_includedir}/KHR/*.h
 %{_libdir}/pkgconfig/egl.pc
 %{_libdir}/libEGL.so
 
@@ -499,10 +496,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %files libGLES-devel
 %defattr(-,root,root,-)
+%dir %{_includedir}/GLES
 %{_includedir}/GLES/egl.h
 %{_includedir}/GLES/gl.h
 %{_includedir}/GLES/glext.h
 %{_includedir}/GLES/glplatform.h
+%dir %{_includedir}/GLES2
 %{_includedir}/GLES2/gl2platform.h
 %{_includedir}/GLES2/gl2.h
 %{_includedir}/GLES2/gl2ext.h
@@ -523,6 +522,36 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libOSMesa.so
 %{_libdir}/pkgconfig/osmesa.pc
 
+%files libglapi
+%{_libdir}/libglapi.so.0
+%{_libdir}/libglapi.so.0.*
+
+%files libgbm
+%defattr(-,root,root,-)
+%doc docs/COPYING
+%{_libdir}/libgbm.so.1
+%{_libdir}/libgbm.so.1.*
+
+%files libgbm-devel
+%defattr(-,root,root,-)
+%{_libdir}/libgbm.so
+%{_includedir}/gbm.h
+%{_libdir}/pkgconfig/gbm.pc
+
+%files libxatracker
+%defattr(-,root,root,-)
+%doc docs/COPYING
+%{_libdir}/libxatracker.so.1
+%{_libdir}/libxatracker.so.1.*
+
+%files libxatracker-devel
+%defattr(-,root,root,-)
+%{_libdir}/libxatracker.so
+%{_includedir}/xa_tracker.h
+%{_includedir}/xa_composite.h
+%{_includedir}/xa_context.h
+%{_libdir}/pkgconfig/xatracker.pc
+
 # We constructed this dir carefully, so just slurp in the whole thing.
 %files source
 %defattr(-,root,root,-)
@@ -533,7 +562,7 @@ rm -rf $RPM_BUILD_ROOT
 %files -n compat32-%{name}-libGL
 %defattr(-,root,root,-)
 %{_libdir}/libGL.so.1
-%{_libdir}/libGL.so.1.2
+%{_libdir}/libGL.so.1.2*
 #%dir %{_libdir}/dri
 #%{_libdir}/dri/*_dri.so
 
@@ -543,16 +572,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/gl.pc
 %{_libdir}/pkgconfig/dri.pc
 
-%files -n compat32-%{name}-libGLU
-%defattr(-,root,root,-)
-%{_libdir}/libGLU.so.1
-%{_libdir}/libGLU.so.1.3.*
-
-%files -n compat32-%{name}-libGLU-devel
-%defattr(-,root,root,-)
-%{_libdir}/libGLU.so
-%{_libdir}/pkgconfig/glu.pc
-
 %files -n compat32-%{name}-libOSMesa
 %defattr(-,root,root,-)
 %{_libdir}/libOSMesa.so.*
@@ -590,9 +609,28 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libGLESv2.so
 %{_libdir}/libglapi.so
 
+%files -n compat32-%{name}-libxatracker
+%defattr(-,root,root,-)
+%{_libdir}/libxatracker.so.1
+%{_libdir}/libxatracker.so.1.*
+
+%files -n compat32-%{name}-libglapi
+%{_libdir}/libglapi.so.0
+%{_libdir}/libglapi.so.0.*
+
+%files -n compat32-%{name}-libgbm
+%defattr(-,root,root,-)
+%{_libdir}/libgbm.so.1
+%{_libdir}/libgbm.so.1.*
+
 %endif
 
 %changelog
+* Sat Nov 17 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 9.0-1
+- update to mesa-9.0
+- split off libGLU and gl-manpages to external package
+- add libxatracker, libgbm
+
 * Thu Jul 12 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 8.0.4-1
 - update to 8.0.4
 - remove BR: freeglut-devel