Merge branch 'master' into f26

This commit is contained in:
Peter Robinson 2017-07-18 11:39:46 +01:00
commit a1032a2b90
3 changed files with 8 additions and 1190 deletions

1184
eglext.h

File diff suppressed because it is too large Load diff

View file

@ -58,7 +58,7 @@
Name: mesa Name: mesa
Summary: Mesa graphics libraries Summary: Mesa graphics libraries
Version: 17.1.4 Version: 17.1.5
Release: 1%{?rctag:.%{rctag}}%{?dist} Release: 1%{?rctag:.%{rctag}}%{?dist}
License: MIT License: MIT
@ -70,9 +70,6 @@ Source2: vl_mpeg12_decoder.c
# Source4 contains email correspondence clarifying the license terms. # Source4 contains email correspondence clarifying the license terms.
# 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.
Source3: Mesa-MLAA-License-Clarification-Email.txt Source3: Mesa-MLAA-License-Clarification-Email.txt
# Update eglext.h to 20161230 version, drop this once upstream has this version
# or newer
Source4: eglext.h
Patch1: 0001-llvm-SONAME-without-version.patch Patch1: 0001-llvm-SONAME-without-version.patch
Patch2: 0002-hardware-gloat.patch Patch2: 0002-hardware-gloat.patch
@ -377,7 +374,6 @@ Headers for development with the Vulkan API.
%endif %endif
cp %{SOURCE3} docs/ cp %{SOURCE3} docs/
cp %{SOURCE4} include/EGL
%build %build
autoreconf -vfi autoreconf -vfi
@ -687,6 +683,12 @@ popd
%endif %endif
%changelog %changelog
* Mon Jul 17 2017 Peter Robinson <pbrobinson@fedoraproject.org> 7.1.5-1
- Update to 17.1.5
* Thu Jul 13 2017 Adam Jackson <ajax@redhat.com>
- Stop replacing eglext.h, we're up to date again
* Sat Jul 1 2017 Peter Robinson <pbrobinson@fedoraproject.org> 7.1.4-1 * Sat Jul 1 2017 Peter Robinson <pbrobinson@fedoraproject.org> 7.1.4-1
- Update to 17.1.4 - Update to 17.1.4

View file

@ -1 +1 @@
SHA512 (mesa-17.1.4.tar.xz) = cb8369f0edd3e17b4eee8da159b9dc487f8144d69fe4b95901e9aa6a924759866f26f91fc2ead7036707eecea41582185e7ce73d54f97bf310f198b72ee0a8e4 SHA512 (mesa-17.1.5.tar.xz) = a12671afd812b304e1db690b123a9de16332608541f71cc3ee9128a3630c81416d46255e5bdbf19e14e85716b218f447987b555e3bc0081b8b6f392556fa21e2