From 57e4140fd5bb63c1d5adfaafebcdc8d948513ac5 Mon Sep 17 00:00:00 2001 From: Lone_Wolf Date: Sun, 3 Jan 2021 15:52:13 +0100 Subject: [PATCH] mesa-vulkan should have been vulkan-mesa, and that was renamed to vulkan-swrast in repo mesa package.. corrected --- .SRCINFO | 14 ++++++-------- PKGBUILD | 8 ++++---- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 3e46ac2..07100e6 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = mesa-git pkgdesc = an open-source implementation of the OpenGL specification, git version - pkgver = 21.0.0_devel.132228.574429f9528 + pkgver = 21.0.0_devel.132837.33a6c01e12c pkgrel = 1 url = https://www.mesa3d.org arch = x86_64 @@ -19,8 +19,7 @@ pkgbase = mesa-git makedepends = meson makedepends = ninja makedepends = glslang - makedepends = llvm=11.0.0 - makedepends = clang=11.0.0 + makedepends = llvm-minimal-git depends = libdrm depends = libxxf86vm depends = libxdamage @@ -35,10 +34,9 @@ pkgbase = mesa-git depends = vulkan-icd-loader depends = zstd depends = expat - depends = llvm-libs=11.0.0 + depends = llvm-libs-minimal-git optdepends = opengl-man-pages: for the OpenGL API man pages - optdepends = clang: opencl - optdepends = compiler-rt: opencl + optdepends = llvm-minimal-git: opencl provides = mesa provides = opencl-mesa provides = vulkan-intel @@ -46,7 +44,7 @@ pkgbase = mesa-git provides = vulkan-mesa-layer provides = libva-mesa-driver provides = mesa-vdpau - provides = mesa-vulkan + provides = vulkan-swrast provides = vulkan-driver provides = opengl-driver provides = opencl-driver @@ -57,7 +55,7 @@ pkgbase = mesa-git conflicts = vulkan-mesa-layer conflicts = libva-mesa-driver conflicts = mesa-vdpau - conflicts = mesa-vulkan + conflicts = vulkan-swrast source = mesa::git+https://gitlab.freedesktop.org/mesa/mesa.git source = LICENSE md5sums = SKIP diff --git a/PKGBUILD b/PKGBUILD index 5ce3e1b..87c6a07 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -11,7 +11,7 @@ pkgname=mesa-git pkgdesc="an open-source implementation of the OpenGL specification, git version" -pkgver=21.0.0_devel.132228.574429f9528 +pkgver=21.0.0_devel.132837.33a6c01e12c pkgrel=1 arch=('x86_64') makedepends=('git' 'python-mako' 'xorgproto' @@ -20,8 +20,8 @@ makedepends=('git' 'python-mako' 'xorgproto' 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') -provides=('mesa' 'opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'vulkan-mesa-layer' 'libva-mesa-driver' 'mesa-vdpau' 'mesa-vulkan' 'vulkan-driver' 'opengl-driver' 'opencl-driver') -conflicts=('mesa' 'opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'vulkan-mesa-layer' 'libva-mesa-driver' 'mesa-vdpau' 'mesa-vulkan') +provides=('mesa' 'opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'vulkan-mesa-layer' 'libva-mesa-driver' 'mesa-vdpau' 'vulkan-swrast' 'vulkan-driver' 'opengl-driver' 'opencl-driver') +conflicts=('mesa' 'opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'vulkan-mesa-layer' 'libva-mesa-driver' 'mesa-vdpau' 'vulkan-swrast') url="https://www.mesa3d.org" license=('custom') source=('mesa::git+https://gitlab.freedesktop.org/mesa/mesa.git' @@ -44,7 +44,7 @@ sha512sums=('SKIP' # 3: llvm-git from LordHeavy unofficial repo # 4 llvm (stable from extra) Default value # - +MESA_WHICH_LLVM=1 if [[ ! $MESA_WHICH_LLVM ]] ; then MESA_WHICH_LLVM=4 fi