mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2025-12-15 06:45:32 +01:00
opencl: rename virtual/opencl-icd to virtual/libopencl1
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> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
parent
6547930f24
commit
87b44d29b6
|
|
@ -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 += " \
|
||||
|
|
|
|||
|
|
@ -11,4 +11,4 @@ SRCREV = "b2e647ffb8f42aa22ce4b0194d6ef6d16d5002b0"
|
|||
|
||||
inherit cmake
|
||||
|
||||
DEPENDS += "opencl-clhpp virtual/opencl-icd"
|
||||
DEPENDS += "opencl-clhpp virtual/libopencl1"
|
||||
|
|
|
|||
|
|
@ -13,6 +13,6 @@ SRCREV = "fdde6677b21329432db8b481e2637cd10f7d3cb2"
|
|||
inherit autotools
|
||||
|
||||
DEPENDS = "ruby-native"
|
||||
PROVIDES = "virtual/opencl-icd"
|
||||
PROVIDES = "virtual/libopencl1"
|
||||
|
||||
BBCLASSEXTEND = "native nativesdk"
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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}
|
||||
|
|
|
|||
|
|
@ -109,7 +109,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,ffmpeg,"
|
||||
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,"
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user