summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorLW-archlinux2019-12-15 15:18:53 +0100
committerLW-archlinux2019-12-15 15:18:53 +0100
commitfaad84341bdaeef13c5ffbe59caed3d1a6f69ba0 (patch)
treeba95eb8bc5d81c90883be31df9df6db786ab3923
parent6f9b33b856e3d18f93affc98a297e62719e8870e (diff)
downloadaur-faad84341bdaeef13c5ffbe59caed3d1a6f69ba0.tar.gz
remove undesired script from /usr/bin
-rw-r--r--.SRCINFO13
-rw-r--r--PKGBUILD36
2 files changed, 28 insertions, 21 deletions
diff --git a/.SRCINFO b/.SRCINFO
index cd160c18445..1ce85ba88f7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = lib32-mesa-git
pkgdesc = an open-source implementation of the OpenGL specification, git version
- pkgver = 19.3.0_devel.116318.16233797f49
+ pkgver = 20.0.0_devel.118529.c06ba835895
pkgrel = 1
url = https://www.mesa3d.org
arch = x86_64
@@ -22,6 +22,7 @@ pkgbase = lib32-mesa-git
makedepends = meson
makedepends = lib32-libva
makedepends = lib32-libxrandr
+ makedepends = lib32-vulkan-icd-loader
makedepends = lib32-llvm=9.0.0
depends = mesa-git
depends = lib32-gcc-libs
@@ -36,11 +37,11 @@ pkgbase = lib32-mesa-git
depends = glslang
depends = lib32-llvm-libs=9.0.0
optdepends = opengl-man-pages: for the OpenGL API man pages
- provides = lib32-mesa=19.3.0_devel.116318.16233797f49-1
- provides = lib32-vulkan-intel=19.3.0_devel.116318.16233797f49-1
- provides = lib32-vulkan-radeon=19.3.0_devel.116318.16233797f49-1
- provides = lib32-libva-mesa-driver=19.3.0_devel.116318.16233797f49-1
- provides = lib32-mesa-vdpau=19.3.0_devel.116318.16233797f49-1
+ provides = lib32-mesa=20.0.0_devel.118529.c06ba835895-1
+ provides = lib32-vulkan-intel=20.0.0_devel.118529.c06ba835895-1
+ provides = lib32-vulkan-radeon=20.0.0_devel.118529.c06ba835895-1
+ provides = lib32-libva-mesa-driver=20.0.0_devel.118529.c06ba835895-1
+ provides = lib32-mesa-vdpau=20.0.0_devel.118529.c06ba835895-1
provides = lib32-opengl-driver
conflicts = lib32-mesa
conflicts = lib32-vulkan-intel
diff --git a/PKGBUILD b/PKGBUILD
index 58c3d443548..1262ba19630 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,12 +11,12 @@
pkgname=lib32-mesa-git
pkgdesc="an open-source implementation of the OpenGL specification, git version"
-pkgver=19.3.0_devel.116318.16233797f49
-pkgrel=1
+pkgver=20.0.0_devel.118529.c06ba835895
+pkgrel=2
arch=('x86_64')
makedepends=('python-mako' 'lib32-libxml2' 'lib32-libx11' 'xorgproto'
'lib32-gcc-libs' 'lib32-libvdpau' 'lib32-libelf' 'git' 'lib32-libgcrypt' 'lib32-systemd'
- 'mesa-git' 'lib32-libglvnd' 'wayland-protocols' 'lib32-wayland' 'meson' 'lib32-libva' 'lib32-libxrandr')
+ 'mesa-git' 'lib32-libglvnd' 'wayland-protocols' 'lib32-wayland' 'meson' 'lib32-libva' 'lib32-libxrandr' 'lib32-vulkan-icd-loader')
depends=('mesa-git' 'lib32-gcc-libs' 'lib32-libdrm' 'lib32-wayland' 'lib32-libxxf86vm' 'lib32-libxdamage' 'lib32-libxshmfence' 'lib32-elfutils'
'lib32-libunwind' 'lib32-lm_sensors' 'glslang')
optdepends=('opengl-man-pages: for the OpenGL API man pages')
@@ -108,7 +108,7 @@ build () {
--libdir=/usr/lib32 \
-D platforms=x11,wayland,drm,surfaceless \
-D dri-drivers=i915,i965,r200,r100,nouveau \
- -D gallium-drivers=r300,r600,radeonsi,nouveau,svga,swrast,virgl,iris \
+ -D gallium-drivers=r300,r600,radeonsi,nouveau,svga,swrast,virgl,iris,zink \
-D vulkan-drivers=amd,intel \
-D dri3=true \
-D egl=true \
@@ -122,7 +122,7 @@ build () {
-D gallium-xa=true \
-D gallium-xvmc=false \
-D gbm=true \
- -D gles1=true \
+ -D gles1=false \
-D gles2=true \
-D glvnd=true \
-D glx=dri \
@@ -139,16 +139,22 @@ build () {
}
package() {
- DESTDIR="$pkgdir" ninja $NINJAFLAGS -C _build install
+ DESTDIR="$pkgdir" ninja $NINJAFLAGS -C _build install
- # remove files provided by mesa-git
- rm -rf "$pkgdir"/etc
- rm -rf "$pkgdir"/usr/include
- rm -rf "$pkgdir"/usr/share/glvnd/
- rm -rf "$pkgdir"/usr/share/drirc.d/
- rm -rf "$pkgdir"/usr/share/vulkan/explicit_layer.d/
+ # remove files provided by mesa-git
+ rm -rf "$pkgdir"/etc
+ rm -rf "$pkgdir"/usr/include
+ rm -rf "$pkgdir"/usr/share/glvnd/
+ rm -rf "$pkgdir"/usr/share/drirc.d/
+ rm -rf "$pkgdir"/usr/share/vulkan/explicit_layer.d/
+
+ # remove script file from /usr/bin
+ # https://gitlab.freedesktop.org/mesa/mesa/issues/2230
+ rm "${pkgdir}/usr/bin/mesa-overlay-control.py"
+ rmdir "${pkgdir}/usr/bin"
- # indirect rendering
- ln -s /usr/lib32/libGLX_mesa.so.0 "${pkgdir}/usr/lib32/libGLX_indirect.so.0"
- install -Dt "$pkgdir"/usr/share/licenses/$pkgbase/ -m644 "$srcdir"/LICENSE
+
+ # indirect rendering
+ ln -s /usr/lib32/libGLX_mesa.so.0 "${pkgdir}/usr/lib32/libGLX_indirect.so.0"
+ install -Dt "$pkgdir"/usr/share/licenses/$pkgbase/ -m644 "$srcdir"/LICENSE
}