Browse Source

mesa: enable parallel build, use standard CFLAGS, add upstream bugfix patch

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@3744 ec354946-7b23-47d6-9f5a-488ba84defc7
daisuke 14 years ago
parent
commit
7af1e9c453
1 changed files with 14 additions and 10 deletions
  1. 14 10
      m/mesa/mesa-vl.spec

+ 14 - 10
m/mesa/mesa-vl.spec

@@ -13,7 +13,7 @@ Summary: Mesa graphics libraries
 Summary(ja): Mesa グラフィックスライブラリ
 Name: mesa
 Version: 7.10.2
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -31,6 +31,9 @@ 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
 %if %{with_dri}
@@ -324,6 +327,8 @@ Mesa offscreen rendering development package
 
 %patch40 -p1 -b .build-fix
 
+%patch50 -p1 -b .i965-fallback-on-null-render-buffer
+
 %build
 
 autoreconf --install
@@ -350,14 +355,8 @@ make clean
 # just to be sure...
 [ `find . -name \*.o | wc -l` -eq 0 ] || exit "make cleaner plz"
 
-# XXX should get visibility working again post-dricore.
-%ifarch ppc
-export CFLAGS="$RPM_OPT_FLAGS -O2"
-export CXXFLAGS="$RPM_OPT_FLAGS -O2"
-%else
-export CFLAGS="$RPM_OPT_FLAGS -Os"
-export CXXFLAGS="$RPM_OPT_FLAGS -Os"
-%endif
+export CFLAGS="$RPM_OPT_FLAGS"
+export CXXFLAGS="$RPM_OPT_FLAGS"
 
 # now build the rest of mesa
 %configure \
@@ -379,7 +378,7 @@ export CXXFLAGS="$RPM_OPT_FLAGS -Os"
     --disable-gallium-egl \
     --disable-gallium-llvm
 
-make #{?_smp_mflags}
+make %{?_smp_mflags}
 
 pushd ../%{manpages}
 %configure
@@ -635,6 +634,11 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Sat Apr 30 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 7.10.2-2
+- add patch50 from upstream fix
+- enable parallel build
+- use standard CFLAGS
+
 * Thu Apr 07 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 7.10.2-1
 - update to 7.10.2