diff options
81 files changed, 1620 insertions, 335 deletions
diff --git a/SCR/SCR-5.4.24_2.1.0.txt b/SCR/SCR-5.4.24_2.1.0.txt index e01b9cb3..67aab05a 100644 --- a/SCR/SCR-5.4.24_2.1.0.txt +++ b/SCR/SCR-5.4.24_2.1.0.txt @@ -4,7 +4,7 @@ Release - Linux 5.4.24_2.1.0 June 2020 Yocto Project recipe manifest: -repo init -u https://source.codeaurora.org/external/imx/imx-manifest -b imx-linux-zeus -m imx_5.4.24_2.1.0.xml +repo init -u https://github.com/nxp-imx/imx-manifest -b imx-linux-zeus -m imx_5.4.24_2.1.0.xml Release tag: rel_imx_5.4.24_2.1.0 @@ -18,7 +18,7 @@ License File: COPYING Package Category: BSP Type of Content: source Description and comments: The Linux kernel with i.MX-specific drivers -Release Location: https://source.codeaurora.org/external/imx/linux-imx -b rel_imx_5.4.24_2.1.0 +Release Location: https://github.com/nxp-imx/linux-imx -b rel_imx_5.4.24_2.1.0 Origin: NXP (GPL-2.0) kernel.org (GPL-2.0) - https://www.kernel.org/ @@ -30,7 +30,7 @@ License File: COPYING Package Category: BSP Type of Content: source Description and comments: Bootloader with i.MX-specific capabilities -Release Location: https://source.codeaurora.org/external/imx/uboot-imx -b rel_imx_5.4.24_2.1.0 +Release Location: https://github.com/nxp-imx/uboot-imx -b rel_imx_5.4.24_2.1.0 Origin: NXP (GPL-2.0) Das U-Boot - Universal Bootloader (GPL-2.0) - http://www.denx.de/wiki/U-Boot/WebHome Android Open Source Project (BSD-2-Clause) - https://source.android.com/ @@ -44,7 +44,7 @@ License File: docs/license.rst Package Category: BSP Type of Content: source Description and comments: ARM Trusted Firmware -Release Location: https://source.codeaurora.org/external/imx/imx-atf -b rel_imx_5.4.24_2.1.0 +Release Location: https://github.com/nxp-imx/imx-atf -b rel_imx_5.4.24_2.1.0 Origin: NXP (BSD-3-clause) arm-trusted-firmware - ARM Limited (BSD-3-clause) - http://github.com/ARM-software/arm-trusted-firmware/ @@ -99,7 +99,7 @@ License File: COPYING Package Category: BSP Type of Content: source Description and comments: Make Image BootLoader -Release Location: https://source.codeaurora.org/external/imx/imx-mkimage -b rel_imx_5.4.24_2.1.0 +Release Location: https://github.com/nxp-imx/imx-mkimage -b rel_imx_5.4.24_2.1.0 Origin: NXP (GPL-2.0) Das U-Boot - Universal Bootloader (GPL-2.0) - http://www.denx.de/wiki/U-Boot/WebHome @@ -111,7 +111,7 @@ License File: COPYING-LGPL-2.1 Package Category: BSP Type of Content: source Description and comments: BSP libraries -Release Location: https://source.codeaurora.org/external/imx/imx-lib -b master +Release Location: https://github.com/nxp-imx/imx-lib -b master Origin: NXP (LGPL-2.1) -------------------------------------------- @@ -122,7 +122,7 @@ License File: COPYING Package Category: BSP Type of Content: source Description and comments: Linux unit test applications -Release Location: https://source.codeaurora.org/external/imx/imx-test -b rel_imx_5.4.24_2.1.0 +Release Location: https://github.com/nxp-imx/imx-test -b rel_imx_5.4.24_2.1.0 Origin: NXP (GPL-2.0) module_test: NXP (GPL-2.0+) Hantro Products Oy. (GPL-2.0+) @@ -192,7 +192,7 @@ License File: COPYING Package Category: BSP Type of Content: source Description and comments: QCA9377 WLAN linux driver -Release Location: https://source.codeaurora.org/external/imx/qcacld-2.0-imx -b rel_imx_5.4.24_2.1.0 +Release Location: https://github.com/nxp-imx/qcacld-2.0-imx -b rel_imx_5.4.24_2.1.0 Origin: NXP (ISC) Qualcomm Atheros, Inc. (ISC) – https://source.codeaurora.org/external/wlan/qcacld-2.0 @@ -228,7 +228,7 @@ License File: mwifiex*/gpl-2.0.txt Package Category: BSP Type of Content: source Description and comments: NXP Wi-Fi linux SDK -Release Location: https://source.codeaurora.org/external/imx/mwifiex -b rel_imx_5.4.24_2.1.0 +Release Location: https://github.com/nxp-imx/mwifiex -b rel_imx_5.4.24_2.1.0 Origin: NXP (GPL-2.0) -------------------------------------------- @@ -277,7 +277,7 @@ License File: COPYING Package Category: BSP Type of Content: source Description and comments: Tool to convert Android sparse images to raw images -Release Location: https://source.codeaurora.org/external/imx/simg2img -b master +Release Location: https://github.com/nxp-imx/simg2img -b master Origin: NXP (Apache-2.0) The Android Open Source Project (Apache-2.0) - https://android.googlesource.com/platform/system/core/+/master/libsparse Gary S Brown (Public Domain) - http://www.opensource.apple.com/source/xnu/xnu-1456.1.26/bsd/libkern/crc32.c?txt @@ -315,7 +315,7 @@ License File: LICENSE Package Category: BSP Type of Content: source Description and comments: Open Portable Trusted Execution Environment for TEE Client library -Release Location: https://source.codeaurora.org/external/imx/imx-optee-client -b rel_imx_5.4.24_2.1.0 +Release Location: https://github.com/nxp-imx/imx-optee-client -b rel_imx_5.4.24_2.1.0 Origin: NXP (BSD-2-Clause) optee_client (BSD-2-Clause) - https://github.com/OP-TEE/optee_client @@ -327,7 +327,7 @@ License File: LICENSE Package Category: BSP Type of Content: source Description and comments: Open Portable Trusted Execution Environment for Linux on ARM -Release Location: https://source.codeaurora.org/external/imx/imx-optee-os -b rel_imx_5.4.24_2.1.0 +Release Location: https://github.com/nxp-imx/imx-optee-os -b rel_imx_5.4.24_2.1.0 Origin: NXP (BSD-2-Clause) OP-TEE Trusted OS (BSD-2-Clause) - https://github.com/OP-TEE/optee_os Mbed TLS (Apache-2.0) - https://github.com/ARMmbed/mbedtls/ @@ -340,7 +340,7 @@ License File: LICENSE.md Package Category: BSP Type of Content: source Description and comments: Open Portable Trusted Execution Environment sanity tests -Release Location: https://source.codeaurora.org/external/imx/imx-optee-test -b rel_imx_5.4.24_2.1.0 +Release Location: https://github.com/nxp-imx/imx-optee-test -b rel_imx_5.4.24_2.1.0 Origin: NXP (BSD-2-Clause) optee_test (BSD-2-Clause) - https://github.com/OP-TEE/optee_test @@ -352,7 +352,7 @@ License File: COPYING Package Category: BSP Type of Content: source Description and comments: A partitioning Hypervisor based on Linux -Release Location: https://source.codeaurora.org/external/imx/imx-jailhouse -b rel_imx_5.4.24_2.1.0 +Release Location: https://github.com/nxp-imx/imx-jailhouse -b rel_imx_5.4.24_2.1.0 Origin: NXP (GPL-2.0) Siemens AG (GPL-2.0) - https://github.com/siemens/jailhouse @@ -364,7 +364,7 @@ License File: COPYING Package Category: BSP Type of Content: source Description and comments: A Virtual Machine Monitor -Release Location: https://source.codeaurora.org/external/imx/imx-xen -b rel_imx_5.4.24_2.1.0 +Release Location: https://github.com/nxp-imx/imx-xen -b rel_imx_5.4.24_2.1.0 Origin: NXP (GPL-2.0) -------------------------------------------- @@ -386,7 +386,7 @@ License File: COPYING Package Category: BSP Type of Content: source Description and comments: NXP i.MX Security Middleware Library -Release Location: https://source.codeaurora.org/external/imx/imx-smw -b rel_imx_5.4.24_2.1.0 +Release Location: https://github.com/nxp-imx/imx-smw -b rel_imx_5.4.24_2.1.0 Origin: NXP (BSD-3-Clause) -------------------------------------------- @@ -399,7 +399,7 @@ License File: vvcam/LICENSE Package Category: Graphics Type of Content: ISP Kernel Module source Description and comments: Kernel Loadable Module for ISP -Release Location: https://source.codeaurora.org/external/imx/isp-vvcam -b rel_imx_5.4.24_2.1.0 +Release Location: https://github.com/nxp-imx/isp-vvcam -b rel_imx_5.4.24_2.1.0 Origin: VeriSilicon Holdings Co., Ltd. (GPL-2.0) -------------------------------------------- @@ -433,7 +433,7 @@ License File: LICENSE Package Category: Graphics Type of Content: source Description and comments: GPU Core IP and test application source -Release Location: https://source.codeaurora.org/external/imx/apitrace-imx -b rel_imx_5.4.24_2.1.0 +Release Location: https://github.com/nxp-imx/apitrace-imx -b rel_imx_5.4.24_2.1.0 Origin: NXP (MIT) apitrace (MIT) - https://github.com/apitrace/apitrace @@ -481,7 +481,7 @@ License File: COPYING-MIT Package Category: Graphics Type of Content: source Description and comments: Xserver Library extensions -Release Location: https://source.codeaurora.org/external/imx/xf86-video-imx-vivante -b rel_imx_5.4.24_2.1.0 +Release Location: https://github.com/nxp-imx/xf86-video-imx-vivante -b rel_imx_5.4.24_2.1.0 Origin: NXP (MIT) Vivante Corp. (MIT) xorg-server (MIT) - http://xorg.freedesktop.org/ @@ -546,7 +546,7 @@ License File: COPYING Package Category: Graphics Type of Content: source Description and comments: i.MX DRM Direct Rendering Manager -Release Location: https://source.codeaurora.org/external/imx/libdrm-imx -b rel_imx_5.4.24_2.1.0 +Release Location: https://github.com/nxp-imx/libdrm-imx -b rel_imx_5.4.24_2.1.0 Origin: NXP (MIT) -------------------------------------------- @@ -557,7 +557,7 @@ License File: COPYING Package Category: Graphics Type of Content: source Description and comments: Wayland protocol development -Release Location: https://source.codeaurora.org/external/imx/wayland-protocols-imx -b rel_imx_5.4.24_2.1.0 +Release Location: https://github.com/nxp-imx/wayland-protocols-imx -b rel_imx_5.4.24_2.1.0 Origin: NXP (MIT) Weston (MIT) - https://anongit.freedesktop.org/git/wayland/wayland-protocols.git @@ -569,7 +569,7 @@ License File: COPYING Package Category: Graphics Type of Content: source Description and comments: A reference implementation of a Wayland compositor -Release Location: https://source.codeaurora.org/external/imx/weston-imx -b rel_imx_5.4.24_2.1.0 +Release Location: https://github.com/nxp-imx/weston-imx -b rel_imx_5.4.24_2.1.0 Origin: NXP (MIT) Weston (MIT) - http://github.com/wayland-project/weston/ @@ -581,7 +581,7 @@ License File: LICENSE.txt Package Category: Graphics Type of Content: source Description and comments: Sample program to monitor i.MX GPU performance data -Release Location: https://source.codeaurora.org/external/imx/imx-gputop -b rel_imx_5.4.24_2.1.0 +Release Location: https://github.com/nxp-imx/imx-gputop -b rel_imx_5.4.24_2.1.0 Origin: NXP (MIT) -------------------------------------------- @@ -680,7 +680,7 @@ License File: LICENSE Package Category: Graphics Type of Content: source Description and comments: i.MX Neural Networks Accelerator Plugin -Release Location: https://source.codeaurora.org/external/imx/nn-imx -b rel_imx_5.4.24_2.1.0 +Release Location: https://github.com/nxp-imx/nn-imx -b rel_imx_5.4.24_2.1.0 Origin: NXP (MIT) Vivante Corporation (MIT) Boost Software (Boost) - https://www.boost.org/ @@ -697,7 +697,7 @@ License File: LICENSE Package Category: Graphics Type of Content: source Description and comments: i.MX OpenCV -Release Location: https://source.codeaurora.org/external/imx/opencv-imx -b rel_imx_5.4.24_2.1.0 +Release Location: https://github.com/nxp-imx/opencv-imx -b rel_imx_5.4.24_2.1.0 Origin: NXP (BSD-3-Cluse) OpenCV Foundation (BSD-3-Clause) - https://github.com/opencv/opencv Intel Corporation (BSD-3-Clause) @@ -714,7 +714,7 @@ License File: LICENSE Package Category: Graphics Type of Content: source Description and comments: ARM Compute Library fork -Release Location: https://source.codeaurora.org/external/imx/ARM-ComputeLibrary-imx -b rel_imx_5.4.24_2.1.0 +Release Location: https://github.com/nxp-imx/ARM-ComputeLibrary-imx -b rel_imx_5.4.24_2.1.0 Origin: NXP (MIT) ARM Software (MIT) - https://github.com/ARM-software/ComputeLibrary @@ -755,7 +755,7 @@ License File: COPYING-LGPL-2.1 Package Category: Multimedia Type of Content: source Description and comments: i.MX Gstreamer 1.0 plugins -Release Location: https://source.codeaurora.org/external/imx/imx-gst1.0-plugin -b rel_imx_5.4.24_2.1.0 +Release Location: https://github.com/nxp-imx/imx-gst1.0-plugin -b rel_imx_5.4.24_2.1.0 Origin: NXP (LGPL-2.1) Gstreamer plugins-Base (LGPL-2.1+) - http://gstreamer.freedesktop.org/src/gst-plugins-base/ Gstreamer plugins-Good (LGPL-2.1+) - http://gstreamer.freedesktop.org/src/gst-plugins-good/ @@ -769,7 +769,7 @@ License File: COPYING Package Category: Multimedia Type of Content: source Description and comments: Open Source Multimedia Farmework -Release Location: https://source.codeaurora.org/external/imx/gstreamer -b rel_imx_5.4.24_2.1.0 +Release Location: https://github.com/nxp-imx/gstreamer -b rel_imx_5.4.24_2.1.0 Origin: NXP (LGPL-2.1) GStreamer (LGPL-2.1+) - http://gstreamer.freedesktop.org/src/gstreamer/ @@ -781,7 +781,7 @@ License File: COPYING Package Category: Multimedia Type of Content: source Description and comments: Gstreamer plugins with good quality code and correct functionality -Release Location: https://source.codeaurora.org/external/imx/gst-plugins-good -b rel_imx_5.4.24_2.1.0 +Release Location: https://github.com/nxp-imx/gst-plugins-good -b rel_imx_5.4.24_2.1.0 Origin: NXP (LGPL-2.1) Gstreamer plugins-Good (LGPL-2.1+) - http://gstreamer.freedesktop.org/src/gst-plugins-good/ @@ -793,7 +793,7 @@ License File: COPYING Package Category: Multimedia Type of Content: source Description and comments: Collection of well-groomed and well-maintained Gstreamer plugins -Release Location: https://source.codeaurora.org/external/imx/gst-plugins-base -b rel_imx_5.4.24_2.1.0 +Release Location: https://github.com/nxp-imx/gst-plugins-base -b rel_imx_5.4.24_2.1.0 Origin: NXP (LGPL-2.1) Gstreamer plugins-Base (LGPL-2.1+) - http://gstreamer.freedesktop.org/src/gst-plugins-base/ @@ -805,7 +805,7 @@ License File: COPYING.LIB Package Category: Multimedia Type of Content: source Description and comments: Gstreamer plug-ins that aren't up to par compared to the rest. Close to good quality but missing something. -Release Location: https://source.codeaurora.org/external/imx/gst-plugins-bad -b rel_imx_5.4.24_2.1.0 +Release Location: https://github.com/nxp-imx/gst-plugins-bad -b rel_imx_5.4.24_2.1.0 Origin: NXP (LGPL-2.1) Gstreamer plugins-Bad (LGPL-2.1+) - http://gstreamer.freedesktop.org/src/gst-plugins-bad/ @@ -913,7 +913,7 @@ License File: COPYING.GPL Package Category: Multimedia Type of Content: source Description and comments: Plugins for various audio libraries and sound servers -Release Location: https://source.codeaurora.org/external/imx/imx-alsa-plugins -b nxp/master +Release Location: https://github.com/nxp-imx/imx-alsa-plugins -b nxp/master Origin: NXP (GPL-2.0) Alsa Plugins (GPL-2.0+) - ftp://ftp.alsa-project.org/pub/plugins/ GNU libtool (GPL-2.0+) http://www.gnu.org/software/libtool/ @@ -1037,7 +1037,7 @@ License File: LICENSE Package Category: MachineLearning Type of Content: source Description and comments: ARM Neural Network SDK -Release Location: https://source.codeaurora.org/external/imx/armnn-imx -b rel_imx_5.4.24_2.1.0 +Release Location: https://github.com/nxp-imx/armnn-imx -b rel_imx_5.4.24_2.1.0 Origin: NXP (MIT) armnn (MIT) - https://github.com/ARM-software/armnn @@ -1049,7 +1049,7 @@ License File: LICENSE Package Category: MachineLearning Type of Content: source Description and comments: Onnxruntime cross-platform scoring engine -Release Location: https://source.codeaurora.org/external/imx/onnxruntime-imx -b rel_imx_5.4.24_2.1.0 +Release Location: https://github.com/nxp-imx/onnxruntime-imx -b rel_imx_5.4.24_2.1.0 Origin: NXP (MIT) Microsoft/onnxruntime (MIT) - https://github.com/Microsoft/onnxruntime Google's Protocol Buffer (BSD-3-clause) - https://tracker.debian.org/pkg/protobuf @@ -1074,7 +1074,7 @@ License File: LICENSE Package Category: MachineLearning Type of Content: source Description and comments: TensorFlow Lite C++ Library -Release Location: https://source.codeaurora.org/external/imx/tensorflow-imx -b rel_imx_5.4.24_2.1.0 +Release Location: https://github.com/nxp-imx/tensorflow-imx -b rel_imx_5.4.24_2.1.0 Origin: NXP (Apache-2.0) TensorFlow (Apache-2.0) - https://github.com/tensorflow/tensorflow/ diff --git a/classes/fsl-eula-unpack.bbclass b/classes/fsl-eula-unpack.bbclass index 9327a3be..93f6dcfe 100644 --- a/classes/fsl-eula-unpack.bbclass +++ b/classes/fsl-eula-unpack.bbclass @@ -28,6 +28,8 @@ FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V9 = "6c12031a11b81db21cdfe0be FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V10 = "fd4b227530cd88a82af6a5982cfb724d" FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V11 = "228c72f2a91452b8a03c4cab30f30ef9" FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V15 = "983e4c77621568488dd902b27e0c2143" +FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V16 = "e9e880185bda059c90c541d40ceca922" +FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V17 = "cf3f9b8d09bc3926b1004ea71f7a248a" FSL_EULA_FILE_MD5SUMS = " \ ${FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V8} \ ${FSL_EULA_FILE_MD5SUM_LA_OPT_BASE_LICENSE_V10} \ @@ -51,6 +53,8 @@ FSL_EULA_FILE_MD5SUMS = " \ ${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V10} \ ${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V11} \ ${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V15} \ + ${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V16} \ + ${FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V17} \ " # The checksum for the EULA in the layer diff --git a/classes/fsl-kernel-localversion.bbclass b/classes/fsl-kernel-localversion.bbclass index 0a175e31..c782a3d3 100644 --- a/classes/fsl-kernel-localversion.bbclass +++ b/classes/fsl-kernel-localversion.bbclass @@ -22,7 +22,8 @@ kernel_conf_variable() { fi } -do_preconfigure() { +do_kernel_localversion[dirs] += "${S} ${B}" +do_kernel_localversion() { mkdir -p ${B} echo "" > ${B}/.config CONF_SED_SCRIPT="" @@ -40,4 +41,5 @@ do_preconfigure() { printf "%s%s" +g $head > ${S}/.scmversion fi } -addtask preconfigure before do_configure after do_unpack do_patch do_kernel_metadata + +addtask kernel_localversion before do_configure after do_patch do_kernel_metadata diff --git a/conf/machine/imx6qdlsabreauto.conf b/conf/machine/imx6qdlsabreauto.conf index 16c1dcb6..a6d5908b 100644 --- a/conf/machine/imx6qdlsabreauto.conf +++ b/conf/machine/imx6qdlsabreauto.conf @@ -40,6 +40,10 @@ UBOOT_SUFFIX = "img" SPL_BINARY = "SPL" WKS_FILE = "imx-uboot-spl-bootpart.wks.in" +# The fsl distro uses u-boot-imx which does not provide unified functionality +# for dl/q/qp SoC variants. Change the defconfig to the targeted SoC variant. +UBOOT_MACHINE_fsl = "mx6qsabreauto_defconfig" + SERIAL_CONSOLES = "115200;ttymxc3" MACHINE_FIRMWARE_append_mx6 = " linux-firmware-ath6k" diff --git a/conf/machine/imx6qdlsabresd.conf b/conf/machine/imx6qdlsabresd.conf index 2fe95dc6..406ad7d7 100644 --- a/conf/machine/imx6qdlsabresd.conf +++ b/conf/machine/imx6qdlsabresd.conf @@ -49,6 +49,10 @@ UBOOT_SUFFIX = "img" SPL_BINARY = "SPL" WKS_FILE = "imx-uboot-spl-bootpart.wks.in" +# The fsl distro uses u-boot-imx which does not provide unified functionality +# for dl/q/qp SoC variants. Change the defconfig to the targeted SoC variant. +UBOOT_MACHINE_fsl = "mx6qsabresd_defconfig" + SERIAL_CONSOLES = "115200;ttymxc0" MACHINE_FIRMWARE_append_mx6 = " linux-firmware-ath6k" diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index 6295ccd0..718efd10 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc @@ -198,11 +198,13 @@ MACHINE_SOCARCH_FILTER_append_use-mainline-bsp = " \ qtbase \ " MACHINE_SOCARCH_FILTER_append_mx6q = " \ - virtual/opencl-icd \ + opencl-icd-loader \ + opencl-clhpp \ opencl-headers \ " MACHINE_SOCARCH_FILTER_append_mx8 = " \ - virtual/opencl-icd \ + opencl-icd-loader \ + opencl-clhpp \ opencl-headers \ " MACHINE_SOCARCH_FILTER_append_mx8qm = " \ @@ -302,24 +304,30 @@ PREFERRED_PROVIDER_virtual/libgles1_imxgpu3d ?= "imx-gpu-viv" PREFERRED_PROVIDER_virtual/libgles2_imxgpu3d ?= "imx-gpu-viv" PREFERRED_PROVIDER_virtual/libg2d ?= "imx-gpu-g2d" PREFERRED_PROVIDER_virtual/libg2d_imxdpu ?= "imx-dpu-g2d" +PREFERRED_PROVIDER_opencl-clhpp_imxgpu ?= "imx-gpu-viv" +PREFERRED_PROVIDER_opencl-headers_imxgpu ?= "imx-gpu-viv" +PREFERRED_PROVIDER_opencl-icd-loader_imxgpu ?= "imx-gpu-viv" -PREFERRED_VERSION_weston_imx ?= "8.0.0.imx" +PREFERRED_VERSION_weston_imx ?= "9.0.0.imx" PREFERRED_VERSION_weston_use-mainline-bsp = "" -PREFERRED_VERSION_wayland-protocols_mx6 ?= "1.18.imx" -PREFERRED_VERSION_wayland-protocols_mx7 ?= "1.18.imx" -PREFERRED_VERSION_wayland-protocols_mx8 ?= "1.18.imx" +PREFERRED_VERSION_wayland-protocols_mx6 ?= "1.20.imx" +PREFERRED_VERSION_wayland-protocols_mx7 ?= "1.20.imx" +PREFERRED_VERSION_wayland-protocols_mx8 ?= "1.20.imx" # Use i.MX libdrm Version -PREFERRED_VERSION_libdrm_mx6 ?= "2.4.99.imx" -PREFERRED_VERSION_libdrm_mx7 ?= "2.4.99.imx" -PREFERRED_VERSION_libdrm_mx8 ?= "2.4.99.imx" +PREFERRED_VERSION_libdrm_mx6 ?= "2.4.102.imx" +PREFERRED_VERSION_libdrm_mx7 ?= "2.4.102.imx" +PREFERRED_VERSION_libdrm_mx8 ?= "2.4.102.imx" # Use i.MX optee Version PREFERRED_VERSION_optee-os_mx8 ?= "3.7.0.imx" PREFERRED_VERSION_optee-client_mx8 ?= "3.7.0.imx" PREFERRED_VERSION_optee-test_mx8 ?= "3.7.0.imx" +#Use i.MX opencv Version for mx8 +PREFERRED_VERSION_opencv_mx8 ?= "4.4.0.imx" + # Handle default kernel IMX_DEFAULT_KERNEL = "linux-fslc-imx" IMX_DEFAULT_KERNEL_mxs = "linux-fslc" @@ -372,18 +380,6 @@ SOC_DEFAULT_WKS_FILE_mxs ?= "imx-uboot-mxs-bootpart.wks.in" WKS_FILE ?= "${SOC_DEFAULT_WKS_FILE}" -# Certain machines override the default fsl u-boot with the -# fslc u-boot. To restore the fsl u-boot, add use-fsl-bsp like this: -# MACHINEOVERRIDES_prepend_imx6ulevk = "use-fsl-bsp:" -UBOOT_MAKE_TARGET_use-fsl-bsp_mx6 = "u-boot.imx" -UBOOT_SUFFIX_use-fsl-bsp_mx6 = "imx" -SPL_BINARY_use-fsl-bsp_mx6 = "" -WKS_FILE_use-fsl-bsp_mx6 = "imx-uboot-bootpart.wks.in" -UBOOT_MAKE_TARGET_use-fsl-bsp_mx7 = "u-boot.imx" -UBOOT_SUFFIX_use-fsl-bsp_mx7 = "imx" -SPL_BINARY_use-fsl-bsp_mx7 = "" -WKS_FILE_use-fsl-bsp_mx7 = "imx-uboot-bootpart.wks.in" - SERIAL_CONSOLES = "115200;ttymxc0" SERIAL_CONSOLES_mxs = "115200;ttyAMA0" diff --git a/dynamic-layers/ivi/recipes-graphics/wayland/weston-init/weston.ini b/dynamic-layers/ivi/recipes-graphics/wayland/weston-init/weston.ini index 6e8e0140..707a4078 100644 --- a/dynamic-layers/ivi/recipes-graphics/wayland/weston-init/weston.ini +++ b/dynamic-layers/ivi/recipes-graphics/wayland/weston-init/weston.ini @@ -2,12 +2,18 @@ shell=ivi-shell.so modules=hmi-controller.so #gbm-format=argb8888 +idle-time=0 #use-g2d=1 #xwayland=true +#repaint-window=16 +#enable-overlay-view=1 #[shell] #size=1920x1080 +[libinput] +touchscreen_calibrator=true + [ivi-shell] ivi-shell-user-interface=weston-ivi-shell-user-interface diff --git a/recipes-bsp/firmware-imx/firmware-imx_8.9.bb b/recipes-bsp/firmware-imx/firmware-imx_8.9.bb index 84534a62..8ff4a321 100644 --- a/recipes-bsp/firmware-imx/firmware-imx_8.9.bb +++ b/recipes-bsp/firmware-imx/firmware-imx_8.9.bb @@ -16,6 +16,8 @@ do_install() { # SDMA Firmware section install -d ${D}${nonarch_base_libdir}/firmware/imx/sdma install -m 0644 ${S}/firmware/sdma/* ${D}${nonarch_base_libdir}/firmware/imx/sdma + rm -f ${D}${nonarch_base_libdir}/firmware/imx/sdma/sdma-imx6q.bin + rm -f ${D}${nonarch_base_libdir}/firmware/imx/sdma/sdma-imx7d.bin # EASRC Firmware section install -d ${D}${nonarch_base_libdir}/firmware/imx/easrc diff --git a/recipes-bsp/imx-atf/imx-atf_2.2.bb b/recipes-bsp/imx-atf/imx-atf_2.2.bb index ca07dcad..8e143ff5 100644 --- a/recipes-bsp/imx-atf/imx-atf_2.2.bb +++ b/recipes-bsp/imx-atf/imx-atf_2.2.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/BSD-3-Clause;m PV .= "+git${SRCPV}" SRCBRANCH = "imx_5.4.47_2.2.0" -SRC_URI = "git://source.codeaurora.org/external/imx/imx-atf.git;protocol=https;branch=${SRCBRANCH} \ +SRC_URI = "git://github.com/nxp-imx/imx-atf.git;protocol=https;branch=${SRCBRANCH} \ file://0001-imx-Fix-missing-inclusion-of-cdefs.h.patch \ file://0001-imx-Fix-multiple-definition-of-ipc_handle.patch \ " diff --git a/recipes-bsp/imx-lib/imx-lib_git.bb b/recipes-bsp/imx-lib/imx-lib_git.bb index d94b2daa..4ebd9521 100644 --- a/recipes-bsp/imx-lib/imx-lib_git.bb +++ b/recipes-bsp/imx-lib/imx-lib_git.bb @@ -13,7 +13,7 @@ PE = "1" PV = "5.8+${SRCPV}" SRCBRANCH = "master" -SRC_URI = "git://source.codeaurora.org/external/imx/imx-lib.git;protocol=https;branch=${SRCBRANCH}" +SRC_URI = "git://github.com/nxp-imx/imx-lib.git;protocol=https;branch=${SRCBRANCH}" SRCREV = "3f777974c0c146817e2ff5cb0340ca66a1f99e57" S = "${WORKDIR}/git" diff --git a/recipes-bsp/imx-mkimage/imx-mkimage_git.inc b/recipes-bsp/imx-mkimage/imx-mkimage_git.inc index 28eaff6e..5b851fa1 100644 --- a/recipes-bsp/imx-mkimage/imx-mkimage_git.inc +++ b/recipes-bsp/imx-mkimage/imx-mkimage_git.inc @@ -3,7 +3,7 @@ DEPENDS = "zlib-native openssl-native" SRCBRANCH = "imx_5.4.47_2.2.0" -SRC_URI = "git://source.codeaurora.org/external/imx/imx-mkimage.git;protocol=https;branch=${SRCBRANCH}" +SRC_URI = "git://github.com/nxp-imx/imx-mkimage.git;protocol=https;branch=${SRCBRANCH}" SRCREV = "8da5cd231881df44b5fa21a36820536d86e413db" S = "${WORKDIR}/git" diff --git a/recipes-bsp/imx-test/imx-test_git.bb b/recipes-bsp/imx-test/imx-test_git.bb index b9c12e18..c44d7153 100644 --- a/recipes-bsp/imx-test/imx-test_git.bb +++ b/recipes-bsp/imx-test/imx-test_git.bb @@ -18,7 +18,7 @@ PV = "7.0+${SRCPV}" SRCBRANCH = "imx_5.4.47_2.2.0" SRC_URI = " \ - git://source.codeaurora.org/external/imx/imx-test.git;protocol=https;branch=${SRCBRANCH} \ + git://github.com/nxp-imx/imx-test.git;protocol=https;branch=${SRCBRANCH} \ file://0001-pxp-test-Fix-format-security-error.patch \ file://memtool_profile \ " diff --git a/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.2.0.bb b/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.2.0.bb index a38d064f..8414e53e 100644 --- a/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.2.0.bb +++ b/recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.2.0.bb @@ -13,4 +13,23 @@ S = "${WORKDIR}/${BPN}-${PV}" SRC_URI[md5sum] = "d2b7c0cfdb380e5a65a94251c2437a34" SRC_URI[sha256sum] = "10a7f60964feb9641291815876fb8110dfec603c6451ed9b9c7fe57c23afd10e" +# SCR is the location and name of the Software Content Register file +# relative to ${D}${D_SUBDIR}. +SCR = "SCR.txt" + +do_install () { + install -d ${D}${D_SUBDIR} + cp -r ${S}/* ${D}${D_SUBDIR} + if [ -d "${D}/usr/lib" ] && [ "${D}/usr/lib" != "${D}${libdir}" ]; then + mv ${D}/usr/lib ${D}${libdir} + fi + rm ${D}${D_SUBDIR}/COPYING + if [ ! -f ${D}${D_SUBDIR}/${SCR} ]; then + bbfatal "Missing Software Content Register \"${D}${D_SUBDIR}/${SCR}\"" + fi + rm ${D}${D_SUBDIR}/${SCR} +} + +FILES_${PN} = "/" + COMPATIBLE_MACHINE = "(mx8mp)" diff --git a/recipes-bsp/isp-imx/basler-camera_4.2.2.6.0.bb b/recipes-bsp/isp-imx/basler-camera_4.2.2.6.0.bb new file mode 100644 index 00000000..369ca5ce --- /dev/null +++ b/recipes-bsp/isp-imx/basler-camera_4.2.2.6.0.bb @@ -0,0 +1,27 @@ +# Copyright 2020 NXP + +DESCRIPTION = "Basler camera binary drivers" +LICENSE = "Proprietary" +LIC_FILES_CHKSUM = "file://COPYING;md5=cf3f9b8d09bc3926b1004ea71f7a248a" + +inherit fsl-eula-unpack + +SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true" + +SRC_URI[md5sum] = "8c94839802598853f7b91f6386b4643e" +SRC_URI[sha256sum] = "6456dbb0095d988cce65f94e92a3ea80d796e02fd410987c937cfc0a09ca2e4a" + +do_install() { + dest_dir=${D}/opt/imx8-isp/bin + install -d ${D}/${libdir} + install -d $dest_dir + cp -r ${S}/opt/imx8-isp/bin/* $dest_dir + cp -r ${S}/usr/lib/* ${D}/${libdir} +} + +SYSTEMD_AUTO_ENABLE = "enable" + +FILES_${PN} = "${libdir} /opt" +INSANE_SKIP_${PN} = "file-rdeps already-stripped" + +COMPATIBLE_MACHINE = "(imx|use-nxp-bsp)" diff --git a/recipes-bsp/isp-imx/isp-imx/0001-BufferManager.h-add-missing-header-file.patch b/recipes-bsp/isp-imx/isp-imx/0001-BufferManager.h-add-missing-header-file.patch new file mode 100644 index 00000000..725a9907 --- /dev/null +++ b/recipes-bsp/isp-imx/isp-imx/0001-BufferManager.h-add-missing-header-file.patch @@ -0,0 +1,27 @@ +From 325b4bf687ead6598de702df9829a4dad0b6458c Mon Sep 17 00:00:00 2001 +From: Chris Dimich <Chris.Dimich@boundarydevices.com> +Date: Mon, 15 Feb 2021 22:51:01 -0800 +Subject: [PATCH 1/1] BufferManager.h: add missing header file + +Needed to compile with Yocto Gatesgarth. + +Signed-off-by: Chris Dimich <Chris.Dimich@boundarydevices.com> +--- + mediacontrol/buffer/BufferManager.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/mediacontrol/buffer/BufferManager.h b/mediacontrol/buffer/BufferManager.h +index f5691e111..4d5ce6965 100755 +--- a/mediacontrol/buffer/BufferManager.h ++++ b/mediacontrol/buffer/BufferManager.h +@@ -16,6 +16,7 @@ + #include <deque> + #include <map> + #include <EAutoLock.h> ++#include <stdint.h> + + enum { + BUFFER_TYPE_INPUT_FREE = 0, +-- +2.29.0 + diff --git a/recipes-bsp/isp-imx/isp-imx/0001-imx8-isp.service-do-not-prevent-restart-of-service.patch b/recipes-bsp/isp-imx/isp-imx/0001-imx8-isp.service-do-not-prevent-restart-of-service.patch new file mode 100644 index 00000000..86391d4b --- /dev/null +++ b/recipes-bsp/isp-imx/isp-imx/0001-imx8-isp.service-do-not-prevent-restart-of-service.patch @@ -0,0 +1,26 @@ +From ce8dd8db37de85952419a5b28a48ec20d1310cf7 Mon Sep 17 00:00:00 2001 +From: Chris Dimich <Chris.Dimich@boundarydevices.com> +Date: Wed, 17 Feb 2021 14:09:39 -0800 +Subject: [PATCH 1/1] imx8-isp.service: do not prevent restart of service + +Signed-off-by: Chris Dimich <Chris.Dimich@boundarydevices.com> +--- + imx/imx8-isp.service | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/imx/imx8-isp.service b/imx/imx8-isp.service +index 93d2e9b3a..4f0cd88ca 100644 +--- a/imx/imx8-isp.service ++++ b/imx/imx8-isp.service +@@ -10,7 +10,7 @@ StartLimitBurst=5 + Restart=on-failure + RestartSec=5s + # ENXIO +-RestartPreventExitStatus=6 ++#RestartPreventExitStatus=6 + ExecStart=/opt/imx8-isp/bin/start_isp.sh + + [Install] +-- +2.29.0 + diff --git a/recipes-bsp/isp-imx/isp-imx/0001-run.sh-fix-bashism.patch b/recipes-bsp/isp-imx/isp-imx/0001-run.sh-fix-bashism.patch new file mode 100644 index 00000000..715bed2a --- /dev/null +++ b/recipes-bsp/isp-imx/isp-imx/0001-run.sh-fix-bashism.patch @@ -0,0 +1,23 @@ +From 7070abd558e753b89955a966bb83e11f5a7b8462 Mon Sep 17 00:00:00 2001 +From: Chris Dimich <Chris.Dimich@boundarydevices.com> +Date: Wed, 17 Feb 2021 14:06:26 -0800 +Subject: [PATCH 1/1] run.sh: fix bashism + +Signed-off-by: Chris Dimich <Chris.Dimich@boundarydevices.com> +--- + imx/run.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/imx/run.sh b/imx/run.sh +index c0d676ae7..ebeb7a6e7 100755 +--- a/imx/run.sh ++++ b/imx/run.sh +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/bin/sh + # + # Start the isp_media_server in the configuration from user + # (c) NXP 2020 +-- +2.29.0 + diff --git a/recipes-bsp/isp-imx/isp-imx/0001-start_isp.sh-fix-test-to-be-generic.patch b/recipes-bsp/isp-imx/isp-imx/0001-start_isp.sh-fix-test-to-be-generic.patch new file mode 100644 index 00000000..cb93223e --- /dev/null +++ b/recipes-bsp/isp-imx/isp-imx/0001-start_isp.sh-fix-test-to-be-generic.patch @@ -0,0 +1,46 @@ +From 708f25cfe522df162c3e2c7c56cbe2f7000cb5e4 Mon Sep 17 00:00:00 2001 +From: Gary Bisson <gary.bisson@boundarydevices.com> +Date: Mon, 14 Dec 2020 14:26:01 +0100 +Subject: [PATCH] start_isp.sh: fix test to be generic + +So that it works on EVK and any other i.MX 8M Plus platform. + +Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com> +--- + imx/start_isp.sh | 13 +++++-------- + 1 file changed, 5 insertions(+), 8 deletions(-) + +diff --git a/imx/start_isp.sh b/imx/start_isp.sh +index 02ee7d3b5..fee0492ad 100755 +--- a/imx/start_isp.sh ++++ b/imx/start_isp.sh +@@ -7,21 +7,18 @@ + # + + RUNTIME_DIR="$( cd "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )" +-DEVICE_TREE_BASLER=$(grep basler-camera-vvcam /sys/firmware/devicetree/base/soc@0/*/i2c@*/*/compatible -l 2> /dev/null) +- ++BASLER=`dmesg | grep Basler` + + # check if the basler device has been enabled in the device tree +-if [ -f "$DEVICE_TREE_BASLER" ]; then +- ++if [ ! -z "$BASLER" ]; then + echo "Starting isp_media_server for Basler daA3840-30mc" +- + cd $RUNTIME_DIR + # Default configuration for Basler daA3840-30mc: basler_4k + # Available configurations: basler_4k, basler_1080p60, basler_4khdr, basler_1080p60hdr +- exec ./run.sh -c basler_4k -lm +- ++ #exec ./run.sh -c basler_4k ++ exec ./run.sh -c basler_1080p60 + else + # no device tree found exit with code no device or address +- echo "No device tree found for Basler, check dtb file!" >&2 ++ echo "Basler camera not found!" >&2 + exit 6 + fi +-- +2.29.2 + diff --git a/recipes-bsp/isp-imx/isp-imx_4.2.2.6.0.bb b/recipes-bsp/isp-imx/isp-imx_4.2.2.6.0.bb new file mode 100644 index 00000000..363089f0 --- /dev/null +++ b/recipes-bsp/isp-imx/isp-imx_4.2.2.6.0.bb @@ -0,0 +1,84 @@ +# Copyright 2020 NXP + +DESCRIPTION = "i.MX Verisilicon Software ISP" +LICENSE = "Proprietary" +LIC_FILES_CHKSUM = "file://${WORKDIR}/${PN}-${PV}/COPYING;md5=cf3f9b8d09bc3926b1004ea71f7a248a" + + +inherit fsl-eula-unpack cmake systemd + +SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true \ + file://0001-BufferManager.h-add-missing-header-file.patch;patchdir=.. \ + file://0001-imx8-isp.service-do-not-prevent-restart-of-service.patch;patchdir=.. \ + file://0001-run.sh-fix-bashism.patch;patchdir=.. \ + file://0001-start_isp.sh-fix-test-to-be-generic.patch;patchdir=.. \ +" + +SRC_URI[md5sum] = "2246009411af32b1e02fbb0b242a0fc0" +SRC_URI[sha256sum] = "7a245abb5fee23319f59b970db0bb014a2932fd6d5bd44f16f7dd31bbe25003a" + +S = "${WORKDIR}/${PN}-${PV}/appshell" + +DEPENDS = "python3 libdrm" + +OECMAKE_GENERATOR = "Unix Makefiles" + +SYSTEMD_SERVICE_${PN} = "imx8-isp.service" + +EXTRA_OECMAKE += " \ + -DCMAKE_BUILD_TYPE=release \ + -DISP_VERSION=ISP8000NANO_V1802 \ + -DPLATFORM=ARM64 \ + -DAPPMODE=V4L2 \ + -DQTLESS=1 \ + -DFULL_SRC_COMPILE=1 \ + -DWITH_DRM=1 \ + -DWITH_DWE=1 \ + -DSERVER_LESS=1 \ + -DSUBDEV_V4L2=1 \ + -DENABLE_IRQ=1 \ + -DPARTITION_BUILD=0 \ + -D3A_SRC_BUILD=0 \ + -Wno-dev \ +" + +do_configure_prepend() { + export SDKTARGETSYSROOT=${STAGING_DIR_HOST} +} + +do_install() { + install -d ${D}/${libdir} + install -d ${D}/${includedir} + install -d ${D}/opt/imx8-isp/bin + + cp -r ${WORKDIR}/build/generated/release/bin/*_test ${D}/opt/imx8-isp/bin + cp -r ${WORKDIR}/build/generated/release/bin/*2775* ${D}/opt/imx8-isp/bin + cp -r ${WORKDIR}/build/generated/release/bin/isp_media_server ${D}/opt/imx8-isp/bin + cp -r ${WORKDIR}/build/generated/release/bin/vvext ${D}/opt/imx8-isp/bin + cp -r ${WORKDIR}/${PN}-${PV}/mediacontrol/case/ ${D}/opt/imx8-isp/bin + cp -r ${WORKDIR}/build/generated/release/lib/*.so* ${D}/${libdir} + cp -r ${WORKDIR}/build/generated/release/include/* ${D}/${includedir} + + cp ${WORKDIR}/${PN}-${PV}/imx/run.sh ${D}/opt/imx8-isp/bin + cp ${WORKDIR}/${PN}-${PV}/imx/start_isp.sh ${D}/opt/imx8-isp/bin + + chmod +x ${D}/opt/imx8-isp/bin/run.sh + chmod +x ${D}/opt/imx8-isp/bin/start_isp.sh + + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + install -d ${D}${systemd_system_unitdir} + install -m 0644 ${WORKDIR}/${PN}-${PV}/imx/imx8-isp.service ${D}${systemd_system_unitdir} + fi +} + +RDEPENDS_${PN} = "libdrm libpython3" + +PACKAGES = "${PN} ${PN}-dev ${PN}-dbg" + +FILES_${PN} = "${libdir} /opt ${systemd_system_unitdir}/imx8-isp.service" +FILES_${PN}-dbg += "${libdir}/.debug" + +INSANE_SKIP_${PN} += "rpaths dev-deps dev-so" +INSANE_SKIP_${PN}-dev += "rpaths dev-elf" + +COMPATIBLE_MACHINE = "(imx|use-nxp-bsp)" diff --git a/recipes-bsp/u-boot/u-boot-fslc-mfgtool_2020.04.bb b/recipes-bsp/u-boot/u-boot-fslc-mfgtool_2020.04.bb new file mode 100644 index 00000000..7f02746b --- /dev/null +++ b/recipes-bsp/u-boot/u-boot-fslc-mfgtool_2020.04.bb @@ -0,0 +1,8 @@ +# Copyright (C) 2014 O.S. Systems Software LTDA. +# Copyright (C) 2014-2016 Freescale Semiconductor +# Copyright 2017-2019 NXP + +FILESEXTRAPATHS_prepend := "${THISDIR}/u-boot-fslc:" + +require u-boot-fslc_${PV}.bb +require u-boot-mfgtool.inc diff --git a/recipes-bsp/u-boot/u-boot-imx-common.inc b/recipes-bsp/u-boot/u-boot-imx-common.inc index fd5371bb..5359afa3 100644 --- a/recipes-bsp/u-boot/u-boot-imx-common.inc +++ b/recipes-bsp/u-boot/u-boot-imx-common.inc @@ -4,7 +4,7 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRCBRANCH = "imx_v2020.04_5.4.47_2.2.0" -SRC_URI = "git://source.codeaurora.org/external/imx/uboot-imx.git;protocol=https;branch=${SRCBRANCH}" +SRC_URI = "git://github.com/nxp-imx/uboot-imx.git;protocol=https;branch=${SRCBRANCH}" SRCREV = "ffc3fbe7e5418d16f492c78693c3c4fa41f06f27" DEPENDS += "flex-native bison-native bc-native dtc-native" diff --git a/recipes-dpaa2/dce/dce_git.bb b/recipes-dpaa2/dce/dce_git.bb index 0e31a3c4..9984f080 100644 --- a/recipes-dpaa2/dce/dce_git.bb +++ b/recipes-dpaa2/dce/dce_git.bb @@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=956df5ea6cfe0a1dcf2dee7ca37c0cdf" SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/dce;nobranch=1 \ git://source.codeaurora.org/external/qoriq/qoriq-components/qbman_userspace;nobranch=1;name=qbman;destsuffix=git/lib/qbman_userspace \ " -SRCREV = "0ec35ad12ad04b5dadfa9f8c8a718c715bde41db" -SRCREV_qbman = "a1af1e1528fe2e1ce0df1e6d9170b6c239c8ab4f" +SRCREV = "9db9c08379aa89f45f514f4f3f0a8e8212198758" +SRCREV_qbman = "2f92993a9f34e5221d6b36c63b9e30ef703e9ac3" S = "${WORKDIR}/git" diff --git a/recipes-dpaa2/restool/restool/0001-restool-fix-build-error-with-gcc7.patch b/recipes-dpaa2/restool/restool/0001-restool-fix-build-error-with-gcc7.patch deleted file mode 100644 index 82ade02b..00000000 --- a/recipes-dpaa2/restool/restool/0001-restool-fix-build-error-with-gcc7.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 895db76654c796a0edc6b2d329addde108b1755c Mon Sep 17 00:00:00 2001 -From: Chunrong Guo <chunrong.guo@nxp.com> -Date: Wed, 19 Jul 2017 14:31:23 +0800 -Subject: [PATCH] restool: fix build error with gcc7 - ---- - Makefile | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 3976b66..df1e791 100644 ---- a/Makefile -+++ b/Makefile -@@ -64,7 +64,6 @@ CFLAGS = ${EXTRA_CFLAGS} \ - -Wmissing-prototypes \ - -Wpointer-arith \ - -Winline \ -- -Werror \ - -Wundef \ - -Icommon/ - --- -2.7.4 - diff --git a/recipes-dpaa2/restool/restool_git.bb b/recipes-dpaa2/restool/restool_git.bb index 0211c779..66cea7ef 100644 --- a/recipes-dpaa2/restool/restool_git.bb +++ b/recipes-dpaa2/restool/restool_git.bb @@ -4,14 +4,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ec8d84e9cd4de287e290275d09db27f0" RDEPENDS_${PN} += "bash dtc" -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/restool;nobranch=1 \ - file://0001-restool-fix-build-error-with-gcc7.patch" - -SRCREV = "f0cec094e4c6d1c975b377203a3bf994ba9325a9" +SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/restool;nobranch=1" +SRCREV = "8ddbe4c9559ffad5d7e5dd3cd5f00ceeff7f05d4" S = "${WORKDIR}/git" -EXTRA_OEMAKE = 'CC="${CC}" EXTRA_CFLAGS="-Wno-missing-field-initializers -Wno-missing-braces"' +EXTRA_OEMAKE = 'CC="${CC}" EXTRA_CFLAGS="-O2 -Wno-missing-field-initializers -Wno-missing-braces"' do_install () { oe_runmake install DESTDIR=${D} diff --git a/recipes-extended/dpdk/dpdk.inc b/recipes-extended/dpdk/dpdk.inc index f5793a19..61c02ae7 100644 --- a/recipes-extended/dpdk/dpdk.inc +++ b/recipes-extended/dpdk/dpdk.inc @@ -1,7 +1,7 @@ DESCRIPTION = "Data Plane Development Kit" HOMEPAGE = "http://dpdk.org" -LICENSE = "BSD-3-Clause & LGPLv2 & GPLv2" +RDEPENDS_${PN} += "python3-core" DEPENDS = "virtual/kernel openssl" DEPENDS_append_x86-64 = " numactl" do_configure[depends] += "virtual/kernel:do_shared_workdir" diff --git a/recipes-extended/dpdk/dpdk/0001-examples-ipsec-gw-fix-gcc-10-maybe-uninitialized-war.patch b/recipes-extended/dpdk/dpdk/0001-examples-ipsec-gw-fix-gcc-10-maybe-uninitialized-war.patch deleted file mode 100644 index 3b5a2b3a..00000000 --- a/recipes-extended/dpdk/dpdk/0001-examples-ipsec-gw-fix-gcc-10-maybe-uninitialized-war.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 6fe3e96ab6e92f8faca9784a46bc33d92790c2b8 Mon Sep 17 00:00:00 2001 -From: Kevin Traynor <ktraynor@redhat.com> -Date: Wed, 11 Mar 2020 11:33:00 +0000 -Subject: [PATCH] examples/ipsec-gw: fix gcc 10 maybe-uninitialized warning -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -gcc 10.0.1 reports: - -../examples/ipsec-secgw/ipsec_process.c: In function ‘ipsec_process’: -../examples/ipsec-secgw/ipsec_process.c:132:34: -error: ‘grp.m’ may be used uninitialized in this function - [-Werror=maybe-uninitialized] - 132 | grp[n].cnt = pkts + i - grp[n].m; - | ~~~~~~^~ - -This is a correct warning for the initial execution of the statement. -However, it is the design of the loop that grp[0].cnt will later be -written with the correct value using an initialized grp[0].m before it -is used. - -In order to remove the warning, initialize grp[0].m for the initial and -unused calculation of grp[0].cnt. - -Fixes: 3e5f4625dc17 ("examples/ipsec-secgw: make data-path to use IPsec library") -Cc: stable@dpdk.org - -Upstream-Status: Backport - -Suggested-by: Konstantin Ananyev <konstantin.ananyev@intel.com> -Signed-off-by: Kevin Traynor <ktraynor@redhat.com> -Acked-by: Konstantin Ananyev <konstantin.ananyev@intel.com> -Signed-off-by: Jens Rehsack <jens.rehsack.ext@safrangroup.com> ---- - examples/ipsec-secgw/ipsec_process.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/examples/ipsec-secgw/ipsec_process.c b/examples/ipsec-secgw/ipsec_process.c -index 2eb5c8b34..37f406d46 100644 ---- a/examples/ipsec-secgw/ipsec_process.c -+++ b/examples/ipsec-secgw/ipsec_process.c -@@ -125,6 +125,7 @@ sa_group(void *sa_ptr[], struct rte_mbuf *pkts[], - void * const nosa = &spi; - - sa = nosa; -+ grp[0].m = pkts; - for (i = 0, n = 0; i != num; i++) { - - if (sa != sa_ptr[i]) { --- -2.17.1 - diff --git a/recipes-extended/dpdk/dpdk/0004-update-WERROR_FLAGS.patch b/recipes-extended/dpdk/dpdk/0004-update-WERROR_FLAGS.patch deleted file mode 100644 index 61467377..00000000 --- a/recipes-extended/dpdk/dpdk/0004-update-WERROR_FLAGS.patch +++ /dev/null @@ -1,39 +0,0 @@ -From aa97b9162b68780ca912a226b5045a3ddab41d3c Mon Sep 17 00:00:00 2001 -From: Chunrong Guo <chunrong.guo@nxp.com> -Date: Thu, 4 Jul 2019 08:03:56 +0200 -Subject: [PATCH] update WERROR_FLAGS - -Signed-off-by: C.r. Guo <nxa13725@lsv07004.swis.us-cdc01.nxp.com> ---- - kernel/linux/kni/Makefile | 2 +- - mk/toolchain/gcc/rte.vars.mk | 1 + - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/kernel/linux/kni/Makefile b/kernel/linux/kni/Makefile -index 595bac261..a17939996 100644 ---- a/kernel/linux/kni/Makefile -+++ b/kernel/linux/kni/Makefile -@@ -14,7 +14,7 @@ MODULE = rte_kni - MODULE_CFLAGS += -I$(SRCDIR) --param max-inline-insns-single=50 - MODULE_CFLAGS += -I$(RTE_OUTPUT)/include - MODULE_CFLAGS += -include $(RTE_OUTPUT)/include/rte_config.h --MODULE_CFLAGS += -Wall -Werror -+MODULE_CFLAGS += -Wall -Werror -Wno-missing-attributes - - -include /etc/lsb-release - -diff --git a/mk/toolchain/gcc/rte.vars.mk b/mk/toolchain/gcc/rte.vars.mk -index de5e0d24d..ca2cb5fcd 100644 ---- a/mk/toolchain/gcc/rte.vars.mk -+++ b/mk/toolchain/gcc/rte.vars.mk -@@ -49,6 +49,7 @@ WERROR_FLAGS += -Wcast-align -Wnested-externs -Wcast-qual - WERROR_FLAGS += -Wformat-nonliteral -Wformat-security - WERROR_FLAGS += -Wundef -Wwrite-strings -Wdeprecated - WERROR_FLAGS += -Wno-error=pedantic -+WERROR_FLAGS += -Wno-address-of-packed-member - - ifeq ($(RTE_DEVEL_BUILD),y) - WERROR_FLAGS += -Werror --- -2.17.1 - diff --git a/recipes-extended/dpdk/dpdk/0005-use-python3-instead-of-python.patch b/recipes-extended/dpdk/dpdk/0005-use-python3-instead-of-python.patch new file mode 100644 index 00000000..81ca1244 --- /dev/null +++ b/recipes-extended/dpdk/dpdk/0005-use-python3-instead-of-python.patch @@ -0,0 +1,100 @@ +diff --git a/app/test-bbdev/test-bbdev.py b/app/test-bbdev/test-bbdev.py +index 0194be046..86fe3a89d 100755 +--- a/app/test-bbdev/test-bbdev.py ++++ b/app/test-bbdev/test-bbdev.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + + # SPDX-License-Identifier: BSD-3-Clause + # Copyright(c) 2017 Intel Corporation +diff --git a/app/test-cmdline/cmdline_test.py b/app/test-cmdline/cmdline_test.py +index 3a8fac426..231fe6032 100755 +--- a/app/test-cmdline/cmdline_test.py ++++ b/app/test-cmdline/cmdline_test.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # SPDX-License-Identifier: BSD-3-Clause + # Copyright(c) 2010-2014 Intel Corporation + +diff --git a/app/test/autotest.py b/app/test/autotest.py +index b42f48879..30541d102 100644 +--- a/app/test/autotest.py ++++ b/app/test/autotest.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # SPDX-License-Identifier: BSD-3-Clause + # Copyright(c) 2010-2014 Intel Corporation + +diff --git a/buildtools/map_to_def.py b/buildtools/map_to_def.py +index 6775b54a9..ff67f0a35 100644 +--- a/buildtools/map_to_def.py ++++ b/buildtools/map_to_def.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # SPDX-License-Identifier: BSD-3-Clause + # Copyright(c) 2019 Intel Corporation + +diff --git a/config/arm/armv8_machine.py b/config/arm/armv8_machine.py +index 404866d2f..1f689d9a8 100755 +--- a/config/arm/armv8_machine.py ++++ b/config/arm/armv8_machine.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/env python3 + # SPDX-License-Identifier: BSD-3-Clause + # Copyright(c) 2017 Cavium, Inc + +diff --git a/devtools/update_version_map_abi.py b/devtools/update_version_map_abi.py +index 616412a1c..3244b0984 100755 +--- a/devtools/update_version_map_abi.py ++++ b/devtools/update_version_map_abi.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # SPDX-License-Identifier: BSD-3-Clause + # Copyright(c) 2019 Intel Corporation + +diff --git a/usertools/cpu_layout.py b/usertools/cpu_layout.py +index 6f129b1db..e86bf6b92 100755 +--- a/usertools/cpu_layout.py ++++ b/usertools/cpu_layout.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # SPDX-License-Identifier: BSD-3-Clause + # Copyright(c) 2010-2014 Intel Corporation + # Copyright(c) 2017 Cavium, Inc. All rights reserved. +diff --git a/usertools/dpdk-devbind.py b/usertools/dpdk-devbind.py +index b1d149876..3f8175338 100755 +--- a/usertools/dpdk-devbind.py ++++ b/usertools/dpdk-devbind.py +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#!/usr/bin/env python3 + # SPDX-License-Identifier: BSD-3-Clause + # Copyright(c) 2010-2014 Intel Corporation + # +diff --git a/usertools/dpdk-pmdinfo.py b/usertools/dpdk-pmdinfo.py +index 069a3bf12..1d5c99c2a 100755 +--- a/usertools/dpdk-pmdinfo.py ++++ b/usertools/dpdk-pmdinfo.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # SPDX-License-Identifier: BSD-3-Clause + # Copyright(c) 2016 Neil Horman <nhorman@tuxdriver.com> + +diff --git a/usertools/dpdk-telemetry-client.py b/usertools/dpdk-telemetry-client.py +index 290345dcc..279067450 100755 +--- a/usertools/dpdk-telemetry-client.py ++++ b/usertools/dpdk-telemetry-client.py +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#!/usr/bin/env python3 + # SPDX-License-Identifier: BSD-3-Clause + # Copyright(c) 2018 Intel Corporation + diff --git a/recipes-extended/dpdk/dpdk_19.11-20.04.bb b/recipes-extended/dpdk/dpdk_19.11-20.04.bb deleted file mode 100644 index 398d2ec4..00000000 --- a/recipes-extended/dpdk/dpdk_19.11-20.04.bb +++ /dev/null @@ -1,19 +0,0 @@ -LIC_FILES_CHKSUM = "file://license/README;md5=3383def2d4c82237df281174e981a492" - -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/dpdk;nobranch=1 \ - file://add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch \ - file://0001-add-Wno-cast-function-type.patch \ - file://0001-Add-RTE_KERNELDIR_OUT.patch \ - file://0004-update-WERROR_FLAGS.patch \ - file://0001-examples-ipsec-gw-fix-gcc-10-maybe-uninitialized-war.patch \ -" -SRCREV = "4110a5fed09fa034963cfc246a6285911ecbd540" - -include dpdk.inc - - -do_install_append () { - # Remove the unneeded dir - rm -rf ${D}/${datadir}/${RTE_TARGET}/app -} - diff --git a/recipes-extended/dpdk/dpdk_19.11-20.12.bb b/recipes-extended/dpdk/dpdk_19.11-20.12.bb new file mode 100644 index 00000000..426713c2 --- /dev/null +++ b/recipes-extended/dpdk/dpdk_19.11-20.12.bb @@ -0,0 +1,20 @@ +LICENSE = "BSD-3-Clause & LGPLv2.1 & GPLv2" +LIC_FILES_CHKSUM = "file://license/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://license/lgpl-2.1.txt;md5=4b54a1fd55a448865a0b32d41598759d \ + file://license/bsd-3-clause.txt;md5=0f00d99239d922ffd13cabef83b33444" + +SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/dpdk;nobranch=1 \ + file://add-RTE_KERNELDIR_OUT-to-split-kernel-bu.patch \ + file://0001-add-Wno-cast-function-type.patch \ + file://0001-Add-RTE_KERNELDIR_OUT.patch \ + file://0005-use-python3-instead-of-python.patch \ +" +SRCREV = "7071c27f6f5aefb57de1cffab3484707b1e82e2b" + +include dpdk.inc + +do_install_append () { + # Remove the unneeded dir + rm -rf ${D}/${datadir}/${RTE_TARGET}/app +} + diff --git a/recipes-extended/jailhouse/jailhouse_0.12.bb b/recipes-extended/jailhouse/jailhouse_0.12.bb index a15bec6c..968afeff 100644 --- a/recipes-extended/jailhouse/jailhouse_0.12.bb +++ b/recipes-extended/jailhouse/jailhouse_0.12.bb @@ -16,7 +16,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=9fa7f895f96bde2d47fd5b7d95b6ba4d \ SRCBRANCH = "imx_5.4.47_2.2.0" SRCREV = "8bbe203ee7c1fc16198ce1bf964e54c90606c3c2" -SRC_URI = "git://source.codeaurora.org/external/imx/imx-jailhouse.git;protocol=ssh;branch=${SRCBRANCH} \ +SRC_URI = "git://github.com/nxp-imx/imx-jailhouse.git;protocol=ssh;branch=${SRCBRANCH} \ file://0001-tools-scripts-update-shebang-to-python3.patch \ " diff --git a/recipes-fsl/packagegroups/packagegroup-fsl-isp.bb b/recipes-fsl/packagegroups/packagegroup-fsl-isp.bb new file mode 100644 index 00000000..4ad257ee --- /dev/null +++ b/recipes-fsl/packagegroups/packagegroup-fsl-isp.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "Add packages for ISP build" + +inherit packagegroup + +ISP_PKGS ?= "" +ISP_PKGS_mx8mp = " \ + isp-imx \ + basler-camera \ + basler-camera-dev \ + kernel-module-isp-vvcam \ +" +RDEPENDS_${PN} = " \ + ${ISP_PKGS} \ +" diff --git a/recipes-fsl/packagegroups/packagegroup-fsl-opencv-imx.bb b/recipes-fsl/packagegroups/packagegroup-fsl-opencv-imx.bb new file mode 100644 index 00000000..8eb5b89a --- /dev/null +++ b/recipes-fsl/packagegroups/packagegroup-fsl-opencv-imx.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "Add packages for opencv i.MX build" + +inherit packagegroup + +OPENCV_PKGS = " \ + opencv-apps \ + opencv-samples \ + python3-opencv \ +" +RDEPENDS_${PN} = " \ + ${OPENCV_PKGS} \ +" diff --git a/recipes-graphics/drm/libdrm/musl-ioctl.patch b/recipes-graphics/drm/libdrm/musl-ioctl.patch deleted file mode 100644 index e3d6c5b8..00000000 --- a/recipes-graphics/drm/libdrm/musl-ioctl.patch +++ /dev/null @@ -1,35 +0,0 @@ -Upstream-Status: Submitted -Signed-off-by: Ross Burton <ross.burton@intel.com> - -From 46c0fd6c827a8cb4d04e067bf04fab579ac4712e Mon Sep 17 00:00:00 2001 -From: Ross Burton <ross.burton@intel.com> -Date: Mon, 18 Jun 2018 15:07:03 +0100 -Subject: [PATCH] tests/nouveau/threaded: adapt ioctl signature - -POSIX says ioctl() has the signature (int, int, ...) but glibc has decided to -use (int, unsigned long int, ...) instead. - -Use a #ifdef to adapt the replacement function as appropriate. ---- - tests/nouveau/threaded.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/tests/nouveau/threaded.c b/tests/nouveau/threaded.c -index 3669bcd3..e1c27c01 100644 ---- a/tests/nouveau/threaded.c -+++ b/tests/nouveau/threaded.c -@@ -36,7 +36,11 @@ static int failed; - - static int import_fd; - -+#ifdef __GLIBC__ - int ioctl(int fd, unsigned long request, ...) -+#else -+int ioctl(int fd, int request, ...) -+#endif - { - va_list va; - int ret; --- -2.11.0 - diff --git a/recipes-graphics/drm/libdrm_2.4.99.imx.bb b/recipes-graphics/drm/libdrm_2.4.102.imx.bb index dc2aa8a9..524e144c 100644 --- a/recipes-graphics/drm/libdrm_2.4.99.imx.bb +++ b/recipes-graphics/drm/libdrm_2.4.102.imx.bb @@ -10,15 +10,15 @@ LIC_FILES_CHKSUM = "file://xf86drm.c;beginline=9;endline=32;md5=c8a3b961af7667c5 PROVIDES = "drm" DEPENDS = "libpthread-stubs" -IMX_LIBDRM_SRC ?= "git://source.codeaurora.org/external/imx/libdrm-imx.git;protocol=https;nobranch=1" -IMX_LIBDRM_BRANCH ?= "libdrm-imx-2.4.99" +IMX_LIBDRM_SRC ?= "git://github.com/nxp-imx/libdrm-imx.git;protocol=https;nobranch=1" +IMX_LIBDRM_BRANCH ?= "libdrm-imx-2.4.102" SRC_URI = "${IMX_LIBDRM_SRC};branch=${IMX_LIBDRM_BRANCH} \ - file://musl-ioctl.patch \ file://0001-meson-add-libdrm-vivante-to-the-meson-meta-data.patch " -SRCREV = "f421c9c8c4b8fe48d9e6ef43910e98569c94a4b2" +SRCREV = "f525ae649cd6e81e5d4e459799b0f7a120c4e174" S = "${WORKDIR}/git" DEFAULT_PREFERENCE = "-1" +COMPATIBLE_MACHINE = "(mx6|mx7|mx8)" inherit meson pkgconfig manpages diff --git a/recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.8.9.bb b/recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.8.12.bb index 1bbc45dc..c407fb4a 100644 --- a/recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.8.9.bb +++ b/recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.8.12.bb @@ -4,12 +4,12 @@ DESCRIPTION = "GPU G2D library and apps for i.MX with 2D GPU and DPU" LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://COPYING;md5=983e4c77621568488dd902b27e0c2143" +LIC_FILES_CHKSUM = "file://COPYING;md5=cf3f9b8d09bc3926b1004ea71f7a248a" PROVIDES += "virtual/libg2d" SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true" -SRC_URI[md5sum] = "e532d99c1116ac8b685cd03aab3f4c75" -SRC_URI[sha256sum] = "c48e2d408be9c4bf2731546bece39216c79856e554fd22f6c3040603a2348c72" +SRC_URI[md5sum] = "18a4119f1f7b83a09f60381e5403bbab" +SRC_URI[sha256sum] = "ba7e219b3cee32e0ac305685de21c67f30e0e5a1a89b5ec441ae6b8484b3f964" inherit fsl-eula-unpack @@ -25,7 +25,7 @@ FILES_${PN} = "${libdir}/libg2d* /opt" FILES_${PN}-dev = "${libdir}/libg2d${SOLIBSDEV} ${includedir}" INSANE_SKIP_${PN} += "ldflags" -RDEPENDS_${PN} = "libgal-imx libdrm libopencl-imx" +RDEPENDS_${PN} = "libgal-imx libdrm" # This is required to provide support for VPU Amphion HEVC tile format # From NXP [MGS-5547] (commit e175d6b4f78deab24d319b852998bef55cdecc99): diff --git a/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_9.0.0.bb b/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_9.0.0.bb index 2f8029a4..7601a1cb 100644 --- a/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_9.0.0.bb +++ b/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_9.0.0.bb @@ -4,7 +4,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=aeb969185a143c3c25130bc2c3ef9a50" DEPENDS = "imx-gpu-viv zlib libpng procps" -SRC_URI = "git://source.codeaurora.org/external/imx/apitrace-imx.git;protocol=https;branch=imx_9.0" +SRC_URI = "git://github.com/nxp-imx/apitrace-imx.git;protocol=https;branch=imx_9.0" SRCREV = "fed74f6f84cb4f48ddace4306c9bf90bf7a9a967" S = "${WORKDIR}/git" diff --git a/recipes-graphics/imx-gpu-g2d/imx-gpu-g2d_6.4.3.p0.0.bb b/recipes-graphics/imx-gpu-g2d/imx-gpu-g2d_6.4.3.p1.0.bb index a19c926a..ed11a54b 100644 --- a/recipes-graphics/imx-gpu-g2d/imx-gpu-g2d_6.4.3.p0.0.bb +++ b/recipes-graphics/imx-gpu-g2d/imx-gpu-g2d_6.4.3.p1.0.bb @@ -5,7 +5,7 @@ DESCRIPTION = "GPU G2D library and apps for i.MX with 2D GPU and no DPU" LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://COPYING;md5=983e4c77621568488dd902b27e0c2143" +LIC_FILES_CHKSUM = "file://COPYING;md5=cf3f9b8d09bc3926b1004ea71f7a248a" DEPENDS += "libgal-imx" PROVIDES += "virtual/libg2d" @@ -13,10 +13,10 @@ PROVIDES += "virtual/libg2d" FSLBIN_NAME = "${PN}-${PV}-${TARGET_ARCH}" SRC_URI = "${FSL_MIRROR}/${FSLBIN_NAME}.bin;name=${TARGET_ARCH};fsl-eula=true" -SRC_URI[aarch64.md5sum] = "38d161708c42bb01362b7ba7f91bb6b4" -SRC_URI[aarch64.sha256sum] = "97ee90c81fa0db88e3249cb7df77f17f816ceb9a40355e03f72df99e600d7331" -SRC_URI[arm.md5sum] = "0011979d36205b1a3f03b404d6af4085" -SRC_URI[arm.sha256sum] = "725ad2edd41661713540d5e32509c754cda452acc608955689b8a64977b26ced" +SRC_URI[aarch64.md5sum] = "2c17220ff2c28701b5feca45b341961f" +SRC_URI[aarch64.sha256sum] = "47a39b171d83bced378b1b4f408be6304850fe2f25bf4577dd1ea78e22473f3d" +SRC_URI[arm.md5sum] = "968a7d324016376930579a0f904d6e69" +SRC_URI[arm.sha256sum] = "8d3b024151d4bdcc4f68cdbba9c4e5d126d55c9258de5821c43b393ae3f840b4" S = "${WORKDIR}/${FSLBIN_NAME}" 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 3ec37e5d..5acf6352 100644 --- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc +++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc @@ -6,7 +6,7 @@ DESCRIPTION = "GPU driver and apps for i.MX" SECTION = "libs" LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://COPYING;md5=983e4c77621568488dd902b27e0c2143" +LIC_FILES_CHKSUM = "file://COPYING;md5=cf3f9b8d09bc3926b1004ea71f7a248a" DEPENDS += " \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', \ @@ -43,9 +43,10 @@ PROVIDES += " \ imx-gpu-viv \ libgal-imx \ opencl-headers \ + opencl-clhpp \ + opencl-icd-loader \ virtual/egl \ virtual/libopenvg \ - virtual/opencl-headers \ virtual/opencl-icd \ ${PROVIDES_OPENVX} \ ${EXTRA_PROVIDES} \ @@ -290,9 +291,10 @@ INSANE_SKIP_libgal-imx += "build-deps" FILES_libvsc-imx = "${libdir}/libVSC${SOLIBS}" -FILES_libgbm-imx_mx8 = "${libdir}/libgbm*${SOLIBS}" -FILES_libgbm-imx-dev_mx8 = "${libdir}/pkgconfig/gbm.pc ${includedir}/gbm.h ${libdir}/libgbm${SOLIBSDEV}" +FILES_libgbm-imx_mx8 = "${libdir}/libgbm*${REALSOLIBS} ${libdir}/libgbm${SOLIBSDEV} ${libdir}/libgbm_viv${SOLIBSDEV}" +FILES_libgbm-imx-dev_mx8 = "${libdir}/pkgconfig/gbm.pc ${includedir}/gbm.h" RDEPENDS_libgbm-imx_append_mx8 = " libdrm" +INSANE_SKIP_libgbm-imx += "dev-so" FILES_libvulkan-imx = "${libdir}/libvulkan_VSI${REALSOLIBS} ${libdir}/libSPIRV_viv${SOLIBS}" FILES_libvulkan-imx-dev = "${includedir}/vulkan ${libdir}/libvulkan_VSI${SOLIBSDEV}" diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p0.0-aarch64.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p0.0-aarch64.bb deleted file mode 100644 index f3f9046e..00000000 --- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p0.0-aarch64.bb +++ /dev/null @@ -1,6 +0,0 @@ -require imx-gpu-viv-6.inc - -SRC_URI[md5sum] = "db4c88a19d0c1f7ec2788531822f9144" -SRC_URI[sha256sum] = "b3bd03288106daf3a62d2301d09569292ef6a5c74c761cfa4e41dad85e4bf547" - -COMPATIBLE_MACHINE = "(mx8)" diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p0.0-aarch32.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p1.0-aarch32.bb index 4d7e2bcd..39eb1a1d 100644 --- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p0.0-aarch32.bb +++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p1.0-aarch32.bb @@ -2,9 +2,9 @@ # Copyright 2017-2020 NXP # Released under the MIT license (see COPYING.MIT for the terms) -require recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc +require imx-gpu-viv-6.inc -SRC_URI[md5sum] = "163167d49e1667bab3a8a37ea33b7624" -SRC_URI[sha256sum] = "cdec43e45e840fe30e188e3b6f07c44b4a1ceafc315e605c8d278564db5fcbe9" +SRC_URI[md5sum] = "3ab06c5aa485c79c14e6c856ccfd8d82" +SRC_URI[sha256sum] = "9960fadbc1ea919f8b1b5c1e2e38a52b7293b70c906518d7fff2ada4140c59ea" COMPATIBLE_MACHINE = "(mx6q|mx6dl|mx6sx|mx6sl|mx7ulp)" diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p1.0-aarch64.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p1.0-aarch64.bb new file mode 100644 index 00000000..4db54790 --- /dev/null +++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p1.0-aarch64.bb @@ -0,0 +1,6 @@ +require imx-gpu-viv-6.inc + +SRC_URI[md5sum] = "72a212a1bd8102718f8b03d935f1dcbc" +SRC_URI[sha256sum] = "0505620c3851a980d2e08fee4b4fcd06eff92efac02d1646924bea86e4384ad4" + +COMPATIBLE_MACHINE = "(mx8)" diff --git a/recipes-graphics/mesa/mesa_%.bbappend b/recipes-graphics/mesa/mesa_%.bbappend index 8d429abf..fce3802e 100644 --- a/recipes-graphics/mesa/mesa_%.bbappend +++ b/recipes-graphics/mesa/mesa_%.bbappend @@ -17,17 +17,26 @@ python () { # Enable Etnaviv and Freedreno support PACKAGECONFIG_append_use-mainline-bsp = " gallium etnaviv kmsro freedreno" -USE_OSMESA_ONLY ?= "no" - -# Etnaviv support state for i.MX8 is unknown, therefore only enable OSMesa and -# disable Gallium for now. If you still want to enable Etnaviv, just set -# USE_OSMESA_ONLY_mx8 = "no" in your bbappend. -USE_OSMESA_ONLY_mx8 ?= "yes" - -# Enable OSMesa which also requires dri (classic) swrast -PACKAGECONFIG_append = " ${@oe.utils.conditional('USE_OSMESA_ONLY', 'yes', ' osmesa', '', d)}" -PACKAGECONFIG_remove = " ${@oe.utils.conditional('USE_OSMESA_ONLY', 'yes', 'gallium', '', d)}" -DRIDRIVERS_append = "${@oe.utils.conditional('USE_OSMESA_ONLY', 'yes', 'swrast', '', d)}" +# For NXP BSP, choose between gallium and osmesa, and between enabling +# dri and swrast or not. gallium and dri are default. +# +# For parts with no GPU, use gallium and dri +PACKAGECONFIG_REMOVE_NXPBSP = "" +PACKAGECONFIG_APPEND_NXPBSP = "" +DRIDRIVERS_NXPBSP = "" +# +# For parts with GPU but no DRM, use gallium +PACKAGECONFIG_REMOVE_NXPBSP_imxgpu = "dri" +DRIDRIVERS_NXPBSP_imxgpu = "" +# +# For parts with GPU and DRM, use osmesa, dri, and swrast +PACKAGECONFIG_REMOVE_NXPBSP_imxgpu_imxdrm = "gallium" +PACKAGECONFIG_APPEND_NXPBSP_imxgpu_imxdrm = "osmesa" +DRIDRIVERS_NXPBSP_imxgpu_imxdrm = "swrast" +# +PACKAGECONFIG_remove_use-nxp-bsp = "${PACKAGECONFIG_REMOVE_NXPBSP}" +PACKAGECONFIG_append_use-nxp-bsp = " ${PACKAGECONFIG_APPEND_NXPBSP}" +DRIDRIVERS_use-nxp-bsp = "${DRIDRIVERS_NXPBSP}" BACKEND = \ "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', \ diff --git a/recipes-graphics/wayland/wayland-protocols_1.18.imx.bb b/recipes-graphics/wayland/wayland-protocols_1.20.imx.bb index 7f15bdb3..c8af7301 100644 --- a/recipes-graphics/wayland/wayland-protocols_1.18.imx.bb +++ b/recipes-graphics/wayland/wayland-protocols_1.20.imx.bb @@ -9,8 +9,8 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=c7b12b6702da38ca028ace54aae3d484 \ file://stable/presentation-time/presentation-time.xml;endline=26;md5=4646cd7d9edc9fa55db941f2d3a7dc53" -SRC_URI = "git://source.codeaurora.org/external/imx/wayland-protocols-imx.git;protocol=https;branch=wayland-protocols-imx-1.18" -SRCREV = "ee18c1f66877f7fb652467c349108395c20d4f9a" +SRC_URI = "git://github.com/nxp-imx/wayland-protocols-imx.git;protocol=https;branch=wayland-protocols-imx-1.20" +SRCREV = "9cacf108d0ee5863c7a656da5d2271bc2396e43d" S = "${WORKDIR}/git" inherit autotools pkgconfig diff --git a/recipes-graphics/wayland/weston-init.bbappend b/recipes-graphics/wayland/weston-init.bbappend index e5bbca66..66e148c1 100644 --- a/recipes-graphics/wayland/weston-init.bbappend +++ b/recipes-graphics/wayland/weston-init.bbappend @@ -15,9 +15,18 @@ SRC_URI_append_mx6sl = " file://weston.config" INI_UNCOMMENT_ASSIGNMENTS_append_imx = " \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland=true', '', d)} \ " +INI_UNCOMMENT_ASSIGNMENTS_append_mx6dl = " \ + use-g2d=1 \ +" +INI_UNCOMMENT_ASSIGNMENTS_append_mx6q = " \ + use-g2d=1 \ +" INI_UNCOMMENT_ASSIGNMENTS_append_mx7ulp = " \ use-g2d=1 \ " +INI_UNCOMMENT_ASSIGNMENTS_append_mx8 = " \ + repaint-window=16 \ +" INI_UNCOMMENT_ASSIGNMENTS_append_mx8mm = " \ use-g2d=1 \ " @@ -31,8 +40,8 @@ INI_UNCOMMENT_ASSIGNMENTS_append_mx8mq = " \ " uncomment() { - if ! (grep "^#$1" $2); then - bbfatal "Commented setting '#$1' not found in file $2" + if ! grep -q "^#$1" $2 && ! grep -q "^$1" $2; then + bbwarn "Commented setting '#$1' not found in file $2" fi sed -i -e 's,^#'"$1"','"$1"',g' $2 } diff --git a/recipes-graphics/wayland/weston-init/imx/weston.ini b/recipes-graphics/wayland/weston-init/imx/weston.ini index d9094b1f..916e621a 100644 --- a/recipes-graphics/wayland/weston-init/imx/weston.ini +++ b/recipes-graphics/wayland/weston-init/imx/weston.ini @@ -3,14 +3,19 @@ idle-time=0 #use-g2d=1 #xwayland=true +#repaint-window=16 +#enable-overlay-view=1 #[shell] #size=1920x1080 +[libinput] +touchscreen_calibrator=true + #[output] #name=HDMI-A-1 #mode=1920x1080@60 -#transform=90 +#transform=rotate-90 #[output] #name=HDMI-A-2 @@ -19,7 +24,7 @@ idle-time=0 # off Disables the output # preferred Uses the preferred mode # current Uses the current crt controller mode -#transform=90 +#transform=rotate-90 [screen-share] command=@bindir@/weston --backend=rdp-backend.so --shell=fullscreen-shell.so --no-clients-resize diff --git a/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch b/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch index 62b864c1..3279a728 100644 --- a/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch +++ b/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch @@ -1,7 +1,8 @@ -From 5f2d71998eb77068cbaee2d468cbb296a42d5739 Mon Sep 17 00:00:00 2001 +From a1548c742bf2dedbb47282d8a00407b60bbab669 Mon Sep 17 00:00:00 2001 From: Tom Hochstein <tom.hochstein@nxp.com> Date: Wed, 22 Feb 2017 15:53:30 +0200 Subject: [PATCH] weston-launch: Provide a default version that doesn't require + PAM weston-launch requires PAM for starting weston as a non-root user. @@ -57,7 +58,7 @@ index 08d23ec..cb9fd3f 100644 install: true ) diff --git a/libweston/weston-launch.c b/libweston/weston-launch.c -index 8a711b4..54c567a 100644 +index 521cb2c..2d42d33 100644 --- a/libweston/weston-launch.c +++ b/libweston/weston-launch.c @@ -51,7 +51,9 @@ @@ -97,7 +98,7 @@ index 8a711b4..54c567a 100644 static int setup_launcher_socket(struct weston_launch *wl) -@@ -431,6 +437,7 @@ quit(struct weston_launch *wl, int status) +@@ -466,6 +472,7 @@ quit(struct weston_launch *wl, int status) close(wl->signalfd); close(wl->sock[0]); @@ -105,15 +106,15 @@ index 8a711b4..54c567a 100644 if (wl->new_user) { err = pam_close_session(wl->ph, 0); if (err) -@@ -438,6 +445,7 @@ quit(struct weston_launch *wl, int status) +@@ -473,6 +480,7 @@ quit(struct weston_launch *wl, int status) err, pam_strerror(wl->ph, err)); pam_end(wl->ph, err); } +#endif - if (ioctl(wl->tty, KDSKBMUTE, 0) && - ioctl(wl->tty, KDSKBMODE, wl->kb_mode)) -@@ -666,6 +674,7 @@ setup_session(struct weston_launch *wl, char **child_argv) + /* + * Get a fresh handle to the tty as the previous one is in +@@ -710,6 +718,7 @@ setup_session(struct weston_launch *wl, char **child_argv) setenv("HOME", wl->pw->pw_dir, 1); setenv("SHELL", wl->pw->pw_shell, 1); @@ -121,7 +122,7 @@ index 8a711b4..54c567a 100644 env = pam_getenvlist(wl->ph); if (env) { for (i = 0; env[i]; ++i) { -@@ -674,6 +683,7 @@ setup_session(struct weston_launch *wl, char **child_argv) +@@ -718,6 +727,7 @@ setup_session(struct weston_launch *wl, char **child_argv) } free(env); } @@ -129,7 +130,7 @@ index 8a711b4..54c567a 100644 /* * We open a new session, so it makes sense -@@ -745,8 +755,10 @@ static void +@@ -789,8 +799,10 @@ static void help(const char *name) { fprintf(stderr, "Usage: %s [args...] [-- [weston args..]]\n", name); @@ -140,7 +141,7 @@ index 8a711b4..54c567a 100644 fprintf(stderr, " -t, --tty Start session on alternative tty,\n" " e.g. -t /dev/tty4, requires -u option.\n"); fprintf(stderr, " -v, --verbose Be verbose\n"); -@@ -760,7 +772,9 @@ main(int argc, char *argv[]) +@@ -804,7 +816,9 @@ main(int argc, char *argv[]) int i, c; char *tty = NULL; struct option opts[] = { @@ -150,7 +151,7 @@ index 8a711b4..54c567a 100644 { "tty", required_argument, NULL, 't' }, { "verbose", no_argument, NULL, 'v' }, { "help", no_argument, NULL, 'h' }, -@@ -772,11 +786,16 @@ main(int argc, char *argv[]) +@@ -816,11 +830,16 @@ main(int argc, char *argv[]) while ((c = getopt_long(argc, argv, "u:t:vh", opts, &i)) != -1) { switch (c) { case 'u': @@ -167,7 +168,7 @@ index 8a711b4..54c567a 100644 break; case 't': tty = optarg; -@@ -828,8 +847,10 @@ main(int argc, char *argv[]) +@@ -872,8 +891,10 @@ main(int argc, char *argv[]) if (setup_tty(&wl, tty) < 0) exit(EXIT_FAILURE); @@ -179,7 +180,7 @@ index 8a711b4..54c567a 100644 if (setup_launcher_socket(&wl) < 0) exit(EXIT_FAILURE); diff --git a/meson_options.txt b/meson_options.txt -index c862ecc..73ef2c3 100644 +index 239bd2d..99e4ec3 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -73,6 +73,13 @@ option( diff --git a/recipes-graphics/wayland/weston/dont-use-plane-add-prop.patch b/recipes-graphics/wayland/weston/dont-use-plane-add-prop.patch new file mode 100644 index 00000000..a4444e5d --- /dev/null +++ b/recipes-graphics/wayland/weston/dont-use-plane-add-prop.patch @@ -0,0 +1,23 @@ +Fix atomic modesetting with musl + +atomic modesetting seems to fail with drm weston backend and this patch fixes +it, below errors are seen before weston exits + +atomic: couldn't commit new state: Invalid argument + +Upstream-Status: Submitted [https://gitlab.freedesktop.org/wayland/weston/-/issues/158] +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +--- a/libweston/backend-drm/kms.c ++++ b/libweston/backend-drm/kms.c +@@ -1168,8 +1168,8 @@ drm_pending_state_apply_atomic(struct dr + wl_list_for_each(plane, &b->plane_list, link) { + drm_debug(b, "\t\t[atomic] starting with plane %lu disabled\n", + (unsigned long) plane->plane_id); +- plane_add_prop(req, plane, WDRM_PLANE_CRTC_ID, 0); +- plane_add_prop(req, plane, WDRM_PLANE_FB_ID, 0); ++ //plane_add_prop(req, plane, WDRM_PLANE_CRTC_ID, 0); ++ //plane_add_prop(req, plane, WDRM_PLANE_FB_ID, 0); + } + + flags |= DRM_MODE_ATOMIC_ALLOW_MODESET; diff --git a/recipes-graphics/wayland/weston_8.0.0.imx.bb b/recipes-graphics/wayland/weston_9.0.0.imx.bb index 24a21db5..83153dc6 100644 --- a/recipes-graphics/wayland/weston_8.0.0.imx.bb +++ b/recipes-graphics/wayland/weston_9.0.0.imx.bb @@ -3,7 +3,7 @@ # recipe. The second section customizes the recipe for i.MX. ########### OE-core copy ################## -# Upstream hash: 9b1d30810eeecb46b977c8eed68be69aef891312 +# Upstream hash: 0a882490fe75915c7a119f3498df6750be25f8e0 SUMMARY = "Weston, a Wayland compositor" DESCRIPTION = "Weston is the reference implementation of a Wayland compositor" @@ -17,19 +17,25 @@ SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ file://weston.desktop \ file://xwayland.weston-start \ file://0001-weston-launch-Provide-a-default-version-that-doesn-t.patch \ + file://0001-tests-include-fcntl.h-for-open-O_RDWR-O_CLOEXEC-and-.patch \ " -SRC_URI[md5sum] = "53e4810d852df0601d01fd986a5b22b3" -SRC_URI[sha256sum] = "7518b49b2eaa1c3091f24671bdcc124fd49fc8f1af51161927afa4329c027848" + +SRC_URI_append_libc-musl = " file://dont-use-plane-add-prop.patch " + +SRC_URI[sha256sum] = "5cf5d6ce192e0eb15c1fc861a436bf21b5bb3b91dbdabbdebe83e1f83aa098fe" UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html" inherit meson pkgconfig useradd features_check # depends on virtual/egl -REQUIRED_DISTRO_FEATURES = "opengl" +# weston-init requires pam enabled if started via systemd +REQUIRED_DISTRO_FEATURES = "opengl ${@oe.utils.conditional('VIRTUAL-RUNTIME_init_manager', 'systemd', 'pam', '', d)}" -DEPENDS = "libxkbcommon gdk-pixbuf pixman cairo glib-2.0 jpeg" +DEPENDS = "libxkbcommon gdk-pixbuf pixman cairo glib-2.0" DEPENDS += "wayland wayland-protocols libinput virtual/egl pango wayland-native" +LDFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'lto', '-Wl,-z,undefs', '', d)}" + WESTON_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:1])}" EXTRA_OEMESON += "-Dbackend-default=auto -Dbackend-rdp=false -Dpipewire=false" @@ -38,7 +44,13 @@ PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms fbdev ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland', '', d)} \ ${@bb.utils.filter('DISTRO_FEATURES', 'pam systemd x11', d)} \ ${@bb.utils.contains_any('DISTRO_FEATURES', 'wayland x11', '', 'headless', d)} \ - launch" + launch \ + image-jpeg \ + screenshare \ + shell-desktop \ + shell-fullscreen \ + shell-ivi" + # # Compositor choices # @@ -65,15 +77,25 @@ PACKAGECONFIG[webp] = "-Dimage-webp=true,-Dimage-webp=false,libwebp" # Weston with systemd-login support PACKAGECONFIG[systemd] = "-Dsystemd=true -Dlauncher-logind=true,-Dsystemd=false -Dlauncher-logind=false,systemd dbus" # Weston with Xwayland support (requires X11 and Wayland) -PACKAGECONFIG[xwayland] = "-Dxwayland=true,-Dxwayland=false,libxcursor" +PACKAGECONFIG[xwayland] = "-Dxwayland=true,-Dxwayland=false" # colord CMS support PACKAGECONFIG[colord] = "-Dcolor-management-colord=true,-Dcolor-management-colord=false,colord" # Clients support PACKAGECONFIG[clients] = "-Dsimple-clients=all -Ddemo-clients=true,-Dsimple-clients= -Ddemo-clients=false" # Virtual remote output with GStreamer on DRM backend -PACKAGECONFIG[remoting] = "-Dremoting=true,-Dremoting=false,gstreamer-1.0" +PACKAGECONFIG[remoting] = "-Dremoting=true,-Dremoting=false,gstreamer1.0" # Weston with PAM support PACKAGECONFIG[pam] = "-Dpam=true,-Dpam=false,libpam" +# Weston with screen-share support +PACKAGECONFIG[screenshare] = "-Dscreenshare=true,-Dscreenshare=false" +# Traditional desktop shell +PACKAGECONFIG[shell-desktop] = "-Dshell-desktop=true,-Dshell-desktop=false" +# Fullscreen shell +PACKAGECONFIG[shell-fullscreen] = "-Dshell-fullscreen=true,-Dshell-fullscreen=false" +# In-Vehicle Infotainment (IVI) shell +PACKAGECONFIG[shell-ivi] = "-Dshell-ivi=true,-Dshell-ivi=false" +# JPEG image loading support +PACKAGECONFIG[image-jpeg] = "-Dimage-jpeg=true,-Dimage-jpeg=false, jpeg" do_install_append() { # Weston doesn't need the .la files to load modules, so wipe them @@ -126,14 +148,14 @@ SUMMARY = "Weston, a Wayland compositor, i.MX fork" DEFAULT_PREFERENCE = "-1" -SRCBRANCH = "weston-imx-8.0" -SRC_URI = "git://source.codeaurora.org/external/imx/weston-imx.git;protocol=https;branch=${SRCBRANCH} \ +SRCBRANCH = "weston-imx-9.0" +SRC_URI = "git://github.com/nxp-imx/weston-imx.git;protocol=https;branch=${SRCBRANCH} \ file://weston.png \ file://weston.desktop \ file://xwayland.weston-start \ file://0001-weston-launch-Provide-a-default-version-that-doesn-t.patch \ " -SRCREV = "f6a7d35650121fbe7c20d4cbe0eaac730fab3b2a" +SRCREV = "a1823f20a1d6e24d2f56e98c5576eda34a94f567" S = "${WORKDIR}/git" # Disable OpenGL for parts with GPU support for 2D but not 3D @@ -155,6 +177,7 @@ PACKAGECONFIG_append_imxgpu2d = " imxg2d" # Clients support SIMPLE_CLIENTS = "all" SIMPLE_CLIENTS_imxfbdev = "damage,im,egl,shm,touch,dmabuf-v4l" +PACKAGECONFIG[xwayland] = "-Dxwayland=true,-Dxwayland=false,libxcursor" PACKAGECONFIG[clients] = "-Dsimple-clients=${SIMPLE_CLIENTS} -Ddemo-clients=true,-Dsimple-clients= -Ddemo-clients=false" # Weston with i.MX GPU support PACKAGECONFIG[imxgpu] = "-Dimxgpu=true,-Dimxgpu=false,virtual/egl" diff --git a/recipes-graphics/xorg-driver/xf86-video-armada_git.bb b/recipes-graphics/xorg-driver/xf86-video-armada_git.bb index 0aba8e5a..cc68a518 100644 --- a/recipes-graphics/xorg-driver/xf86-video-armada_git.bb +++ b/recipes-graphics/xorg-driver/xf86-video-armada_git.bb @@ -28,7 +28,7 @@ SRCREV_FORMAT = "armada_etna" PV = "0.1+git${SRCPV}" SRC_URI = " \ - git://git.arm.linux.org.uk/cgit/xf86-video-armada.git;branch=unstable-devel;protocol=http;name=armada \ + git://git.armlinux.org.uk/cgit/xf86-video-armada.git;branch=unstable-devel;protocol=http;name=armada \ git://github.com/etnaviv/etna_viv.git;protocol=https;name=etna;destsuffix=etna_viv \ " diff --git a/recipes-graphics/xorg-driver/xf86-video-imx-vivante_6.4.0.p0.0.bb b/recipes-graphics/xorg-driver/xf86-video-imx-vivante_6.4.0.p0.0.bb index 069008c0..b71e81a3 100644 --- a/recipes-graphics/xorg-driver/xf86-video-imx-vivante_6.4.0.p0.0.bb +++ b/recipes-graphics/xorg-driver/xf86-video-imx-vivante_6.4.0.p0.0.bb @@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = "file://COPYING-MIT;md5=b5e9d9f5c02ea831ab3ecf802bb7c4f3" SRCREV = "c828e8a7c38743e960967e7bb78c134cec31c102" SRCBRANCH = "imx_exa_viv6_g2d" -SRC_URI = "git://source.codeaurora.org/external/imx/xf86-video-imx-vivante.git;protocol=https;branch=${SRCBRANCH} \ +SRC_URI = "git://github.com/nxp-imx/xf86-video-imx-vivante.git;protocol=https;branch=${SRCBRANCH} \ file://rc.autohdmi" S = "${WORKDIR}/git" diff --git a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.3.p0.0.bb b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.3.p1.0.bb index a2023ec6..2a4e4630 100644 --- a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.3.p0.0.bb +++ b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.3.p1.0.bb @@ -7,14 +7,14 @@ allowing flexibility to use a newer graphics release with an older kernel." LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -SRCBRANCH = "imx_5.4.47_2.2.0" +SRCBRANCH = "imx_5.4.70_2.3.0" LOCALVERSION = "-${SRCBRANCH}" -KERNEL_SRC ?= "git://source.codeaurora.org/external/imx/linux-imx.git;protocol=https" +KERNEL_SRC ?= "git://github.com/nxp-imx/linux-imx.git;protocol=https" SRC_URI = " \ ${KERNEL_SRC};branch=${SRCBRANCH};subpath=drivers/mxc/gpu-viv;destsuffix=git/src \ file://Add-makefile.patch \ " -SRCREV = "add79449db6cf3fa4081ccd18182b29cba10e748" +SRCREV = "13b3c469663da0c79d385ce15887f6b5805f060d" S = "${WORKDIR}/git" diff --git a/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.6.0.bb b/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.6.0.bb new file mode 100644 index 00000000..327c8765 --- /dev/null +++ b/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.6.0.bb @@ -0,0 +1,19 @@ +# Copyright 2020 NXP + +DESCRIPTION = "Kernel loadable module for ISP" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://${WORKDIR}/git/vvcam/LICENSE;md5=64381a6ea83b48c39fe524c85f65fb44" + +SRCBRANCH = "imx_5.4.70_2.3.0" +ISP_KERNEL_SRC ?= "git://github.com/nxp-imx/isp-vvcam.git;protocol=https" + +SRC_URI = " \ + ${ISP_KERNEL_SRC};branch=${SRCBRANCH} \ +" +SRCREV = "9824e601d336bcef2dc6284ff3605e0b1d32d63d" + +S = "${WORKDIR}/git/vvcam/v4l2" + +inherit module + +COMPATIBLE_MACHINE = "(imx|use-nxp-bsp)" diff --git a/recipes-kernel/kernel-modules/kernel-module-qcacld-lea.inc b/recipes-kernel/kernel-modules/kernel-module-qcacld-lea.inc index 0b23a47c..3fb18f06 100644 --- a/recipes-kernel/kernel-modules/kernel-module-qcacld-lea.inc +++ b/recipes-kernel/kernel-modules/kernel-module-qcacld-lea.inc @@ -2,7 +2,7 @@ SUMMARY = "Qualcomm WiFi driver for QCA module 9377 and 6174" LICENSE = "BSD & GPLv2" LIC_FILES_CHKSUM = "file://CORE/HDD/src/wlan_hdd_main.c;beginline=1;endline=20;md5=ec8d62116b13db773825ebf7cf91be1d;" -QCACLD_SRC ?= "git://source.codeaurora.org/external/imx/qcacld-2.0-imx.git;protocol=https" +QCACLD_SRC ?= "git://github.com/nxp-imx/qcacld-2.0-imx.git;protocol=https" SRC_URI = "${QCACLD_SRC};branch=IMX_CNSS.LEA.NRT_3.0_KRL5.4" SRCREV = "7dc91e5977f31d60741c55682564788c0f930163" diff --git a/recipes-kernel/linux/linux-fslc-imx_5.4.bb b/recipes-kernel/linux/linux-fslc-imx_5.4.bb index 2395dd43..1dcf682a 100644 --- a/recipes-kernel/linux/linux-fslc-imx_5.4.bb +++ b/recipes-kernel/linux/linux-fslc-imx_5.4.bb @@ -28,7 +28,7 @@ Latest stable Kernel patchlevel is applied and maintained by Community." # ------------------------------------------------------------------------------ # 1. Stable (tag or SHA(s)) # ------------------------------------------------------------------------------ -# tag: v5.4.81 +# tag: v5.4.94 # # ------------------------------------------------------------------------------ # 2. NXP-specific (tag or SHA(s)) @@ -73,14 +73,14 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" SRCBRANCH = "5.4-2.1.x-imx" -SRCREV = "22c6803f24b654d5b681cd90e516ca54262ed6c9" +SRCREV = "13bed7d37705aedaf2378007e023b753a831e8a6" # PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition # required by kernel-yocto.bbclass. # # LINUX_VERSION define should match to the kernel version referenced by SRC_URI and # should be updated once patchlevel is merged. -LINUX_VERSION = "5.4.81" +LINUX_VERSION = "5.4.94" # Local version indicates the branch name in the NXP kernel tree where patches are collected from. LOCALVERSION = "-imx-5.4.24-2.1.0" diff --git a/recipes-kernel/linux/linux-fslc-mfgtool_5.4.bb b/recipes-kernel/linux/linux-fslc-mfgtool_5.4.bb new file mode 100644 index 00000000..c155ebb9 --- /dev/null +++ b/recipes-kernel/linux/linux-fslc-mfgtool_5.4.bb @@ -0,0 +1,15 @@ +# Copyright (C) 2014-2018 O.S. Systems Software LTDA. +# Copyright (C) 2014-2016 Freescale Semiconductor + +SUMMARY = "Produces a Manufacturing Tool compatible Linux Kernel" +DESCRIPTION = "Linux Kernel provided and supported by the Freescale Community \ +that produces a Manufacturing Tool compatible Linux Kernel to be used in updater \ +environment" + +FILESEXTRAPATHS_prepend := "${THISDIR}/linux-fslc:" +require linux-fslc_${PV}.bb +require linux-mfgtool.inc + +KERNEL_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME" +MODULE_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME" +do_package[vardepsexclude] = "DATETIME" diff --git a/recipes-kernel/linux/linux-fslc-qoriq_5.4.bb b/recipes-kernel/linux/linux-fslc-qoriq_5.4.bb index eb8cf0c4..db972ba7 100644 --- a/recipes-kernel/linux/linux-fslc-qoriq_5.4.bb +++ b/recipes-kernel/linux/linux-fslc-qoriq_5.4.bb @@ -10,8 +10,8 @@ require recipes-kernel/linux/linux-qoriq.inc LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" -LINUX_VERSION = "5.4.64" +LINUX_VERSION = "5.4.92" SRCBRANCH = "5.4.y+qoriq+fslc" -SRCREV = "4c04c442c0e91e7cf01f830aca524f09b5613f29" +SRCREV = "11d4722c637a77c6e1c9a8eeec091f1588f6b3f3" SRC_URI := "git://github.com/Freescale/linux-fslc.git;branch=${SRCBRANCH}" diff --git a/recipes-kernel/linux/linux-fslc_5.4.bb b/recipes-kernel/linux/linux-fslc_5.4.bb index d2851f89..57ea14c4 100644 --- a/recipes-kernel/linux/linux-fslc_5.4.bb +++ b/recipes-kernel/linux/linux-fslc_5.4.bb @@ -19,9 +19,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" # # LINUX_VERSION define should match to the kernel version referenced by SRC_URI and # should be updated once patchlevel is merged. -LINUX_VERSION = "5.4.82" +LINUX_VERSION = "5.4.94" SRCBRANCH = "5.4.x+fslc" -SRCREV = "38210f196c3250956c87d501b38b0b88f5cf5177" +SRCREV = "4b9631852aa78dcee7fa1491ea297a92c78a81a3" COMPATIBLE_MACHINE = "(mxs|mx5|mx6|vf|use-mainline-bsp)" diff --git a/recipes-kernel/linux/linux-imx-headers_5.4.bb b/recipes-kernel/linux/linux-imx-headers_5.4.bb index ac460c0d..1e726302 100644 --- a/recipes-kernel/linux/linux-imx-headers_5.4.bb +++ b/recipes-kernel/linux/linux-imx-headers_5.4.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" SRCBRANCH = "imx_5.4.47_2.2.0" LOCALVERSION = "-2.2.0" -SRC_URI = "git://source.codeaurora.org/external/imx/linux-imx.git;protocol=https;branch=${SRCBRANCH}" +SRC_URI = "git://github.com/nxp-imx/linux-imx.git;protocol=https;branch=${SRCBRANCH}" SRCREV = "dea2fede7e024ee7029b13e8d82a00ec14427777" S = "${WORKDIR}/git" diff --git a/recipes-kernel/linux/linux-imx.inc b/recipes-kernel/linux/linux-imx.inc index c08ee0d4..33e92f78 100644 --- a/recipes-kernel/linux/linux-imx.inc +++ b/recipes-kernel/linux/linux-imx.inc @@ -14,7 +14,7 @@ SRCBRANCH ?= "" # Set the PV to the correct kernel version to satisfy the kernel version sanity check PV = "${LINUX_VERSION}+git${SRCPV}" -SRC_URI = "git://source.codeaurora.org/external/imx/linux-imx;protocol=https;branch=${SRCBRANCH} \ +SRC_URI = "git://github.com/nxp-imx/linux-imx;protocol=https;branch=${SRCBRANCH} \ file://defconfig \ file://0001-perf-tests-bp_account-Make-global-variable-static.patch \ file://0001-perf-cs-etm-Move-definition-of-traceid_list-global-v.patch \ diff --git a/recipes-kernel/linux/linux-qoriq.inc b/recipes-kernel/linux/linux-qoriq.inc index dcf28401..4d134b47 100644 --- a/recipes-kernel/linux/linux-qoriq.inc +++ b/recipes-kernel/linux/linux-qoriq.inc @@ -53,7 +53,7 @@ do_merge_delta_config() { done cp .config ${WORKDIR}/defconfig } -addtask merge_delta_config before do_preconfigure after do_patch +addtask merge_delta_config before do_kernel_localversion after do_patch # The link of dts folder is needed for 32b compile of aarch64 targets(e.g. ls1043ardb-32b) do_compile_prepend_fsl-lsch2-32b() { diff --git a/recipes-multimedia/alsa/imx-alsa-plugins_1.0.26.bb b/recipes-multimedia/alsa/imx-alsa-plugins_1.0.26.bb index db2f71fd..237b4925 100644 --- a/recipes-multimedia/alsa/imx-alsa-plugins_1.0.26.bb +++ b/recipes-multimedia/alsa/imx-alsa-plugins_1.0.26.bb @@ -18,7 +18,7 @@ LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=94d55d512a9ba36caa9b7df079bae19f" inherit autotools pkgconfig use-imx-headers SRCBRANCH = "MM_04.05.01_1909_L4.19.35" -SRC_URI = "git://source.codeaurora.org/external/imx/imx-alsa-plugins.git;protocol=https;branch=${SRCBRANCH}" +SRC_URI = "git://github.com/nxp-imx/imx-alsa-plugins.git;protocol=https;branch=${SRCBRANCH}" SRCREV = "cde60d68ab2acee913dbfacb8aabb53d87dd3e38" S = "${WORKDIR}/git" diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.imx.bb index 3dc7cbf8..02097514 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.imx.bb @@ -10,7 +10,7 @@ DEFAULT_PREFERENCE = "-1" PACKAGE_ARCH_imxpxp = "${MACHINE_SOCARCH}" PACKAGE_ARCH_mx8 = "${MACHINE_SOCARCH}" -GST1.0-PLUGINS-BAD_SRC ?= "gitsm://source.codeaurora.org/external/imx/gst-plugins-bad.git;protocol=https" +GST1.0-PLUGINS-BAD_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-bad.git;protocol=https" SRCBRANCH = "MM_04.05.06_2008_L5.4.47" SRC_URI = " \ diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.imx.bb index db0b740f..3d7c3e2d 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.imx.bb @@ -4,7 +4,7 @@ LICENSE = "GPLv2+ & LGPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d \ file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=a4e1830fce078028c8f0974161272607" -GST1.0-PLUGINS-BASE_SRC ?= "gitsm://source.codeaurora.org/external/imx/gst-plugins-base.git;protocol=https" +GST1.0-PLUGINS-BASE_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-base.git;protocol=https" SRCBRANCH = "MM_04.05.06_2008_L5.4.47" SRCREV = "3c4aa2a58576d68f6e684efa58609665679c9969" SRC_URI = "${GST1.0-PLUGINS-BASE_SRC};branch=${SRCBRANCH} \ diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.imx.bb index 7774a351..ad7ac113 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.imx.bb @@ -1,7 +1,7 @@ require recipes-multimedia/gstreamer/gstreamer1.0-plugins-common.inc -GST1.0-PLUGINS-GOOD_SRC ?= "gitsm://source.codeaurora.org/external/imx/gst-plugins-good.git;protocol=https" +GST1.0-PLUGINS-GOOD_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-good.git;protocol=https" SRCBRANCH = "MM_04.05.06_2008_L5.4.47" SRC_URI = " \ diff --git a/recipes-multimedia/gstreamer/gstreamer1.0_1.16.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0_1.16.imx.bb index 8bbc16c8..3d558c62 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0_1.16.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0_1.16.imx.bb @@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d \ file://gst/gst.h;beginline=1;endline=21;md5=e059138481205ee2c6fc1c079c016d0d" # Use i.MX fork of GST for customizations -GST1.0_SRC ?= "gitsm://source.codeaurora.org/external/imx/gstreamer.git;protocol=https" +GST1.0_SRC ?= "gitsm://github.com/nxp-imx/gstreamer.git;protocol=https" SRCBRANCH = "MM_04.05.06_2008_L5.4.47" SRC_URI = " \ diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.5.6.bb b/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.5.6.bb index d2881656..ec6f92c0 100644 --- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.5.6.bb +++ b/recipes-multimedia/gstreamer/imx-gst1.0-plugin_4.5.6.bb @@ -23,7 +23,7 @@ LIC_FILES_CHKSUM = "file://COPYING-LGPL-2;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ SRCBRANCH = "MM_04.05.06_2008_L5.4.47" SRC_URI = " \ - git://source.codeaurora.org/external/imx/imx-gst1.0-plugin.git;protocol=https;branch=${SRCBRANCH} \ + git://github.com/nxp-imx/imx-gst1.0-plugin.git;protocol=https;branch=${SRCBRANCH} \ file://0001-fsl_parser.h-fix-compiler-error-with-fcommon.patch \ " SRCREV = "a4373418f5884de7d2da63581d3905f0e3a5d842" diff --git a/recipes-multimedia/libimxvpuapi/libimxvpuapi2_2.2.0.bb b/recipes-multimedia/libimxvpuapi/libimxvpuapi2_2.2.0.bb new file mode 100644 index 00000000..f66eff27 --- /dev/null +++ b/recipes-multimedia/libimxvpuapi/libimxvpuapi2_2.2.0.bb @@ -0,0 +1,26 @@ +DESCRIPTION = "frontend for the i.MX6 / i.MX8 VPU hardware video engines" +HOMEPAGE = "https://github.com/Freescale/libimxvpuapi" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://LICENSE;md5=38fa42a5a6425b26d2919b17b1527324" +SECTION = "multimedia" +DEPENDS = "virtual/imxvpu libimxdmabuffer" + +PV .= "+git${SRCPV}" + +SRCBRANCH ?= "master" +SRCREV = "a650f13fb5de94e0c7c9e77f4d07ea275ea80dac" +SRC_URI = "git://github.com/Freescale/libimxvpuapi.git;branch=${SRCBRANCH}" + +S = "${WORKDIR}/git" + +inherit waf pkgconfig use-imx-headers + +IMX_PLATFORM_mx6 = "imx6" +IMX_PLATFORM_mx8mq = "imx8m" +IMX_PLATFORM_mx8mm = "imx8mm" +IMX_PLATFORM_mx8mp = "imx8mm" + +EXTRA_OECONF = "--imx-platform=${IMX_PLATFORM} --libdir=${libdir} --imx-headers=${STAGING_INCDIR_IMX} --sysroot-path=${RECIPE_SYSROOT}" + +PACKAGE_ARCH = "${MACHINE_ARCH}" +COMPATIBLE_MACHINE = "(imxvpu)" diff --git a/recipes-security/optee-imx/optee-client_3.7.0.imx.bb b/recipes-security/optee-imx/optee-client_3.7.0.imx.bb index d83f8a9c..ee0cead8 100644 --- a/recipes-security/optee-imx/optee-client_3.7.0.imx.bb +++ b/recipes-security/optee-imx/optee-client_3.7.0.imx.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=69663ab153298557a59c67a60a743e5b" inherit python3native systemd SRCBRANCH = "imx_5.4.24_2.1.0" -SRC_URI = "git://source.codeaurora.org/external/imx/imx-optee-client.git;protocol=https;branch=${SRCBRANCH}" +SRC_URI = "git://github.com/nxp-imx/imx-optee-client.git;protocol=https;branch=${SRCBRANCH}" SRCREV = "bc0ec8ce1e4dc5ae23f4737ef659338b7cd408fe" diff --git a/recipes-security/optee-imx/optee-os_3.7.0.imx.bb b/recipes-security/optee-imx/optee-os_3.7.0.imx.bb index 1bef749b..6c6afe9c 100644 --- a/recipes-security/optee-imx/optee-os_3.7.0.imx.bb +++ b/recipes-security/optee-imx/optee-os_3.7.0.imx.bb @@ -12,7 +12,7 @@ DEPENDS = "python3-pycrypto-native python3-pyelftools-native u-boot-mkimage-nati SRCBRANCH = "imx_5.4.24_2.1.0" SRC_URI = "\ - git://source.codeaurora.org/external/imx/imx-optee-os.git;protocol=https;branch=${SRCBRANCH} \ + git://github.com/nxp-imx/imx-optee-os.git;protocol=https;branch=${SRCBRANCH} \ file://0001-optee-os-fix-gcc10-compilation-issue-and-missing-cc-.patch \ " diff --git a/recipes-security/optee-imx/optee-test_3.7.0.imx.bb b/recipes-security/optee-imx/optee-test_3.7.0.imx.bb index e0dfdbe2..13066507 100644 --- a/recipes-security/optee-imx/optee-test_3.7.0.imx.bb +++ b/recipes-security/optee-imx/optee-test_3.7.0.imx.bb @@ -13,7 +13,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRCBRANCH = "imx_5.4.24_2.1.0" -SRC_URI = "git://source.codeaurora.org/external/imx/imx-optee-test.git;protocol=https;branch=${SRCBRANCH} \ +SRC_URI = "git://github.com/nxp-imx/imx-optee-test.git;protocol=https;branch=${SRCBRANCH} \ file://0001-use-python3-instead-of-python.patch \ " diff --git a/recipes-support/opencv/opencv/0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch b/recipes-support/opencv/opencv/0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch new file mode 100644 index 00000000..9e6a6137 --- /dev/null +++ b/recipes-support/opencv/opencv/0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch @@ -0,0 +1,36 @@ +From 9b4959b97d2e95d4b49cf6ca2a3fce3cdb484f2d Mon Sep 17 00:00:00 2001 +From: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> +Date: Thu, 31 Mar 2016 00:20:15 +0200 +Subject: [PATCH] 3rdparty/ippicv: Use pre-downloaded ipp + +Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> +Signed-off-by: Ismo Puustinen <ismo.puustinen@intel.com> + +--- + 3rdparty/ippicv/ippicv.cmake | 15 +-------------- + 1 file changed, 1 insertion(+), 14 deletions(-) + +diff --git a/3rdparty/ippicv/ippicv.cmake b/3rdparty/ippicv/ippicv.cmake +index 257af6fcc6..f88460450f 100644 +--- a/3rdparty/ippicv/ippicv.cmake ++++ b/3rdparty/ippicv/ippicv.cmake +@@ -34,18 +34,5 @@ function(download_ippicv root_var) + endif() + + set(THE_ROOT "${OpenCV_BINARY_DIR}/3rdparty/ippicv") +- ocv_download(FILENAME ${OPENCV_ICV_NAME} +- HASH ${OPENCV_ICV_HASH} +- URL +- "${OPENCV_IPPICV_URL}" +- "$ENV{OPENCV_IPPICV_URL}" +- "https://raw.githubusercontent.com/opencv/opencv_3rdparty/${IPPICV_COMMIT}/ippicv/" +- DESTINATION_DIR "${THE_ROOT}" +- ID IPPICV +- STATUS res +- UNPACK RELATIVE_URL) +- +- if(res) +- set(${root_var} "${THE_ROOT}/${OPENCV_ICV_PACKAGE_SUBDIR}" PARENT_SCOPE) +- endif() ++ set(${root_var} "${THE_ROOT}/${OPENCV_ICV_PACKAGE_SUBDIR}" PARENT_SCOPE) + endfunction() diff --git a/recipes-support/opencv/opencv/0001-Add-smaller-version-of-download_models.py.patch b/recipes-support/opencv/opencv/0001-Add-smaller-version-of-download_models.py.patch new file mode 100644 index 00000000..0aabee29 --- /dev/null +++ b/recipes-support/opencv/opencv/0001-Add-smaller-version-of-download_models.py.patch @@ -0,0 +1,179 @@ +From fca4d9eec289f22c081daa2c61a1110e3f268f92 Mon Sep 17 00:00:00 2001 +From: Tom Hochstein <tom.hochstein@nxp.com> +Date: Tue, 1 Sep 2020 14:57:07 -0500 +Subject: [PATCH] Add smaller version of download_models.py + +Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com> +--- + testdata/dnn/download_models_basic.py | 159 ++++++++++++++++++++++++++ + 1 file changed, 159 insertions(+) + create mode 100644 testdata/dnn/download_models_basic.py + +diff --git a/testdata/dnn/download_models_basic.py b/testdata/dnn/download_models_basic.py +new file mode 100644 +index 0000000..5c8a616 +--- /dev/null ++++ b/testdata/dnn/download_models_basic.py +@@ -0,0 +1,159 @@ ++#!/usr/bin/env python ++ ++from __future__ import print_function ++import hashlib ++import sys ++import tarfile ++if sys.version_info[0] < 3: ++ from urllib2 import urlopen ++else: ++ from urllib.request import urlopen ++ ++ ++class Model: ++ MB = 1024*1024 ++ BUFSIZE = 10*MB ++ ++ def __init__(self, **kwargs): ++ self.name = kwargs.pop('name') ++ self.url = kwargs.pop('url', None) ++ self.filename = kwargs.pop('filename') ++ self.sha = kwargs.pop('sha', None) ++ self.archive = kwargs.pop('archive', None) ++ self.member = kwargs.pop('member', None) ++ ++ def __str__(self): ++ return 'Model <{}>'.format(self.name) ++ ++ def printRequest(self, r): ++ def getMB(r): ++ d = dict(r.info()) ++ for c in ['content-length', 'Content-Length']: ++ if c in d: ++ return int(d[c]) / self.MB ++ return '<unknown>' ++ print(' {} {} [{} Mb]'.format(r.getcode(), r.msg, getMB(r))) ++ ++ def verify(self): ++ if not self.sha: ++ return False ++ print(' expect {}'.format(self.sha)) ++ sha = hashlib.sha1() ++ try: ++ with open(self.filename, 'rb') as f: ++ while True: ++ buf = f.read(self.BUFSIZE) ++ if not buf: ++ break ++ sha.update(buf) ++ print(' actual {}'.format(sha.hexdigest())) ++ return self.sha == sha.hexdigest() ++ except Exception as e: ++ print(' catch {}'.format(e)) ++ ++ def get(self): ++ if self.verify(): ++ print(' hash match - skipping') ++ return True ++ ++ if self.archive or self.member: ++ assert(self.archive and self.member) ++ print(' hash check failed - extracting') ++ print(' get {}'.format(self.member)) ++ self.extract() ++ else: ++ assert(self.url) ++ print(' hash check failed - downloading') ++ print(' get {}'.format(self.url)) ++ self.download() ++ ++ print(' done') ++ print(' file {}'.format(self.filename)) ++ return self.verify() ++ ++ def download(self): ++ try: ++ r = urlopen(self.url, timeout=60) ++ self.printRequest(r) ++ self.save(r) ++ except Exception as e: ++ print(' catch {}'.format(e)) ++ ++ def extract(self): ++ try: ++ with tarfile.open(self.archive) as f: ++ assert self.member in f.getnames() ++ self.save(f.extractfile(self.member)) ++ except Exception as e: ++ print(' catch {}'.format(e)) ++ ++ def save(self, r): ++ with open(self.filename, 'wb') as f: ++ print(' progress ', end='') ++ sys.stdout.flush() ++ while True: ++ buf = r.read(self.BUFSIZE) ++ if not buf: ++ break ++ f.write(buf) ++ print('>', end='') ++ sys.stdout.flush() ++ ++models = [ ++ Model( ++ name='Fcn', ++ url='http://dl.caffe.berkeleyvision.org/fcn8s-heavy-pascal.caffemodel', ++ sha='c449ea74dd7d83751d1357d6a8c323fcf4038962', ++ filename='fcn8s-heavy-pascal.caffemodel'), ++ Model( ++ name='SqueezeNet_v1.1', ++ url='https://raw.githubusercontent.com/DeepScale/SqueezeNet/b5c3f1a23713c8b3fd7b801d229f6b04c64374a5/SqueezeNet_v1.1/squeezenet_v1.1.caffemodel', ++ sha='3397f026368a45ae236403ccc81cfcbe8ebe1bd0', ++ filename='squeezenet_v1.1.caffemodel'), ++ Model( ++ name='Colorization', ++ url='https://raw.githubusercontent.com/richzhang/colorization/master/models/colorization_deploy_v2.prototxt', ++ sha='f528334e386a69cbaaf237a7611d833bef8e5219', ++ filename='colorization_deploy_v2.prototxt'), ++ Model( ++ name='Colorization', ++ url='http://eecs.berkeley.edu/~rich.zhang/projects/2016_colorization/files/demo_v2/colorization_release_v2.caffemodel', ++ sha='21e61293a3fa6747308171c11b6dd18a68a26e7f', ++ filename='colorization_release_v2.caffemodel'), ++ Model( ++ name='OpenPose/pose/coco', # https://github.com/CMU-Perceptual-Computing-Lab/openpose ++ url='http://posefs1.perception.cs.cmu.edu/OpenPose/models/pose/coco/pose_iter_440000.caffemodel', ++ sha='ac7e97da66f3ab8169af2e601384c144e23a95c1', ++ filename='openpose_pose_coco.caffemodel'), ++ Model( ++ name='YOLOv3', # https://pjreddie.com/darknet/yolo/ ++ url='https://pjreddie.com/media/files/yolov3.weights', ++ sha='520878f12e97cf820529daea502acca380f1cb8e', ++ filename='yolov3.weights'), ++ Model( ++ name='EAST', # https://github.com/argman/EAST (a TensorFlow model), https://arxiv.org/abs/1704.03155v2 (a paper) ++ url='https://www.dropbox.com/s/r2ingd0l3zt8hxs/frozen_east_text_detection.tar.gz?dl=1', ++ sha='3ca8233d6edd748f7ed23246c8ca24cbf696bb94', ++ filename='frozen_east_text_detection.tar.gz'), ++ Model( ++ name='EAST', ++ archive='frozen_east_text_detection.tar.gz', ++ member='frozen_east_text_detection.pb', ++ sha='fffabf5ac36f37bddf68e34e84b45f5c4247ed06', ++ filename='frozen_east_text_detection.pb'), ++] ++ ++# Note: models will be downloaded to current working directory ++# expected working directory is opencv_extra/testdata/dnn ++if __name__ == '__main__': ++ failedModels = [] ++ for m in models: ++ print(m) ++ if not m.get(): ++ failedModels.append(m.filename) ++ ++ if failedModels: ++ print("Following models have not been downloaded:") ++ for f in failedModels: ++ print("* {}".format(f)) ++ exit(15) +-- +2.17.1 + diff --git a/recipes-support/opencv/opencv/0001-Dont-use-isystem.patch b/recipes-support/opencv/opencv/0001-Dont-use-isystem.patch new file mode 100644 index 00000000..948a80fa --- /dev/null +++ b/recipes-support/opencv/opencv/0001-Dont-use-isystem.patch @@ -0,0 +1,28 @@ +From 66e50ee69fa9ee2469d349100e70d8b296c4b4dc Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 11 Sep 2018 00:21:18 -0700 +Subject: [PATCH] Dont use isystem + +clang really does not like it + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +--- + cmake/OpenCVPCHSupport.cmake | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/cmake/OpenCVPCHSupport.cmake b/cmake/OpenCVPCHSupport.cmake +index 08cd06def4..46c9c02da3 100644 +--- a/cmake/OpenCVPCHSupport.cmake ++++ b/cmake/OpenCVPCHSupport.cmake +@@ -18,6 +18,8 @@ IF(CV_GCC) + SET(PCHSupport_FOUND TRUE) + ENDIF() + ++ SET(CMAKE_INCLUDE_SYSTEM_FLAG_C "-I") ++ SET(CMAKE_INCLUDE_SYSTEM_FLAG_CXX "-I") + SET(_PCH_include_prefix "-I") + SET(_PCH_isystem_prefix "-isystem") + SET(_PCH_define_prefix "-D") diff --git a/recipes-support/opencv/opencv/0001-Make-ts-module-external.patch b/recipes-support/opencv/opencv/0001-Make-ts-module-external.patch new file mode 100644 index 00000000..d56b8ae6 --- /dev/null +++ b/recipes-support/opencv/opencv/0001-Make-ts-module-external.patch @@ -0,0 +1,42 @@ +From 11bbf909e08594628bd757d989ae34cf1bfe200b Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli.yu@windriver.com> +Date: Thu, 18 Jun 2020 05:51:38 +0000 +Subject: [PATCH] Make ts module external + +Make ts module external + +Reference: https://github.com/qbonnard/opencv/commit/6b229c5834cb9a0930425e762a6c7b03244d7abb + +Upstream-Status: Submitted [https://github.com/opencv/opencv/issues/8408] + +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + modules/ts/CMakeLists.txt | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/modules/ts/CMakeLists.txt b/modules/ts/CMakeLists.txt +index f95bed0793..66f315bcca 100644 +--- a/modules/ts/CMakeLists.txt ++++ b/modules/ts/CMakeLists.txt +@@ -4,9 +4,6 @@ if(NOT BUILD_opencv_ts AND NOT BUILD_TESTS AND NOT BUILD_PERF_TESTS) + ocv_module_disable(ts) + endif() + +-set(OPENCV_MODULE_TYPE STATIC) +-set(OPENCV_MODULE_IS_PART_OF_WORLD FALSE) +- + if(WINRT) + # WINRT doesn't have access to environment variables + # so adding corresponding macros during CMake run +@@ -16,7 +13,7 @@ endif() + + ocv_warnings_disable(CMAKE_CXX_FLAGS -Wundef) + +-ocv_add_module(ts INTERNAL opencv_core opencv_imgproc opencv_imgcodecs opencv_videoio opencv_highgui) ++ocv_add_module(ts opencv_core opencv_imgproc opencv_imgcodecs opencv_videoio opencv_highgui) + + ocv_glob_module_sources() + ocv_module_include_directories() +-- +2.24.1 + diff --git a/recipes-support/opencv/opencv/0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch b/recipes-support/opencv/opencv/0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch new file mode 100644 index 00000000..1e47f8b1 --- /dev/null +++ b/recipes-support/opencv/opencv/0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch @@ -0,0 +1,31 @@ +From e4ec6cea72da9e9ae5ba57140fa2f5c63f1f8295 Mon Sep 17 00:00:00 2001 +From: Jason Wessel <jason.wessel@windriver.com> +Date: Wed, 9 May 2018 13:33:59 -0700 +Subject: [PATCH] Temporarliy work around deprecated ffmpeg RAW function + compile failure until next uprev + +Signed-off-by: Jason Wessel <jason.wessel@windriver.com> + +--- + modules/videoio/src/cap_ffmpeg_impl.hpp | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/modules/videoio/src/cap_ffmpeg_impl.hpp b/modules/videoio/src/cap_ffmpeg_impl.hpp +index 6dca724a89..ae55dd4555 100644 +--- a/modules/videoio/src/cap_ffmpeg_impl.hpp ++++ b/modules/videoio/src/cap_ffmpeg_impl.hpp +@@ -774,6 +774,14 @@ struct ImplMutex::Impl + + #endif + ++/* NOTE This is deprecated in ffmpeg and the code should be removed */ ++#ifndef AVFMT_RAWPICTURE ++#define AVFMT_RAWPICTURE 0x0020 ++#endif /* AVFMT_RAWPICTURE */ ++#ifndef CODEC_FLAG_GLOBAL_HEADER ++#define CODEC_FLAG_GLOBAL_HEADER AV_CODEC_FLAG_GLOBAL_HEADER ++#endif ++ + void ImplMutex::init() + { + impl = new Impl(); diff --git a/recipes-support/opencv/opencv/0001-Use-Os-to-compile-tinyxml2.cpp.patch b/recipes-support/opencv/opencv/0001-Use-Os-to-compile-tinyxml2.cpp.patch new file mode 100644 index 00000000..c5a64387 --- /dev/null +++ b/recipes-support/opencv/opencv/0001-Use-Os-to-compile-tinyxml2.cpp.patch @@ -0,0 +1,31 @@ +From 59fafe6e39759e193b5764b36b4c5a93da352123 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 18 Aug 2020 00:36:49 -0700 +Subject: [PATCH] Use -Os to compile tinyxml2.cpp + +This workarounds issue [1] seen on riscv with gcc + +[1] https://github.com/riscv/riscv-gnu-toolchain/issues/624 + +Upstream-Status: Inappropriate [ OE-Specific ] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + modules/datasets/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modules/datasets/CMakeLists.txt b/modules/datasets/CMakeLists.txt +index 56ca9e310..99b7a33f6 100644 +--- a/modules/datasets/CMakeLists.txt ++++ b/modules/datasets/CMakeLists.txt +@@ -2,7 +2,7 @@ set(the_description "datasets framework") + + set(filter_srcs "${CMAKE_CURRENT_LIST_DIR}/src/tinyxml2/tinyxml2.cpp") + if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") +- ocv_append_source_files_cxx_compiler_options(filter_srcs "-Wno-suggest-override") # GCC ++ ocv_append_source_files_cxx_compiler_options(filter_srcs "-Wno-suggest-override -Os") # GCC + elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") + ocv_append_source_files_cxx_compiler_options(filter_srcs "-Wno-inconsistent-missing-override") # Clang + endif() +-- +2.28.0 + diff --git a/recipes-support/opencv/opencv/0003-To-fix-errors-as-following.patch b/recipes-support/opencv/opencv/0003-To-fix-errors-as-following.patch new file mode 100644 index 00000000..bb47ef2b --- /dev/null +++ b/recipes-support/opencv/opencv/0003-To-fix-errors-as-following.patch @@ -0,0 +1,70 @@ +From f42c9b8c7bafcadc7e95fb25a391707f970eb426 Mon Sep 17 00:00:00 2001 +From: Huang Qiyu <huangqy.fnst@cn.fujitsu.com> +Date: Fri, 19 May 2017 04:27:50 +0900 +Subject: [PATCH] To fix errors as following: + +"test_main.cpp:45: undefined reference to `parseCustomOptions(int, char**)'" +"perf_abs.cpp:13: undefined reference to `cvtest::param_seed'" +"test_superres.cpp:270: undefined reference to `checkIppStatus()'" + +Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com> + +Also add the visibility changes for certain OpenCL-related functions in +ts module. + +Signed-off-by: Ismo Puustinen <ismo.puustinen@intel.com> + +--- + modules/ts/include/opencv2/ts.hpp | 4 ++-- + modules/ts/include/opencv2/ts/ocl_test.hpp | 2 +- + modules/ts/include/opencv2/ts/ts_ext.hpp | 2 +- + 3 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/modules/ts/include/opencv2/ts.hpp b/modules/ts/include/opencv2/ts.hpp +index ed7491a89a..80919d13ee 100644 +--- a/modules/ts/include/opencv2/ts.hpp ++++ b/modules/ts/include/opencv2/ts.hpp +@@ -728,7 +728,7 @@ protected: + } + }; + +-extern uint64 param_seed; ++CV_EXPORTS extern uint64 param_seed; + + struct DefaultRngAuto + { +@@ -791,7 +791,7 @@ private: + #endif + #endif + +-void parseCustomOptions(int argc, char **argv); ++CV_EXPORTS void parseCustomOptions(int argc, char **argv); + + #define CV_TEST_INIT0_NOOP (void)0 + +diff --git a/modules/ts/include/opencv2/ts/ocl_test.hpp b/modules/ts/include/opencv2/ts/ocl_test.hpp +index 11572e9f48..438112e2aa 100644 +--- a/modules/ts/include/opencv2/ts/ocl_test.hpp ++++ b/modules/ts/include/opencv2/ts/ocl_test.hpp +@@ -82,7 +82,7 @@ inline UMat ToUMat(InputArray src) + return dst; + } + +-extern int test_loop_times; ++CV_EXPORTS extern int test_loop_times; + + #define MAX_VALUE 357 + +diff --git a/modules/ts/include/opencv2/ts/ts_ext.hpp b/modules/ts/include/opencv2/ts/ts_ext.hpp +index b2a4cac241..b94c681c0c 100644 +--- a/modules/ts/include/opencv2/ts/ts_ext.hpp ++++ b/modules/ts/include/opencv2/ts/ts_ext.hpp +@@ -9,7 +9,7 @@ + #define OPENCV_TS_EXT_HPP + + namespace cvtest { +-void checkIppStatus(); ++CV_EXPORTS void checkIppStatus(); + extern bool skipUnstableTests; + extern bool runBigDataTests; + extern int testThreads; diff --git a/recipes-support/opencv/opencv/OpenCV_DNN_examples.patch b/recipes-support/opencv/opencv/OpenCV_DNN_examples.patch new file mode 100644 index 00000000..569d5b02 --- /dev/null +++ b/recipes-support/opencv/opencv/OpenCV_DNN_examples.patch @@ -0,0 +1,148 @@ +From 3c4daafb54f961e376104a461ca7ec114ff0331a Mon Sep 17 00:00:00 2001 +From: Ludek Slosarcik <ludek.slosarcik@nxp.com> +Date: Fri, 14 Feb 2020 15:46:50 +0100 +Subject: [PATCH] opencv_dnn: added video device for 2 examples, and change text labels + +Signed-off-by: Ludek Slosarcik <ludek.slosarcik@nxp.com> + +Upstream-Status: Pending +--- + samples/cpp/logistic_regression.cpp | 2 +- + samples/dnn/classification.cpp | 7 ++++--- + samples/dnn/object_detection.cpp | 10 +++++----- + samples/dnn/segmentation.cpp | 2 +- + samples/dnn/text_detection.cpp | 5 +++-- + 5 files changed, 14 insertions(+), 12 deletions(-) + +Index: git/samples/cpp/logistic_regression.cpp +=================================================================== +--- git.orig/samples/cpp/logistic_regression.cpp ++++ git/samples/cpp/logistic_regression.cpp +@@ -83,7 +83,7 @@ static float calculateAccuracyPercent(co + + int main() + { +- const String filename = samples::findFile("data01.xml"); ++ const String filename = samples::findFile("../data/data01.xml"); + cout << "**********************************************************************" << endl; + cout << filename + << " contains digits 0 and 1 of 20 samples each, collected on an Android device" << endl; +Index: git/samples/dnn/classification.cpp +=================================================================== +--- git.orig/samples/dnn/classification.cpp ++++ git/samples/dnn/classification.cpp +@@ -11,6 +11,7 @@ std::string keys = + "{ help h | | Print help message. }" + "{ @alias | | An alias name of model to extract preprocessing parameters from models.yml file. }" + "{ zoo | models.yml | An optional path to file with preprocessing parameters }" ++ "{ device | 0 | camera device number. }" + "{ input i | | Path to input image or video file. Skip this argument to capture frames from a camera.}" + "{ framework f | | Optional name of an origin framework of the model. Detect it automatically if it does not set. }" + "{ classes | | Optional path to a text file with names of classes. }" +@@ -94,7 +95,7 @@ int main(int argc, char** argv) + if (parser.has("input")) + cap.open(parser.get<String>("input")); + else +- cap.open(0); ++ cap.open(parser.get<int>("device")); + //! [Open a video file or an image file or a camera stream] + + // Process frames. +@@ -131,13 +132,13 @@ int main(int argc, char** argv) + double freq = getTickFrequency() / 1000; + double t = net.getPerfProfile(layersTimes) / freq; + std::string label = format("Inference time: %.2f ms", t); +- putText(frame, label, Point(0, 15), FONT_HERSHEY_SIMPLEX, 0.5, Scalar(0, 255, 0)); ++ putText(frame, label, Point(0, 20), FONT_HERSHEY_SIMPLEX, 0.8, Scalar(0, 0, 255), 2, 8, false); + + // Print predicted class. + label = format("%s: %.4f", (classes.empty() ? format("Class #%d", classId).c_str() : + classes[classId].c_str()), + confidence); +- putText(frame, label, Point(0, 40), FONT_HERSHEY_SIMPLEX, 0.5, Scalar(0, 255, 0)); ++ putText(frame, label, Point(0, 45), FONT_HERSHEY_SIMPLEX, 0.8, Scalar(0, 0, 255), 2, 8, false); + + imshow(kWinName, frame); + } +Index: git/samples/dnn/object_detection.cpp +=================================================================== +--- git.orig/samples/dnn/object_detection.cpp ++++ git/samples/dnn/object_detection.cpp +@@ -251,13 +251,13 @@ int main(int argc, char** argv) + if (predictionsQueue.counter > 1) + { + std::string label = format("Camera: %.2f FPS", framesQueue.getFPS()); +- putText(frame, label, Point(0, 15), FONT_HERSHEY_SIMPLEX, 0.5, Scalar(0, 255, 0)); ++ putText(frame, label, Point(0, 20), FONT_HERSHEY_SIMPLEX, 0.8, Scalar(0, 0, 255), 2, 8, false); + + label = format("Network: %.2f FPS", predictionsQueue.getFPS()); +- putText(frame, label, Point(0, 30), FONT_HERSHEY_SIMPLEX, 0.5, Scalar(0, 255, 0)); ++ putText(frame, label, Point(0, 45), FONT_HERSHEY_SIMPLEX, 0.8, Scalar(0, 0, 255), 2, 8, false); + + label = format("Skipped frames: %d", framesQueue.counter - predictionsQueue.counter); +- putText(frame, label, Point(0, 45), FONT_HERSHEY_SIMPLEX, 0.5, Scalar(0, 255, 0)); ++ putText(frame, label, Point(0, 70), FONT_HERSHEY_SIMPLEX, 0.8, Scalar(0, 0, 255), 2, 8, false); + } + imshow(kWinName, frame); + } +@@ -293,7 +293,7 @@ int main(int argc, char** argv) + double freq = getTickFrequency() / 1000; + double t = net.getPerfProfile(layersTimes) / freq; + std::string label = format("Inference time: %.2f ms", t); +- putText(frame, label, Point(0, 15), FONT_HERSHEY_SIMPLEX, 0.5, Scalar(0, 255, 0)); ++ putText(frame, label, Point(0, 20), FONT_HERSHEY_SIMPLEX, 0.8, Scalar(0, 0, 255), 2, 8, false); + + imshow(kWinName, frame); + } +@@ -462,7 +462,7 @@ void drawPred(int classId, float conf, i + top = max(top, labelSize.height); + rectangle(frame, Point(left, top - labelSize.height), + Point(left + labelSize.width, top + baseLine), Scalar::all(255), FILLED); +- putText(frame, label, Point(left, top), FONT_HERSHEY_SIMPLEX, 0.5, Scalar()); ++ putText(frame, label, Point(left, top), FONT_HERSHEY_SIMPLEX, 0.8, Scalar()); + } + + void callback(int pos, void*) +Index: git/samples/dnn/segmentation.cpp +=================================================================== +--- git.orig/samples/dnn/segmentation.cpp ++++ git/samples/dnn/segmentation.cpp +@@ -157,7 +157,7 @@ int main(int argc, char** argv) + double freq = getTickFrequency() / 1000; + double t = net.getPerfProfile(layersTimes) / freq; + std::string label = format("Inference time: %.2f ms", t); +- putText(frame, label, Point(0, 15), FONT_HERSHEY_SIMPLEX, 0.5, Scalar(0, 255, 0)); ++ putText(frame, label, Point(0, 20), FONT_HERSHEY_SIMPLEX, 0.8, Scalar(0, 0, 255), 2, 8, false); + + imshow(kWinName, frame); + if (!classes.empty()) +Index: git/samples/dnn/text_detection.cpp +=================================================================== +--- git.orig/samples/dnn/text_detection.cpp ++++ git/samples/dnn/text_detection.cpp +@@ -25,6 +25,7 @@ using namespace cv::dnn; + const char* keys = + "{ help h | | Print help message. }" + "{ input i | | Path to input image or video file. Skip this argument to capture frames from a camera.}" ++ "{ device | 0 | camera device number. }" + "{ model m | | Path to a binary .pb file contains trained detector network.}" + "{ ocr | | Path to a binary .pb or .onnx file contains trained recognition network.}" + "{ width | 320 | Preprocess input image by resizing to a specific width. It should be multiple by 32. }" +@@ -75,7 +76,7 @@ int main(int argc, char** argv) + + // Open a video file or an image file or a camera stream. + VideoCapture cap; +- bool openSuccess = parser.has("input") ? cap.open(parser.get<String>("input")) : cap.open(0); ++ bool openSuccess = parser.has("input") ? cap.open(parser.get<String>("input")) : cap.open(parser.get<int>("device")); + CV_Assert(openSuccess); + + static const std::string kWinName = "EAST: An Efficient and Accurate Scene Text Detector"; +@@ -156,7 +157,7 @@ int main(int argc, char** argv) + + // Put efficiency information. + std::string label = format("Inference time: %.2f ms", tickMeter.getTimeMilli()); +- putText(frame, label, Point(0, 15), FONT_HERSHEY_SIMPLEX, 0.5, Scalar(0, 255, 0)); ++ putText(frame, label, Point(0, 20), FONT_HERSHEY_SIMPLEX, 0.8, Scalar(0, 0, 255), 2, 8, false); + + imshow(kWinName, frame); + diff --git a/recipes-support/opencv/opencv/download.patch b/recipes-support/opencv/opencv/download.patch new file mode 100644 index 00000000..33ac4831 --- /dev/null +++ b/recipes-support/opencv/opencv/download.patch @@ -0,0 +1,41 @@ +From b18a280fab06a680d9f831bf8b462647f3cb6214 Mon Sep 17 00:00:00 2001 +From: Ross Burton <ross.burton@intel.com> +Date: Thu, 9 Jan 2020 16:24:24 +0000 +Subject: [PATCH] opencv: abort configure if we need to download + +This CMake module will download files during do_configure. This is bad as it +means we can't do offline builds. + +Add an option to disallow downloads by emitting a fatal error. + +Upstream-Status: Pending +Signed-off-by: Ross Burton <ross.burton@intel.com> + +--- + cmake/OpenCVDownload.cmake | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/cmake/OpenCVDownload.cmake b/cmake/OpenCVDownload.cmake +index 63cf6d3238..4acf477f70 100644 +--- a/cmake/OpenCVDownload.cmake ++++ b/cmake/OpenCVDownload.cmake +@@ -14,6 +14,7 @@ + # RELATIVE_URL - if set, then URL is treated as a base, and FILENAME will be appended to it + # Note: uses OPENCV_DOWNLOAD_PATH folder as cache, default is <opencv>/.cache + ++set(OPENCV_ALLOW_DOWNLOADS ON CACHE BOOL "Allow downloads") + set(HELP_OPENCV_DOWNLOAD_PATH "Cache directory for downloaded files") + if(DEFINED ENV{OPENCV_DOWNLOAD_PATH}) + set(OPENCV_DOWNLOAD_PATH "$ENV{OPENCV_DOWNLOAD_PATH}" CACHE PATH "${HELP_OPENCV_DOWNLOAD_PATH}") +@@ -156,6 +157,11 @@ function(ocv_download) + + # Download + if(NOT EXISTS "${CACHE_CANDIDATE}") ++ if(NOT OPENCV_ALLOW_DOWNLOADS) ++ message(FATAL_ERROR "Not going to download ${DL_FILENAME}") ++ return() ++ endif() ++ + ocv_download_log("#cmake_download \"${CACHE_CANDIDATE}\" \"${DL_URL}\"") + foreach(try ${OPENCV_DOWNLOAD_TRIES_LIST}) + ocv_download_log("#try ${try}") diff --git a/recipes-support/opencv/opencv_4.4.0.imx.bb b/recipes-support/opencv/opencv_4.4.0.imx.bb new file mode 100644 index 00000000..8d037044 --- /dev/null +++ b/recipes-support/opencv/opencv_4.4.0.imx.bb @@ -0,0 +1,295 @@ +# This recipe is for the i.MX fork of opencv. For ease of +# maintenance, the top section is a verbatim copy of an OE-core +# recipe. The second section customizes the recipe for i.MX. + +########## meta-openembedded copy ########### + +SUMMARY = "Opencv : The Open Computer Vision Library" +HOMEPAGE = "http://opencv.org/" +SECTION = "libs" + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=19598330421859a6dd353a4318091ac7" + +ARM_INSTRUCTION_SET_armv4 = "arm" +ARM_INSTRUCTION_SET_armv5 = "arm" + +DEPENDS = "libtool swig-native bzip2 zlib glib-2.0 libwebp" + +SRCREV_opencv = "c3bb57afeaf030f10939204d48d7c2a3842f4293" +SRCREV_contrib = "5fae4082cc493efa5cb7a7486f9e009618a5198b" +SRCREV_ipp = "a56b6ac6f030c312b2dce17430eef13aed9af274" +SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26" +SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d" +SRCREV_face = "8afa57abc8229d611c4937165d20e2a2d9fc5a12" + +def ipp_filename(d): + import re + arch = d.getVar('TARGET_ARCH') + if re.match("i.86$", arch): + return "ippicv_2020_lnx_ia32_20191018_general.tgz" + else: + return "ippicv_2020_lnx_intel64_20191018_general.tgz" + +def ipp_md5sum(d): + import re + arch = d.getVar('TARGET_ARCH') + if re.match("i.86$", arch): + return "ad189a940fb60eb71f291321322fe3e8" + else: + return "7421de0095c7a39162ae13a6098782f9" + +IPP_FILENAME = "${@ipp_filename(d)}" +IPP_MD5 = "${@ipp_md5sum(d)}" + +SRCREV_FORMAT = "opencv_contrib_ipp_boostdesc_vgg" +SRC_URI = "git://github.com/opencv/opencv.git;name=opencv \ + git://github.com/opencv/opencv_contrib.git;destsuffix=contrib;name=contrib \ + git://github.com/opencv/opencv_3rdparty.git;branch=ippicv/master_20191018;destsuffix=ipp;name=ipp \ + git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_boostdesc_20161012;destsuffix=boostdesc;name=boostdesc \ + git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_vgg_20160317;destsuffix=vgg;name=vgg \ + git://github.com/opencv/opencv_3rdparty.git;branch=contrib_face_alignment_20170818;destsuffix=face;name=face \ + file://0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch \ + file://0003-To-fix-errors-as-following.patch \ + file://0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch \ + file://0001-Dont-use-isystem.patch \ + file://download.patch \ + file://0001-Make-ts-module-external.patch \ + " +SRC_URI_append_riscv64 = " file://0001-Use-Os-to-compile-tinyxml2.cpp.patch;patchdir=../contrib" + +S = "${WORKDIR}/git" + +# OpenCV wants to download more files during configure. We download these in +# do_fetch and construct a source cache in the format it expects +OPENCV_DLDIR = "${WORKDIR}/downloads" + +do_unpack_extra() { + tar xzf ${WORKDIR}/ipp/ippicv/${IPP_FILENAME} -C ${WORKDIR} + + md5() { + # Return the MD5 of $1 + echo $(md5sum $1 | cut -d' ' -f1) + } + cache() { + TAG=$1 + shift + mkdir --parents ${OPENCV_DLDIR}/$TAG + for F in $*; do + DEST=${OPENCV_DLDIR}/$TAG/$(md5 $F)-$(basename $F) + test -e $DEST || ln -s $F $DEST + done + } + cache xfeatures2d/boostdesc ${WORKDIR}/boostdesc/*.i + cache xfeatures2d/vgg ${WORKDIR}/vgg/*.i + cache data ${WORKDIR}/face/*.dat +} +addtask unpack_extra after do_unpack before do_patch + +CMAKE_VERBOSE = "VERBOSE=1" + +EXTRA_OECMAKE = "-DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules \ + -DWITH_1394=OFF \ + -DENABLE_PRECOMPILED_HEADERS=OFF \ + -DCMAKE_SKIP_RPATH=ON \ + -DOPENCV_ICV_HASH=${IPP_MD5} \ + -DIPPROOT=${WORKDIR}/ippicv_lnx \ + -DOPENCV_GENERATE_PKGCONFIG=ON \ + -DOPENCV_DOWNLOAD_PATH=${OPENCV_DLDIR} \ + -DOPENCV_ALLOW_DOWNLOADS=OFF \ + ${@bb.utils.contains("TARGET_CC_ARCH", "-msse3", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1", "", d)} \ + ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.1", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1", "", d)} \ + ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.2", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1 -DENABLE_SSE42=1", "", d)} \ +" +EXTRA_OECMAKE_append_x86 = " -DX86=ON" + +PACKAGECONFIG ??= "gapi python3 eigen jpeg png tiff v4l libv4l gstreamer samples tbb gphoto2 \ + ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk", "", d)} \ + ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "libav", "", d)}" + +PACKAGECONFIG[gapi] = "-DWITH_ADE=ON -Dade_DIR=${STAGING_LIBDIR},-DWITH_ADE=OFF,ade" +PACKAGECONFIG[amdblas] = "-DWITH_OPENCLAMDBLAS=ON,-DWITH_OPENCLAMDBLAS=OFF,libclamdblas," +PACKAGECONFIG[amdfft] = "-DWITH_OPENCLAMDFFT=ON,-DWITH_OPENCLAMDFFT=OFF,libclamdfft," +PACKAGECONFIG[dnn] = "-DBUILD_opencv_dnn=ON -DPROTOBUF_UPDATE_FILES=ON -DBUILD_PROTOBUF=OFF,-DBUILD_opencv_dnn=OFF,protobuf protobuf-native," +PACKAGECONFIG[eigen] = "-DWITH_EIGEN=ON,-DWITH_EIGEN=OFF,libeigen gflags glog," +PACKAGECONFIG[freetype] = "-DBUILD_opencv_freetype=ON,-DBUILD_opencv_freetype=OFF,freetype," +PACKAGECONFIG[gphoto2] = "-DWITH_GPHOTO2=ON,-DWITH_GPHOTO2=OFF,libgphoto2," +PACKAGECONFIG[gstreamer] = "-DWITH_GSTREAMER=ON,-DWITH_GSTREAMER=OFF,gstreamer1.0 gstreamer1.0-plugins-base," +PACKAGECONFIG[gtk] = "-DWITH_GTK=ON,-DWITH_GTK=OFF,gtk+3," +PACKAGECONFIG[jasper] = "-DWITH_JASPER=ON,-DWITH_JASPER=OFF,jasper," +PACKAGECONFIG[java] = "-DJAVA_INCLUDE_PATH=${JAVA_HOME}/include -DJAVA_INCLUDE_PATH2=${JAVA_HOME}/include/linux -DJAVA_AWT_INCLUDE_PATH=${JAVA_HOME}/include -DJAVA_AWT_LIBRARY=${JAVA_HOME}/lib/amd64/libjawt.so -DJAVA_JVM_LIBRARY=${JAVA_HOME}/lib/amd64/server/libjvm.so,,ant-native fastjar-native openjdk-8-native," +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[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," +PACKAGECONFIG[python3] = "-DPYTHON3_NUMPY_INCLUDE_DIRS:PATH=${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/numpy/core/include,,python3-numpy," +PACKAGECONFIG[samples] = "-DBUILD_EXAMPLES=ON -DINSTALL_PYTHON_EXAMPLES=ON,-DBUILD_EXAMPLES=OFF,," +PACKAGECONFIG[tbb] = "-DWITH_TBB=ON,-DWITH_TBB=OFF,tbb," +PACKAGECONFIG[text] = "-DBUILD_opencv_text=ON,-DBUILD_opencv_text=OFF,tesseract," +PACKAGECONFIG[tiff] = "-DWITH_TIFF=ON,-DWITH_TIFF=OFF,tiff," +PACKAGECONFIG[v4l] = "-DWITH_V4L=ON,-DWITH_V4L=OFF,v4l-utils," + +inherit pkgconfig cmake + +inherit ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'distutils3-base', '', d)} +inherit ${@bb.utils.contains('PACKAGECONFIG', 'python2', 'distutils-base', '', d)} + +export PYTHON_CSPEC="-I${STAGING_INCDIR}/${PYTHON_DIR}" +export PYTHON="${STAGING_BINDIR_NATIVE}/${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3', 'python', d)}" +export ORACLE_JAVA_HOME="${STAGING_DIR_NATIVE}/usr/bin/java" +export JAVA_HOME="${STAGING_DIR_NATIVE}/usr/lib/jvm/openjdk-8-native" +export ANT_DIR="${STAGING_DIR_NATIVE}/usr/share/ant/" + +TARGET_CC_ARCH += "-I${S}/include " + +PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'samples', '${PN}-samples', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'oracle-java', '${PN}-java', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'java', '${PN}-java', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'python2', 'python-${BPN}', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3-${BPN}', '', d)} \ + ${PN}-apps" + +python populate_packages_prepend () { + cv_libdir = d.expand('${libdir}') + do_split_packages(d, cv_libdir, '^lib(.*)\.so$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev', allow_links=True) + do_split_packages(d, cv_libdir, '^lib(.*)\.la$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev') + do_split_packages(d, cv_libdir, '^lib(.*)\.a$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev') + do_split_packages(d, cv_libdir, '^lib(.*)\.so\.*', 'lib%s', 'OpenCV %s library', extra_depends='', allow_links=True) + + pn = d.getVar('PN') + metapkg = pn + '-dev' + d.setVar('ALLOW_EMPTY_' + metapkg, "1") + blacklist = [ metapkg ] + metapkg_rdepends = [ ] + packages = d.getVar('PACKAGES').split() + for pkg in packages[1:]: + if not pkg in blacklist and not pkg in metapkg_rdepends and pkg.endswith('-dev'): + metapkg_rdepends.append(pkg) + d.setVar('RRECOMMENDS_' + metapkg, ' '.join(metapkg_rdepends)) + + metapkg = pn + d.setVar('ALLOW_EMPTY_' + metapkg, "1") + blacklist = [ metapkg, "libopencv-ts" ] + metapkg_rdepends = [ ] + for pkg in packages[1:]: + if not pkg in blacklist and not pkg in metapkg_rdepends and not pkg.endswith('-dev') and not pkg.endswith('-dbg') and not pkg.endswith('-doc') and not pkg.endswith('-locale') and not pkg.endswith('-staticdev'): + metapkg_rdepends.append(pkg) + d.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends)) +} + +PACKAGES_DYNAMIC += "^libopencv-.*" + +FILES_${PN} = "" +FILES_${PN}-dbg += "${datadir}/OpenCV/java/.debug/* ${datadir}/OpenCV/samples/bin/.debug/*" +FILES_${PN}-dev = "${includedir} ${libdir}/pkgconfig ${libdir}/cmake/opencv4/*.cmake" +FILES_${PN}-staticdev += "${libdir}/opencv4/3rdparty/*.a" +FILES_${PN}-apps = "${bindir}/* ${datadir}/opencv4 ${datadir}/licenses" +FILES_${PN}-java = "${datadir}/OpenCV/java" +FILES_${PN}-samples = "${datadir}/opencv4/samples/" + +INSANE_SKIP_${PN}-java = "libdir" +INSANE_SKIP_${PN}-dbg = "libdir" + +ALLOW_EMPTY_${PN} = "1" + +SUMMARY_python-opencv = "Python bindings to opencv" +FILES_python-opencv = "${PYTHON_SITEPACKAGES_DIR}/*" +RDEPENDS_python-opencv = "python-core python-numpy" + +SUMMARY_python3-opencv = "Python bindings to opencv" +FILES_python3-opencv = "${PYTHON_SITEPACKAGES_DIR}/*" +RDEPENDS_python3-opencv = "python3-core python3-numpy" + +RDEPENDS_${PN}-apps = "bash" + +do_compile_prepend() { + # remove the build host info to improve reproducibility + if [ -f ${WORKDIR}/build/modules/core/version_string.inc ]; then + sed -i "s#${WORKDIR}#/workdir#g" ${WORKDIR}/build/modules/core/version_string.inc + fi +} + +do_install_append() { + # Move Python files into correct library folder (for multilib build) + if [ "$libdir" != "/usr/lib" -a -d ${D}/usr/lib ]; then + mv ${D}/usr/lib/* ${D}/${libdir}/ + rm -rf ${D}/usr/lib + fi +} + +TOOLCHAIN = "gcc" + +########## End of meta-openembedded copy ########## + +########## i.MX overrides ########## + +SUMMARY = "Opencv : The Open Computer Vision Library, i.MX Fork" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=19598330421859a6dd353a4318091ac7" + +SRCREV_opencv = "e39e6eded2d365a5dc370e1a72717e132166cf07" +SRCREV_contrib = "5fae4082cc493efa5cb7a7486f9e009618a5198b" +SRCREV_extra = "65796edadce27ed013e3deeedb3c081ff527e4ec" +SRC_URI[tinydnn.md5sum] = "adb1c512e09ca2c7a6faef36f9c53e59" +SRC_URI[tinydnn.sha256sum] = "e2c61ce8c5debaa644121179e9dbdcf83f497f39de853f8dd5175846505aa18b" +SRCREV_FORMAT_append = "_extra" + +OPENCV_SRC ?= "git://github.com/nxp-imx/opencv-imx.git;protocol=https" +SRCBRANCH = "4.4.0_imx" +SRC_URI = "${OPENCV_SRC};branch=${SRCBRANCH};name=opencv \ + git://github.com/opencv/opencv_extra.git;destsuffix=extra;name=extra \ + git://github.com/opencv/opencv_contrib.git;destsuffix=contrib;name=contrib \ + git://github.com/opencv/opencv_3rdparty.git;branch=ippicv/master_20191018;destsuffix=ipp;name=ipp \ + git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_boostdesc_20161012;destsuffix=boostdesc;name=boostdesc \ + git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_vgg_20160317;destsuffix=vgg;name=vgg \ + git://github.com/opencv/opencv_3rdparty.git;branch=contrib_face_alignment_20170818;destsuffix=face;name=face \ + https://github.com/tiny-dnn/tiny-dnn/archive/v1.0.0a3.tar.gz;destsuffix=git/3rdparty/tinydnn/tiny-dnn-1.0.0a3;name=tinydnn;unpack=false \ + file://0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch \ + file://0003-To-fix-errors-as-following.patch \ + file://0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch \ + file://0001-Dont-use-isystem.patch \ + file://download.patch \ + file://0001-Make-ts-module-external.patch \ + file://OpenCV_DNN_examples.patch \ + file://0001-Add-smaller-version-of-download_models.py.patch;patchdir=../extra \ + " +PV = "4.4.0.imx" + +PACKAGECONFIG_remove = "eigen" +PACKAGECONFIG_append_mx8 = " dnn text" +PACKAGECONFIG_OPENCL = "" +PACKAGECONFIG_OPENCL_mx8 = "opencl" +PACKAGECONFIG_OPENCL_mx8dxl = "" +PACKAGECONFIG_OPENCL_mx8phantomdxl = "" +PACKAGECONFIG_OPENCL_mx8mm = "" +PACKAGECONFIG_OPENCL_mx8mnlite = "" +PACKAGECONFIG_append = " ${PACKAGECONFIG_OPENCL}" + +PACKAGECONFIG[openvx] = "-DWITH_OPENVX=ON -DOPENVX_ROOT=${STAGING_LIBDIR} -DOPENVX_LIB_CANDIDATES='OpenVX;OpenVXU',-DWITH_OPENVX=OFF,virtual/libopenvx," +PACKAGECONFIG[qt5] = "-DWITH_QT=ON -DOE_QMAKE_PATH_EXTERNAL_HOST_BINS=${STAGING_BINDIR_NATIVE} -DCMAKE_PREFIX_PATH=${STAGING_BINDIR_NATIVE}/cmake,-DWITH_QT=OFF,qtbase qtbase-native," +PACKAGECONFIG[test] = "-DBUILD_TESTS=ON -DINSTALL_TESTS=ON -DOPENCV_TEST_DATA_PATH=${S}/../extra/testdata, -DBUILD_TESTS=OFF -DINSTALL_TESTS=OFF," + +do_unpack_extra_append() { + mkdir -p ${S}/3rdparty/tinydnn/ + tar xzf ${WORKDIR}/v1.0.0a3.tar.gz -C ${S}/3rdparty/tinydnn/ +} + +do_install_append() { + ln -sf opencv4/opencv2 ${D}${includedir}/opencv2 + install -d ${D}${datadir}/OpenCV/samples/data + cp -r ${S}/samples/data/* ${D}${datadir}/OpenCV/samples/data + install -d ${D}${datadir}/OpenCV/samples/bin/ + cp -f bin/example_* ${D}${datadir}/OpenCV/samples/bin/ + if ${@bb.utils.contains('PACKAGECONFIG', 'test', 'true', 'false', d)}; then + cp -r share/opencv4/testdata/cv/face/* ${D}${datadir}/opencv4/testdata/cv/face/ + fi +} + +FILES_${PN}-samples += "${datadir}/OpenCV/samples" + +COMPATIBLE_MACHINE = "(mx8)" + +########## End of i.MX overrides ########## |