diff options
Diffstat (limited to 'dynamic-layers')
15 files changed, 252 insertions, 10 deletions
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 707a4078..b1392871 100644 --- a/dynamic-layers/ivi/recipes-graphics/wayland/weston-init/weston.ini +++ b/dynamic-layers/ivi/recipes-graphics/wayland/weston-init/weston.ini @@ -4,7 +4,6 @@ modules=hmi-controller.so #gbm-format=argb8888 idle-time=0 #use-g2d=1 -#xwayland=true #repaint-window=16 #enable-overlay-view=1 diff --git a/dynamic-layers/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend b/dynamic-layers/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend index 400e850e..7b7784ab 100644 --- a/dynamic-layers/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend +++ b/dynamic-layers/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend @@ -1,16 +1,20 @@ -# Common Build targets -TFA_BUILD_TARGET = "all" -TFA_INSTALL_TARGET = "bl31" - # List of supported machines from this layer COMPATIBLE_MACHINE:imx8mm-lpddr4-evk = "imx8mm-lpddr4-evk" +TFA_BUILD_TARGET:imx8mm-lpddr4-evk = "all" +TFA_INSTALL_TARGET:imx8mm-lpddr4-evk = "bl31" TFA_PLATFORM:imx8mm-lpddr4-evk = "imx8mm" COMPATIBLE_MACHINE:imx8mn-ddr4-evk = "imx8mn-ddr4-evk" +TFA_BUILD_TARGET:imx8mn-ddr4-evk = "all" +TFA_INSTALL_TARGET:imx8mn-ddr4-evk = "bl31" TFA_PLATFORM:imx8mn-ddr4-evk = "imx8mn" COMPATIBLE_MACHINE:imx8mp-lpddr4-evk = "imx8mp-lpddr4-evk" +TFA_BUILD_TARGET:imx8mp-lpddr4-evk = "all" +TFA_INSTALL_TARGET:imx8mp-lpddr4-evk = "bl31" TFA_PLATFORM:imx8mp-lpddr4-evk = "imx8mp" COMPATIBLE_MACHINE:imx8mq-evk = "imx8mq-evk" +TFA_BUILD_TARGET:imx8mq-evk = "all" +TFA_INSTALL_TARGET:imx8mq-evk = "bl31" TFA_PLATFORM:imx8mq-evk = "imx8mq" diff --git a/dynamic-layers/multimedia-layer/recipes-multimedia/pipewire/pipewire/0001-launch-allow-pipewire-pulse-can-be-started-by-root.patch b/dynamic-layers/multimedia-layer/recipes-multimedia/pipewire/pipewire/0001-launch-allow-pipewire-pulse-can-be-started-by-root.patch new file mode 100644 index 00000000..ab34dc2f --- /dev/null +++ b/dynamic-layers/multimedia-layer/recipes-multimedia/pipewire/pipewire/0001-launch-allow-pipewire-pulse-can-be-started-by-root.patch @@ -0,0 +1,41 @@ +From 2cac94185824aa7df07ec48a2872f3d26d517a6d Mon Sep 17 00:00:00 2001 +From: Shengjiu Wang <shengjiu.wang@nxp.com> +Date: Tue, 28 Nov 2023 10:23:42 +0800 +Subject: [PATCH] launch: allow pipewire-pulse can be started by root. + +revert commit 8942f6b40 ("launch: avoid autostarting pipewire-pulse +systemd units for root") + +Upstream-Status: Inappropriate [i.MX specific] +Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com> +--- + src/daemon/systemd/user/pipewire-pulse.service.in | 1 - + src/daemon/systemd/user/pipewire-pulse.socket | 1 - + 2 files changed, 2 deletions(-) + +diff --git a/src/daemon/systemd/user/pipewire-pulse.service.in b/src/daemon/systemd/user/pipewire-pulse.service.in +index 73d22e532..da7728ee3 100644 +--- a/src/daemon/systemd/user/pipewire-pulse.service.in ++++ b/src/daemon/systemd/user/pipewire-pulse.service.in +@@ -14,7 +14,6 @@ Description=PipeWire PulseAudio + # After=pipewire-pulse.socket is not needed, as it is already implicit in the + # socket-service relationship, see systemd.socket(5). + Requires=pipewire-pulse.socket +-ConditionUser=!root + Wants=pipewire.service pipewire-session-manager.service + After=pipewire.service pipewire-session-manager.service + Conflicts=pulseaudio.service +diff --git a/src/daemon/systemd/user/pipewire-pulse.socket b/src/daemon/systemd/user/pipewire-pulse.socket +index 1ae5edafb..d27fb0e26 100644 +--- a/src/daemon/systemd/user/pipewire-pulse.socket ++++ b/src/daemon/systemd/user/pipewire-pulse.socket +@@ -1,6 +1,5 @@ + [Unit] + Description=PipeWire PulseAudio +-ConditionUser=!root + Conflicts=pulseaudio.socket + + [Socket] +-- +2.34.1 + diff --git a/dynamic-layers/multimedia-layer/recipes-multimedia/pipewire/pipewire_%.bbappend b/dynamic-layers/multimedia-layer/recipes-multimedia/pipewire/pipewire_%.bbappend new file mode 100644 index 00000000..7d84ee93 --- /dev/null +++ b/dynamic-layers/multimedia-layer/recipes-multimedia/pipewire/pipewire_%.bbappend @@ -0,0 +1,14 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" + +SRC_URI:append:imx-nxp-bsp = " file://0001-launch-allow-pipewire-pulse-can-be-started-by-root.patch" + +SYSTEMD_AUTO_ENABLE:imx-nxp-bsp = "disable" + +DEPENDS:append:mx95-nxp-bsp = " libdrm" + +PACKAGECONFIG:remove:mx95-nxp-bsp = "libcamera" +PACKAGECONFIG:remove:imx-nxp-bsp = "gstreamer" +PACKAGECONFIG:class-target:append:imx-nxp-bsp = " ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez-lc3', '', d)}" + +# FIXME: Needs to qualify on PACKAGECONFIG +SYSTEMD_SERVICE:${PN}-pulse = "pipewire-pulse.service" diff --git a/dynamic-layers/multimedia-layer/recipes-multimedia/vlc/vlc_%.bbappend b/dynamic-layers/multimedia-layer/recipes-multimedia/vlc/vlc_%.bbappend new file mode 100644 index 00000000..b85752b7 --- /dev/null +++ b/dynamic-layers/multimedia-layer/recipes-multimedia/vlc/vlc_%.bbappend @@ -0,0 +1,2 @@ +# vivante drivers does not provide glx +PACKAGECONFIG:remove:imxgpu = "x11" diff --git a/dynamic-layers/openembedded-layer/recipes-devtools/cst/files/0001-fix-err-msg-linking.patch b/dynamic-layers/openembedded-layer/recipes-devtools/cst/files/0001-fix-err-msg-linking.patch new file mode 100644 index 00000000..a3f5c828 --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-devtools/cst/files/0001-fix-err-msg-linking.patch @@ -0,0 +1,56 @@ +NXP uses weaken to solve conflict in linking. +On Ubuntu 22.04(LTS) this fails to link cst with libcrypto. + +The patch fixes the conflict in the code itself. +It restricts the scope of err_msg to the module. + +Upstream-Status: Inappropriate [i.MX specific] +Signed-off-by: Walter Schweizer <walter.schweizer@siemens.com> +---- +diff --git a/code/cst/code/build/make/rules.mk b/code/cst/code/build/make/rules.mk +index 1c0842b..9c46cc4 100644 +--- a/code/cst/code/build/make/rules.mk ++++ b/code/cst/code/build/make/rules.mk +@@ -25,11 +25,11 @@ LFLAGS := -t + %.a: + @echo "Create archive $@" + $(AR) $(ARFLAGS) $@ $^ +-ifneq ($(OSTYPE),mingw32) +-ifneq ($(OSTYPE),osx) +- $(OBJCOPY) --weaken $@ +-endif +-endif ++#ifneq ($(OSTYPE),mingw32) ++#ifneq ($(OSTYPE),osx) ++# $(OBJCOPY) --weaken $@ ++#endif ++#endif + + %.exe: + @echo "Link $@" +diff --git a/code/cst/code/front_end/src/acst.c b/code/cst/code/front_end/src/acst.c +index fb1e8aa..1e993ee 100644 +--- a/code/cst/code/front_end/src/acst.c ++++ b/code/cst/code/front_end/src/acst.c +@@ -65,7 +65,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + /*=========================================================================== + LOCAL VARIABLES + =============================================================================*/ +-char err_msg[MAX_ERR_MSG_BYTES]; ++static char err_msg[MAX_ERR_MSG_BYTES]; + + /*=========================================================================== + LOCAL FUNCTION PROTOTYPES +diff --git a/code/cst/code/front_end/src/misc_helper.c b/code/cst/code/front_end/src/misc_helper.c +index 678dc17..9014b2a 100644 +--- a/code/cst/code/front_end/src/misc_helper.c ++++ b/code/cst/code/front_end/src/misc_helper.c +@@ -60,7 +60,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + /*=========================================================================== + LOCAL VARIABLES + =============================================================================*/ +-char err_msg[MAX_ERR_MSG_BYTES]; ++static char err_msg[MAX_ERR_MSG_BYTES]; + + /*=========================================================================== + LOCAL FUNCTION PROTOTYPES diff --git a/dynamic-layers/openembedded-layer/recipes-devtools/cst/imx-cst_3.3.1.bb b/dynamic-layers/openembedded-layer/recipes-devtools/cst/imx-cst_3.3.1.bb index 317ca379..5f808a97 100644 --- a/dynamic-layers/openembedded-layer/recipes-devtools/cst/imx-cst_3.3.1.bb +++ b/dynamic-layers/openembedded-layer/recipes-devtools/cst/imx-cst_3.3.1.bb @@ -9,7 +9,10 @@ DEPENDS = "byacc-native flex-native openssl" # tag=debian/3.3.1+dfsg-2 SRCREV = "e2c687a856e6670e753147aacef42d0a3c07891a" -SRC_URI = "git://gitlab.apertis.org/pkg/imx-code-signing-tool.git;protocol=https;branch=apertis/v2022pre" +SRC_URI = " \ + file://0001-fix-err-msg-linking.patch \ + git://gitlab.apertis.org/pkg/imx-code-signing-tool.git;protocol=https;branch=apertis/v2022pre \ +" S = "${WORKDIR}/git" diff --git a/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc_git.bb b/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc_git.bb index 70e5a1a3..62a71772 100644 --- a/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc_git.bb +++ b/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc_git.bb @@ -1,13 +1,13 @@ SUMMARY = "Frame Manager Configuration tool" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=a504ab5a8ff235e67c7301214749346c" +LIC_FILES_CHKSUM = "file://LICENSE;md5=a504ab5a8ff235e67c7301214749346c" PR = "r2" DEPENDS = "libxml2 fmlib tclap" -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/fmc;nobranch=1" -SRCREV = "c2ed7c269e86ac6a0aac361f5876c96e700443f4" +SRC_URI = "git://github.com/nxp-qoriq/fmc;protocol=https;nobranch=1" +SRCREV = "63c8ac99899a9bcd723801579b4d786594670455" S = "${WORKDIR}/git" diff --git a/dynamic-layers/openembedded-layer/recipes-multimedia/mpv/mpv_%.bbappend b/dynamic-layers/openembedded-layer/recipes-multimedia/mpv/mpv_%.bbappend new file mode 100644 index 00000000..5cf6d411 --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-multimedia/mpv/mpv_%.bbappend @@ -0,0 +1,2 @@ +# testbuild/../test.c:10: undefined reference to `glXCreateContext' +PACKAGECONFIG:remove:imxgpu = "x11" diff --git a/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4-imx-support.inc b/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4-imx-support.inc index 03e09e57..1f63cd7a 100644 --- a/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4-imx-support.inc +++ b/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4-imx-support.inc @@ -8,10 +8,12 @@ python __anonymous () { d.appendVarFlag('do_configure', 'depends', ' virtual/kernel:do_shared_workdir') } -SRC_URI:append:imxgpu2d += " \ +SRC_URI:append:imxgpu2d = " \ file://0001-Add-support-for-i.MX-codecs-to-phonon.patch \ file://0002-i.MX-video-renderer-Allow-v4l-device-from-environmen.patch \ file://0003-i.MX6-force-egl-visual-ID-33.patch \ + file://0001-config.tests-add-DEFINES-to-compile-egl-test-with-im.patch \ + file://0002-config.tests-add-DEFINES-to-compile-egl4gles1-test-w.patch \ " DEPENDS:append:imxgpu2d = " virtual/kernel virtual/libgles2" diff --git a/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/0001-config.tests-add-DEFINES-to-compile-egl-test-with-im.patch b/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/0001-config.tests-add-DEFINES-to-compile-egl-test-with-im.patch new file mode 100644 index 00000000..7eee7cf2 --- /dev/null +++ b/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/0001-config.tests-add-DEFINES-to-compile-egl-test-with-im.patch @@ -0,0 +1,25 @@ +From 234580de9d63fd79a8b444358cdaeac111a17061 Mon Sep 17 00:00:00 2001 +From: Mauro Salvini <m.salvini@koansoftware.com> +Date: Thu, 29 Sep 2022 16:06:04 +0200 +Subject: [PATCH 1/2] config.tests: add DEFINES to compile egl test with + imxgpu2d (Vivante) + +Signed-off-by: Mauro Salvini <m.salvini@koansoftware.com> +--- + config.tests/unix/egl/egl.pro | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/config.tests/unix/egl/egl.pro b/config.tests/unix/egl/egl.pro +index f04d0535..bc35b908 100644 +--- a/config.tests/unix/egl/egl.pro ++++ b/config.tests/unix/egl/egl.pro +@@ -6,5 +6,6 @@ for(p, QMAKE_LIBDIR_EGL) { + + !isEmpty(QMAKE_INCDIR_EGL): INCLUDEPATH += $$QMAKE_INCDIR_EGL + !isEmpty(QMAKE_LIBS_EGL): LIBS += $$QMAKE_LIBS_EGL ++DEFINES += LINUX=1 EGL_API_FB=1 + + CONFIG -= qt +-- +2.17.1 + diff --git a/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/0002-config.tests-add-DEFINES-to-compile-egl4gles1-test-w.patch b/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/0002-config.tests-add-DEFINES-to-compile-egl4gles1-test-w.patch new file mode 100644 index 00000000..993df85e --- /dev/null +++ b/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/0002-config.tests-add-DEFINES-to-compile-egl4gles1-test-w.patch @@ -0,0 +1,25 @@ +From adb19c68d3c92eb1a88e49e447ce827f14943486 Mon Sep 17 00:00:00 2001 +From: Mauro Salvini <m.salvini@koansoftware.com> +Date: Thu, 29 Sep 2022 16:12:11 +0200 +Subject: [PATCH 2/2] config.tests: add DEFINES to compile egl4gles1 test with + imxgpu2d (Vivante) + +Signed-off-by: Mauro Salvini <m.salvini@koansoftware.com> +--- + config.tests/unix/egl4gles1/egl4gles1.pro | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/config.tests/unix/egl4gles1/egl4gles1.pro b/config.tests/unix/egl4gles1/egl4gles1.pro +index 667ea8e3..14cb4a76 100644 +--- a/config.tests/unix/egl4gles1/egl4gles1.pro ++++ b/config.tests/unix/egl4gles1/egl4gles1.pro +@@ -6,5 +6,6 @@ for(p, QMAKE_LIBDIR_EGL) { + + !isEmpty(QMAKE_INCDIR_EGL): INCLUDEPATH += $$QMAKE_INCDIR_EGL + !isEmpty(QMAKE_LIBS_EGL): LIBS += $$QMAKE_LIBS_EGL ++DEFINES += LINUX=1 EGL_API_FB=1 + + CONFIG -= qt +-- +2.17.1 + diff --git a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtmultimedia_%.bbappend b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtmultimedia_%.bbappend new file mode 100644 index 00000000..f019c72d --- /dev/null +++ b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtmultimedia_%.bbappend @@ -0,0 +1,9 @@ +# Fixes QT5 application builds searching for libimx6vivantevideonode.so +# via cmake cmake/Qt5Multimedia/Qt5MultimediaConfig.cmake +do_install:append:imxgpu() { + install -d ${D}${libdir}/plugins/videoimx6vivantevideonode + ln -sf ../video/videonode/libeglvideonode.so ${D}${libdir}/plugins/videoimx6vivantevideonode/libeglvideonode.so + ln -sf ../video/videonode/libimx6vivantevideonode.so ${D}${libdir}/plugins/videoimx6vivantevideonode/libimx6vivantevideonode.so +} + +INSANE_SKIP:${PN}-plugins:imxgpu = "dev-so" diff --git a/dynamic-layers/qt6-layer/recipes-qt/qt6/qtbase_%.bbappend b/dynamic-layers/qt6-layer/recipes-qt/qt6/qtbase_%.bbappend new file mode 100644 index 00000000..1c51fc09 --- /dev/null +++ b/dynamic-layers/qt6-layer/recipes-qt/qt6/qtbase_%.bbappend @@ -0,0 +1,54 @@ +# Copyright (C) 2013 Eric Bénard - Eukréa Electromatique +# Copyright (C) 2016 Freescale Semiconductor +# Copyright (C) 2016, 2017 O.S. Systems Software LTDA. +# Copyright (C) 2017-2018 NXP + +PACKAGECONFIG_GRAPHICS:imxpxp = " \ + gles2" +PACKAGECONFIG_GRAPHICS:imxgpu2d = " \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', ' gl', '', d)} \ + ${PACKAGECONFIG_GRAPHICS_IMX_GPU}" +PACKAGECONFIG_GRAPHICS:imxgpu3d = " \ + gles2 \ + ${PACKAGECONFIG_GRAPHICS_IMX_GPU}" +PACKAGECONFIG_GRAPHICS_IMX_GPU = "" +PACKAGECONFIG_GRAPHICS_IMX_GPU:mx8-nxp-bsp = " \ + gbm kms" + +PACKAGECONFIG_GRAPHICS:use-mainline-bsp ?= " \ + gles2 gbm kms" + +PACKAGECONFIG += " \ + ${PACKAGECONFIG_PLATFORM}" + +PACKAGECONFIG_PLATFORM = "" +PACKAGECONFIG_PLATFORM:imxgpu2d = " \ + no-opengl \ + linuxfb \ + ${PACKAGECONFIG_PLATFORM_EGLFS}" +PACKAGECONFIG_PLATFORM:imxgpu3d = " \ + ${PACKAGECONFIG_PLATFORM_EGLFS}" + +PACKAGECONFIG_PLATFORM_EGLFS = "" +PACKAGECONFIG_PLATFORM_EGLFS:imxgpu3d = " \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', \ + bb.utils.contains('DISTRO_FEATURES', 'wayland', '', \ + 'eglfs', d), d)}" +PACKAGECONFIG_PLATFORM_EGLFS:mx8-nxp-bsp = " \ + eglfs" + +PACKAGECONFIG_PLATFORM:use-mainline-bsp = " \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'eglfs', d)}" + +PACKAGECONFIG += " \ + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '${PACKAGECONFIG_WAYLAND}', '', d)}" +PACKAGECONFIG_WAYLAND = "wayland" + +PACKAGECONFIG += " \ + ${@bb.utils.contains('DISTRO_FEATURES', 'vulkan', '${PACKAGECONFIG_VULKAN}', '', d)}" +PACKAGECONFIG_VULKAN = "" +PACKAGECONFIG_VULKAN:imxgpu = " \ + ${PACKAGECONFIG_VULKAN_IMX_GPU}" +PACKAGECONFIG_VULKAN_IMX_GPU = "" +PACKAGECONFIG_VULKAN_IMX_GPU:mx8-nxp-bsp = "vulkan" +PACKAGECONFIG_VULKAN_IMX_GPU:mx8mm-nxp-bsp = "" diff --git a/dynamic-layers/qt6-layer/recipes-qt/qt6/qtwayland_%.bbappend b/dynamic-layers/qt6-layer/recipes-qt/qt6/qtwayland_%.bbappend new file mode 100644 index 00000000..ca011758 --- /dev/null +++ b/dynamic-layers/qt6-layer/recipes-qt/qt6/qtwayland_%.bbappend @@ -0,0 +1,6 @@ +# etnaviv mesa does not have glx +PACKAGECONFIG:remove:use-mainline-bsp = "xcomposite-glx" + +PACKAGECONFIG:remove:mx6-nxp-bsp = "xcomposite-egl xcomposite-glx" +PACKAGECONFIG:remove:mx7-nxp-bsp = "xcomposite-egl xcomposite-glx" +PACKAGECONFIG:remove:mx8-nxp-bsp = "xcomposite-egl xcomposite-glx" |