Mercurial > mxe-octave

changeset 5398:c0d7569adb6c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mesa: update to v20.0.6 * src/mesa.mk: update version, checksum * src/mesa-1-fixes.patch: update patch
author John Donoghue <john.donoghue@ieee.org>
date Tue, 12 May 2020 08:01:41 -0400
parents c7d361682237
children 11fe8ac3cbe7
files src/mesa-1-fixes.patch src/mesa.mk
diffstat 2 files changed, 17 insertions(+), 20 deletions(-) [+]
line wrap: on
line diff
--- a/src/mesa-1-fixes.patch	Mon May 11 13:56:37 2020 -0400
+++ b/src/mesa-1-fixes.patch	Tue May 12 08:01:41 2020 -0400
@@ -1,7 +1,7 @@
-diff -uNr a/scons/gallium.py b/scons/gallium.py
---- a/scons/gallium.py	2017-09-17 19:03:22.000000000 -0400
-+++ b/scons/gallium.py	2017-10-04 19:24:29.499373623 -0400
-@@ -580,9 +580,6 @@
+diff -ur mesa-20.0.6.orig/scons/gallium.py mesa-20.0.6/scons/gallium.py
+--- mesa-20.0.6.orig/scons/gallium.py	2020-05-12 07:11:05.849629292 -0400
++++ mesa-20.0.6/scons/gallium.py	2020-05-12 07:12:17.601633140 -0400
+@@ -617,9 +617,6 @@
                  '-Wl,--dynamicbase', # ASLR
              ]
              # Avoid depending on gcc runtime DLLs
@@ -11,18 +11,15 @@
              # Handle the @xx symbol munging of DLL exports
              shlinkflags += ['-Wl,--enable-stdcall-fixup']
              #shlinkflags += ['-Wl,--kill-at']
-diff -uNr a/scons/llvm.py b/scons/llvm.py
---- a/scons/llvm.py	2018-12-27 17:02:01.000000000 +0100
-+++ b/scons/llvm.py	2019-01-21 18:47:28.456846140 +0100
-@@ -122,10 +122,7 @@
-                 'LLVMIRReader', 'LLVMAsmParser',
-                 'LLVMDemangle', 'LLVMGlobalISel', 'LLVMDebugInfoMSF',
-                 'LLVMBinaryFormat',
-+                'version', 'uuid', 'ole32', 'oleaut32', 'z',
+diff -ur mesa-20.0.6.orig/scons/llvm.py mesa-20.0.6/scons/llvm.py
+--- mesa-20.0.6.orig/scons/llvm.py	2020-05-12 07:11:05.849629292 -0400
++++ mesa-20.0.6/scons/llvm.py	2020-05-12 07:49:13.605280341 -0400
+@@ -243,7 +243,7 @@
+         ])
+ 
+         # Mingw-w64 zlib is required when building with LLVM support in MSYS2 environment
+-        if host_platform.system().lower().startswith('mingw'):
++        if host_platform.system().lower().startswith('mingw') or env['crosscompile']:
+             env.Append(LIBS = [
+                  'z',
              ])
--            if env['platform'] == 'windows' and env['crosscompile']:
--                # LLVM 5.0 requires MinGW w/ pthreads due to use of std::thread and friends.
--                assert env['gcc']
--                env['CXX'] = env['CXX'] + '-posix'
-         elif llvm_version >= distutils.version.LooseVersion('4.0'):
-             env.Prepend(LIBS = [
--- a/src/mesa.mk	Mon May 11 13:56:37 2020 -0400
+++ b/src/mesa.mk	Tue May 12 08:01:41 2020 -0400
@@ -2,8 +2,8 @@
 # See index.html for further information.
 
 PKG             := mesa
-$(PKG)_VERSION  := 19.0.8
-$(PKG)_CHECKSUM := 5fd340a6304f7501014e1bd7291e4cfa7a6efcdb
+$(PKG)_VERSION  := 20.0.6
+$(PKG)_CHECKSUM := 5bf6d97770c7f010db3ea27944cfdcda079d39c8
 $(PKG)_SUBDIR   := mesa-$($(PKG)_VERSION)
 $(PKG)_FILE     := mesa-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := ftp://ftp.freedesktop.org/pub/mesa/$($(PKG)_FILE)