From 8205578d828dc6a0d9b0518b13587cc149986da8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sat, 21 Nov 2020 23:08:57 +0100
Subject: [PATCH 1/2] libclc: rename from libclc-git + update to 11.0.0

Use the libclc src provided by llvm-project. Adopt.
---
 srcpkgs/libclc-git/template | 29 -----------------------------
 srcpkgs/libclc/template     | 28 ++++++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 29 deletions(-)
 delete mode 100644 srcpkgs/libclc-git/template
 create mode 100644 srcpkgs/libclc/template

diff --git a/srcpkgs/libclc-git/template b/srcpkgs/libclc-git/template
deleted file mode 100644
index 748ffe98fc8..00000000000
--- a/srcpkgs/libclc-git/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'libclc-git'
-pkgname=libclc-git
-version=20181127
-revision=4
-_git_hash=1ecb16dd7d8b8e9151027faab996f27b2ac508e3
-wrksrc="libclc-${_git_hash}"
-build_style=configure
-configure_script="./configure.py"
-configure_args="--prefix=/usr"
-hostmakedepends="clang libedit-devel libffi-devel llvm ncurses-devel
- python zlib-devel"
-short_desc="Open implementation of the OpenCL C programming language"
-maintainer="John Galt <johngaltfirstrun@gmail.com>"
-license="BSD/MIT"
-homepage="http://libclc.llvm.org"
-provides="libclc-${version}_${revision}"
-replaces="libclc>=0"
-archs=noarch
-distfiles="https://github.com/llvm-mirror/libclc/archive/${_git_hash}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=d9cf73a5d1ab05995086e7a3a0fd6c06172ee59cdd2512c395caae99b9fce453
-
-pre_build() {
-	sed -i Makefile \
-		-e"s;/usr/bin/clang++;g++;g" \
-		-e"s;-mtune=i686;;g"
-}
-post_install() {
-	vlicense LICENSE.TXT
-}
diff --git a/srcpkgs/libclc/template b/srcpkgs/libclc/template
new file mode 100644
index 00000000000..2f5e5f62dc3
--- /dev/null
+++ b/srcpkgs/libclc/template
@@ -0,0 +1,28 @@
+# Template file for 'libclc'
+pkgname=libclc
+version=11.0.0
+revision=1
+wrksrc="${pkgname}-${version}.src"
+build_style=cmake
+hostmakedepends="cmake clang llvm python3 libedit-devel libffi-devel
+ ncurses-devel zlib-devel"
+short_desc="Open implementation of the OpenCL C programming language"
+maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+license="BSD-3-Clause, MIT"
+homepage="https://libclc.llvm.org"
+distfiles="https://github.com/llvm/llvm-project/releases/download/llvmorg-${version}/libclc-${version}.src.tar.xz"
+checksum=5a0a2f67b85ede09b2f08c071c5b0b6b5ad56bfb00b39a22c369afcc613c42ee
+replaces="libclc-git>=0"
+
+do_configure() {
+	# We really do a native build.
+	# The outcome is just header files.
+	unset CC CXX LD CFLAGS CXXFLAGS LDFLAGS
+	mkdir -p build
+	cd build
+	cmake ${configure_args} ..
+}
+
+post_install() {
+	vlicense LICENSE.TXT
+}

From 4cc67a7ec2d8da8eb2e2d19018cb97e2cf7b7961 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sat, 21 Nov 2020 23:10:23 +0100
Subject: [PATCH 2/2] mesa: update to 20.2.3

---
 srcpkgs/mesa/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index cf9d83d0d73..99b02b13bd4 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,7 +1,7 @@
 # Template file for 'mesa'
 pkgname=mesa
-version=20.2.2
-revision=2
+version=20.2.3
+revision=1
 wrksrc="mesa-${version}"
 build_style=meson
 configure_args="-Dglvnd=true -Dshared-glapi=true -Dgbm=true -Degl=true
@@ -23,7 +23,7 @@ license="MIT, LGPL-2.1-or-later"
 homepage="https://www.mesa3d.org/"
 changelog="https://docs.mesa3d.org/relnotes/${version}.html"
 distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=1f93eb1090cf71490cd0e204e04f8427a82b6ed534b7f49ca50cea7dcc89b861
+checksum=ae1b240e11531df528d14dc214d2dc4d2b4f2e835c6230ba0b492b171eceb82b
 
 build_options="wayland"
 build_options_default="wayland"
@@ -134,7 +134,7 @@ fi
 # enabled currently by amd drivers
 if [ "$_have_opencl" ]; then
 	hostmakedepends+=" clang"
-	makedepends+=" clang libclc-git"
+	makedepends+=" clang libclc"
 	subpackages+=" mesa-opencl"
 	configure_args+=" -Dgallium-opencl=icd"
 fi
@@ -256,7 +256,7 @@ libxatracker_package() {
 
 mesa-opencl_package() {
 	short_desc="Mesa implementation of OpenCL (r600+ only)"
-	depends="libclc-git"
+	depends="libclc"
 	pkg_install() {
 		vmove etc/OpenCL
 		vmove "usr/lib/libMesaOpenCL.so.*"