mesa trunk + llvm trunk : Coroutines.h not found

Enabled the disabled videocodecs
This commit is contained in:
Reza Jahanbakhshi 2022-05-01 00:52:05 +02:00
parent 2d1b278799
commit 6035e762be
3 changed files with 30 additions and 8 deletions

View File

@ -1,6 +1,6 @@
pkgbase = mesa-git
pkgdesc = an open-source implementation of the OpenGL specification, git version
pkgver = 22.1.0_devel.152249.3ac73838433.d41d8cd98f00b204e9800998ecf8427e
pkgver = 22.2.0_devel.152593.5f09ee77a15.22efc1fc44e0c04a8ab8a28a8733428c
pkgrel = 1
url = https://www.mesa3d.org
arch = x86_64
@ -14,11 +14,11 @@ pkgbase = mesa-git
makedepends = libva
makedepends = elfutils
makedepends = libxrandr
makedepends = ocl-icd
makedepends = wayland-protocols
makedepends = meson
makedepends = ninja
makedepends = glslang
makedepends = libclc
makedepends = llvm=13.0.1
makedepends = clang=13.0.1
depends = libdrm
@ -63,11 +63,14 @@ pkgbase = mesa-git
source = mesa::git+https://gitlab.freedesktop.org/mesa/mesa.git#branch=main
source = LICENSE
source = clover-compat.patch
source = workaround--LLVM15-FTBFS-no-more-Coroutines.h.patch
md5sums = SKIP
md5sums = 5c65a0fe315dd347e09b1f2826a1df5a
md5sums = 66105b07e15f9e4f0dd614b75da18230
md5sums = a4e1e8a8a90b6434b80d8ec859747e0c
sha512sums = SKIP
sha512sums = 25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2
sha512sums = b738961ef89c49e2699749a3eb2deb0dfd3c7fd0e27e7ea0006894ab44770349e27edbec36c22351704341207a63ee23614f2fb5b01e2f1c2efc36230807716a
sha512sums = ee96c9c3c29cfd7bffc1ee72fecf6bdd9a4ac7245afa11e7b28432e8695fc9d16d241cb8330029e5460cc54898258b87bc73d99fc1bf9743ce9bb718a85f5806
pkgname = mesa-git

View File

@ -12,12 +12,12 @@
pkgname=mesa-git
pkgdesc="an open-source implementation of the OpenGL specification, git version"
pkgver=22.2.0_devel.152593.5f09ee77a15.22efc1fc44e0c04a8ab8a28a8733428c
pkgver=22.2.0_devel.153080.53fe6f10846.6aa0994e8686145503079d47a8bd2ae8
pkgrel=1
arch=('x86_64')
makedepends=('git' 'python-mako' 'xorgproto'
'libxml2' 'libx11' 'libvdpau' 'libva' 'elfutils' 'libxrandr'
'ocl-icd' 'wayland-protocols' 'meson' 'ninja' 'glslang')
'wayland-protocols' 'meson' 'ninja' 'glslang' 'libclc')
depends=('libdrm' 'libxxf86vm' 'libxdamage' 'libxshmfence' 'libelf'
'libomxil-bellagio' 'libunwind' 'libglvnd' 'wayland' 'lm_sensors' 'libclc' 'vulkan-icd-loader' 'zstd' 'expat')
optdepends=('opengl-man-pages: for the OpenGL API man pages')
@ -27,13 +27,16 @@ url="https://www.mesa3d.org"
license=('custom')
source=('mesa::git+https://gitlab.freedesktop.org/mesa/mesa.git#branch=main'
'LICENSE'
'clover-compat.patch')
'clover-compat.patch'
'workaround--LLVM15-FTBFS-no-more-Coroutines.h.patch')
md5sums=('SKIP'
'5c65a0fe315dd347e09b1f2826a1df5a'
'66105b07e15f9e4f0dd614b75da18230')
'66105b07e15f9e4f0dd614b75da18230'
'a4e1e8a8a90b6434b80d8ec859747e0c')
sha512sums=('SKIP'
'25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2'
'b738961ef89c49e2699749a3eb2deb0dfd3c7fd0e27e7ea0006894ab44770349e27edbec36c22351704341207a63ee23614f2fb5b01e2f1c2efc36230807716a')
'b738961ef89c49e2699749a3eb2deb0dfd3c7fd0e27e7ea0006894ab44770349e27edbec36c22351704341207a63ee23614f2fb5b01e2f1c2efc36230807716a'
'ee96c9c3c29cfd7bffc1ee72fecf6bdd9a4ac7245afa11e7b28432e8695fc9d16d241cb8330029e5460cc54898258b87bc73d99fc1bf9743ce9bb718a85f5806')
# NINJAFLAGS is an env var used to pass commandline options to ninja
# NOTE: It's your responbility to validate the value of $NINJAFLAGS. If unsure, don't set it.
@ -151,7 +154,8 @@ build () {
-D vulkan-layers=device-select,overlay \
-D tools=[] \
-D zstd=enabled \
-D microsoft-clc=disabled
-D microsoft-clc=disabled \
-D video-codecs=vc1dec,h264dec,h264enc,h265dec,h265enc
meson configure _build

View File

@ -0,0 +1,15 @@
---
src/gallium/auxiliary/gallivm/lp_bld.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/src/gallium/auxiliary/gallivm/lp_bld.h
+++ b/src/gallium/auxiliary/gallivm/lp_bld.h
@@ -81,7 +81,7 @@
#define LLVMInsertBasicBlock ILLEGAL_LLVM_FUNCTION
#define LLVMCreateBuilder ILLEGAL_LLVM_FUNCTION
-#if LLVM_VERSION_MAJOR >= 8
+#if LLVM_VERSION_MAJOR >= 8 && LLVM_VERSION_MAJOR < 15
#define GALLIVM_HAVE_CORO 1
#else
#define GALLIVM_HAVE_CORO 0