hardknott: qt5: sync with meta-imx hardknott-5.10.72-2.2.0 branch

Most of the changes are cosmetic (copyright years and whitespace). Update
gstreamer1.0-plugins-good-qt to v1.18.5, remove outdated patch for said package
and sync qtwayland recipe.

Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
This commit is contained in:
Gabriel Valcazar 2021-12-21 12:01:36 +01:00
parent 030fc2a641
commit 046ed3f1f2
7 changed files with 5 additions and 39 deletions

View File

@ -1,28 +0,0 @@
From 66389744b6f521880679433fd3ea6ed072eef9a3 Mon Sep 17 00:00:00 2001
From: Yuqing Zhu <carol.zhu@nxp.com>
Date: Wed, 26 Jul 2017 11:29:41 +0800
Subject: [PATCH] configure.ac: Add prefix to correct the QT_PATH
Signed-off-by: Yuqing Zhu <carol.zhu@nxp.com>
---
configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index fa26262..b35a828 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2919,8 +2919,8 @@ dnl *** Qt ***
translit(dnm, m, l) AM_CONDITIONAL(USE_QT, true)
AG_GST_CHECK_FEATURE(QT, [Qt elements], qt, [
PKG_CHECK_MODULES(QT, Qt5Core Qt5Gui Qt5Qml Qt5Quick >= 5.4.0, [
- QT_PATH=`$PKG_CONFIG --variable=exec_prefix Qt5Core`
- QT_HOST_PATH=`$PKG_CONFIG --variable=host_bins Qt5Core`
+ QT_PATH=$STAGING_DIR`$PKG_CONFIG --variable=exec_prefix Qt5Core`
+ QT_HOST_PATH=$STAGING_DIR`$PKG_CONFIG --variable=host_bins Qt5Core`
AC_ARG_WITH([moc],
AS_HELP_STRING([--with-moc], [Set location of qt moc tool]),
[MOC=$withval])
--
1.9.1

View File

@ -1,12 +1,12 @@
require recipes-multimedia/gstreamer/gstreamer1.0-plugins-common.inc 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://source.codeaurora.org/external/imx/gst-plugins-good.git;protocol=https"
SRCBRANCH = "MM_04.06.00_2012_L5.10.y" SRCBRANCH = "MM_04.06.03_2110_L5.10.y"
SRC_URI = " \ SRC_URI = " \
${GST1.0-PLUGINS-GOOD_SRC};branch=${SRCBRANCH} \ ${GST1.0-PLUGINS-GOOD_SRC};branch=${SRCBRANCH} \
" "
SRCREV = "67da20d13550aa257efcf3aaa2a3f0a7e50880ba" SRCREV = "7113baa4dd681cf028b04ef4ebe70b06db4b0f08"
DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE = "-1"

View File

@ -1,5 +1,5 @@
# Copyright (C) 2014-2016 Freescale Semiconductor # Copyright (C) 2014-2016 Freescale Semiconductor
# Copyright 2017-2018 NXP # Copyright 2017-2019 NXP
# Released under the MIT license (see COPYING.MIT for the terms) # Released under the MIT license (see COPYING.MIT for the terms)
DESCRIPTION = "Freescale QT Multimedia applications" DESCRIPTION = "Freescale QT Multimedia applications"

View File

@ -5,4 +5,3 @@ if ls ${D}${libdir}/pkgconfig/Qt5*.pc >/dev/null 2>&1; then
sed -i 's,-L${STAGING_DIR_HOST}/usr/lib,,' ${D}${libdir}/pkgconfig/Qt5*.pc sed -i 's,-L${STAGING_DIR_HOST}/usr/lib,,' ${D}${libdir}/pkgconfig/Qt5*.pc
fi fi
} }

View File

@ -1,7 +1,7 @@
# Copyright (C) 2013 Eric Bénard - Eukréa Electromatique # Copyright (C) 2013 Eric Bénard - Eukréa Electromatique
# Copyright (C) 2016 O.S. Systems Software LTDA. # Copyright (C) 2016 O.S. Systems Software LTDA.
# Copyright (C) 2016 Freescale Semiconductor # Copyright (C) 2016 Freescale Semiconductor
# Copyright 2017-2018 NXP # Copyright 2017-2021 NXP
# Copyright (C) 2015-2018, Digi International Inc. # Copyright (C) 2015-2018, Digi International Inc.
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"

View File

@ -8,4 +8,3 @@ if ls ${D}${libdir}/pkgconfig/Qt5*.pc >/dev/null 2>&1; then
sed -i 's,-L${STAGING_DIR_HOST}/usr/lib,,' ${D}${libdir}/pkgconfig/Qt5*.pc sed -i 's,-L${STAGING_DIR_HOST}/usr/lib,,' ${D}${libdir}/pkgconfig/Qt5*.pc
fi fi
} }

View File

@ -1,12 +1,8 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
SRC_URI_append_mx6sl = " file://0001-hardwareintegration-Do-not-include-shm-emulation-ser.patch \ SRC_URI_append_mx6sl = " file://0001-hardwareintegration-Do-not-include-shm-emulation-ser.patch"
"
PACKAGECONFIG_remove_mx6 = "xcomposite-egl xcomposite-glx"
PACKAGECONFIG_remove_mx6sl = "wayland-egl" PACKAGECONFIG_remove_mx6sl = "wayland-egl"
PACKAGECONFIG_remove_mx7 = "xcomposite-egl xcomposite-glx"
PACKAGECONFIG_remove_mx8 = "xcomposite-egl xcomposite-glx"
PACKAGECONFIG_remove_mx8mm = "wayland-vulkan-server-buffer" PACKAGECONFIG_remove_mx8mm = "wayland-vulkan-server-buffer"