summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorLW-archlinux2019-05-09 15:24:36 +0200
committerLW-archlinux2019-05-09 15:24:36 +0200
commit6c6ae675836e6008ace8ef5c3ca102a455b6fa67 (patch)
tree7f79fb5f7427361f9b898bb2535aa95a6533a649
parente1106572785c2a9ba344d1e761cf351499ab460d (diff)
downloadaur-6c6ae675836e6008ace8ef5c3ca102a455b6fa67.tar.gz
use environment variable to select llvm package to build against, also re-enabled vulkan overlay
-rw-r--r--.SRCINFO20
-rw-r--r--PKGBUILD123
2 files changed, 92 insertions, 51 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 359930d8247..4c80ae018d5 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.1.0_devel.110691.e340d7beef9
+ pkgver = 19.2.0_devel.110857.8b3baa27440
pkgrel = 1
url = https://www.mesa3d.org
arch = x86_64
@@ -12,18 +12,17 @@ pkgbase = lib32-mesa-git
makedepends = lib32-gcc-libs
makedepends = lib32-libvdpau
makedepends = lib32-libelf
- makedepends = lib32-llvm-git
makedepends = git
makedepends = lib32-libgcrypt
makedepends = lib32-systemd
makedepends = mesa-git
- makedepends = lib32-llvm-libs-git
makedepends = lib32-libglvnd
makedepends = wayland-protocols
makedepends = lib32-wayland
makedepends = meson
makedepends = lib32-libva
makedepends = lib32-libxrandr
+ makedepends = lone_wolf-lib32-llvm-git
depends = mesa-git
depends = lib32-gcc-libs
depends = lib32-libdrm
@@ -32,16 +31,16 @@ pkgbase = lib32-mesa-git
depends = lib32-libxdamage
depends = lib32-libxshmfence
depends = lib32-elfutils
- depends = lib32-llvm-libs-git
depends = lib32-libunwind
depends = lib32-lm_sensors
depends = glslang
+ depends = lone_wolf-lib32-llvm-libs-git
optdepends = opengl-man-pages: for the OpenGL API man pages
- provides = lib32-mesa
- provides = lib32-vulkan-intel
- provides = lib32-vulkan-radeon
- provides = lib32-libva-mesa-driver
- provides = lib32-mesa-vdpau
+ provides = lib32-mesa=19.2.0_devel.110857.8b3baa27440-1
+ provides = lib32-vulkan-intel=19.2.0_devel.110857.8b3baa27440-1
+ provides = lib32-vulkan-radeon=19.2.0_devel.110857.8b3baa27440-1
+ provides = lib32-libva-mesa-driver=19.2.0_devel.110857.8b3baa27440-1
+ provides = lib32-mesa-vdpau=19.2.0_devel.110857.8b3baa27440-1
provides = lib32-opengl-driver
conflicts = lib32-mesa
conflicts = lib32-vulkan-intel
@@ -51,6 +50,9 @@ pkgbase = lib32-mesa-git
source = mesa::git://anongit.freedesktop.org/mesa/mesa
source = LICENSE
source = llvm32.native
+ md5sums = SKIP
+ md5sums = 5c65a0fe315dd347e09b1f2826a1df5a
+ md5sums = 6b4a19068a323d7f90a3d3cd315ed1f9
sha512sums = SKIP
sha512sums = 25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2
sha512sums = c7dbb390ebde291c517a854fcbe5166c24e95206f768cc9458ca896b2253aabd6df12a7becf831998721b2d622d0c02afdd8d519e77dea8e1d6807b35f0166fe
diff --git a/PKGBUILD b/PKGBUILD
index f27796de120..997464715d5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,19 +9,18 @@
# Contributor: Antti "Tera" Oja <antti.bofh@gmail.com>
# Contributor: Diego Jose <diegoxter1006@gmail.com>
-pkgbase=lib32-mesa-git
-pkgname=('lib32-mesa-git')
+pkgname=(lib32-mesa-git)
pkgdesc="an open-source implementation of the OpenGL specification, git version"
-pkgver=19.1.0_devel.110691.e340d7beef9
+pkgver=19.2.0_devel.110857.8b3baa27440
pkgrel=1
arch=('x86_64')
makedepends=('python-mako' 'lib32-libxml2' 'lib32-libx11' 'xorgproto'
- 'lib32-gcc-libs' 'lib32-libvdpau' 'lib32-libelf' 'lib32-llvm-git' 'git' 'lib32-libgcrypt' 'lib32-systemd'
- 'mesa-git' 'lib32-llvm-libs-git' 'lib32-libglvnd' 'wayland-protocols' 'lib32-wayland' 'meson' 'lib32-libva' 'lib32-libxrandr')
+ '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')
depends=('mesa-git' 'lib32-gcc-libs' 'lib32-libdrm' 'lib32-wayland' 'lib32-libxxf86vm' 'lib32-libxdamage' 'lib32-libxshmfence' 'lib32-elfutils'
- 'lib32-llvm-libs-git' 'lib32-libunwind' 'lib32-lm_sensors' 'glslang')
+ 'lib32-libunwind' 'lib32-lm_sensors' 'glslang')
optdepends=('opengl-man-pages: for the OpenGL API man pages')
-provides=('lib32-mesa' 'lib32-vulkan-intel' 'lib32-vulkan-radeon' 'lib32-libva-mesa-driver' 'lib32-mesa-vdpau' 'lib32-opengl-driver')
+provides=(lib32-mesa=$pkgver-$pkgrel lib32-vulkan-intel=$pkgver-$pkgrel lib32-vulkan-radeon=$pkgver-$pkgrel lib32-libva-mesa-driver=$pkgver-$pkgrel lib32-mesa-vdpau=$pkgver-$pkgrel 'lib32-opengl-driver')
conflicts=('lib32-mesa' 'lib32-vulkan-intel' 'lib32-vulkan-radeon' 'lib32-libva-mesa-driver' 'lib32-mesa-vdpau')
url="https://www.mesa3d.org"
license=('custom')
@@ -30,10 +29,49 @@ source=('mesa::git://anongit.freedesktop.org/mesa/mesa'
'llvm32.native'
)
+md5sums=('SKIP'
+ '5c65a0fe315dd347e09b1f2826a1df5a'
+ '6b4a19068a323d7f90a3d3cd315ed1f9')
sha512sums=('SKIP'
'25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2'
'c7dbb390ebde291c517a854fcbe5166c24e95206f768cc9458ca896b2253aabd6df12a7becf831998721b2d622d0c02afdd8d519e77dea8e1d6807b35f0166fe')
+# mesa_which_llvm is an evironment variable used to determine which llvm package tree is used to built mesa-git against
+# 1: lone_wolf-llvm-git (aur) Default value
+# 2: llvm-git (aur)
+# 3 llvm-svn (lordheavy unoffical repo)
+# 4 llvm (stable from extra)
+#
+# N.B. make sure lib32-mesa-git uses same value for this as mesa-git to avoid problems !
+
+if [[ ! $mesa_which_llvm ]] ; then
+ mesa_which_llvm=1
+fi
+
+case $mesa_which_llvm in
+ 1)
+ # aur lone_wolf-llvm-git
+ makedepends+=('lone_wolf-lib32-llvm-git')
+ depends+=('lone_wolf-lib32-llvm-libs-git')
+ ;;
+ 2)
+ # aur llvm-git
+ makedepends+=('lib32-llvm-git')
+ depends+=('lib32-llvm-libs-git')
+ ;;
+ 3)
+ # mesa-git/llvm-svn (lordheavy unofficial repo)
+ makedepends+=('lib32-llvm-svn')
+ depends+=('lib32-llvm-libs-svn')
+ ;;
+ 4)
+ # extra/llvm
+ makedepends+=(lib32-llvm=8.0.0)
+ depends+=(lib32-llvm-libs=8.0.0)
+ ;;
+ *)
+esac
+
pkgver() {
cd mesa
@@ -50,40 +88,41 @@ build () {
rm -rf _build
fi
meson setup mesa _build \
- --native-file llvm32.native \
- -D b_ndebug=true \
- -D buildtype=plain \
- --wrap-mode=nofallback \
- -D prefix=/usr \
- -D sysconfdir=/etc \
- --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 vulkan-drivers=amd,intel \
- -D dri3=true \
- -D egl=true \
- -D gallium-extra-hud=true \
- -D gallium-nine=true \
- -D gallium-omx=disabled \
- -D gallium-opencl=disabled \
- -D gallium-va=true \
- -D gallium-vdpau=true \
- -D gallium-xa=true \
- -D gallium-xvmc=false \
- -D gbm=true \
- -D gles1=true \
- -D gles2=true \
- -D glvnd=true \
- -D glx=dri \
- -D libunwind=true \
- -D llvm=true \
- -D lmsensors=true \
- -D osmesa=gallium \
- -D shared-glapi=true \
- -D valgrind=false \
- -D tools=[]
-# -D vulkan-overlay-layer=true \
+ --native-file llvm32.native \
+ -D b_ndebug=true \
+ -D buildtype=plain \
+ --wrap-mode=nofallback \
+ -D prefix=/usr \
+ -D sysconfdir=/etc \
+ --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 vulkan-drivers=amd,intel \
+ -D dri3=true \
+ -D egl=true \
+ -D gallium-extra-hud=true \
+ -D vulkan-overlay-layer=true \
+ -D gallium-nine=true \
+ -D gallium-omx=disabled \
+ -D gallium-opencl=disabled \
+ -D gallium-va=true \
+ -D gallium-vdpau=true \
+ -D gallium-xa=true \
+ -D gallium-xvmc=false \
+ -D gbm=true \
+ -D gles1=true \
+ -D gles2=true \
+ -D glvnd=true \
+ -D glx=dri \
+ -D libunwind=true \
+ -D llvm=true \
+ -D lmsensors=true \
+ -D osmesa=gallium \
+ -D shared-glapi=true \
+ -D valgrind=false \
+ -D tools=[] \
+
meson configure _build
if [[ ! $NINJAFLAGS ]]; then
ninja -C _build
@@ -93,7 +132,7 @@ build () {
}
-package_lib32-mesa-git () {
+package() {
DESTDIR="$pkgdir" ninja -C _build install