From 64bda5146c13a840e073b69e66df94799b0fb392 Mon Sep 17 00:00:00 2001 From: LW-archlinux Date: Wed, 3 Jul 2019 12:52:56 +0200 Subject: [PATCH] removed patch that is now in master, added mesa-vulkan-layer to provides & conflicts --- .SRCINFO | 21 +++++++++---------- PKGBUILD | 20 ++++++++---------- ...angASTMatchers_library_as_dependency.patch | 11 ---------- 3 files changed, 19 insertions(+), 33 deletions(-) delete mode 100644 targets-opencl-Add_clangASTMatchers_library_as_dependency.patch diff --git a/.SRCINFO b/.SRCINFO index 5d9f73b..248303c 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.112337.bb75c73e962 + pkgver = 19.2.0_devel.112439.11a3679e3ab pkgrel = 1 url = https://www.mesa3d.org arch = x86_64 @@ -37,13 +37,14 @@ pkgbase = mesa-git depends = glslang depends = llvm-libs-minimal-git optdepends = opengl-man-pages: for the OpenGL API man pages - provides = mesa=19.2.0_devel.112337.bb75c73e962-1 - provides = vulkan-intel=19.2.0_devel.112337.bb75c73e962-1 - provides = vulkan-radeon=19.2.0_devel.112337.bb75c73e962-1 - provides = libva-mesa-driver=19.2.0_devel.112337.bb75c73e962-1 - provides = mesa-vdpau=19.2.0_devel.112337.bb75c73e962-1 - provides = vulkan-driver=19.2.0_devel.112337.bb75c73e962-1 - provides = opencl-mesa=19.2.0_devel.112337.bb75c73e962-1 + provides = mesa=19.2.0_devel.112439.11a3679e3ab-1 + provides = vulkan-intel=19.2.0_devel.112439.11a3679e3ab-1 + provides = vulkan-radeon=19.2.0_devel.112439.11a3679e3ab-1 + provides = libva-mesa-driver=19.2.0_devel.112439.11a3679e3ab-1 + provides = mesa-vdpau=19.2.0_devel.112439.11a3679e3ab-1 + provides = vulkan-driver=19.2.0_devel.112439.11a3679e3ab-1 + provides = opencl-mesa=19.2.0_devel.112439.11a3679e3ab-1 + provides = mesa-vulkan-layer=19.2.0_devel.112439.11a3679e3ab-1 provides = opengl-driver provides = opencl-driver conflicts = mesa @@ -52,15 +53,13 @@ pkgbase = mesa-git conflicts = vulkan-radeon conflicts = libva-mesa-driver conflicts = mesa-vdpau + conflicts = mesa-vulkan-layer source = mesa::git://anongit.freedesktop.org/mesa/mesa source = LICENSE - source = targets-opencl-Add_clangASTMatchers_library_as_dependency.patch md5sums = SKIP md5sums = 5c65a0fe315dd347e09b1f2826a1df5a - md5sums = 73c3573455404a1eb6a6504ce6ff21f5 sha512sums = SKIP sha512sums = 25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2 - sha512sums = 29241b93f07e6e3473b6c3e690f69cbe3594c2d1257e97325e47f54d35c446ea9262d4ac9c4094cb545a9b7722aa9e07588815418df872ef707a4fa9ffe002d9 pkgname = mesa-git diff --git a/PKGBUILD b/PKGBUILD index 3ffc596..54712d3 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.112337.bb75c73e962 +pkgver=19.2.0_devel.112439.11a3679e3ab pkgrel=1 arch=('x86_64') makedepends=('git' 'python-mako' 'xorgproto' @@ -20,25 +20,25 @@ 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 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=$pkgver-$pkgrel opengl-driver opencl-driver) +conflicts=('mesa' 'opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'libva-mesa-driver' 'mesa-vdpau' 'mesa-vulkan-layer') url="https://www.mesa3d.org" license=('custom') source=('mesa::git://anongit.freedesktop.org/mesa/mesa' 'LICENSE' - 'targets-opencl-Add_clangASTMatchers_library_as_dependency.patch') +) md5sums=('SKIP' '5c65a0fe315dd347e09b1f2826a1df5a' - '73c3573455404a1eb6a6504ce6ff21f5') +) 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. +# 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 @@ -52,7 +52,7 @@ fi case $MESA_WHICH_LLVM in 1) - # aur lone_wolf-llvm-git + # aur llvm-minimal-git makedepends+=('llvm-minimal-git') depends+=('llvm-libs-minimal-git') ;; @@ -63,7 +63,7 @@ case $MESA_WHICH_LLVM in depends+=('aur-llvm-libs-git') ;; 3) - # mesa-git/llvm-svn (lordheavy unofficial repo) + # mesa-git/llvm-git (lordheavy unofficial repo) makedepends+=('llvm-git' 'clang-git') depends+=('llvm-libs-git') ;; @@ -91,8 +91,6 @@ prepare() { if [ -d _build ]; then rm -rf _build fi - cd mesa - patch --forward --strip=1 --input="$srcdir"/targets-opencl-Add_clangASTMatchers_library_as_dependency.patch } build () { diff --git a/targets-opencl-Add_clangASTMatchers_library_as_dependency.patch b/targets-opencl-Add_clangASTMatchers_library_as_dependency.patch deleted file mode 100644 index bb02ae6..0000000 --- a/targets-opencl-Add_clangASTMatchers_library_as_dependency.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --unified --recursive --text mesa.orig/src/gallium/targets/opencl/meson.build mesa.new/src/gallium/targets/opencl/meson.build ---- mesa.orig/src/gallium/targets/opencl/meson.build 2019-06-29 20:56:04.000000000 +0200 -+++ mesa.new/src/gallium/targets/opencl/meson.build 2019-06-29 21:10:45.934703892 +0200 -@@ -51,6 +51,7 @@ - cpp.find_library('clangSema', dirs : llvm_libdir), - cpp.find_library('clangAnalysis', dirs : llvm_libdir), - cpp.find_library('clangAST', dirs : llvm_libdir), -+ cpp.find_library('clangASTMatchers', dirs : llvm_libdir), - cpp.find_library('clangEdit', dirs : llvm_libdir), - cpp.find_library('clangLex', dirs : llvm_libdir), - cpp.find_library('clangBasic', dirs : llvm_libdir),