libglvnd 1.2.0 entered extra, depend on it again

This commit is contained in:
LW-archlinux 2019-10-03 22:16:15 +02:00
parent de8595be9a
commit 3432817c58
2 changed files with 14 additions and 18 deletions

View File

@ -1,7 +1,7 @@
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 = 19.3.0_devel.115749.336b021d36f pkgver = 19.3.0_devel.115858.cdc331c6f9f
pkgrel = 2 pkgrel = 1
url = https://www.mesa3d.org url = https://www.mesa3d.org
arch = x86_64 arch = x86_64
license = custom license = custom
@ -22,8 +22,7 @@ pkgbase = mesa-git
makedepends = wayland-protocols makedepends = wayland-protocols
makedepends = meson makedepends = meson
makedepends = ninja makedepends = ninja
makedepends = llvm=8.0.1 makedepends = llvm-minimal-git
makedepends = clang=8.0.1
depends = libdrm depends = libdrm
depends = libxxf86vm depends = libxxf86vm
depends = libxdamage depends = libxdamage
@ -31,19 +30,19 @@ pkgbase = mesa-git
depends = libelf depends = libelf
depends = libomxil-bellagio depends = libomxil-bellagio
depends = libunwind depends = libunwind
depends = libglvnd12 depends = libglvnd
depends = wayland depends = wayland
depends = lm_sensors depends = lm_sensors
depends = libclc depends = libclc
depends = glslang depends = glslang
depends = llvm-libs=8.0.1 depends = llvm-libs-minimal-git
optdepends = opengl-man-pages: for the OpenGL API man pages optdepends = opengl-man-pages: for the OpenGL API man pages
provides = mesa=19.3.0_devel.115749.336b021d36f-2 provides = mesa=19.3.0_devel.115858.cdc331c6f9f-1
provides = vulkan-intel=19.3.0_devel.115749.336b021d36f-2 provides = vulkan-intel=19.3.0_devel.115858.cdc331c6f9f-1
provides = vulkan-radeon=19.3.0_devel.115749.336b021d36f-2 provides = vulkan-radeon=19.3.0_devel.115858.cdc331c6f9f-1
provides = vulkan-mesa-layer=19.3.0_devel.115749.336b021d36f-2 provides = vulkan-mesa-layer=19.3.0_devel.115858.cdc331c6f9f-1
provides = libva-mesa-driver=19.3.0_devel.115749.336b021d36f-2 provides = libva-mesa-driver=19.3.0_devel.115858.cdc331c6f9f-1
provides = mesa-vdpau=19.3.0_devel.115749.336b021d36f-2 provides = mesa-vdpau=19.3.0_devel.115858.cdc331c6f9f-1
provides = vulkan-driver provides = vulkan-driver
provides = opencl- provides = opencl-
provides = opengl-driver provides = opengl-driver

View File

@ -11,14 +11,14 @@
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=19.3.0_devel.115749.336b021d36f pkgver=19.3.0_devel.115858.cdc331c6f9f
pkgrel=2 pkgrel=1
arch=('x86_64') arch=('x86_64')
makedepends=('git' 'python-mako' 'xorgproto' makedepends=('git' 'python-mako' 'xorgproto'
'libxml2' 'libx11' 'libvdpau' 'libva' 'elfutils' 'libomxil-bellagio' 'libxrandr' 'libxml2' 'libx11' 'libvdpau' 'libva' 'elfutils' 'libomxil-bellagio' 'libxrandr'
'ocl-icd' 'vulkan-icd-loader' 'libgcrypt' 'wayland' 'wayland-protocols' 'meson' 'ninja') 'ocl-icd' 'vulkan-icd-loader' 'libgcrypt' 'wayland' 'wayland-protocols' 'meson' 'ninja')
depends=('libdrm' 'libxxf86vm' 'libxdamage' 'libxshmfence' 'libelf' depends=('libdrm' 'libxxf86vm' 'libxdamage' 'libxshmfence' 'libelf'
'libomxil-bellagio' 'libunwind' 'libglvnd12' 'wayland' 'lm_sensors' 'libclc' 'glslang') 'libomxil-bellagio' 'libunwind' 'libglvnd' 'wayland' 'lm_sensors' 'libclc' 'glslang')
optdepends=('opengl-man-pages: for the OpenGL API man pages') optdepends=('opengl-man-pages: for the OpenGL API man pages')
provides=(mesa=$pkgver-$pkgrel vulkan-intel=$pkgver-$pkgrel vulkan-radeon=$pkgver-$pkgrel vulkan-mesa-layer=$pkgver-$pkgrel libva-mesa-driver=$pkgver-$pkgrel mesa-vdpau=$pkgver-$pkgrel vulkan-driver opencl- opengl-driver opencl-driver) provides=(mesa=$pkgver-$pkgrel vulkan-intel=$pkgver-$pkgrel vulkan-radeon=$pkgver-$pkgrel vulkan-mesa-layer=$pkgver-$pkgrel libva-mesa-driver=$pkgver-$pkgrel mesa-vdpau=$pkgver-$pkgrel vulkan-driver opencl- opengl-driver opencl-driver)
conflicts=('mesa' 'opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'vulkan-mesa-layer' 'libva-mesa-driver' 'mesa-vdpau') conflicts=('mesa' 'opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'vulkan-mesa-layer' 'libva-mesa-driver' 'mesa-vdpau')
@ -135,8 +135,5 @@ package() {
# indirect rendering # indirect rendering
ln -s /usr/lib/libGLX_mesa.so.0 "${pkgdir}/usr/lib/libGLX_indirect.so.0" ln -s /usr/lib/libGLX_mesa.so.0 "${pkgdir}/usr/lib/libGLX_indirect.so.0"
# remove files provided by libglvnd 1.2.0 and later
# rm ${pkgdir}/usr/lib/pkgconfig/{e,}gl.pc
install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${srcdir}/LICENSE" install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${srcdir}/LICENSE"
} }