From f3d5db849a5174e83246d5094c34f6ae1bbfee01 Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Thu, 18 Jan 2024 10:03:57 -0500 Subject: [PATCH 1/3] New package: OpenCL-ICD-Loader-2023.12.14 --- common/shlibs | 2 +- srcpkgs/OpenCL-ICD-Loader-devel | 1 + srcpkgs/OpenCL-ICD-Loader/template | 33 +++++++++++++++++++++++++++ srcpkgs/ocl-icd | 1 + srcpkgs/ocl-icd-devel | 2 +- srcpkgs/ocl-icd/template | 36 ------------------------------ 6 files changed, 37 insertions(+), 38 deletions(-) create mode 120000 srcpkgs/OpenCL-ICD-Loader-devel create mode 100644 srcpkgs/OpenCL-ICD-Loader/template create mode 120000 srcpkgs/ocl-icd delete mode 100644 srcpkgs/ocl-icd/template diff --git a/common/shlibs b/common/shlibs index 9e6d29c73341e..241be3e11ac29 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3469,7 +3469,7 @@ libtepl-6.so.2 tepl-6.4.0_1 libnomacsCore.so.3 nomacs-3.10.2_4 libaudit.so.1 libaudit-2.8.4_1 libauparse.so.0 libauparse-2.8.4_1 -libOpenCL.so.1 ocl-icd-2.2.12_1 +libOpenCL.so.1 OpenCL-ICD-Loader-2023.12.14_1 liburiparser.so.1 uriparser-0.8.6_1 libcpptest.so.1 cpptest-2.0.0_1 libhandy-0.0.so.0 libhandy-0.0.3_1 diff --git a/srcpkgs/OpenCL-ICD-Loader-devel b/srcpkgs/OpenCL-ICD-Loader-devel new file mode 120000 index 0000000000000..ccd0f91d6e804 --- /dev/null +++ b/srcpkgs/OpenCL-ICD-Loader-devel @@ -0,0 +1 @@ +OpenCL-ICD-Loader \ No newline at end of file diff --git a/srcpkgs/OpenCL-ICD-Loader/template b/srcpkgs/OpenCL-ICD-Loader/template new file mode 100644 index 0000000000000..1ec3a60a23344 --- /dev/null +++ b/srcpkgs/OpenCL-ICD-Loader/template @@ -0,0 +1,33 @@ +# Template file for 'OpenCL-ICD-Loader' +pkgname=OpenCL-ICD-Loader +version=2023.12.14 +revision=1 +build_style=cmake +makedepends="OpenCL-Headers" +short_desc="Khronos OpenCL ICD Loader" +maintainer="Daniel Martinez " +license="Apache-2.0" +homepage="https://github.com/KhronosGroup/OpenCL-ICD-Loader" +distfiles="https://github.com/KhronosGroup/OpenCL-ICD-Loader/archive/refs/tags/v${version}.tar.gz" +checksum=af8df96f1e1030329e8d4892ba3aa761b923838d4c689ef52d97822ab0bd8917 + +ocl-icd-devel_package() { + build_style=meta + depends="OpenCL-ICD-Loader-devel>=${version}_${revision}" + short_desc+=" (transitional dummy package)" +} + +ocl-icd_package() { + build_style=meta + depends="OpenCL-ICD-Loader>=${version}_${revision}" + short_desc+=" (transitional dummy package)" +} + +OpenCL-ICD-Loader-devel_package() { + depends="OpenCL-ICD-Loader-${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/lib/pkgconfig/OpenCL.pc + vmove usr/share/cmake/OpenCLICDLoader + } +} diff --git a/srcpkgs/ocl-icd b/srcpkgs/ocl-icd new file mode 120000 index 0000000000000..ccd0f91d6e804 --- /dev/null +++ b/srcpkgs/ocl-icd @@ -0,0 +1 @@ +OpenCL-ICD-Loader \ No newline at end of file diff --git a/srcpkgs/ocl-icd-devel b/srcpkgs/ocl-icd-devel index bcd9e7f625181..ccd0f91d6e804 120000 --- a/srcpkgs/ocl-icd-devel +++ b/srcpkgs/ocl-icd-devel @@ -1 +1 @@ -ocl-icd \ No newline at end of file +OpenCL-ICD-Loader \ No newline at end of file diff --git a/srcpkgs/ocl-icd/template b/srcpkgs/ocl-icd/template deleted file mode 100644 index ab3e07a9f762b..0000000000000 --- a/srcpkgs/ocl-icd/template +++ /dev/null @@ -1,36 +0,0 @@ -# Template file for 'ocl-icd' -pkgname=ocl-icd -version=2.3.2 -revision=2 -build_style=gnu-configure -hostmakedepends="ruby xmlto asciidoc automake libtool" -makedepends="OpenCL-Headers" -short_desc="Generic OpenCL ICD loader/demultiplexer" -maintainer="Orphaned " -license="BSD-2-Clause" -homepage="https://github.com/OCL-dev/ocl-icd" -distfiles="https://github.com/OCL-dev/${pkgname}/archive/v${version}.tar.gz" -checksum=ec47d7dcd961ea06695b067e8b7edb82e420ddce03e0081a908c62fd0b8535c5 - -provides="libOpenCL-1.2_1" -replaces="libOpenCL>=0" - -CFLAGS="-fcommon" - -pre_configure() { - ./bootstrap -} - -post_install() { - vlicense COPYING -} - -ocl-icd-devel_package() { - depends="OpenCL-Headers ${sourcepkg}>=${version}_${revision}" - short_desc+=" - development files" - pkg_install() { - vmove usr/include - vmove usr/lib/pkgconfig - vmove usr/share/doc - } -} From 9f104c82f8d66b2ffb804e4c7c348779b0bb01eb Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Thu, 18 Jan 2024 10:06:38 -0500 Subject: [PATCH 2/3] New package: OpenCL-CLHPP-2023.12.14 --- srcpkgs/OpenCL-CLHPP/template | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 srcpkgs/OpenCL-CLHPP/template diff --git a/srcpkgs/OpenCL-CLHPP/template b/srcpkgs/OpenCL-CLHPP/template new file mode 100644 index 0000000000000..b2fe70a57637c --- /dev/null +++ b/srcpkgs/OpenCL-CLHPP/template @@ -0,0 +1,17 @@ +# Template file for 'OpenCL-CLHPP' +pkgname=OpenCL-CLHPP +version=2023.12.14 +revision=1 +build_style=cmake +configure_args=" + -DBUILD_EXAMPLES=OFF + -DBUILD_TESTING=OFF +" +makedepends="OpenCL-Headers OpenCL-ICD-Loader-devel" +depends="OpenCL-Headers" +short_desc="OpenCL API C++ bindings" +maintainer="Daniel Martinez " +license="Apache-2.0" +homepage="https://github.com/KhronosGroup/OpenCL-CLHPP" +distfiles="https://github.com/KhronosGroup/OpenCL-CLHPP/archive/refs/tags/v${version}.tar.gz" +checksum="9106700634e79cfa0935ebd67197f64689ced24c42da702acf18fa8435bd8a82" From 7436aecab55b362c06d63705fff435daa96b3ff7 Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Thu, 18 Jan 2024 10:07:17 -0500 Subject: [PATCH 3/3] New package: OpenCL-SDK-2023.12.14 --- srcpkgs/OpenCL-SDK/patches/submodules.patch | 17 +++++++++++++++++ srcpkgs/OpenCL-SDK/template | 21 +++++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 srcpkgs/OpenCL-SDK/patches/submodules.patch create mode 100644 srcpkgs/OpenCL-SDK/template diff --git a/srcpkgs/OpenCL-SDK/patches/submodules.patch b/srcpkgs/OpenCL-SDK/patches/submodules.patch new file mode 100644 index 0000000000000..35c6bacf518e1 --- /dev/null +++ b/srcpkgs/OpenCL-SDK/patches/submodules.patch @@ -0,0 +1,17 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 333b529..aa508e5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -39,9 +39,9 @@ if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) + set(CMAKE_INSTALL_PREFIX "${PROJECT_SOURCE_DIR}/install" CACHE PATH "Install Path" FORCE) + endif() + +-add_subdirectory(external/OpenCL-Headers) +-add_subdirectory(external/OpenCL-ICD-Loader) +-add_subdirectory(external/OpenCL-CLHPP) ++find_package (OpenCLHeaders REQUIRED) ++find_package (OpenCL REQUIRED) ++find_package (OpenCLHeadersCpp REQUIRED) + + list(APPEND CMAKE_MODULE_PATH + ${PROJECT_SOURCE_DIR}/cmake diff --git a/srcpkgs/OpenCL-SDK/template b/srcpkgs/OpenCL-SDK/template new file mode 100644 index 0000000000000..5b176bbdcbebe --- /dev/null +++ b/srcpkgs/OpenCL-SDK/template @@ -0,0 +1,21 @@ +# Template file for 'OpenCL-SDK' +pkgname=OpenCL-SDK +version=2023.12.14 +revision=1 +#build_wrksrc=OpenCL-SDK-${version} +build_style=cmake +configure_args=" + -DOPENCL_SDK_BUILD_SAMPLES=OFF + -DOPENCL_SDK_BUILD_OPENGL_SAMPLES=OFF + -DOPENCL_SDK_TEST_SAMPLES=OFF + -DOPENCL_SDK_BUILD_TESTS=OFF +" +hostmakedepends="git" +makedepends="OpenCL-Headers OpenCL-ICD-Loader-devel OpenCL-CLHPP" +depends="${makedepends}" +short_desc="OpenCL SDK" +maintainer="Daniel Martinez " +license="Apache-2.0" +homepage="https://github.com/KhronosGroup/OpenCL-SDK" +distfiles="https://github.com/KhronosGroup/OpenCL-SDK/archive/refs/tags/v${version}.tar.gz" +checksum="9d70ec09aa5d811e6b345ce27fed20fbe0d826ce944b1eaa01af4c3f822adf7b"