diff mbox series

[meta-oe,v2,2/6] opencl: rename virtual/opencl-icd to virtual/libopencl1

Message ID 20250918014442.1436475-2-dmitry.baryshkov@oss.qualcomm.com
State New
Headers show
Series [meta-oe,v2,1/6] ocl-icd, opencl-icd-loader: drop RPROVIDES for virtual-opencl-icd | expand

Commit Message

Dmitry Baryshkov Sept. 18, 2025, 1:44 a.m. UTC 
The ocl-icd and opencl-icd-loader provide libOpenCL.so.1 rather than the
OpenCL Installable Client Driver (ICD). Rename the virtual package
accordingly.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
---
 meta-oe/conf/layer.conf                                     | 2 +-
 meta-oe/recipes-core/opencl/clpeak_1.1.5.bb                 | 2 +-
 meta-oe/recipes-core/opencl/ocl-icd_2.3.2.bb                | 2 +-
 meta-oe/recipes-core/opencl/opencl-icd-loader_2024.05.08.bb | 2 +-
 meta-oe/recipes-graphics/ktx-software/ktx-software_4.4.0.bb | 2 +-
 meta-oe/recipes-support/opencl/clinfo_3.0.23.01.25.bb       | 3 +--
 meta-oe/recipes-support/opencv/opencv_4.12.0.bb             | 2 +-
 7 files changed, 7 insertions(+), 8 deletions(-)
diff mbox series

Patch

diff --git a/meta-oe/conf/layer.conf b/meta-oe/conf/layer.conf
index 2f3da6170e89..5b9ceb424eb1 100644
--- a/meta-oe/conf/layer.conf
+++ b/meta-oe/conf/layer.conf
@@ -58,7 +58,7 @@  PREFERRED_RPROVIDER_nativesdk-libdevmapper = "nativesdk-lvm2"
 PREFERRED_PROVIDER_android-tools-conf ?= "android-tools-conf"
 # Configures whether coreutils or uutils-coreutils is used.
 PREFERRED_PROVIDER_coreutils = "coreutils"
-PREFERRED_PROVIDER_virtual/opencl-icd ?= "opencl-icd-loader"
+PREFERRED_PROVIDER_virtual/libopencl1 ?= "opencl-icd-loader"
 PREFERRED_RPROVIDER_virtual-redis ?= "redis"
 
 SIGGEN_EXCLUDERECIPES_ABISAFE += " \
diff --git a/meta-oe/recipes-core/opencl/clpeak_1.1.5.bb b/meta-oe/recipes-core/opencl/clpeak_1.1.5.bb
index a765f1530f87..4744f788b926 100644
--- a/meta-oe/recipes-core/opencl/clpeak_1.1.5.bb
+++ b/meta-oe/recipes-core/opencl/clpeak_1.1.5.bb
@@ -11,4 +11,4 @@  SRCREV = "b2e647ffb8f42aa22ce4b0194d6ef6d16d5002b0"
 
 inherit cmake
 
-DEPENDS += "opencl-clhpp virtual/opencl-icd"
+DEPENDS += "opencl-clhpp virtual/libopencl1"
diff --git a/meta-oe/recipes-core/opencl/ocl-icd_2.3.2.bb b/meta-oe/recipes-core/opencl/ocl-icd_2.3.2.bb
index b266d6af6d91..f31c51c67e73 100644
--- a/meta-oe/recipes-core/opencl/ocl-icd_2.3.2.bb
+++ b/meta-oe/recipes-core/opencl/ocl-icd_2.3.2.bb
@@ -13,6 +13,6 @@  SRCREV = "fdde6677b21329432db8b481e2637cd10f7d3cb2"
 inherit autotools
 
 DEPENDS = "ruby-native"
-PROVIDES = "virtual/opencl-icd"
+PROVIDES = "virtual/libopencl1"
 
 BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-oe/recipes-core/opencl/opencl-icd-loader_2024.05.08.bb b/meta-oe/recipes-core/opencl/opencl-icd-loader_2024.05.08.bb
index d5337af8e5fb..f847c3eae40e 100644
--- a/meta-oe/recipes-core/opencl/opencl-icd-loader_2024.05.08.bb
+++ b/meta-oe/recipes-core/opencl/opencl-icd-loader_2024.05.08.bb
@@ -8,7 +8,7 @@  inherit pkgconfig cmake
 
 DEPENDS += "opencl-headers"
 
-PROVIDES = "virtual/opencl-icd"
+PROVIDES = "virtual/libopencl1"
 
 SRCREV = "861b68b290e76d08e7241608479c16431f529945"
 SRC_URI = "git://github.com/KhronosGroup/OpenCL-ICD-Loader.git;branch=main;protocol=https"
diff --git a/meta-oe/recipes-graphics/ktx-software/ktx-software_4.4.0.bb b/meta-oe/recipes-graphics/ktx-software/ktx-software_4.4.0.bb
index 21af3c493bc0..ae4caeb89c4a 100644
--- a/meta-oe/recipes-graphics/ktx-software/ktx-software_4.4.0.bb
+++ b/meta-oe/recipes-graphics/ktx-software/ktx-software_4.4.0.bb
@@ -16,4 +16,4 @@  inherit cmake
 # BASISU does not work with avx
 TUNE_CCARGS:append:x86-64 = " -mno-avx"
 
-PACKAGECONFIG[ocl_backend] = "-DBASISU_SUPPORT_OPENCL=ON, -DBASISU_SUPPORT_OPENCL=OFF, virtual/opencl-icd"
+PACKAGECONFIG[ocl_backend] = "-DBASISU_SUPPORT_OPENCL=ON, -DBASISU_SUPPORT_OPENCL=OFF, virtual/libopencl1"
diff --git a/meta-oe/recipes-support/opencl/clinfo_3.0.23.01.25.bb b/meta-oe/recipes-support/opencl/clinfo_3.0.23.01.25.bb
index 7390d83bcc05..4d9ed1b8ca38 100644
--- a/meta-oe/recipes-support/opencl/clinfo_3.0.23.01.25.bb
+++ b/meta-oe/recipes-support/opencl/clinfo_3.0.23.01.25.bb
@@ -11,8 +11,7 @@  SRC_URI = "git://github.com/Oblomov/clinfo.git;protocol=https;branch=master"
 
 SRCREV = "748c3930a9b9cb826e631d77439e2cb8f84f5bcf"
 
-
-DEPENDS += "opencl-headers virtual/opencl-icd"
+DEPENDS += "opencl-headers virtual/libopencl1"
 
 do_install() {
 	oe_runmake install PREFIX=${D}${prefix} MANDIR=${D}${mandir}
diff --git a/meta-oe/recipes-support/opencv/opencv_4.12.0.bb b/meta-oe/recipes-support/opencv/opencv_4.12.0.bb
index 86af1ebc4313..64dbd1db37a6 100644
--- a/meta-oe/recipes-support/opencv/opencv_4.12.0.bb
+++ b/meta-oe/recipes-support/opencv/opencv_4.12.0.bb
@@ -108,7 +108,7 @@  PACKAGECONFIG[java] = "-DJAVA_INCLUDE_PATH=${JAVA_HOME}/include -DJAVA_INCLUDE_P
 PACKAGECONFIG[jpeg] = "-DWITH_JPEG=ON,-DWITH_JPEG=OFF,jpeg,"
 PACKAGECONFIG[libav] = "-DWITH_FFMPEG=ON,-DWITH_FFMPEG=OFF,libav,"
 PACKAGECONFIG[libv4l] = "-DWITH_LIBV4L=ON,-DWITH_LIBV4L=OFF,v4l-utils,"
-PACKAGECONFIG[opencl] = "-DWITH_OPENCL=ON,-DWITH_OPENCL=OFF,opencl-headers virtual/opencl-icd,"
+PACKAGECONFIG[opencl] = "-DWITH_OPENCL=ON,-DWITH_OPENCL=OFF,opencl-headers virtual/libopencl1,"
 PACKAGECONFIG[openvino] = "-DWITH_OPENVINO=ON,-DWITH_OPENVINO=OFF,openvino-inference-engine,openvino-inference-engine"
 PACKAGECONFIG[oracle-java] = "-DJAVA_INCLUDE_PATH=${ORACLE_JAVA_HOME}/include -DJAVA_INCLUDE_PATH2=${ORACLE_JAVA_HOME}/include/linux -DJAVA_AWT_INCLUDE_PATH=${ORACLE_JAVA_HOME}/include -DJAVA_AWT_LIBRARY=${ORACLE_JAVA_HOME}/lib/amd64/libjawt.so -DJAVA_JVM_LIBRARY=${ORACLE_JAVA_HOME}/lib/amd64/server/libjvm.so,,ant-native oracle-jse-jdk oracle-jse-jdk-native,"
 PACKAGECONFIG[png] = "-DWITH_PNG=ON,-DWITH_PNG=OFF,libpng,"