diff options
| -rw-r--r-- | .SRCINFO | 34 | ||||
| -rw-r--r-- | PKGBUILD | 117 |
2 files changed, 87 insertions, 64 deletions
@@ -1,6 +1,8 @@ -pkgbase = mesa-git - pkgdesc = an open-source implementation of the OpenGL specification, git version - pkgver = 19.2.0_devel.112785.a110a8090d6 +# Generated by mksrcinfo v8 +# Fri Jul 12 22:08:12 UTC 2019 +pkgbase = mesa-aco-git + pkgdesc = Mesa with the ACO compiler patchset, git version + pkgver = 19.2.0_devel.113855.7157929d52c pkgrel = 1 url = https://www.mesa3d.org arch = x86_64 @@ -38,29 +40,33 @@ pkgbase = mesa-git depends = glslang depends = llvm-libs=8.0.0 optdepends = opengl-man-pages: for the OpenGL API man pages - provides = mesa=19.2.0_devel.112785.a110a8090d6-1 - provides = vulkan-intel=19.2.0_devel.112785.a110a8090d6-1 - provides = vulkan-radeon=19.2.0_devel.112785.a110a8090d6-1 - provides = vulkan-mesa-layer=19.2.0_devel.112785.a110a8090d6-1 - provides = libva-mesa-driver=19.2.0_devel.112785.a110a8090d6-1 - provides = mesa-vdpau=19.2.0_devel.112785.a110a8090d6-1 - provides = vulkan-driver - provides = opencl- + provides = mesa=19.2.0_devel.113855.7157929d52c-1 + provides = mesa-git=19.2.0_devel.113855.7157929d52c-1 + provides = vulkan-intel=19.2.0_devel.113855.7157929d52c-1 + provides = vulkan-radeon=19.2.0_devel.113855.7157929d52c-1 + provides = libva-mesa-driver=19.2.0_devel.113855.7157929d52c-1 + provides = mesa-vdpau=19.2.0_devel.113855.7157929d52c-1 + provides = vulkan-driver=19.2.0_devel.113855.7157929d52c-1 + provides = opencl-mesa=19.2.0_devel.113855.7157929d52c-1 + provides = mesa-vulkan-layer=19.2.0_devel.113855.7157929d52c-1 + provides = vulkan-mesa-layer=19.2.0_devel.113855.7157929d52c-1 provides = opengl-driver provides = opencl-driver conflicts = mesa + conflicts = mesa-git conflicts = opencl-mesa conflicts = vulkan-intel conflicts = vulkan-radeon - conflicts = vulkan-mesa-layer conflicts = libva-mesa-driver conflicts = mesa-vdpau - source = mesa::git://anongit.freedesktop.org/mesa/mesa + conflicts = mesa-vulkan-layer + conflicts = vulkan-mesa-layer + source = mesa-aco::git+https://github.com/daniel-schuermann/mesa source = LICENSE md5sums = SKIP md5sums = 5c65a0fe315dd347e09b1f2826a1df5a sha512sums = SKIP sha512sums = 25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2 -pkgname = mesa-git +pkgname = mesa-aco-git @@ -1,4 +1,5 @@ -# Maintainer: Lone_Wolf <lonewolf at xs4all dot nl> +# Maintainer: John Schoenick <johns@valvesoftware.com> +# Contributor: Lone_Wolf <lonewolf at xs4all dot nl> # Contributor: Armin K. <krejzi at email dot com> # Contributor: Kristian Klausen <klausenbusk@hotmail.com> # Contributor: Egon Ashrafinia <e.ashrafinia@gmail.com> @@ -9,9 +10,9 @@ # Contributor: Antti "Tera" Oja <antti.bofh@gmail.com> # Contributor: Diego Jose <diegoxter1006@gmail.com> -pkgname=mesa-git -pkgdesc="an open-source implementation of the OpenGL specification, git version" -pkgver=19.2.0_devel.112785.a110a8090d6 +pkgname=mesa-aco-git +pkgdesc="Mesa with the ACO compiler patchset, git version" +pkgver=19.2.0_devel.113855.7157929d52c pkgrel=1 arch=('x86_64') makedepends=('git' 'python-mako' 'xorgproto' @@ -20,11 +21,23 @@ makedepends=('git' 'python-mako' 'xorgproto' depends=('libdrm' 'libxxf86vm' 'libxdamage' 'libxshmfence' 'libelf' 'libomxil-bellagio' 'libunwind' 'libglvnd' 'wayland' 'lm_sensors' 'libclc' 'glslang') 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) -conflicts=('mesa' 'opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'vulkan-mesa-layer' 'libva-mesa-driver' 'mesa-vdpau') +provides=("mesa=$pkgver-$pkgrel" + "mesa-git=$pkgver-$pkgrel" + "vulkan-intel=$pkgver-$pkgrel" + "vulkan-radeon=$pkgver-$pkgrel" + "libva-mesa-driver=$pkgver-$pkgrel" + "mesa-vdpau=$pkgver-$pkgrel" + "vulkan-driver=$pkgver-$pkgrel" + "opencl-mesa=$pkgver-$pkgrel" + # mesa-vulkan-layer was renamed as it was brought in from AUR + "mesa-vulkan-layer=$pkgver-$pkgrel" + "vulkan-mesa-layer=$pkgver-$pkgrel" + "opengl-driver" + "opencl-driver") +conflicts=('mesa' 'mesa-git' 'opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'libva-mesa-driver' 'mesa-vdpau' 'mesa-vulkan-layer' 'vulkan-mesa-layer') url="https://www.mesa3d.org" license=('custom') -source=('mesa::git://anongit.freedesktop.org/mesa/mesa' +source=('mesa-aco::git+https://github.com/daniel-schuermann/mesa' 'LICENSE' ) md5sums=('SKIP' @@ -34,53 +47,57 @@ sha512sums=('SKIP' '25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2' ) + # NINJAFLAGS is an env var used to pass commandline options to ninja # NOTE: It's your responbility to validate the value of $NINJAFLAGS. If unsure, don't set it. -# MESA_WHICH_LLVM is an environment variable used to determine which llvm package tree is used to built mesa-git against. -# Adding a line to ~/.bashrc that sets this value is the simplest way to ensure a specific choice. -# -# 1: llvm-minimal-git (aur) preferred value -# 2: AUR llvm-git -# 3: llvm-git from LordHeavy unofficial repo -# 4 llvm (stable from extra) Default value -# +# Users of alternative llvm packages may need to tweak the hard version dependency here, which ensures this package is +# rebuilt if the underlying llvm updates. +makedepends+=(llvm=8.0.0 clang=8.0.0) +depends+=(llvm-libs=8.0.0) -if [[ ! $MESA_WHICH_LLVM ]] ; then - MESA_WHICH_LLVM=4 -fi +# LLVM NOTE: The upstream mesa-git package provides these alternative suggestions. Really, these packages should all +# have the necessary provides to make selecting these manually here unnecessary, and we've disabled them +# because they break aurhelpers such as yay. +# +## MESA_WHICH_LLVM is an environment variable used to determine which llvm package tree is used to built mesa-git against. +## Adding a line to makepkg.conf that sets this value is the simplest way to ensure a specific choice. +## +## 1: llvm-minimal-git (aur) preferred value +## 2: AUR llvm-git +## 3: llvm-git from LordHeavy unofficial repo +## 4 llvm (stable from extra) Default value +### if [[ ! $MESA_WHICH_LLVM ]] ; then +### MESA_WHICH_LLVM=4 +### fi +### +### case $MESA_WHICH_LLVM in +### 1) +### # aur lone_wolf-llvm-git +### makedepends+=('llvm-minimal-git') +### depends+=('llvm-libs-minimal-git') +### ;; +### 2) +### # aur llvm-git +### # depending on aur-llvm-* to avoid mixup with LH llvm-git +### makedepends+=('aur-llvm-git') +### depends+=('aur-llvm-libs-git') +### ;; +### 3) +### # mesa-git/llvm-svn (lordheavy unofficial repo) +### makedepends+=('llvm-git' 'clang-git') +### depends+=('llvm-libs-git') +### ;; +### 4) +### # extra/llvm +### makedepends+=(llvm=8.0.0 clang=8.0.0) +### depends+=(llvm-libs=8.0.0) +### ;; +### *) +### esac -case $MESA_WHICH_LLVM in - 1) - # aur llvm-minimal-git - makedepends+=('llvm-minimal-git') - depends+=('llvm-libs-minimal-git') - ;; - 2) - # aur llvm-git - # depending on aur-llvm-* to avoid mixup with LH llvm-git - makedepends+=('aur-llvm-git') - depends+=('aur-llvm-libs-git') - ;; - 3) - # mesa-git/llvm-git (lordheavy unofficial repo) - makedepends+=('llvm-git' 'clang-git') - depends+=('llvm-libs-git') - ;; - 4) - # extra/llvm - makedepends+=(llvm=8.0.0 clang=8.0.0) - depends+=(llvm-libs=8.0.0) - ;; - *) -esac - - - - - pkgver() { - cd mesa + cd mesa-aco read -r _ver <VERSION echo ${_ver/-/_}.$(git rev-list --count HEAD).$(git rev-parse --short HEAD) } @@ -94,7 +111,7 @@ prepare() { } build () { - meson setup mesa _build \ + meson setup mesa-aco _build \ -D b_ndebug=true \ -D buildtype=plain \ --wrap-mode=nofallback \ @@ -127,7 +144,7 @@ build () { -D valgrind=false \ -D vulkan-overlay-layer=true \ -D tools=[] - + meson configure _build ninja $NINJAFLAGS -C _build } |