mesa:

- update to 7.11
- build with llvm 2.9
- use 300/r600 gallium driver as default
- drop xorg-x11-drv-vmwgfx


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

m/mesa/mesa-vl.spec

@@ -1,8 +1,14 @@
 # When bootstrapping an arch, omit the -demos subpackage.
 
-# S390 doesn't have video cards, so it's not much use building DRI there.
-%define with_dri 1
-%define driver dri
+%define base_drivers mga,nouveau,r128,radeon,r200,savage,tdfx
+%ifarch %{ix86}
+%define ix86_drivers ,i810,i915,i965,sis,unichrome
+%endif
+%ifarch x86_64
+%define amd64_drivers ,i915,i965,unichrome
+%endif
+%define dri_drivers --with-dri-drivers=%{base_drivers}%{?ix86_drivers}%{?amd64_drivers}
+
 
 %define manpages gl-manpages-1.0.1
 #%define gitdate 20100217
@@ -12,7 +18,7 @@
 Summary: Mesa graphics libraries
 Summary(ja): Mesa グラフィックスライブラリ
 Name: mesa
-Version: 7.10.3
+Version: 7.11
 Release: 1%{?_dist_release}
 License: MIT
 Group: System Environment/Libraries
@@ -22,24 +28,17 @@ Source0: ftp://ftp.freedesktop.org/pub/mesa/%{version}/MesaLib-%{version}.tar.bz
 Source2: %{manpages}.tar.bz2
 Source3: make-git-snapshot.sh
 
-Patch3: mesa-7.8-no-mach64.patch
-Patch4: mesa-7.8-nouveau-legacy-enable.patch
+Patch3: mesa-7.11-no-mach64.patch
+Patch4: mesa-legacy-drivers.patch
 
-#Patch7: mesa-7.1-link-shared.patch
+Patch8: mesa-7.10-llvmcore.patch
 
 Patch30: mesa-7.6-hush-vblank-warning.patch
 
-Patch40: mesa-7.10.1-buildfix.patch
-
-#   http://cgit.freedesktop.org/mesa/mesa/commit/?id=13bab58f04c1ec6d0d52760eab490a0997d9abe2
-Patch50: mesa-7.10.2-i965-fallback-on-null-render-buffer.patch
-
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: pkgconfig
 BuildRequires: flex, bison
-%if %{with_dri}
 BuildRequires: libdrm-devel >= 2.4.24
-%endif
 BuildRequires: libXxf86vm-devel
 BuildRequires: expat-devel >= 2.0
 BuildRequires: xorg-x11-proto-devel >= 7.4
@@ -53,6 +52,7 @@ BuildRequires: libXdamage-devel
 BuildRequires: libXi-devel
 BuildRequires: libXmu-devel
 BuildRequires: libudev-devel
+BuildRequires: llvm-devel >= 2.9
 
 %description
 Mesa
@@ -65,9 +65,7 @@ Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 Provides: libGL
 Obsoletes: Mesa, XFree86-gl, XOrg-gl
-%if %{with_dri}
 Requires: libdrm >= 2.4.5
-%endif
 
 %description libGL
 Mesa libGL runtime libraries and DRI drivers.
@@ -191,15 +189,6 @@ The mesa-source package provides the minimal source code needed to
 build DRI enabled X servers, etc.
 
 
-%package -n xorg-x11-drv-vmwgfx
-Summary: VMware GFX DDX driver
-Summary(ja): VMware GFX DDX ドライバ
-Group: User Interface/X Hardware Support
-
-%description -n xorg-x11-drv-vmwgfx
-2D driver for VMware SVGA vGPU
-
-
 # compat32
 %package -n compat32-%{name}-libGL
 Summary: Mesa libGL runtime libraries and DRI drivers
@@ -208,9 +197,7 @@ Group: System Environment/Libraries
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 Requires: %{name}-libGL = %{version}-%{release}
-%if %{with_dri}
 Requires: compat32-libdrm >= 2.4.5
-%endif
 
 %description -n compat32-%{name}-libGL
 Mesa libGL runtime libraries and DRI drivers.
@@ -322,39 +309,19 @@ Mesa offscreen rendering development package
 %setup -q -n Mesa-%{version} -b2
 
 %patch3 -p1 -b .no-mach64
-%patch4 -p1 -b .nouveau-legacy
-#%patch7 -p1 -b .dricore
+%patch4 -p1 -b .legacy
+%patch8 -p1 -b .llvmcore
 %patch30 -p1 -b .vblank-warning
 
-%patch40 -p1 -b .build-fix
-
-%patch50 -p1 -b .i965-fallback-on-null-render-buffer
-
 %build
 
 autoreconf --install
 
-%ifarch ppc
-export CFLAGS="$RPM_OPT_FLAGS -fvisibility=hidden -O2"
-export CXXFLAGS="$RPM_OPT_FLAGS -fvisibility=hidden -O2"
+%ifarch %{ix86}
+%define common_flags --enable-pic --enable-udev --disable-asm
 %else
-export CFLAGS="$RPM_OPT_FLAGS -fvisibility=hidden -Os"
-export CXXFLAGS="$RPM_OPT_FLAGS -fvisibility=hidden -Os"
+%define common_flags --enable-pic --enable-udev
 %endif
-%define common_flags --enable-pic --disable-asm --enable-udev
-%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 %{osmesa_flags} --with-osmesa-bits=8
-make %{_smp_mflags}
-mv %{_lib} osmesa8
-make clean
-
-# just to be sure...
-[ `find . -name \*.o | wc -l` -eq 0 ] || exit "make cleaner plz"
 
 export CFLAGS="$RPM_OPT_FLAGS"
 export CXXFLAGS="$RPM_OPT_FLAGS"
@@ -364,24 +331,23 @@ export CXXFLAGS="$RPM_OPT_FLAGS"
     %{common_flags} \
     --disable-glw \
     --disable-glut \
-    --disable-gl-osmesa \
-    --with-driver=%{driver} \
+    --enable-gl-osmesa \
+    --with-osmesa-bits=8 \
+    --with-driver=dri \
     --with-dri-driverdir=%{_libdir}/dri \
     --with-state-trackers=dri,xorg,glx \
     --enable-egl \
     --enable-gles1 \
     --enable-gles2 \
-    --enable-gallium-svga \
-    --enable-gallium-nouveau \
-    --enable-gallium-radeon \
-    --enable-gallium-r600 \
-    --disable-gallium-intel \
     --disable-gallium-egl \
-    --disable-gallium-llvm
+    --with-gallium-drivers=r300,r600,nouveau,swrast \
+    --enable-gallium-llvm \
+    %{?dri_drivers}
 
 make %{?_smp_mflags}
 
 pushd ../%{manpages}
+autoreconf -v --install
 %configure
 make %{?_smp_mflags}
 popd
@@ -393,23 +359,18 @@ rm -rf $RPM_BUILD_ROOT
 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}/libllvmcore-2.8.so >& /dev/null
-
 # use gallium driver iff built
 [ -f %{_lib}/gallium/swrastg_dri.so ] && mv %{_lib}/gallium/swrastg_dri.so %{_lib}/swrast_dri.so
-# copy gallium driver with suffix 'g'
-# use classic driver as default
-[ -f %{_lib}/gallium/r300_dri.so ] && cp %{_lib}/gallium/r300_dri.so %{_lib}/r300g_dri.so
-[ -f %{_lib}/gallium/r600_dri.so ] && cp %{_lib}/gallium/r600_dri.so %{_lib}/r600g_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 r300g r600g radeon savage sis swrast tdfx unichrome nouveau_vieux gallium/vmwgfx; do
+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 || :
-%endif
+
 
 # strip out undesirable headers
 pushd $RPM_BUILD_ROOT%{_includedir}/GL 
@@ -420,9 +381,6 @@ pushd $RPM_BUILD_ROOT%{_libdir}
 rm -f xorg/modules/drivers/modesetting_drv.so
 popd
 
-# and osmesa
-mv osmesa*/libOS* $RPM_BUILD_ROOT%{_libdir}
-
 # man pages
 pushd ../%{manpages}
 make %{?_smp_mflags} install DESTDIR=$RPM_BUILD_ROOT
@@ -479,11 +437,9 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{_libdir}/libGL.so.1
 %{_libdir}/libGL.so.1.2
-%if %{with_dri}
 %dir %{_libdir}/dri
 #%{_libdir}/dri/libdricore.so
 %{_libdir}/dri/*_dri.so
-%endif
 
 %files libGL-devel
 %defattr(-,root,root,-)
@@ -519,8 +475,6 @@ rm -rf $RPM_BUILD_ROOT
 %doc docs/COPYING
 %{_libdir}/libEGL.so.1
 %{_libdir}/libEGL.so.1.*
-%{_libdir}/egl/egl_glx.so
-%{_libdir}/egl/egl_dri2.so
 
 %files libEGL-devel
 %defattr(-,root,root,-)
@@ -538,6 +492,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libGLESv1_CM.so.1.*
 %{_libdir}/libGLESv2.so.2
 %{_libdir}/libGLESv2.so.2.*
+%{_libdir}/libglapi.so.0
+%{_libdir}/libglapi.so.0.*
 
 %files libGLES-devel
 %defattr(-,root,root,-)
@@ -552,6 +508,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/glesv2.pc
 %{_libdir}/libGLESv1_CM.so
 %{_libdir}/libGLESv2.so
+%{_libdir}/libglapi.so
 
 %files libOSMesa
 %defattr(-,root,root,-)
@@ -561,26 +518,21 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{_includedir}/GL/osmesa.h
 %{_libdir}/libOSMesa.so
+%{_libdir}/pkgconfig/osmesa.pc
 
 # We constructed this dir carefully, so just slurp in the whole thing.
 %files source
 %defattr(-,root,root,-)
 %{mesasourcedir}
 
-%files -n xorg-x11-drv-vmwgfx
-%defattr(-,root,root,-)
-%{_libdir}/xorg/modules/drivers/vmwgfx_drv.so
-
 # compat32
 %if %{build_compat32}
 %files -n compat32-%{name}-libGL
 %defattr(-,root,root,-)
 %{_libdir}/libGL.so.1
 %{_libdir}/libGL.so.1.2
-%if %{with_dri}
-%dir %{_libdir}/dri
-%{_libdir}/dri/*_dri.so
-%endif
+#%dir %{_libdir}/dri
+#%{_libdir}/dri/*_dri.so
 
 %files -n compat32-%{name}-libGL-devel
 %defattr(-,root,root,-)
@@ -611,8 +563,6 @@ rm -rf $RPM_BUILD_ROOT
 %doc docs/COPYING
 %{_libdir}/libEGL.so.1
 %{_libdir}/libEGL.so.1.*
-%{_libdir}/egl/egl_glx.so
-%{_libdir}/egl/egl_dri2.so
 
 %files -n compat32-%{name}-libEGL-devel
 %defattr(-,root,root,-)
@@ -626,6 +576,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libGLESv1_CM.so.1.*
 %{_libdir}/libGLESv2.so.2
 %{_libdir}/libGLESv2.so.2.*
+%{_libdir}/libglapi.so.0
+%{_libdir}/libglapi.so.0.*
 
 %files -n compat32-%{name}-libGLES-devel
 %defattr(-,root,root,-)
@@ -633,10 +585,18 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/glesv2.pc
 %{_libdir}/libGLESv1_CM.so
 %{_libdir}/libGLESv2.so
+%{_libdir}/libglapi.so
 
 %endif
 
 %changelog
+* Thu Aug 25 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 7.11-1
+- update to 7.11
+- use r[36]00g gallium driver as default.
+- add BR: llvm-devel
+- drop xorg-x11-drv-vmwgfx
+- drop dri modules from compat32-mesa-libGL
+
 * Sat Apr 30 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 7.10.3-1
 - update to 7.10.3
 - use r300/r600 classic driver for default.