From e984d44edb186021de98d87442a08ec3db5c4b33 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 18 Nov 2022 05:42:33 +0000 Subject: meta-freescale: update layers Update freescale layer to latest revision on kirkstone branch. Remove vulkan bbappend that is now fixes in upstream recipes. Update imx gstreamer to version 1.20 Pick-to: 6.4 Change-Id: I19387e81c9d6936ced9106202a0dd8d574701a26 Reviewed-by: Ari Parkkila Reviewed-by: Qt CI Bot --- meta-boot2qt-distro/conf/distro/include/fsl.inc | 13 +++++----- .../vulkan/vulkan-loader_%.bbappend | 30 ---------------------- scripts/manifest.xml | 4 +-- 3 files changed, 8 insertions(+), 39 deletions(-) delete mode 100644 meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-graphics/vulkan/vulkan-loader_%.bbappend diff --git a/meta-boot2qt-distro/conf/distro/include/fsl.inc b/meta-boot2qt-distro/conf/distro/include/fsl.inc index ad7b960e..b922515f 100644 --- a/meta-boot2qt-distro/conf/distro/include/fsl.inc +++ b/meta-boot2qt-distro/conf/distro/include/fsl.inc @@ -57,12 +57,11 @@ QBSP_LICENSE_FILE ?= "${FSL_EULA_FILE}" QBSP_LICENSE_NAME ?= "NXP Semiconductors Software License Agreement" # Use gstreamer from meta-freescale -PREFERRED_VERSION_gstreamer1.0:use-nxp-bsp ?= "1.18.5.imx" -PREFERRED_VERSION_gstreamer1.0-plugins-base:use-nxp-bsp ?= "1.18.5.imx" -PREFERRED_VERSION_gstreamer1.0-plugins-good:use-nxp-bsp ?= "1.18.5.imx" -PREFERRED_VERSION_gstreamer1.0-plugins-bad:use-nxp-bsp ?= "1.18.5.imx" -PREFERRED_VERSION_gstreamer1.0-plugins-ugly:use-nxp-bsp ?= "1.18.5" -PREFERRED_VERSION_gstreamer1.0-libav:use-nxp-bsp ?= "1.18.5" -PREFERRED_VERSION_gstreamer1.0-rtsp-server:use-nxp-bsp ?= "1.18.5" +PREFERRED_VERSION_gstreamer1.0:use-nxp-bsp ?= "1.20.0.imx" +PREFERRED_VERSION_gstreamer1.0-plugins-base:use-nxp-bsp ?= "1.20.0.imx" +PREFERRED_VERSION_gstreamer1.0-plugins-good:use-nxp-bsp ?= "1.20.0.imx" +PREFERRED_VERSION_gstreamer1.0-plugins-bad:use-nxp-bsp ?= "1.20.0.imx" +PREFERRED_VERSION_gstreamer1.0-libav:use-nxp-bsp ?= "1.20.0" +PREFERRED_VERSION_gstreamer1.0-rtsp-server:use-nxp-bsp ?= "1.20.0" MACHINE_GSTREAMER_1_0_PLUGIN:append:imxgpu = " imx-gst1.0-plugin" diff --git a/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-graphics/vulkan/vulkan-loader_%.bbappend b/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-graphics/vulkan/vulkan-loader_%.bbappend deleted file mode 100644 index 0915ba8a..00000000 --- a/meta-boot2qt-distro/dynamic-layers/freescale-layer/recipes-graphics/vulkan/vulkan-loader_%.bbappend +++ /dev/null @@ -1,30 +0,0 @@ -############################################################################ -## -## Copyright (C) 2021 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:GPL$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 or (at your option) any later version -## approved by the KDE Free Qt Foundation. The licenses are as published by -## the Free Software Foundation and appearing in the file LICENSE.GPL3 -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################ - -RRECOMMENDS:${PN}:use-nxp-bsp = "libvulkan-imx" diff --git a/scripts/manifest.xml b/scripts/manifest.xml index b2e83f1f..0842708c 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -40,12 +40,12 @@ fetch="https://github.com/Freescale"/> -- cgit v1.2.3