rpms/mesa
7
0
Fork 1
Code Issues Pull Requests Releases Activity

mesa-9.1-53-gd0ccb5b.patch: Sync with today's git

Browse Source
This commit is contained in:
Adam Jackson 2013-03-19 11:50:20 -04:00
parent aa9273eca0
commit 6655a94c5c
2 changed files with 1988 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1974
mesa-9.1-53-gd0ccb5b.patch Normal file
View File

File diff suppressed because it is too large Load Diff

25
mesa.spec
View File

@ -1,5 +1,4 @@
%if 0%{?rhel} %if 0%{?rhel}
%define rhel_no_hw_arches ppc ppc64 ppc64p7
%define with_private_llvm 1 %define with_private_llvm 1
%else %else
%define with_private_llvm 0 %define with_private_llvm 0
@ -15,7 +14,7 @@
%endif %endif
# S390 doesn't have video cards, but we need swrast for xserver's GLX # S390 doesn't have video cards, but we need swrast for xserver's GLX
%ifarch s390 s390x %{?rhel_no_hw_arches} %ifarch s390 s390x
%define with_hardware 0 %define with_hardware 0
%define dri_drivers --with-dri-drivers=swrast %define dri_drivers --with-dri-drivers=swrast
%else %else
@ -49,7 +48,7 @@
Summary: Mesa graphics libraries Summary: Mesa graphics libraries
Name: mesa Name: mesa
Version: 9.1 Version: 9.1
Release: 2%{?dist} Release: 3%{?dist}
License: MIT License: MIT
Group: System Environment/Libraries Group: System Environment/Libraries
URL: http://www.mesa3d.org URL: http://www.mesa3d.org
@ -64,16 +63,18 @@ Source3: make-git-snapshot.sh
# Fedora opts to ignore the optional part of clause 2 and treat that code as 2 clause BSD. # Fedora opts to ignore the optional part of clause 2 and treat that code as 2 clause BSD.
Source4: Mesa-MLAA-License-Clarification-Email.txt Source4: Mesa-MLAA-License-Clarification-Email.txt
# -fno-rtti makes nv50 assert angry # git diff-tree -p mesa-9.1..origin/9.1 > `git describe origin/9.1`.patch
Patch0: nv50-fix-build.patch Patch0: mesa-9.1-53-gd0ccb5b.patch
Patch1: intel-revert-gl3.patch
Patch1: nv50-fix-build.patch
Patch2: intel-revert-gl3.patch
#Patch7: mesa-7.1-link-shared.patch #Patch7: mesa-7.1-link-shared.patch
Patch9: mesa-8.0-llvmpipe-shmget.patch Patch9: mesa-8.0-llvmpipe-shmget.patch
#Patch11: mesa-8.0-nouveau-tfp-blacklist.patch #Patch11: mesa-8.0-nouveau-tfp-blacklist.patch
Patch12: mesa-8.0.1-fix-16bpp.patch Patch12: mesa-8.0.1-fix-16bpp.patch
#Patch13: mesa-9.0.1-less-cxx-please.patch
Patch14: i965-hack-hiz-snb-fix.patch Patch14: i965-hack-hiz-snb-fix.patch
BuildRequires: pkgconfig autoconf automake libtool BuildRequires: pkgconfig autoconf automake libtool
%if %{with_hardware} %if %{with_hardware}
BuildRequires: kernel-headers BuildRequires: kernel-headers
@ -282,8 +283,9 @@ Mesa shared glapi
%prep %prep
%setup -q -n Mesa-%{version}%{?snapshot} %setup -q -n Mesa-%{version}%{?snapshot}
#setup -q -n mesa-%{gitdate} #setup -q -n mesa-%{gitdate}
%patch0 -p1 -b .nv50rtti %patch0 -p1 -b .git
%patch1 -p1 -b .nogl3 %patch1 -p1 -b .nv50rtti
%patch2 -p1 -b .nogl3
#%patch11 -p1 -b .nouveau #%patch11 -p1 -b .nouveau
# this fastpath is: # this fastpath is:
@ -297,8 +299,6 @@ Mesa shared glapi
#patch9 -p1 -b .shmget #patch9 -p1 -b .shmget
#patch12 -p1 -b .16bpp #patch12 -p1 -b .16bpp
#%patch13 -p1 -b .less-cpp
# hack from chromium - awaiting real upstream fix # hack from chromium - awaiting real upstream fix
%patch14 -p1 -b .snbfix %patch14 -p1 -b .snbfix
# default to dri (not xlib) for libGL on all arches # default to dri (not xlib) for libGL on all arches
@ -592,6 +592,9 @@ rm -rf $RPM_BUILD_ROOT
%endif %endif
%changelog %changelog
* Tue Mar 19 2013 Adam Jackson <ajax@redhat.com> 9.1-3
- mesa-9.1-53-gd0ccb5b.patch: Sync with today's git
* Tue Mar 19 2013 Dave Airlie <airlied@redhat.com> 9.1-2 * Tue Mar 19 2013 Dave Airlie <airlied@redhat.com> 9.1-2
- add SNB hang workaround from chromium - add SNB hang workaround from chromium