diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index 43d2f48b..8c52b06b 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc @@ -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" diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc index 274fbf56..28e65b42 100644 --- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc +++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc @@ -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 = "" diff --git a/recipes-multimedia/imx-opencl-converter/imx-opencl-converter_0.8.0.bb b/recipes-multimedia/imx-opencl-converter/imx-opencl-converter_0.8.0.bb index e9429916..cf4e4d18 100644 --- a/recipes-multimedia/imx-opencl-converter/imx-opencl-converter_0.8.0.bb +++ b/recipes-multimedia/imx-opencl-converter/imx-opencl-converter_0.8.0.bb @@ -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" diff --git a/recipes-support/opencv/opencv_4.6.0.imx.bb b/recipes-support/opencv/opencv_4.6.0.imx.bb index 8a0ca2c1..0195bc61 100644 --- a/recipes-support/opencv/opencv_4.6.0.imx.bb +++ b/recipes-support/opencv/opencv_4.6.0.imx.bb @@ -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,"