Re: [PR PATCH] [Updated] [WIP] New packages - Intel OpenCL (NEO)

[zlice <zlice@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1196 bytes --]

There is an updated pull request by zlice against master on the void-packages repository

https://github.com/zlice/void-packages intel-opencl
https://github.com/void-linux/void-packages/pull/43084

[WIP] New packages - Intel OpenCL (NEO)
[ci skip]

#### Testing the changes
- I tested the changes in this PR: **YES**

Ran a few OpenCL examples and [cl-mem](https://github.com/nerdralph/cl-mem). `clinfo` reports more stats also

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**

#### Local build testing
- I built this PR locally for my native architecture, **x86_64**

Could not get musl to build `intel-compute-runtime`. There are a few patches for execinfo, backtrace and RTLD_XXX but even sorting those out gets to a 'error code: -11'.

#### Comments

closes #11364

~~depends on #41132 for gmmlib bump (didn't want to add there in case it delays merge)~~

~~MIT license not in the tar for `intel-vc-intrinsics` yet? Was just added the other day.~~


A patch file from https://github.com/void-linux/void-packages/pull/43084.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-intel-opencl-43084.patch --]
[-- Type: text/x-diff, Size: 20535 bytes --]

From b4cf5ec7172779a66edad8deb6f230bc030b130a Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sun, 25 Feb 2024 12:08:36 -0500
Subject: [PATCH 01/12] New package: intel-opencl-clang-15.0.0

---
 srcpkgs/intel-opencl-clang/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/intel-opencl-clang/template

diff --git a/srcpkgs/intel-opencl-clang/template b/srcpkgs/intel-opencl-clang/template
new file mode 100644
index 00000000000000..ed5892d00dade9
--- /dev/null
+++ b/srcpkgs/intel-opencl-clang/template
@@ -0,0 +1,19 @@
+# Template file for 'intel-opencl-clang'
+pkgname=intel-opencl-clang
+version=15.0.0
+revision=1
+archs="x86_64*"
+build_style=cmake
+configure_args="-Wno-dev -DPREFERRED_LLVM_VERSION=15.0.7"
+hostmakedepends="cmake"
+makedepends="llvm15-devel clang15 clang-tools-extra15 SPIRV-LLVM-Translator15-devel"
+short_desc="LLVM linked opencl-clang"
+maintainer="Zlice <zlice555@gmail.com>"
+license="NCSA"
+homepage="https://github.com/intel/opencl-clang"
+distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
+checksum=ea179674e52bc8c658e2655f76be467f7052f7d2c37ebcfdb102dce645ad1411
+
+post_install() {
+	vlicense LICENSE
+}

From a580fff8b7bcaefff2a0329b643d4f9d73861ad8 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sun, 25 Feb 2024 12:10:52 -0500
Subject: [PATCH 02/12] New package: intel-vc-intrinsics-0.18.0

---
 srcpkgs/intel-vc-intrinsics/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/intel-vc-intrinsics/template

diff --git a/srcpkgs/intel-vc-intrinsics/template b/srcpkgs/intel-vc-intrinsics/template
new file mode 100644
index 00000000000000..b67257286d4f0e
--- /dev/null
+++ b/srcpkgs/intel-vc-intrinsics/template
@@ -0,0 +1,19 @@
+# Template file for 'intel-vc-intrinsics'
+pkgname=intel-vc-intrinsics
+version=0.18.0
+revision=1
+archs="x86_64*"
+build_style=cmake
+configure_args="-Wno-dev -DLLVM_DIR=/usr/lib/cmake/llvm -DCMAKE_BUILD_TYPE=Release"
+hostmakedepends="cmake python"
+makedepends="llvm15-devel clang15 clang-tools-extra15"
+short_desc="Set of intrinsics on top of core LLVM IR"
+maintainer="Zlice <zlice555@gmail.com>"
+license="MIT"
+homepage="https://github.com/intel/vc-intrinsics"
+distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
+checksum=b694273095356b35686c1e8684ee215f46bd8a73988092913d84216f080ef995
+
+post_install() {
+	vlicense LICENSE.md
+}

From 3b070a7b8080efeca8eef2e1e94c5b0b7a1d9635 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sun, 25 Feb 2024 12:11:29 -0500
Subject: [PATCH 03/12] New package: intel-graphics-compile-1.0.15985.7

---
 srcpkgs/intel-graphics-compiler/template | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 srcpkgs/intel-graphics-compiler/template

diff --git a/srcpkgs/intel-graphics-compiler/template b/srcpkgs/intel-graphics-compiler/template
new file mode 100644
index 00000000000000..727d4aacdcc0df
--- /dev/null
+++ b/srcpkgs/intel-graphics-compiler/template
@@ -0,0 +1,22 @@
+# Template file for 'intel-graphics-compiler'
+pkgname=intel-graphics-compiler
+version=1.0.15985.7
+revision=1
+archs="x86_64*"
+build_style=cmake
+configure_args="-Wno-dev -DIGC_OPTION__LLVM_PREFERRED_VERSION=15.0.7 -DCCLANG_FROM_SYSTEM=ON
+ -DIGC_OPTION__SPIRV_TOOLS_MODE=Prebuilds -DIGC_OPTION__USE_PREINSTALLED_SPRIV_HEADERS=ON
+ -DIGC_OPTION__VC_INTRINSICS_MODE=Prebuilds"
+hostmakedepends="flex bison zlib-devel libzstd-devel cmake"
+makedepends="llvm15-devel clang15 clang-tools-extra15 intel-opencl-clang intel-vc-intrinsics
+ lld15 lld15-devel SPIRV-Headers SPIRV-LLVM-Translator15-devel SPIRV-Tools-devel python3-Mako"
+short_desc="LLVM based compiler for OpenCL targeting Intel"
+maintainer="Zlice <zlice555@gmail.com>"
+license="MIT"
+homepage="https://github.com/intel/intel-graphics-compiler"
+distfiles="${homepage}/archive/refs/tags/igc-${version}.tar.gz"
+checksum=fa4d824b9d2fc9c32decf07dd03a6af07236b060497f2bff513d0b709c2606a9
+
+post_install() {
+	vlicense LICENSE.md
+}

From 952f6a146ad0e4d625a190e23a7ea634ca2dd9dc Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sun, 25 Feb 2024 12:12:12 -0500
Subject: [PATCH 04/12] New package: intel-compute-runtime-23.52.28202.14

---
 srcpkgs/intel-compute-runtime/template | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 srcpkgs/intel-compute-runtime/template

diff --git a/srcpkgs/intel-compute-runtime/template b/srcpkgs/intel-compute-runtime/template
new file mode 100644
index 00000000000000..f026ab35e670f3
--- /dev/null
+++ b/srcpkgs/intel-compute-runtime/template
@@ -0,0 +1,22 @@
+# Template file for 'intel-compute-runtime'
+pkgname=intel-compute-runtime
+version=23.52.28202.14
+revision=1
+archs="x86_64"
+build_style=cmake
+configure_args="-Wno-dev -DNEO_SKIP_UNIT_TESTS=1 -DSUPPORT_DG1=ON -DSUPPORT_DG2=ON"
+hostmakedepends="cmake pkg-config"
+makedepends="intel-gmmlib-devel libva-devel ocl-icd-devel
+ intel-opencl-clang intel-graphics-compiler level-zero-devel
+ intel-metrics-library intel-metrics-discovery"
+depends="intel-graphics-compiler"
+short_desc="Intel Graphics Compute Runtime for oneAPI Level Zero and OpenCL"
+maintainer="Zlice <zlice555@gmail.com>"
+license="MIT"
+homepage="https://github.com/intel/compute-runtime"
+distfiles="${homepage}/archive/refs/tags/${version}.tar.gz"
+checksum=de5f2873e67d4a856022e0a7eaecbf8119d9eb51b2eefa30ae61cae1a1d9a422
+
+post_install() {
+	vlicense LICENSE.md
+}

From 3ea7f41fdcd4ab77d61244ee5a01decf0c01ac77 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sun, 25 Feb 2024 12:12:26 -0500
Subject: [PATCH 05/12] New package: intel-metrics-discovery-1.12.170

---
 srcpkgs/intel-metrics-discovery/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/intel-metrics-discovery/template

diff --git a/srcpkgs/intel-metrics-discovery/template b/srcpkgs/intel-metrics-discovery/template
new file mode 100644
index 00000000000000..b64083d484de0b
--- /dev/null
+++ b/srcpkgs/intel-metrics-discovery/template
@@ -0,0 +1,19 @@
+# Template file for 'intel-metrics-discovery'
+pkgname=intel-metrics-discovery
+version=1.12.170
+revision=1
+archs="x86_64*"
+build_style=cmake
+configure_args="-Wdev-no -DCMAKE_BUILD_TYPE=Release"
+hostmakedepends="cmake"
+makedepends="libdrm-devel"
+short_desc="Helper library that provides access to GPU performance data"
+maintainer="Zlice <zlice555@gmail.com>"
+license="MIT"
+homepage="https://github.com/intel/metrics-discovery"
+distfiles="${homepage}/archive/refs/tags/metrics-discovery-${version}.tar.gz"
+checksum=5942588d8bb266b589c878c49e1b3a8ac069edd9f1ddd219ec8fe071ac4919cc
+
+post_install() {
+	vlicense LICENSE.md
+}

From b6a820ddc7eca5cd27ddb6c1b65313923e44f9ca Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sun, 25 Feb 2024 12:12:37 -0500
Subject: [PATCH 06/12] New package: intel-metrics-library-1.0.156

---
 srcpkgs/intel-metrics-library/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/intel-metrics-library/template

diff --git a/srcpkgs/intel-metrics-library/template b/srcpkgs/intel-metrics-library/template
new file mode 100644
index 00000000000000..870d7af5e873f3
--- /dev/null
+++ b/srcpkgs/intel-metrics-library/template
@@ -0,0 +1,19 @@
+# Template file for 'intel-metrics-library'
+pkgname=intel-metrics-library
+version=1.0.156
+revision=1
+archs="x86_64*"
+build_style=cmake
+configure_args="-Wdev-no -DCMAKE_BUILD_TYPE=Release"
+hostmakedepends="cmake"
+makedepends="libdrm-devel"
+short_desc="Helper library that provides access to GPU performance counters"
+maintainer="Zlice <zlice555@gmail.com>"
+license="MIT"
+homepage="https://github.com/intel/metrics-library"
+distfiles="${homepage}/archive/refs/tags/metrics-library-${version}.tar.gz"
+checksum=0d37bcc803ca678ae0f9420431211a9d1b1f25d1569a49d88b4aa85b898f1b61
+
+post_install() {
+	vlicense LICENSE.md
+}

From 8874b0866b195f9a1f2ef67703135c5e4bd3a349 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sun, 25 Feb 2024 12:12:48 -0500
Subject: [PATCH 07/12] New package: level-zero-1.15.8

---
 srcpkgs/level-zero-devel    |  1 +
 srcpkgs/level-zero/template | 28 ++++++++++++++++++++++++++++
 2 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/level-zero-devel
 create mode 100644 srcpkgs/level-zero/template

diff --git a/srcpkgs/level-zero-devel b/srcpkgs/level-zero-devel
new file mode 120000
index 00000000000000..96ee8adf7303c4
--- /dev/null
+++ b/srcpkgs/level-zero-devel
@@ -0,0 +1 @@
+level-zero
\ No newline at end of file
diff --git a/srcpkgs/level-zero/template b/srcpkgs/level-zero/template
new file mode 100644
index 00000000000000..031429f8310615
--- /dev/null
+++ b/srcpkgs/level-zero/template
@@ -0,0 +1,28 @@
+# Template file for 'level-zero'
+pkgname=level-zero
+version=1.15.8
+revision=1
+archs="x86_64*"
+build_style=cmake
+hostmakedepends="cmake"
+makedepends="llvm15-devel clang15 clang-tools-extra15 SPIRV-LLVM-Translator15-devel"
+short_desc="OneAPI Level Zero Specification"
+maintainer="Zlice <zlice555@gmail.com>"
+license="NCSA"
+homepage="https://github.com/oneapi-src/level-zero"
+distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
+checksum=80663dbd4d01d9519185c6e568f2e836bfea7484363f4da8cf5cf77c3bf58602
+
+post_install() {
+	vlicense LICENSE
+}
+
+level-zero-devel_package() {
+	depends="${makedepends} ${sourcepkg}-${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}

From 7284a1ae794d91b524bc55b56b21426334ca1e8d Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sun, 25 Feb 2024 12:13:05 -0500
Subject: [PATCH 08/12] intel-gmmlib: update to 22.3.17

---
 srcpkgs/intel-gmmlib/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/intel-gmmlib/template b/srcpkgs/intel-gmmlib/template
index b9df642f6320f2..5aa1106f54147d 100644
--- a/srcpkgs/intel-gmmlib/template
+++ b/srcpkgs/intel-gmmlib/template
@@ -1,6 +1,6 @@
 # Template file for 'intel-gmmlib'
 pkgname=intel-gmmlib
-version=22.3.12
+version=22.3.17
 revision=1
 archs="i686* x86_64*"
 build_style=cmake
@@ -18,7 +18,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/intel/gmmlib"
 distfiles="https://github.com/intel/gmmlib/archive/intel-gmmlib-${version}.tar.gz"
-checksum=14ec859936aea696a65e6b9488e95a0ac26b15126ef65b20956ef219004dd9a6
+checksum=5fa23407d4780c4ee8acd68e9ec9186e1721238150dc36ca9ab469a335891d2a
 
 lib32disabled=yes
 

From 917bb606dc2da2fa37efd8986a990e2c084cdfcc Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sun, 25 Feb 2024 12:13:17 -0500
Subject: [PATCH 09/12] intel-media-driver: update to 24.1.3

---
 srcpkgs/intel-media-driver/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/intel-media-driver/template b/srcpkgs/intel-media-driver/template
index 973e80257664cf..61f4ccf3fc4a9c 100644
--- a/srcpkgs/intel-media-driver/template
+++ b/srcpkgs/intel-media-driver/template
@@ -1,6 +1,6 @@
 # Template file for 'intel-media-driver'
 pkgname=intel-media-driver
-version=23.4.1
+version=24.1.3
 revision=1
 archs="x86_64*"
 build_style=cmake
@@ -13,7 +13,7 @@ license="MIT, BSD-3-Clause"
 homepage="https://github.com/intel/media-driver"
 changelog="https://github.com/intel/media-driver/releases"
 distfiles="https://github.com/intel/media-driver/archive/intel-media-${version}.tar.gz"
-checksum=c61e7bc8f495a2314b24d14c88a1a8955e1347d26afa54c9b37b5527b9b316ad
+checksum=a024e96abd662193e4295f427a76c5894087503df46bd82c0e5bea103e44b171
 
 build_options="nonfree"
 desc_option_nonfree="Enable nonfree kernels"

From 13444126017b1dd849c6f278d20957213d25cfd1 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sun, 25 Feb 2024 12:13:29 -0500
Subject: [PATCH 10/12] oneVPL: update to 2023.4.0

---
 srcpkgs/oneVPL/patches/cross-pc.patch |  7 ++++---
 srcpkgs/oneVPL/template               | 12 ++++++------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/oneVPL/patches/cross-pc.patch b/srcpkgs/oneVPL/patches/cross-pc.patch
index 0b24a2124c9b2f..611192a3862585 100644
--- a/srcpkgs/oneVPL/patches/cross-pc.patch
+++ b/srcpkgs/oneVPL/patches/cross-pc.patch
@@ -1,5 +1,5 @@
---- a/dispatcher/pkgconfig/vpl.pc.in	2023-07-21 23:28:38.000000000 +0200
-+++ -	2023-11-14 10:16:46.665168740 +0100
+--- a/libvpl/pkgconfig/vpl.pc.in	2023-11-29 17:59:08.000000000 -0500
++++ - 15:12:59.127421949 -0500
 @@ -1,6 +1,6 @@
 -prefix=@pc_rel_prefix@
 -libdir=@pc_rel_libdir@
@@ -7,6 +7,7 @@
 +prefix=@CMAKE_INSTALL_PREFIX@
 +libdir=${prefix}/lib
 +includedir=${prefix}/include
- 
+
  # oneAPI Video Processing Library (oneVPL)
  Name: oneVPL
+
diff --git a/srcpkgs/oneVPL/template b/srcpkgs/oneVPL/template
index de6cd7adc9828f..21fe1b2e06a599 100644
--- a/srcpkgs/oneVPL/template
+++ b/srcpkgs/oneVPL/template
@@ -1,17 +1,17 @@
 # Template file for 'oneVPL'
 pkgname=oneVPL
-version=2023.3.1
-revision=2
+version=2023.4.0
+revision=1
 build_style=cmake
 hostmakedepends="libva-devel libX11-devel"
 hostmakedepends="pkg-config"
 short_desc="Intel oneAPI Video Processing Library"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MIT"
-homepage="https://github.com/oneapi-src/oneVPL"
-changelog="https://github.com/oneapi-src/oneVPL/blob/master/CHANGELOG.md"
-distfiles="https://github.com/oneapi-src/oneVPL/archive/refs/tags/v$version.tar.gz"
-checksum=4411543519486a2450f6f5af06a077596e7888a551768594e9dfa2a46b23b6f5
+homepage="https://github.com/intel/libvpl"
+changelog="https://github.com/intel/libvpl/blob/master/CHANGELOG.md"
+distfiles="https://github.com/intel/libvpl/archive/refs/tags/v${version}.tar.gz"
+checksum=978398c7bb1665a6ad7a1a15cc57dc0204608e56c88436e376b717320a9e63fd
 
 post_install() {
 	vlicense LICENSE

From f3cbff6898fa5c59d9a7ee0d187b844f33b275e1 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 11 May 2024 20:09:56 -0400
Subject: [PATCH 11/12] New package: SPIRV-LLVM-Translator15-15.0.0_1

---
 common/shlibs                            |  1 +
 srcpkgs/SPIRV-LLVM-Translator15-devel    |  1 +
 srcpkgs/SPIRV-LLVM-Translator15/template | 32 ++++++++++++++++++++++++
 3 files changed, 34 insertions(+)
 create mode 120000 srcpkgs/SPIRV-LLVM-Translator15-devel
 create mode 100644 srcpkgs/SPIRV-LLVM-Translator15/template

diff --git a/common/shlibs b/common/shlibs
index 75e1249abcb264..2686077c894c95 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -990,6 +990,7 @@ libLLVM-11.so libllvm11-11.0.0_1
 libLLVM-12.so libllvm12-12.0.0_1
 libLLVM-15.so libllvm15-15.0.7_4
 libLLVM-17.so libllvm17-17.0.6_1
+libLLVMSPIRVLib.so.15 SPIRV-LLVM-Translator15-15.0.0_1
 libLLVMSPIRVLib.so.17 SPIRV-LLVM-Translator-17.0.0_1
 libomp.so.5 libomp-17.0.6_1
 libomptarget.so.17 libomp-17.0.3_1
diff --git a/srcpkgs/SPIRV-LLVM-Translator15-devel b/srcpkgs/SPIRV-LLVM-Translator15-devel
new file mode 120000
index 00000000000000..77ea95bbc4b924
--- /dev/null
+++ b/srcpkgs/SPIRV-LLVM-Translator15-devel
@@ -0,0 +1 @@
+SPIRV-LLVM-Translator15
\ No newline at end of file
diff --git a/srcpkgs/SPIRV-LLVM-Translator15/template b/srcpkgs/SPIRV-LLVM-Translator15/template
new file mode 100644
index 00000000000000..845da9aaaa9a5e
--- /dev/null
+++ b/srcpkgs/SPIRV-LLVM-Translator15/template
@@ -0,0 +1,32 @@
+# Template file for 'SPIRV-LLVM-Translator15'
+pkgname=SPIRV-LLVM-Translator15
+version=15.0.0
+revision=1
+build_style=cmake
+make_build_args="llvm-spirv"
+configure_args="-Wno-dev -DLLVM_LINK_LLVM_DYLIB=ON -DCMAKE_SKIP_RPATH=ON
+ -DLLVM_SPIRV_INCLUDE_TESTS=OFF -DBUILD_SHARED_LIBS=ON
+ -DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR=/usr"
+hostmakedepends="clang15 llvm15"
+makedepends="clang-tools-extra15 llvm15-devel SPIRV-Headers"
+short_desc="API and commands for processing SPIR-V modules"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="NCSA"
+homepage="https://github.com/KhronosGroup/SPIRV-LLVM-Translator"
+distfiles="https://github.com/KhronosGroup/SPIRV-LLVM-Translator/archive/refs/tags/v${version}.tar.gz"
+checksum=b1bebd77f72988758c00852e78c2ddc545815a612169a0cb377d021e2f846d88
+
+post_install() {
+	vlicense LICENSE.TXT
+	vbin ${wrksrc}/${cmake_builddir}/tools/llvm-spirv/llvm-spirv
+}
+
+SPIRV-LLVM-Translator15-devel_package() {
+	depends="SPIRV-LLVM-Translator15-${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}

From 070eff9042328b790d1559f72b07ff6059f4fecb Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Sat, 11 May 2024 20:10:50 -0400
Subject: [PATCH 12/12] llvm15: readd devel packages

---
 common/shlibs           |  1 +
 srcpkgs/clang15-devel   |  1 +
 srcpkgs/llvm15-devel    |  1 +
 srcpkgs/llvm15/template | 59 +++++++++++++++++++++++++++++++++++++++--
 4 files changed, 60 insertions(+), 2 deletions(-)
 create mode 120000 srcpkgs/clang15-devel
 create mode 120000 srcpkgs/llvm15-devel

diff --git a/common/shlibs b/common/shlibs
index 2686077c894c95..e32e3d026260cd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -992,6 +992,7 @@ libLLVM-15.so libllvm15-15.0.7_4
 libLLVM-17.so libllvm17-17.0.6_1
 libLLVMSPIRVLib.so.15 SPIRV-LLVM-Translator15-15.0.0_1
 libLLVMSPIRVLib.so.17 SPIRV-LLVM-Translator-17.0.0_1
+libopencl-clang.so.15 intel-opencl-clang-15.0.0_1
 libomp.so.5 libomp-17.0.6_1
 libomptarget.so.17 libomp-17.0.3_1
 libisofs.so.6 libisofs-0.6.24_1
diff --git a/srcpkgs/clang15-devel b/srcpkgs/clang15-devel
new file mode 120000
index 00000000000000..c3d2f127dbecdf
--- /dev/null
+++ b/srcpkgs/clang15-devel
@@ -0,0 +1 @@
+clang15
\ No newline at end of file
diff --git a/srcpkgs/llvm15-devel b/srcpkgs/llvm15-devel
new file mode 120000
index 00000000000000..ad57a969b9f9cf
--- /dev/null
+++ b/srcpkgs/llvm15-devel
@@ -0,0 +1 @@
+llvm15
\ No newline at end of file
diff --git a/srcpkgs/llvm15/template b/srcpkgs/llvm15/template
index 91ef4a07949135..2122206c0c0ebb 100644
--- a/srcpkgs/llvm15/template
+++ b/srcpkgs/llvm15/template
@@ -1,7 +1,7 @@
 # Template file for 'llvm15'
 pkgname=llvm15
 version=15.0.7
-revision=4
+revision=5
 build_wrksrc=llvm
 build_style=cmake
 _ext_suffix=".cpython-${py3_ver/./}-linux-${XBPS_TARGET_LIBC/glibc/gnu}.so"
@@ -57,7 +57,7 @@ esac
 
 
 subpackages="clang-tools-extra15 clang15 clang-analyzer15 libclang15 libclang-cpp15
- libllvm15"
+ libllvm15 llvm15-devel"
 
 if [ "$_lldb_enable" = "yes" ]; then
 	# XXX fails to cross compile due to python
@@ -219,6 +219,38 @@ clang-tools-extra15_package() {
 	}
 }
 
+clang15-devel_package() {
+	lib32disabled=yes
+	depends="libstdc++-devel libgcc-devel  binutils ${XBPS_TARGET_LIBC}-devel
+		clang15>=${version}_${revision} clang-analyzer15>=${version}_${revision}
+		llvm15>=${version}_${revision}"
+	if [ "$build_option_clang_tools_extra" ]; then
+		depends+=" clang-tools-extra15>=${version}_${revision}"
+	fi
+	short_desc+=" - C language family frontend - development Files"
+	homepage="https://clang.llvm.org/"
+	pkg_install() {
+	vmove usr/include/clang
+	vmove usr/include/clang-c
+	vmove usr/lib/libear
+	vmove usr/lib/cmake/clang
+	vmove "usr/lib/libclang*.a"
+	vmove "usr/lib/libclang*.so"
+	vmove usr/share/clang
+	vmove usr/bin/hmaptool
+	vmove usr/bin/git-clang-format
+	if [ "$build_option_clang_tools_extra" ]; then
+		vmove usr/include/clang-tidy
+		vmove usr/lib/libfindAllSymbols.a
+	fi
+	if [ "$build_option_polly" ]; then
+		vmove usr/include/polly
+		vmove usr/lib/cmake/polly
+		vmove "usr/lib/libPolly*.a"
+	fi
+	}
+}
+
 clang15_package() {
 	lib32disabled=yes
 	depends="libstdc++-devel libgcc-devel  binutils ${XBPS_TARGET_LIBC}-devel
@@ -304,6 +336,29 @@ lldb15-devel_package() {
 	}
 }
 
+llvm15-devel_package() {
+	short_desc+=" - development files"
+	depends="llvm15>=${version}_${revision}"
+	if [ "$build_option_openmp" ]; then
+		depends+=" libomp-devel>=${version}_${revision} "
+	fi
+	if [ "$build_option_mlir" ]; then
+		depends+=" mlir17-devel>=${version}_${revision} "
+	fi
+	if [ "$build_option_clang" ]; then
+		depends+=" clang15-devel>=${version}_${revision} "
+	fi
+	pkg_install() {
+		vmove usr/lib/libLLVM.so
+		vmove usr/lib/libLTO.so
+		vmove usr/lib/libRemarks.so
+		vmove usr/include/llvm
+		vmove usr/include/llvm-c
+		vmove "usr/lib/libLLVM*.a"
+		vmove usr/lib/cmake/llvm
+	}
+}
+
 libllvm15_package() {
 	short_desc+=" - runtime library"
 	pkg_install() {