Mercurial > mxe-octave

changeset 4946:a99cf8dbe52d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mesa: Update to v18.2.8 * src/mesa.mk: Update version and checksum. Also install headers in KHR. * src/mesa-1-fixes.patch: Remove logic because we build g++ with pthreads. * src/mesa-proto.mk: Also install headers in KHR.
author Markus Mützel <markus.muetzel@gmx.de>
date Mon, 21 Jan 2019 19:35:27 +0100
parents 76828d146a8d
children 94980e5ea766
files src/mesa-1-fixes.patch src/mesa-proto.mk src/mesa.mk
diffstat 3 files changed, 17 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/mesa-1-fixes.patch	Tue Jan 29 12:41:34 2019 -0500
+++ b/src/mesa-1-fixes.patch	Mon Jan 21 19:35:27 2019 +0100
@@ -12,13 +12,17 @@
              shlinkflags += ['-Wl,--enable-stdcall-fixup']
              #shlinkflags += ['-Wl,--kill-at']
 diff -uNr a/scons/llvm.py b/scons/llvm.py
---- a/scons/llvm.py	2018-07-27 09:52:17.000000000 -0400
-+++ b/scons/llvm.py	2018-07-30 10:16:26.424580230 -0400
-@@ -122,6 +122,7 @@
+--- 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',
              ])
+-            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-proto.mk	Tue Jan 29 12:41:34 2019 -0500
+++ b/src/mesa-proto.mk	Mon Jan 21 19:35:27 2019 +0100
@@ -20,6 +20,10 @@
     for f in '$(1)/include/GL/*.h' ; do \
       $(INSTALL) -m 644 $$f '$(3)$(HOST_INCDIR)/GL'; \
     done
+    $(INSTALL) -d '$(3)$(HOST_INCDIR)/KHR';
+    for f in '$(1)/include/KHR/*.h' ; do \
+      $(INSTALL) -m 644 $$f '$(3)$(HOST_INCDIR)/KHR'; \
+    done
   endef
 else
   define $(PKG)_BUILD
--- a/src/mesa.mk	Tue Jan 29 12:41:34 2019 -0500
+++ b/src/mesa.mk	Mon Jan 21 19:35:27 2019 +0100
@@ -2,8 +2,8 @@
 # See index.html for further information.
 
 PKG             := mesa
-$(PKG)_VERSION  := 18.1.5
-$(PKG)_CHECKSUM := 1ca7d5f5d12c95f8da137be34223229b9f0594fe
+$(PKG)_VERSION  := 18.2.8
+$(PKG)_CHECKSUM := 6a16cb828c9b4fc244f1af45960f01e90ab03553
 $(PKG)_SUBDIR   := mesa-$($(PKG)_VERSION)
 $(PKG)_FILE     := mesa-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := ftp://ftp.freedesktop.org/pub/mesa/$($(PKG)_FILE)
@@ -49,6 +49,10 @@
     for f in '$(1)/include/GL/*.h' ; do \
       $(INSTALL) -m 644 $$f '$(3)$(HOST_INCDIR)/GL'; \
     done
+    $(INSTALL) -d '$(3)$(HOST_INCDIR)/KHR';
+    for f in '$(1)/include/KHR/*.h' ; do \
+      $(INSTALL) -m 644 $$f '$(3)$(HOST_INCDIR)/KHR'; \
+    done
 
     if [ -f '$(1)/build/windows-$($(PKG)_MACHINE)/gallium/targets/libgl-gdi/opengl32.dll' ]; then \
       $(INSTALL) -d '$(3)$(HOST_BINDIR)'; \