mesa-7.8-0.1.git20100217

update to mesa 7.8 git snapshot


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

m/mesa/mesa-vl.spec

@@ -5,29 +5,33 @@
 %define driver dri
 
 %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: 7.6.1
-Release: 1%{?_dist_release}
+Version: 7.8
+Release: 0.1.git%{gitdate}%{?_dist_release}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
 
-Source0: http://www.mesa3d.org/beta/MesaLib-%{version}.tar.bz2
-Source1: http://www.mesa3d.org/beta/MesaDemos-%{version}.tar.bz2
+#Source0: http://www.mesa3d.org/beta/MesaLib-%{version}.tar.bz2
+#Source1: http://www.mesa3d.org/beta/MesaDemos-%{version}.tar.bz2
+Source0: %{name}-%{gitdate}.tar.bz2
 Source2: %{manpages}.tar.bz2
 Source3: make-git-snapshot.sh
 
 Patch1: mesa-7.4.4-osmesa-version.patch
 Patch2: mesa-7.1-nukeglthread-debug.patch
 Patch3: mesa-no-mach64.patch
+Patch4: nouveau-legacy-enable.patch
 
-Patch7: mesa-7.1-link-shared.patch
-Patch9: intel-revert-vbl.patch
+#Patch7: mesa-7.1-link-shared.patch
+
+Patch30: mesa-7.6-hush-vblank-warning.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: pkgconfig
@@ -234,13 +238,15 @@ Requires: %{name}-libOSMesa-devel = %{version}-%{release}
 Mesa offscreen rendering development package
 
 %prep
-%setup -q -n Mesa-%{version} -b1 -b2
+#%setup -q -n Mesa-%{version} -b1 -b2
+%setup -q -n mesa-%{gitdate} -b2
+
 %patch1 -p1 -b .osmesa
 %patch2 -p1 -b .intel-glthread
 %patch3 -p1 -b .no-mach64
-#%patch6 -p1 -b .radeon-rewrite
-%patch7 -p1 -b .dricore
-%patch9 -p1 -b .intel-vbl
+%patch4 -p1 -b .nouveau-legacy
+#%patch7 -p1 -b .dricore
+%patch30 -p1 -b .vblank-warning
 
 # Hack the demos to use installed data files
 sed -i 's,../images,%{_libdir}/mesa-demos-data,' progs/demos/*.c
@@ -254,25 +260,25 @@ autoreconf --install
 
 export CFLAGS="$RPM_OPT_FLAGS -fvisibility=hidden -Os"
 export CXXFLAGS="$RPM_OPT_FLAGS -fvisibility=hidden -Os"
-%define common_flags --enable-pic
-%define osmesa_flags --with-driver=osmesa --disable-asm %{common_flags}
+%define common_flags --enable-pic --disable-asm
+%define osmesa_flags --with-driver=osmesa --disable-gallium --disable-egl --disable-glu --with-dri-drivers="" %{common_flags}
 
 # first, build the osmesa variants. XXX this is overkill.  osmesa32 is
 # sufficient to render to any of the channel sizes, according to the
 # docs.  should fix this someday.
 
-%configure --with-driver=osmesa --with-osmesa-bits=8
-make %{_smp_mflags} SRC_DIRS=mesa
+%configure %{osmesa_flags} --with-osmesa-bits=8
+make %{_smp_mflags}
 mv %{_lib} osmesa8
 make clean
 
-%configure --with-driver=osmesa --with-osmesa-bits=16
-make %{_smp_mflags} SRC_DIRS=mesa
+%configure %{osmesa_flags} --with-osmesa-bits=16
+make %{_smp_mflags}
 mv %{_lib} osmesa16
 make clean
 
-%configure --with-driver=osmesa --with-osmesa-bits=32
-make %{_smp_mflags} SRC_DIRS=mesa
+%configure %{osmesa_flags} --with-osmesa-bits=32
+make %{_smp_mflags}
 mv %{_lib} osmesa32
 make clean
 
@@ -285,12 +291,16 @@ export CXXFLAGS="$RPM_OPT_FLAGS -Os"
 
 # now build the rest of mesa
 %configure \
+    %{common_flags} \
+    --disable-egl \
     --disable-glw \
     --disable-glut \
     --disable-gl-osmesa \
-    --disable-gallium \
     --with-driver=%{driver} \
-    --with-dri-driverdir=%{_libdir}/dri
+    --with-dri-driverdir=%{_libdir}/dri \
+    --with-state-trackers=dri,xorg,glx \
+    --enable-gallium-svga \
+    --enable-gallium-nouveau
 
 make #{?_smp_mflags}
 
@@ -311,8 +321,8 @@ make install DESTDIR=$RPM_BUILD_ROOT DRI_DIRS=
 # just the DRI drivers that are sane
 %if %{with_dri}
 install -d $RPM_BUILD_ROOT%{_libdir}/dri
-install -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/dri %{_lib}/libdricore.so >& /dev/null
-for f in i810 i915 i965 mga r128 r200 r300 radeon savage sis swrast tdfx unichrome; do
+#install -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/dri %{_lib}/libdricore.so >& /dev/null
+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 || :
@@ -344,7 +354,7 @@ 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*/* $RPM_BUILD_ROOT%{_libdir}
+mv osmesa*/libOS* $RPM_BUILD_ROOT%{_libdir}
 
 # man pages
 pushd ../%{manpages}
@@ -388,7 +398,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libGL.so.1.2
 %if %{with_dri}
 %dir %{_libdir}/dri
-%{_libdir}/dri/libdricore.so
+#%{_libdir}/dri/libdricore.so
 %{_libdir}/dri/*_dri.so
 %endif
 
@@ -508,7 +518,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libGL.so.1.2
 %if %{with_dri}
 %dir %{_libdir}/dri
-%{_libdir}/dri/libdricore.so
+#%{_libdir}/dri/libdricore.so
 %{_libdir}/dri/*_dri.so
 %endif
 
@@ -542,6 +552,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Thu Mar 11 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 7.8-0.1.git20100217
+- update to 7.8 branch from git
+
 * Tue Jan 19 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 7.6.1-1
 - update to 7.6.1 release