From ffc8c0ee0475048f9bbb4bd55e67c4c8b370051e Mon Sep 17 00:00:00 2001 From: LW-archlinux Date: Sun, 12 May 2019 14:57:09 +0200 Subject: [PATCH] moved removal of _build folder to prepare() --- .SRCINFO | 16 ++++++++-------- PKGBUILD | 9 +++++++-- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index ed03d13..e6f1fb7 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = mesa-git pkgdesc = an open-source implementation of the OpenGL specification, git version - pkgver = 19.2.0_devel.110857.8b3baa27440 + pkgver = 19.2.0_devel.110903.974c4d679c2 pkgrel = 1 url = https://www.mesa3d.org arch = x86_64 @@ -38,13 +38,13 @@ pkgbase = mesa-git depends = glslang depends = lone_wolf-llvm-libs-git optdepends = opengl-man-pages: for the OpenGL API man pages - provides = mesa=19.2.0_devel.110857.8b3baa27440-1 - provides = vulkan-intel=19.2.0_devel.110857.8b3baa27440-1 - provides = vulkan-radeon=19.2.0_devel.110857.8b3baa27440-1 - provides = libva-mesa-driver=19.2.0_devel.110857.8b3baa27440-1 - provides = mesa-vdpau=19.2.0_devel.110857.8b3baa27440-1 - provides = vulkan-driver=19.2.0_devel.110857.8b3baa27440-1 - provides = opencl-mesa=19.2.0_devel.110857.8b3baa27440-1 + provides = mesa=19.2.0_devel.110903.974c4d679c2-1 + provides = vulkan-intel=19.2.0_devel.110903.974c4d679c2-1 + provides = vulkan-radeon=19.2.0_devel.110903.974c4d679c2-1 + provides = libva-mesa-driver=19.2.0_devel.110903.974c4d679c2-1 + provides = mesa-vdpau=19.2.0_devel.110903.974c4d679c2-1 + provides = vulkan-driver=19.2.0_devel.110903.974c4d679c2-1 + provides = opencl-mesa=19.2.0_devel.110903.974c4d679c2-1 provides = opengl-driver provides = opencl-driver conflicts = mesa diff --git a/PKGBUILD b/PKGBUILD index f7168ff..3a55a32 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -11,7 +11,7 @@ pkgname=mesa-git pkgdesc="an open-source implementation of the OpenGL specification, git version" -pkgver=19.2.0_devel.110857.8b3baa27440 +pkgver=19.2.0_devel.110903.974c4d679c2 pkgrel=1 arch=('x86_64') makedepends=('git' 'python-mako' 'xorgproto' @@ -75,10 +75,15 @@ pkgver() { echo ${_ver/-/_}.$(git rev-list --count HEAD).$(git rev-parse --short HEAD) } -build () { +prepare() { + # although removing _build folder in build() function feels more natural, + # that interferes with the spirit of makepkg --noextract if [ -d _build ]; then rm -rf _build fi +} + +build () { meson setup mesa _build \ -D b_ndebug=true \ -D buildtype=plain \