[mesa] rebase to upstream snapshot of 7.12
Dave Airlie
airlied at fedoraproject.org
Mon Nov 14 16:22:56 UTC 2011
commit 3c65592ff9b906b4c42ffdfba50a609de27ec8c1
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Nov 14 16:21:07 2011 +0000
rebase to upstream snapshot of 7.12
.gitignore | 1 +
0001-nv50-fix-max-texture-levels.patch | 18 ----------
legacy-drivers.patch | 36 --------------------
mesa-7.10-llvmcore.patch | 16 ++++----
mesa-7.11-fix-sw-24bpp.patch | 32 -----------------
mesa-7.11-generic-wmb.patch | 12 ------
mesa-7.6-hush-vblank-warning.patch | 12 ------
mesa-no-mach64.patch | 46 -------------------------
mesa.spec | 58 +++++++------------------------
sources | 2 +-
10 files changed, 23 insertions(+), 210 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f0e2145..8b11767 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,4 @@ mesa-20100720.tar.bz2
/mesa-20110730.tar.xz
/MesaLib-7.11.tar.bz2
/mesa-20111103.tar.xz
+/mesa-20111114.tar.xz
diff --git a/mesa-7.10-llvmcore.patch b/mesa-7.10-llvmcore.patch
index 853a0b4..7b8f388 100644
--- a/mesa-7.10-llvmcore.patch
+++ b/mesa-7.10-llvmcore.patch
@@ -1,12 +1,12 @@
-diff -up mesa-20110412/configure.ac.jx mesa-20110412/configure.ac
---- mesa-20110412/configure.ac.jx 2011-05-09 15:04:19.000000000 -0400
-+++ mesa-20110412/configure.ac 2011-05-09 15:05:11.000000000 -0400
-@@ -1679,7 +1679,7 @@ if test "x$enable_gallium_llvm" = xyes;
+diff -up mesa-20111114/configure.ac.dma mesa-20111114/configure.ac
+--- mesa-20111114/configure.ac.dma 2011-11-14 15:57:16.783162469 +0000
++++ mesa-20111114/configure.ac 2011-11-14 15:58:07.877159762 +0000
+@@ -1742,7 +1742,7 @@ if test "x$enable_gallium_llvm" = xyes;
if test "x$LLVM_CONFIG" != xno; then
LLVM_VERSION=`$LLVM_CONFIG --version`
- LLVM_CFLAGS=`$LLVM_CONFIG --cppflags`
-- LLVM_LIBS="`$LLVM_CONFIG --libs` -lstdc++"
-+ LLVM_LIBS="-lLLVM-`llvm-config --version` -lstdc++"
+ LLVM_CFLAGS=`$LLVM_CONFIG --cppflags|sed 's/-DNDEBUG\>//g'`
+- LLVM_LIBS="`$LLVM_CONFIG --libs`"
++ LLVM_LIBS=-lLLVM-`llvm-config --version` -lstdc++
LLVM_LDFLAGS=`$LLVM_CONFIG --ldflags`
- GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS llvmpipe"
+ DEFINES="$DEFINES -D__STDC_CONSTANT_MACROS"
diff --git a/mesa.spec b/mesa.spec
index a62c8fc..bffd005 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -4,12 +4,12 @@
%define dri_drivers --with-dri-drivers=swrast
%else
%define with_hardware 1
-%define base_drivers mga,nouveau,r128,radeon,r200,savage,tdfx
+%define base_drivers nouveau,radeon,r200
%ifarch %{ix86}
-%define ix86_drivers ,i810,i915,i965,sis,unichrome
+%define ix86_drivers ,i915,i965
%endif
%ifarch x86_64
-%define amd64_drivers ,i915,i965,unichrome
+%define amd64_drivers ,i915,i965
%endif
%ifarch ia64
%define ia64_drivers ,i915
@@ -20,13 +20,13 @@
%define _default_patch_fuzz 2
%define manpages gl-manpages-1.0.1
-%define gitdate 20111103
+%define gitdate 20111114
#% define snapshot
Summary: Mesa graphics libraries
Name: mesa
-Version: 7.11
-Release: 12%{?dist}
+Version: 7.12
+Release: 0.1%{?dist}
License: MIT
Group: System Environment/Libraries
URL: http://www.mesa3d.org
@@ -39,17 +39,10 @@ Source2: %{manpages}.tar.bz2
Source3: make-git-snapshot.sh
Patch2: mesa-7.1-nukeglthread-debug.patch
-Patch3: mesa-no-mach64.patch
-Patch4: legacy-drivers.patch
#Patch7: mesa-7.1-link-shared.patch
Patch8: mesa-7.10-llvmcore.patch
-Patch30: mesa-7.6-hush-vblank-warning.patch
-Patch31: mesa-7.10-swrastg.patch
-Patch32: mesa-7.11-generic-wmb.patch
-Patch34: 0001-nv50-fix-max-texture-levels.patch
-
BuildRequires: pkgconfig autoconf automake libtool
%if %{with_hardware}
BuildRequires: kernel-headers >= 2.6.27-0.305.rc5.git6
@@ -216,14 +209,8 @@ Mesa offscreen rendering development package
#%setup -q -n Mesa-%{version}%{?snapshot} -b0 -b2
%setup -q -n mesa-%{gitdate} -b2
%patch2 -p1 -b .intel-glthread
-%patch3 -p1 -b .no-mach64
-%patch4 -p1 -b .classic
#patch7 -p1 -b .dricore
%patch8 -p1 -b .llvmcore
-%patch30 -p1 -b .vblank-warning
-#patch31 -p1 -b .swrastg
-%patch32 -p1 -b .wmb
-%patch34 -p1 -b .nv50-texlevel
%build
@@ -239,11 +226,7 @@ export CXXFLAGS="$RPM_OPT_FLAGS"
%endif
%configure %{common_flags} \
- --disable-glw \
- --disable-glut \
- --enable-gl-osmesa \
- --with-driver=dri \
- --with-osmesa-bits=8 \
+ --enable-osmesa \
--with-dri-driverdir=%{_libdir}/dri \
--enable-egl \
--enable-gles1 \
@@ -258,7 +241,7 @@ export CXXFLAGS="$RPM_OPT_FLAGS"
%endif
%{?dri_drivers}
-make %{?_smp_mflags}
+make %{?_smp_mflags} MKDEP=/bin/true
pushd ../%{manpages}
autoreconf -v --install
@@ -281,9 +264,9 @@ install -d $RPM_BUILD_ROOT%{_libdir}/dri
# use gallium driver iff built
[ -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
-[ -f %{_lib}/gallium/swrastg_dri.so ] && mv %{_lib}/gallium/swrastg_dri.so %{_lib}/swrast_dri.so
+[ -f %{_lib}/gallium/swrast_dri.so ] && mv %{_lib}/gallium/swrast_dri.so %{_lib}/swrast_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
+for f in i915 i965 r200 r300 r600 radeon swrast 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 || :
@@ -369,24 +352,6 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/dri/nouveau_vieux_dri.so
%endif
%{_libdir}/dri/swrast_dri.so
-%exclude %{_libdir}/dri/swrastg_dri.so
-
-%files dri-drivers-dri1
-%defattr(-,root,root,-)
-%doc docs/COPYING
-%if %{with_hardware}
-%ifarch %{ix86} x86_64
-%{_libdir}/dri/unichrome_dri.so
-%ifarch %{ix86}
-%{_libdir}/dri/i810_dri.so
-%{_libdir}/dri/sis_dri.so
-%endif
-%endif
-%{_libdir}/dri/r128_dri.so
-%{_libdir}/dri/mga_dri.so
-%{_libdir}/dri/savage_dri.so
-%{_libdir}/dri/tdfx_dri.so
-%endif
%files -n khrplatform-devel
%defattr(-,root,root,-)
@@ -462,6 +427,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pkgconfig/osmesa.pc
%changelog
+* Mon Nov 14 2011 Dave Airlie <airlied at redhat.com> 7.12-0.1
+- rebase to upstream snapshot of 7.12
+
* Mon Nov 14 2011 Adam Jackson <ajax at redhat.com> 7.11-12
- Rebuild for new libllvm soname
diff --git a/sources b/sources
index 81d81a6..fda98ac 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
6ae05158e678f4594343f32c2ca50515 gl-manpages-1.0.1.tar.bz2
-333f61aac5367c8b7b9ea22943c448b1 mesa-20111103.tar.xz
+fdf17b0823514116454371e4967d62ab mesa-20111114.tar.xz
More information about the scm-commits
mailing list