diff options
| -rw-r--r-- | .SRCINFO | 10 | ||||
| -rw-r--r-- | PKGBUILD | 14 | ||||
| -rw-r--r-- | mingw-posix.patch | 22 |
3 files changed, 35 insertions, 11 deletions
@@ -1,6 +1,6 @@ pkgbase = mingw-w64-mesa pkgdesc = An open-source implementation of the OpenGL specification (mingw-w64) - pkgver = 19.0.3 + pkgver = 19.0.5 pkgrel = 1 url = https://www.mesa3d.org/ arch = any @@ -13,10 +13,12 @@ pkgbase = mingw-w64-mesa options = staticlibs options = !strip options = !buildflags - source = https://mesa.freedesktop.org/archive/mesa-19.0.3.tar.xz - source = https://mesa.freedesktop.org/archive/mesa-19.0.3.tar.xz.sig + source = https://mesa.freedesktop.org/archive/mesa-19.0.5.tar.xz + source = https://mesa.freedesktop.org/archive/mesa-19.0.5.tar.xz.sig + source = mingw-posix.patch validpgpkeys = 71C4B75620BC75708B4BDB254C95FAAB3EB073EC - sha256sums = f027244e38dc309a4c12db45ef79be81ab62c797a50a88d566e4edb6159fc4d5 + sha256sums = 6aecb7f67c136768692fb3c33a54196186c6c4fcafab7973516a355e1a54f831 + sha256sums = SKIP sha256sums = SKIP pkgname = mingw-w64-mesa @@ -1,5 +1,5 @@ pkgname=mingw-w64-mesa -pkgver=19.0.3 +pkgver=19.0.5 pkgrel=1 pkgdesc="An open-source implementation of the OpenGL specification (mingw-w64)" arch=('any') @@ -9,18 +9,18 @@ makedepends=('mingw-w64-gcc' 'scons' 'python2-mako') depends=('mingw-w64-dlfcn' 'mingw-w64-llvm') options=('staticlibs' '!strip' '!buildflags') validpgpkeys=('71C4B75620BC75708B4BDB254C95FAAB3EB073EC') # Dylan Baker <dylan@pnwbakers.com> -source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig}) -sha256sums=('f027244e38dc309a4c12db45ef79be81ab62c797a50a88d566e4edb6159fc4d5' SKIP) +source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig} mingw-posix.patch) +sha256sums=('6aecb7f67c136768692fb3c33a54196186c6c4fcafab7973516a355e1a54f831' SKIP SKIP) _architectures="i686-w64-mingw32 x86_64-w64-mingw32" prepare () { cd "${srcdir}"/mesa-${pkgver} - # sh: /usr/bin/i686-w64-mingw32-g++-posix: No such file or directory - sed -i "s|env\['CXX'\] = env\['CXX'\] + '-posix'||g" scons/llvm.py + # https://gitlab.freedesktop.org/mesa/mesa/merge_requests/784 + patch -p1 -i "${srcdir}"/mingw-posix.patch - # hack: libLLVMSupport.a: undefined reference to `compressBound' - sed -i "s|'LLVMSupport',|'LLVMSupport','z',|g" scons/llvm.py + # libLLVMSupport.a: undefined reference to `compressBound' (only with static llvm) + sed -i "s|'LLVMSupport',|'LLVMSupport', 'z',|g" scons/llvm.py } build() { diff --git a/mingw-posix.patch b/mingw-posix.patch new file mode 100644 index 000000000000..4e8adc641c90 --- /dev/null +++ b/mingw-posix.patch @@ -0,0 +1,22 @@ +diff --git a/scons/llvm.py b/scons/llvm.py +index a84ad51..8ef7a84 100644 +--- a/scons/llvm.py ++++ b/scons/llvm.py +@@ -32,6 +32,7 @@ import os.path + import re + import sys + import distutils.version ++import subprocess + + import SCons.Errors + import SCons.Util +@@ -123,7 +124,8 @@ def generate(env): + 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' ++ if subprocess.call(env['CXX'] + '-posix -v', shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) == 0: ++ env['CXX'] = env['CXX'] + '-posix' + elif llvm_version >= distutils.version.LooseVersion('4.0'): + env.Prepend(LIBS = [ + 'LLVMX86Disassembler', 'LLVMX86AsmParser', |