mesa: update to 7.10, split mesa-demos and glx-utils to their own source package.

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

m/mesa/mesa-vl.spec

@@ -12,20 +12,17 @@
 Summary: Mesa graphics libraries
 Summary(ja): Mesa グラフィックスライブラリ
 Name: mesa
-Version: 7.8.2
+Version: 7.10
 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
-Source1: ftp://ftp.freedesktop.org/pub/mesa/%{version}/MesaDemos-%{version}.tar.bz2
-#Source0: %{name}-%{gitdate}.tar.bz2
 Source2: %{manpages}.tar.bz2
 Source3: make-git-snapshot.sh
 Source10: nouveau_class.h
 
-Patch1: mesa-7.4.4-osmesa-version.patch
 Patch3: mesa-7.8-no-mach64.patch
 Patch4: mesa-7.8-nouveau-legacy-enable.patch
 
@@ -33,13 +30,13 @@ Patch4: mesa-7.8-nouveau-legacy-enable.patch
 
 Patch30: mesa-7.6-hush-vblank-warning.patch
 
-Patch40: mesa-7.8.2-nouveau-build-fix.patch
+#Patch40: mesa-7.8.2-nouveau-build-fix.patch
-Patch41: mesa-7.8.2-gallium-build-fix.patch
+#Patch41: mesa-7.8.2-gallium-build-fix.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: pkgconfig
 %if %{with_dri}
-BuildRequires: libdrm-devel >= 2.4.9
+BuildRequires: libdrm-devel >= 2.4.23
 %endif
 BuildRequires: libXxf86vm-devel
 BuildRequires: expat-devel >= 2.0
@@ -53,6 +50,7 @@ BuildRequires: libXfixes-devel
 BuildRequires: libXdamage-devel
 BuildRequires: libXi-devel
 BuildRequires: libXmu-devel
+BuildRequires: libtalloc-devel
 
 %description
 Mesa
@@ -149,24 +147,6 @@ The mesa-source package provides the minimal source code needed to
 build DRI enabled X servers, etc.
 
 
-%package -n glx-utils
-Summary: GLX utilities
-Summary(ja): GLX　ユーティリティ
-Group: Development/Libraries
-
-%description -n glx-utils
-The glx-utils package provides the glxinfo and glxgears utilities.
-
-
-%package demos
-Summary: Mesa demos
-Summary(ja): Mesa デモ
-Group: Development/Libraries
-
-%description demos
-This package provides some demo applications for testing Mesa.
-
-
 %package -n xorg-x11-drv-vmwgfx
 Summary: VMware GFX DDX driver
 Summary(ja): VMware GFX DDX ドライバ
@@ -252,10 +232,8 @@ Requires: %{name}-libOSMesa-devel = %{version}-%{release}
 Mesa offscreen rendering development package
 
 %prep
-%setup -q -n Mesa-%{version} -b1 -b2
+%setup -q -n Mesa-%{version} -b2
-#%setup -q -n mesa-%{gitdate} -b2
 
-%patch1 -p1 -b .osmesa
 %patch3 -p1 -b .no-mach64
 %patch4 -p1 -b .nouveau-legacy
 #%patch7 -p1 -b .dricore
@@ -263,14 +241,8 @@ Mesa offscreen rendering development package
 
 cp %{SOURCE10} src/mesa/drivers/dri/nouveau
 cp %{SOURCE10} src/gallium/drivers/nouveau
-%patch40 -p1 -b .build-fix
+#%patch40 -p1 -b .build-fix
-%patch41 -p1 -b .build-fix
+#%patch41 -p1 -b .build-fix
-
-# Hack the demos to use installed data files
-sed -i 's,../images,%{_libdir}/mesa-demos-data,' progs/demos/*.c
-sed -i 's,geartrain.dat,%{_libdir}/mesa-demos-data/&,' progs/demos/geartrain.c
-sed -i 's,isosurf.dat,%{_libdir}/mesa-demos-data/&,' progs/demos/isosurf.c
-sed -i 's,terrain.dat,%{_libdir}/mesa-demos-data/&,' progs/demos/terrain.c
 
 %build
 
@@ -333,9 +305,6 @@ export CXXFLAGS="$RPM_OPT_FLAGS -Os"
 
 make #{?_smp_mflags}
 
-make -C progs/xdemos glxgears glxinfo
-make %{?_smp_mflags} -C progs/demos
-
 pushd ../%{manpages}
 %configure
 make %{?_smp_mflags}
@@ -370,18 +339,6 @@ pushd $RPM_BUILD_ROOT%{_libdir}/dri
 rm -f EGL_*.so
 popd
 
-# XXX demos, since they don't install automatically.  should fix that.
-install -d $RPM_BUILD_ROOT%{_bindir}
-install -m 0755 progs/xdemos/glxgears $RPM_BUILD_ROOT%{_bindir}
-install -m 0755 progs/xdemos/glxinfo $RPM_BUILD_ROOT%{_bindir}
-find progs/demos/ -type f -perm /0111 |
-    xargs install -m 0755 -t $RPM_BUILD_ROOT/%{_bindir}
-# bah, name conflicts
-mv $RPM_BUILD_ROOT/%{_bindir}/{rain,mesa-rain}
-install -d $RPM_BUILD_ROOT/%{_libdir}/mesa-demos-data
-install -m 0644 progs/images/*.rgb $RPM_BUILD_ROOT/%{_libdir}/mesa-demos-data
-install -m 0644 progs/demos/*.dat $RPM_BUILD_ROOT/%{_libdir}/mesa-demos-data
-
 # and osmesa
 mv osmesa*/libOS* $RPM_BUILD_ROOT%{_libdir}
 
@@ -462,9 +419,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %files libOSMesa
 %defattr(-,root,root,-)
-%{_libdir}/libOSMesa.so.6*
+%{_libdir}/libOSMesa.so.7*
-%{_libdir}/libOSMesa16.so.6*
+%{_libdir}/libOSMesa16.so.7*
-%{_libdir}/libOSMesa32.so.6*
+%{_libdir}/libOSMesa32.so.7*
 
 %files libOSMesa-devel
 %defattr(-,root,root,-)
@@ -478,67 +435,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{mesasourcedir}
 
-%files -n glx-utils
-%defattr(-,root,root,-)
-%{_bindir}/glxgears
-%{_bindir}/glxinfo
-
-%files demos
-%defattr(-,root,root,-)
-%{_bindir}/arbfplight
-%{_bindir}/arbfslight
-%{_bindir}/arbocclude
-%{_bindir}/bounce
-%{_bindir}/clearspd
-%{_bindir}/copypix
-%{_bindir}/cubemap
-%{_bindir}/dinoshade
-%{_bindir}/drawpix
-%{_bindir}/engine
-%{_bindir}/fbo_firecube
-%{_bindir}/fbotexture
-%{_bindir}/fire
-%{_bindir}/fogcoord
-%{_bindir}/fplight
-%{_bindir}/fslight
-%{_bindir}/gamma
-%{_bindir}/gearbox
-%{_bindir}/gears
-%{_bindir}/geartrain
-%{_bindir}/glinfo
-%{_bindir}/gloss
-%{_bindir}/gltestperf
-%{_bindir}/ipers
-%{_bindir}/isosurf
-%{_bindir}/lodbias
-%{_bindir}/morph3d
-%{_bindir}/multiarb
-%{_bindir}/paltex
-%{_bindir}/pointblast
-%{_bindir}/projtex
-%{_bindir}/mesa-rain
-%{_bindir}/ray
-%{_bindir}/readpix
-%{_bindir}/reflect
-%{_bindir}/renormal
-%{_bindir}/shadowtex
-%{_bindir}/singlebuffer
-%{_bindir}/spectex
-%{_bindir}/spriteblast
-%{_bindir}/stex3d
-%{_bindir}/teapot
-%{_bindir}/terrain
-%{_bindir}/tessdemo
-%{_bindir}/texcyl
-%{_bindir}/texenv
-%{_bindir}/textures
-%{_bindir}/trispd
-%{_bindir}/tunnel
-%{_bindir}/tunnel2
-%{_bindir}/vao_demo
-%{_bindir}/winpos
-%{_libdir}/mesa-demos-data
-
 %files -n xorg-x11-drv-vmwgfx
 %defattr(-,root,root,-)
 %{_libdir}/xorg/modules/drivers/vmwgfx_drv.so
@@ -573,9 +469,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n compat32-%{name}-libOSMesa
 %defattr(-,root,root,-)
-%{_libdir}/libOSMesa.so.6*
+%{_libdir}/libOSMesa.so.7*
-%{_libdir}/libOSMesa16.so.6*
+%{_libdir}/libOSMesa16.so.7*
-%{_libdir}/libOSMesa32.so.6*
+%{_libdir}/libOSMesa32.so.7*
 
 %files -n compat32-%{name}-libOSMesa-devel
 %defattr(-,root,root,-)
@@ -585,6 +481,11 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Fri Jan 28 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 7.10-1
+- update to 7.10
+- split mesa-demos and glx-utils to their own source package.
+- add BR: libtalloc-devel
+
 * Wed Sep 22 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 7.8.2-1
 - update to 7.8.2
 - add Patch40,41 to fix build failure