disabled clover opencl, corrected provides/conflicts/deps

This commit is contained in:
Lone_Wolf 2023-11-04 17:13:13 +01:00
parent c91559f621
commit 0802bccb99
2 changed files with 23 additions and 17 deletions

View File

@ -1,6 +1,6 @@
pkgbase = mesa-git pkgbase = mesa-git
pkgdesc = an open-source implementation of the OpenGL specification, git version pkgdesc = an open-source implementation of the OpenGL specification, git version
pkgver = 24.0.0_devel.179834.47398c65ee7.d41d8cd pkgver = 24.0.0_devel.179925.0e481bf4632.d41d8cd
pkgrel = 1 pkgrel = 1
url = https://www.mesa3d.org url = https://www.mesa3d.org
arch = x86_64 arch = x86_64
@ -9,7 +9,6 @@ pkgbase = mesa-git
makedepends = python-mako makedepends = python-mako
makedepends = xorgproto makedepends = xorgproto
makedepends = libxml2 makedepends = libxml2
makedepends = libx11
makedepends = libvdpau makedepends = libvdpau
makedepends = libva makedepends = libva
makedepends = elfutils makedepends = elfutils
@ -19,8 +18,6 @@ pkgbase = mesa-git
makedepends = ninja makedepends = ninja
makedepends = glslang makedepends = glslang
makedepends = directx-headers makedepends = directx-headers
makedepends = libclc
makedepends = spirv-llvm-translator
makedepends = llvm=16.0.6 makedepends = llvm=16.0.6
makedepends = clang=16.0.6 makedepends = clang=16.0.6
depends = libdrm depends = libdrm
@ -33,31 +30,37 @@ pkgbase = mesa-git
depends = libglvnd depends = libglvnd
depends = wayland depends = wayland
depends = lm_sensors depends = lm_sensors
depends = libclc
depends = vulkan-icd-loader depends = vulkan-icd-loader
depends = zstd depends = zstd
depends = expat depends = expat
depends = gcc-libs
depends = libxfixes
depends = libx11
depends = systemd-libs
depends = libxext
depends = libxcb
depends = glibc
depends = zlib
depends = llvm-libs=16.0.6 depends = llvm-libs=16.0.6
optdepends = opengl-man-pages: for the OpenGL API man pages optdepends = opengl-man-pages: for the OpenGL API man pages
optdepends = clang: opencl optdepends = clang: opencl
optdepends = compiler-rt: opencl optdepends = compiler-rt: opencl
provides = mesa provides = mesa
provides = opencl-mesa
provides = vulkan-intel provides = vulkan-intel
provides = vulkan-radeon provides = vulkan-radeon
provides = vulkan-mesa-layer provides = vulkan-mesa-layers
provides = libva-mesa-driver provides = libva-mesa-driver
provides = mesa-vdpau provides = mesa-vdpau
provides = vulkan-swrast provides = vulkan-swrast
provides = vulkan-driver provides = vulkan-driver
provides = mesa-libgl provides = mesa-libgl
provides = opengl-driver provides = opengl-driver
provides = opencl-driver
conflicts = mesa conflicts = mesa
conflicts = opencl-mesa conflicts = opencl-clover-mesa
conflicts = opencl-rusticl-mesa
conflicts = vulkan-intel conflicts = vulkan-intel
conflicts = vulkan-radeon conflicts = vulkan-radeon
conflicts = vulkan-mesa-layer conflicts = vulkan-mesa-layers
conflicts = libva-mesa-driver conflicts = libva-mesa-driver
conflicts = mesa-vdpau conflicts = mesa-vdpau
conflicts = vulkan-swrast conflicts = vulkan-swrast

View File

@ -12,18 +12,21 @@
pkgname=mesa-git pkgname=mesa-git
pkgdesc="an open-source implementation of the OpenGL specification, git version" pkgdesc="an open-source implementation of the OpenGL specification, git version"
pkgver=24.0.0_devel.179834.47398c65ee7.d41d8cd pkgver=24.0.0_devel.179925.0e481bf4632.d41d8cd
pkgrel=1 pkgrel=1
arch=('x86_64') arch=('x86_64')
makedepends=('git' 'python-mako' 'xorgproto' makedepends=('git' 'python-mako' 'xorgproto'
'libxml2' 'libx11' 'libvdpau' 'libva' 'elfutils' 'libxrandr' 'libxml2' 'libvdpau' 'libva' 'elfutils' 'libxrandr'
'wayland-protocols' 'meson' 'ninja' 'glslang' 'directx-headers' 'wayland-protocols' 'meson' 'ninja' 'glslang' 'directx-headers'
'libclc' 'spirv-llvm-translator') )
depends=('libdrm' 'libxxf86vm' 'libxdamage' 'libxshmfence' 'libelf' depends=('libdrm' 'libxxf86vm' 'libxdamage' 'libxshmfence' 'libelf'
'libomxil-bellagio' 'libunwind' 'libglvnd' 'wayland' 'lm_sensors' 'libclc' 'vulkan-icd-loader' 'zstd' 'expat') 'libomxil-bellagio' 'libunwind' 'libglvnd' 'wayland' 'lm_sensors'
'vulkan-icd-loader' 'zstd' 'expat' 'gcc-libs' 'libxfixes' 'libx11' 'systemd-libs' 'libxext' 'libxcb'
'glibc' 'zlib'
)
optdepends=('opengl-man-pages: for the OpenGL API man pages') 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' 'vulkan-swrast' 'vulkan-driver' 'mesa-libgl' 'opengl-driver' 'opencl-driver') provides=('mesa' 'vulkan-intel' 'vulkan-radeon' 'vulkan-mesa-layers' 'libva-mesa-driver' 'mesa-vdpau' 'vulkan-swrast' 'vulkan-driver' 'mesa-libgl' 'opengl-driver')
conflicts=('mesa' 'opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'vulkan-mesa-layer' 'libva-mesa-driver' 'mesa-vdpau' 'vulkan-swrast' 'mesa-libgl') conflicts=('mesa' 'opencl-clover-mesa' 'opencl-rusticl-mesa' 'vulkan-intel' 'vulkan-radeon' 'vulkan-mesa-layers' 'libva-mesa-driver' 'mesa-vdpau' 'vulkan-swrast' 'mesa-libgl')
url="https://www.mesa3d.org" url="https://www.mesa3d.org"
license=('custom') license=('custom')
source=('mesa::git+https://gitlab.freedesktop.org/mesa/mesa.git#branch=main' source=('mesa::git+https://gitlab.freedesktop.org/mesa/mesa.git#branch=main'
@ -128,7 +131,7 @@ build () {
-D gallium-extra-hud=true \ -D gallium-extra-hud=true \
-D gallium-nine=true \ -D gallium-nine=true \
-D gallium-omx=bellagio \ -D gallium-omx=bellagio \
-D gallium-opencl=icd \ -D gallium-opencl=disabled \
-D gallium-va=enabled \ -D gallium-va=enabled \
-D gallium-vdpau=enabled \ -D gallium-vdpau=enabled \
-D gallium-xa=enabled \ -D gallium-xa=enabled \