MIRRORS/meta-freescale
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-freescale.git synced 2025-10-22 14:52:19 +02:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

layerwide: follow rename virtual/opencl-icd to virtual/libopencl1

Browse Source 
A change in meta-openembedded that provided virtual/opencl-icd [1]
changed the name to virtual/libopencl1.

[1] https://git.openembedded.org/meta-openembedded/commit/?id=87b44d29b6942427bfb1fab02a4564e41dcc01a0

Fixes e.g. when building 'clpeak' for a downstream vivante setup:
| ERROR: The file /usr/lib/libOpenCL.so.1 is installed by both opencl-icd-loader and imx-gpu-viv, aborting

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
This commit is contained in:
Max Krummenacher 2025-09-28 11:07:47 +02:00
parent a939618a07
commit d7910cd433
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
conf/machine/include/imx-base.inc
View File

@ -362,7 +362,7 @@ MACHINE_SOCARCH_FILTER:append:imxgpu = " \
virtual/egl \
virtual/libopenvg \
virtual/mesa \
virtual/opencl-icd \
virtual/libopencl1 \
libdrm \
cairo \
libgal-imx \
@ -571,7 +571,7 @@ PREFERRED_PROVIDER_virtual/libgles3:imxgpu3d ?= "${IMXGPU_GRAPHICS_PROVIDER}"
PREFERRED_PROVIDER_opencl-clhpp:imxviv ?= "imx-gpu-viv"
PREFERRED_PROVIDER_opencl-headers:imxviv ?= "imx-gpu-viv"
PREFERRED_PROVIDER_opencl-icd-loader:imxviv ?= "imx-gpu-viv"
PREFERRED_PROVIDER_virtual/opencl-icd:imxviv ?= "imx-gpu-viv"
PREFERRED_PROVIDER_virtual/libopencl1:imxviv ?= "imx-gpu-viv"
PREFERRED_PROVIDER_virtual/libg2d ?= "imx-gpu-g2d"
PREFERRED_PROVIDER_virtual/libg2d:imxdpu ?= "imx-dpu-g2d"

2
recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
View File

@ -46,7 +46,7 @@ PROVIDES_OPENCL = " \
opencl-headers \
opencl-clhpp \
opencl-icd-loader \
virtual/opencl-icd \
virtual/libopencl1 \
"
PROVIDES_OPENCL:mx7-nxp-bsp = ""
PROVIDES_OPENCL:mx8mm-nxp-bsp = ""

2
recipes-multimedia/imx-opencl-converter/imx-opencl-converter_0.8.0.bb
View File

@ -3,7 +3,7 @@ DESCRIPTION = "NXP Multimedia opencl converter lib"
LICENSE = "Proprietary"
SECTION = "multimedia"
LIC_FILES_CHKSUM = "file://COPYING;md5=a93b654673e1bc8398ed1f30e0813359"
DEPENDS = "virtual/opencl-icd"
DEPENDS = "virtual/libopencl1"
SRC_URI = "${FSL_MIRROR}/${BP}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true"
IMX_SRCREV_ABBREV = "b81b785"

2
recipes-support/opencv/opencv_4.6.0.imx.bb
View File

@ -139,7 +139,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[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,"
PACKAGECONFIG[python2] = "-DPYTHON2_NUMPY_INCLUDE_DIRS:PATH=${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/numpy/core/include,,python-numpy,"