* Re: [PR PATCH] [Updated] libclc: rename from libclc-git and update to 11.0.0
2020-11-21 22:12 [PR PATCH] libclc: rename from libclc-git and update to 11.0.0 pullmoll
@ 2020-11-21 22:15 ` pullmoll
2020-11-21 22:24 ` pullmoll
` (20 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: pullmoll @ 2020-11-21 22:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 395 bytes --]
There is an updated pull request by pullmoll against master on the void-packages repository
https://github.com/pullmoll/void-packages libclc
https://github.com/void-linux/void-packages/pull/26580
libclc: rename from libclc-git and update to 11.0.0
Use the libclc src provided by llvm-project. Adopt.
A patch file from https://github.com/void-linux/void-packages/pull/26580.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libclc-26580.patch --]
[-- Type: text/x-diff, Size: 3789 bytes --]
From e00342d2e9acd97b800c8e44c51b6fd721822ae4 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 | 20 ++++++++++++++++++++
2 files changed, 20 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..ed509439f8f
--- /dev/null
+++ b/srcpkgs/libclc/template
@@ -0,0 +1,20 @@
+# Template file for 'libclc'
+pkgname=libclc
+version=11.0.0
+revision=1
+wrksrc="${pkgname}-${version}.src"
+build_style=cmake
+hostmakedepends="clang libedit-devel libffi-devel llvm ncurses-devel
+ python3 zlib-devel"
+short_desc="Open implementation of the OpenCL C programming language"
+maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+license="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"
+provides="libclc-${version}_${revision}"
+
+post_install() {
+ vlicense LICENSE.TXT
+}
From 6198cb81a0bf0c699509f4ece639ba50bef7d02e 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: revbump for libclc{-git,} rename and update
---
srcpkgs/mesa/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index cf9d83d0d73..a6903480d7d 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
+revision=3
wrksrc="mesa-${version}"
build_style=meson
configure_args="-Dglvnd=true -Dshared-glapi=true -Dgbm=true -Degl=true
@@ -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.*"
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: libclc: rename from libclc-git and update to 11.0.0
2020-11-21 22:12 [PR PATCH] libclc: rename from libclc-git and update to 11.0.0 pullmoll
2020-11-21 22:15 ` [PR PATCH] [Updated] " pullmoll
@ 2020-11-21 22:24 ` pullmoll
2020-11-22 18:49 ` [PR PATCH] [Updated] " pullmoll
` (19 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: pullmoll @ 2020-11-21 22:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 236 bytes --]
New comment by pullmoll on void-packages repository
https://github.com/void-linux/void-packages/pull/26580#issuecomment-731645759
Comment:
Hmm.. cross clang11 fails. Perhaps we should use gcc instead of clang as the old template did.
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PR PATCH] [Updated] libclc: rename from libclc-git and update to 11.0.0
2020-11-21 22:12 [PR PATCH] libclc: rename from libclc-git and update to 11.0.0 pullmoll
2020-11-21 22:15 ` [PR PATCH] [Updated] " pullmoll
2020-11-21 22:24 ` pullmoll
@ 2020-11-22 18:49 ` pullmoll
2020-11-22 18:59 ` pullmoll
` (18 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: pullmoll @ 2020-11-22 18:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 395 bytes --]
There is an updated pull request by pullmoll against master on the void-packages repository
https://github.com/pullmoll/void-packages libclc
https://github.com/void-linux/void-packages/pull/26580
libclc: rename from libclc-git and update to 11.0.0
Use the libclc src provided by llvm-project. Adopt.
A patch file from https://github.com/void-linux/void-packages/pull/26580.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libclc-26580.patch --]
[-- Type: text/x-diff, Size: 4089 bytes --]
From 916c7c3b93ddc607a038492f0f969c2c6bb85ffc 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 | 39 +++++++++++++++++++++++++++++++++++++
2 files changed, 39 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..8e388ec3b72
--- /dev/null
+++ b/srcpkgs/libclc/template
@@ -0,0 +1,39 @@
+# Template file for 'libclc'
+pkgname=libclc
+version=11.0.0
+revision=1
+wrksrc="${pkgname}-${version}.src"
+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/MIT"
+homepage="https://libclc.llvm.org"
+provides="libclc-${version}_${revision}"
+replaces="libclc>=0"
+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 CFLAGS CXXFLAGS
+ mkdir -p build
+ cd build
+ cmake ..
+}
+
+do_build() {
+ cd build
+ make ${makejobs}
+}
+
+do_install() {
+ cd build
+ make ${makejobs} install
+}
+
+post_install() {
+ vlicense LICENSE.TXT
+}
From 7eb0a6567ea665697b13913f9123af1113397e4c 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: revbump for libclc{-git,} rename and update
---
srcpkgs/mesa/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index cf9d83d0d73..a6903480d7d 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
+revision=3
wrksrc="mesa-${version}"
build_style=meson
configure_args="-Dglvnd=true -Dshared-glapi=true -Dgbm=true -Degl=true
@@ -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.*"
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: libclc: rename from libclc-git and update to 11.0.0
2020-11-21 22:12 [PR PATCH] libclc: rename from libclc-git and update to 11.0.0 pullmoll
` (2 preceding siblings ...)
2020-11-22 18:49 ` [PR PATCH] [Updated] " pullmoll
@ 2020-11-22 18:59 ` pullmoll
2020-11-22 19:01 ` pullmoll
` (17 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: pullmoll @ 2020-11-22 18:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 209 bytes --]
New comment by pullmoll on void-packages repository
https://github.com/void-linux/void-packages/pull/26580#issuecomment-731815941
Comment:
Err, and again I'm searching how to undraft a PR. Where's the link?
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: libclc: rename from libclc-git and update to 11.0.0
2020-11-21 22:12 [PR PATCH] libclc: rename from libclc-git and update to 11.0.0 pullmoll
` (3 preceding siblings ...)
2020-11-22 18:59 ` pullmoll
@ 2020-11-22 19:01 ` pullmoll
2020-11-22 19:03 ` [PR PATCH] [Updated] " pullmoll
` (16 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: pullmoll @ 2020-11-22 19:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 242 bytes --]
New comment by pullmoll on void-packages repository
https://github.com/void-linux/void-packages/pull/26580#issuecomment-731815941
Comment:
Err, and again I'm searching how to undraft a PR. Where's the link?
D'OH! It bit me in the... well.
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PR PATCH] [Updated] libclc: rename from libclc-git and update to 11.0.0
2020-11-21 22:12 [PR PATCH] libclc: rename from libclc-git and update to 11.0.0 pullmoll
` (4 preceding siblings ...)
2020-11-22 19:01 ` pullmoll
@ 2020-11-22 19:03 ` pullmoll
2020-11-22 19:07 ` pullmoll
` (15 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: pullmoll @ 2020-11-22 19:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 395 bytes --]
There is an updated pull request by pullmoll against master on the void-packages repository
https://github.com/pullmoll/void-packages libclc
https://github.com/void-linux/void-packages/pull/26580
libclc: rename from libclc-git and update to 11.0.0
Use the libclc src provided by llvm-project. Adopt.
A patch file from https://github.com/void-linux/void-packages/pull/26580.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libclc-26580.patch --]
[-- Type: text/x-diff, Size: 4078 bytes --]
From b0dec5ddd2efd8a7d47f5fad6a6f67314ce1be35 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 | 38 +++++++++++++++++++++++++++++++++++++
2 files changed, 38 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..2a701796742
--- /dev/null
+++ b/srcpkgs/libclc/template
@@ -0,0 +1,38 @@
+# Template file for 'libclc'
+pkgname=libclc
+version=11.0.0
+revision=1
+wrksrc="${pkgname}-${version}.src"
+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
+provides="libclc-${version}_${revision}"
+replaces="libclc-git>=0"
+
+do_configure() {
+ # We really do a native build.
+ # The outcome is just header files.
+ unset CC CXX CFLAGS CXXFLAGS
+ mkdir -p build
+ cd build
+ cmake ..
+}
+
+do_build() {
+ cd build
+ make ${makejobs}
+}
+
+do_install() {
+ cd build
+ make ${makejobs} install
+}
+
+post_install() {
+ vlicense LICENSE.TXT
+}
From fe7b10ead173942875289cf5b1a4449261e43970 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: revbump for libclc{-git,} rename and update
---
srcpkgs/mesa/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index cf9d83d0d73..a6903480d7d 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
+revision=3
wrksrc="mesa-${version}"
build_style=meson
configure_args="-Dglvnd=true -Dshared-glapi=true -Dgbm=true -Degl=true
@@ -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.*"
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PR PATCH] [Updated] libclc: rename from libclc-git and update to 11.0.0
2020-11-21 22:12 [PR PATCH] libclc: rename from libclc-git and update to 11.0.0 pullmoll
` (5 preceding siblings ...)
2020-11-22 19:03 ` [PR PATCH] [Updated] " pullmoll
@ 2020-11-22 19:07 ` pullmoll
2020-11-22 19:16 ` [PR REVIEW] " ericonr
` (14 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: pullmoll @ 2020-11-22 19:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 395 bytes --]
There is an updated pull request by pullmoll against master on the void-packages repository
https://github.com/pullmoll/void-packages libclc
https://github.com/void-linux/void-packages/pull/26580
libclc: rename from libclc-git and update to 11.0.0
Use the libclc src provided by llvm-project. Adopt.
A patch file from https://github.com/void-linux/void-packages/pull/26580.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libclc-26580.patch --]
[-- Type: text/x-diff, Size: 4089 bytes --]
From 44abaef654d817df79d2bc74139a4a60d87a19aa 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 | 38 +++++++++++++++++++++++++++++++++++++
2 files changed, 38 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..3c0f754941b
--- /dev/null
+++ b/srcpkgs/libclc/template
@@ -0,0 +1,38 @@
+# Template file for 'libclc'
+pkgname=libclc
+version=11.0.0
+revision=1
+wrksrc="${pkgname}-${version}.src"
+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
+provides="libclc-${version}_${revision}"
+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 ..
+}
+
+do_build() {
+ cd build
+ make ${makejobs}
+}
+
+do_install() {
+ cd build
+ make ${makejobs} install
+}
+
+post_install() {
+ vlicense LICENSE.TXT
+}
From 4f1026ca9e559b7b7c6b08cf21634d6c07f5ef75 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: revbump for libclc{-git,} rename and update
---
srcpkgs/mesa/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index cf9d83d0d73..a6903480d7d 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
+revision=3
wrksrc="mesa-${version}"
build_style=meson
configure_args="-Dglvnd=true -Dshared-glapi=true -Dgbm=true -Degl=true
@@ -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.*"
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PR REVIEW] libclc: rename from libclc-git and update to 11.0.0
2020-11-21 22:12 [PR PATCH] libclc: rename from libclc-git and update to 11.0.0 pullmoll
` (6 preceding siblings ...)
2020-11-22 19:07 ` pullmoll
@ 2020-11-22 19:16 ` ericonr
2020-11-22 19:20 ` pullmoll
` (13 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: ericonr @ 2020-11-22 19:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 174 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/26580#discussion_r528391417
Comment:
Why is this line necessary?
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PR REVIEW] libclc: rename from libclc-git and update to 11.0.0
2020-11-21 22:12 [PR PATCH] libclc: rename from libclc-git and update to 11.0.0 pullmoll
` (7 preceding siblings ...)
2020-11-22 19:16 ` [PR REVIEW] " ericonr
@ 2020-11-22 19:20 ` pullmoll
2020-11-22 19:23 ` pullmoll
` (12 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: pullmoll @ 2020-11-22 19:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 255 bytes --]
New review comment by pullmoll on void-packages repository
https://github.com/void-linux/void-packages/pull/26580#discussion_r528391835
Comment:
Actually I don't know if it is. There is no library, just header files, so it's probably not needed at all.
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: libclc: rename from libclc-git and update to 11.0.0
2020-11-21 22:12 [PR PATCH] libclc: rename from libclc-git and update to 11.0.0 pullmoll
` (8 preceding siblings ...)
2020-11-22 19:20 ` pullmoll
@ 2020-11-22 19:23 ` pullmoll
2020-11-22 19:24 ` pullmoll
` (11 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: pullmoll @ 2020-11-22 19:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 206 bytes --]
New comment by pullmoll on void-packages repository
https://github.com/void-linux/void-packages/pull/26580#issuecomment-731827080
Comment:
So libclc.pc is not installed for some reason. Need to fix that.
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: libclc: rename from libclc-git and update to 11.0.0
2020-11-21 22:12 [PR PATCH] libclc: rename from libclc-git and update to 11.0.0 pullmoll
` (9 preceding siblings ...)
2020-11-22 19:23 ` pullmoll
@ 2020-11-22 19:24 ` pullmoll
2020-11-22 19:27 ` pullmoll
` (10 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: pullmoll @ 2020-11-22 19:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 281 bytes --]
New comment by pullmoll on void-packages repository
https://github.com/void-linux/void-packages/pull/26580#issuecomment-731827080
Comment:
So libclc.pc is not installed for some reason. Need to fix that.
...err passing DISTDIR=$DISTDIR in do_install() probably helps. *blushes*
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: libclc: rename from libclc-git and update to 11.0.0
2020-11-21 22:12 [PR PATCH] libclc: rename from libclc-git and update to 11.0.0 pullmoll
` (10 preceding siblings ...)
2020-11-22 19:24 ` pullmoll
@ 2020-11-22 19:27 ` pullmoll
2020-11-22 19:38 ` [PR PATCH] [Updated] " pullmoll
` (9 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: pullmoll @ 2020-11-22 19:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 281 bytes --]
New comment by pullmoll on void-packages repository
https://github.com/void-linux/void-packages/pull/26580#issuecomment-731827080
Comment:
So libclc.pc is not installed for some reason. Need to fix that.
...err passing DESTDIR=$DESTDIR in do_install() probably helps. *blushes*
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PR PATCH] [Updated] libclc: rename from libclc-git and update to 11.0.0
2020-11-21 22:12 [PR PATCH] libclc: rename from libclc-git and update to 11.0.0 pullmoll
` (11 preceding siblings ...)
2020-11-22 19:27 ` pullmoll
@ 2020-11-22 19:38 ` pullmoll
2020-11-24 17:47 ` pullmoll
` (8 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: pullmoll @ 2020-11-22 19:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 395 bytes --]
There is an updated pull request by pullmoll against master on the void-packages repository
https://github.com/pullmoll/void-packages libclc
https://github.com/void-linux/void-packages/pull/26580
libclc: rename from libclc-git and update to 11.0.0
Use the libclc src provided by llvm-project. Adopt.
A patch file from https://github.com/void-linux/void-packages/pull/26580.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libclc-26580.patch --]
[-- Type: text/x-diff, Size: 4157 bytes --]
From 2d6757176303797cfef8fd97ca838dd2146412bc 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 | 38 +++++++++++++++++++++++++++++++++++++
2 files changed, 38 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..3c5f16196c0
--- /dev/null
+++ b/srcpkgs/libclc/template
@@ -0,0 +1,38 @@
+# Template file for 'libclc'
+pkgname=libclc
+version=11.0.0
+revision=1
+wrksrc="${pkgname}-${version}.src"
+configure_args="-DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release"
+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} ..
+}
+
+do_build() {
+ cd build
+ make ${makejobs}
+}
+
+do_install() {
+ cd build
+ make DESTDIR="$DESTDIR" ${makejobs} install
+}
+
+post_install() {
+ vlicense LICENSE.TXT
+}
From ba6033589b69313fbdff9a10405c51bbe6bf80ee 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: revbump for libclc{-git,} rename and update
---
srcpkgs/mesa/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index cf9d83d0d73..a6903480d7d 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
+revision=3
wrksrc="mesa-${version}"
build_style=meson
configure_args="-Dglvnd=true -Dshared-glapi=true -Dgbm=true -Degl=true
@@ -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.*"
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: libclc: rename from libclc-git and update to 11.0.0
2020-11-21 22:12 [PR PATCH] libclc: rename from libclc-git and update to 11.0.0 pullmoll
` (12 preceding siblings ...)
2020-11-22 19:38 ` [PR PATCH] [Updated] " pullmoll
@ 2020-11-24 17:47 ` pullmoll
2020-11-25 12:31 ` [PR PATCH] [Updated] " pullmoll
` (7 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: pullmoll @ 2020-11-24 17:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 496 bytes --]
New comment by pullmoll on void-packages repository
https://github.com/void-linux/void-packages/pull/26580#issuecomment-733136166
Comment:
Hmm, and I have no idea how to test it. Nothing depends on `mesa-opencl`.
I have a Radeon RX 550 (Baffin) and believe it is not among the supported hardware,
at least there is no `usr/share/clc/baffin-*--.bc` file in `libclc-11.0.1_1.x86_64.xbps`.
Probably needs a real R600 card to test with. But then why shouldn't it work if it compiles w/o issues?
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PR PATCH] [Updated] libclc: rename from libclc-git and update to 11.0.0
2020-11-21 22:12 [PR PATCH] libclc: rename from libclc-git and update to 11.0.0 pullmoll
` (13 preceding siblings ...)
2020-11-24 17:47 ` pullmoll
@ 2020-11-25 12:31 ` pullmoll
2020-11-25 18:49 ` [PR REVIEW] " Vaelatern
` (6 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: pullmoll @ 2020-11-25 12:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 395 bytes --]
There is an updated pull request by pullmoll against master on the void-packages repository
https://github.com/pullmoll/void-packages libclc
https://github.com/void-linux/void-packages/pull/26580
libclc: rename from libclc-git and update to 11.0.0
Use the libclc src provided by llvm-project. Adopt.
A patch file from https://github.com/void-linux/void-packages/pull/26580.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libclc-26580.patch --]
[-- Type: text/x-diff, Size: 4583 bytes --]
From 2d6757176303797cfef8fd97ca838dd2146412bc 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 | 38 +++++++++++++++++++++++++++++++++++++
2 files changed, 38 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..3c5f16196c0
--- /dev/null
+++ b/srcpkgs/libclc/template
@@ -0,0 +1,38 @@
+# Template file for 'libclc'
+pkgname=libclc
+version=11.0.0
+revision=1
+wrksrc="${pkgname}-${version}.src"
+configure_args="-DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release"
+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} ..
+}
+
+do_build() {
+ cd build
+ make ${makejobs}
+}
+
+do_install() {
+ cd build
+ make DESTDIR="$DESTDIR" ${makejobs} install
+}
+
+post_install() {
+ vlicense LICENSE.TXT
+}
From 0b492d067616c84f5f71a6705d5cc0bfb2b60f4f 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.*"
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PR REVIEW] libclc: rename from libclc-git and update to 11.0.0
2020-11-21 22:12 [PR PATCH] libclc: rename from libclc-git and update to 11.0.0 pullmoll
` (14 preceding siblings ...)
2020-11-25 12:31 ` [PR PATCH] [Updated] " pullmoll
@ 2020-11-25 18:49 ` Vaelatern
2020-11-25 19:04 ` pullmoll
` (5 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: Vaelatern @ 2020-11-25 18:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 179 bytes --]
New review comment by Vaelatern on void-packages repository
https://github.com/void-linux/void-packages/pull/26580#discussion_r530580975
Comment:
Why not the cmake build style?
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PR REVIEW] libclc: rename from libclc-git and update to 11.0.0
2020-11-21 22:12 [PR PATCH] libclc: rename from libclc-git and update to 11.0.0 pullmoll
` (15 preceding siblings ...)
2020-11-25 18:49 ` [PR REVIEW] " Vaelatern
@ 2020-11-25 19:04 ` pullmoll
2020-11-25 19:18 ` Vaelatern
` (4 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: pullmoll @ 2020-11-25 19:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 210 bytes --]
New review comment by pullmoll on void-packages repository
https://github.com/void-linux/void-packages/pull/26580#discussion_r530588243
Comment:
Because it tries to cross compile for the target architecture.
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PR REVIEW] libclc: rename from libclc-git and update to 11.0.0
2020-11-21 22:12 [PR PATCH] libclc: rename from libclc-git and update to 11.0.0 pullmoll
` (16 preceding siblings ...)
2020-11-25 19:04 ` pullmoll
@ 2020-11-25 19:18 ` Vaelatern
2020-11-25 19:32 ` pullmoll
` (3 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: Vaelatern @ 2020-11-25 19:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 222 bytes --]
New review comment by Vaelatern on void-packages repository
https://github.com/void-linux/void-packages/pull/26580#discussion_r530594685
Comment:
Doesn't explain why bother with the do_build or do_install steps manually
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PR REVIEW] libclc: rename from libclc-git and update to 11.0.0
2020-11-21 22:12 [PR PATCH] libclc: rename from libclc-git and update to 11.0.0 pullmoll
` (17 preceding siblings ...)
2020-11-25 19:18 ` Vaelatern
@ 2020-11-25 19:32 ` pullmoll
2020-11-25 19:36 ` [PR PATCH] [Updated] " pullmoll
` (2 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: pullmoll @ 2020-11-25 19:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 237 bytes --]
New review comment by pullmoll on void-packages repository
https://github.com/void-linux/void-packages/pull/26580#discussion_r530601215
Comment:
True. I didn't think about overriding just the `do_configure()` step. I will change that.
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PR PATCH] [Updated] libclc: rename from libclc-git and update to 11.0.0
2020-11-21 22:12 [PR PATCH] libclc: rename from libclc-git and update to 11.0.0 pullmoll
` (18 preceding siblings ...)
2020-11-25 19:32 ` pullmoll
@ 2020-11-25 19:36 ` pullmoll
2020-11-25 19:37 ` pullmoll
2020-11-25 20:07 ` pullmoll
21 siblings, 0 replies; 23+ messages in thread
From: pullmoll @ 2020-11-25 19:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 395 bytes --]
There is an updated pull request by pullmoll against master on the void-packages repository
https://github.com/pullmoll/void-packages libclc
https://github.com/void-linux/void-packages/pull/26580
libclc: rename from libclc-git and update to 11.0.0
Use the libclc src provided by llvm-project. Adopt.
A patch file from https://github.com/void-linux/void-packages/pull/26580.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libclc-26580.patch --]
[-- Type: text/x-diff, Size: 4394 bytes --]
From 584486b2394502bf48b752d069ff5c6daf86856c 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..396706b9aee
--- /dev/null
+++ b/srcpkgs/libclc/template
@@ -0,0 +1,28 @@
+# Template file for 'libclc'
+pkgname=libclc
+version=11.0.0
+revision=1
+build_style=cmake
+wrksrc="${pkgname}-${version}.src"
+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 1e3ad0af5bc3ccd00cd1a55e990d40db37a66210 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.*"
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PR PATCH] [Updated] libclc: rename from libclc-git and update to 11.0.0
2020-11-21 22:12 [PR PATCH] libclc: rename from libclc-git and update to 11.0.0 pullmoll
` (19 preceding siblings ...)
2020-11-25 19:36 ` [PR PATCH] [Updated] " pullmoll
@ 2020-11-25 19:37 ` pullmoll
2020-11-25 20:07 ` pullmoll
21 siblings, 0 replies; 23+ messages in thread
From: pullmoll @ 2020-11-25 19:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 395 bytes --]
There is an updated pull request by pullmoll against master on the void-packages repository
https://github.com/pullmoll/void-packages libclc
https://github.com/void-linux/void-packages/pull/26580
libclc: rename from libclc-git and update to 11.0.0
Use the libclc src provided by llvm-project. Adopt.
A patch file from https://github.com/void-linux/void-packages/pull/26580.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libclc-26580.patch --]
[-- Type: text/x-diff, Size: 4394 bytes --]
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.*"
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PR PATCH] [Updated] libclc: rename from libclc-git and update to 11.0.0
2020-11-21 22:12 [PR PATCH] libclc: rename from libclc-git and update to 11.0.0 pullmoll
` (20 preceding siblings ...)
2020-11-25 19:37 ` pullmoll
@ 2020-11-25 20:07 ` pullmoll
21 siblings, 0 replies; 23+ messages in thread
From: pullmoll @ 2020-11-25 20:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 395 bytes --]
There is an updated pull request by pullmoll against master on the void-packages repository
https://github.com/pullmoll/void-packages libclc
https://github.com/void-linux/void-packages/pull/26580
libclc: rename from libclc-git and update to 11.0.0
Use the libclc src provided by llvm-project. Adopt.
A patch file from https://github.com/void-linux/void-packages/pull/26580.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libclc-26580.patch --]
[-- Type: text/x-diff, Size: 4468 bytes --]
From f5500b19b1824fbd7e37c1d6f774c5b2ab9d5f81 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 | 29 +++++++++++++++++++++++++++++
2 files changed, 29 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..590a33736f1
--- /dev/null
+++ b/srcpkgs/libclc/template
@@ -0,0 +1,29 @@
+# Template file for 'libclc'
+pkgname=libclc
+version=11.0.0
+revision=1
+wrksrc="${pkgname}-${version}.src"
+build_style=cmake
+configure_args="-DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release"
+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 8c1d18079293cfec61d4f82adbd174c411d02895 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.*"
^ permalink raw reply [flat|nested] 23+ messages in thread