Create mesa-aco-git from mesa-git

1 files changed, 60 insertions, 46 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 3ffc59655d31..fa2cadda03e2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -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,7 +10,7 @@
 # Contributor: Antti "Tera" Oja <antti.bofh@gmail.com>
 # Contributor: Diego Jose <diegoxter1006@gmail.com>
 
-pkgname=mesa-git
+pkgname=mesa-aco-git
 pkgdesc="an open-source implementation of the OpenGL specification, git version"
 pkgver=19.2.0_devel.112337.bb75c73e962
 pkgrel=1
@@ -20,11 +21,20 @@ 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 libva-mesa-driver=$pkgver-$pkgrel mesa-vdpau=$pkgver-$pkgrel vulkan-driver=$pkgver-$pkgrel opencl-mesa=$pkgver-$pkgrel opengl-driver opencl-driver)
-conflicts=('mesa' 'opencl-mesa' 'vulkan-intel' 'vulkan-radeon' '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"
+          "opengl-driver"
+          "opencl-driver")
+conflicts=('mesa' 'mesa-git' 'opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'libva-mesa-driver' 'mesa-vdpau')
 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'
         'targets-opencl-Add_clangASTMatchers_library_as_dependency.patch')
 md5sums=('SKIP'
@@ -34,51 +44,55 @@ sha512sums=('SKIP'
             '25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2'
             '29241b93f07e6e3473b6c3e690f69cbe3594c2d1257e97325e47f54d35c446ea9262d4ac9c4094cb545a9b7722aa9e07588815418df872ef707a4fa9ffe002d9')
 
+
 # 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 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
-# 
+# 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 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
-        
-        
-        
-        
-        
 pkgver() {
     cd mesa
     read -r _ver <VERSION
@@ -129,7 +143,7 @@ build () {
        -D valgrind=false \
        -D vulkan-overlay-layer=true \
        -D tools=[]
-       
+
     meson configure _build
     ninja  $NINJAFLAGS -C _build
 }