diff options
12 files changed, 43 insertions, 72 deletions
diff --git a/meta-agl-bsp/conf/include/agl_imx8mq-evk-viv.inc b/meta-agl-bsp/conf/include/agl_imx8mq-evk-viv.inc deleted file mode 100644 index 3988fcd6f..000000000 --- a/meta-agl-bsp/conf/include/agl_imx8mq-evk-viv.inc +++ /dev/null @@ -1,8 +0,0 @@ -require agl_imx8mq-evk-common.inc - -IMX_DEFAULT_BSP = "nxp" - -# NOTE: -# There is some potential benefit to using the community supported -# linux-fslc-imx hybrid kernel here, but keeping the configuration -# close to upstream to ease maintenance seems worthwhile. diff --git a/meta-agl-bsp/meta-freescale-layer/recipes-graphics/wayland/weston_12.0.3.imx.bbappend b/meta-agl-bsp/meta-freescale-layer/recipes-graphics/wayland/weston_12.0.3.imx.bbappend deleted file mode 100644 index ca162e28f..000000000 --- a/meta-agl-bsp/meta-freescale-layer/recipes-graphics/wayland/weston_12.0.3.imx.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -# Use provided hook to disable removal of wayland from PACKAGECONFIG -PACKAGECONFIG_IMX_REMOVALS = "x11" diff --git a/meta-agl-bsp/virtualization-layer/recipes-graphics/mesa/mesa/0001-virgl-virgl_driinfo.h.in-Disable-by-default-emulated.patch b/meta-agl-bsp/virtualization-layer/recipes-graphics/mesa/mesa/0001-virgl-virgl_driinfo.h.in-Disable-by-default-emulated.patch deleted file mode 100644 index d27696056..000000000 --- a/meta-agl-bsp/virtualization-layer/recipes-graphics/mesa/mesa/0001-virgl-virgl_driinfo.h.in-Disable-by-default-emulated.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 737ccb36c0faf275037e5e96a263c89a44886ddd Mon Sep 17 00:00:00 2001 -From: Marius Vlad <marius.vlad@collabora.com> -Date: Mon, 19 Dec 2022 11:51:28 +0200 -Subject: [PATCH] virgl/virgl_driinfo.h.in: Disable by default emulated BGRA - - and swizzling - -Workaround in place for virtio aarch64 to avoid graphical artefacts when -first time booting up on PVR host driver. - -Introduced with patch 'virgl: Always enable emulated BGRA and swizzling -unless specifically told not to' in mesa-20.3.0. - -Signed-off-by: Marius Vlad <marius.vlad@collabora.com> ---- - src/gallium/drivers/virgl/virgl_driinfo.h.in | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/gallium/drivers/virgl/virgl_driinfo.h.in b/src/gallium/drivers/virgl/virgl_driinfo.h.in -index ec688f5..244021e 100644 ---- a/src/gallium/drivers/virgl/virgl_driinfo.h.in -+++ b/src/gallium/drivers/virgl/virgl_driinfo.h.in -@@ -8,8 +8,8 @@ - // 5. Implement the tweak in virglrenderer - DRI_CONF_SECTION_MISCELLANEOUS - DRI_CONF_FORMAT_L8_SRGB_ENABLE_READBACK(false) -- DRI_CONF_GLES_EMULATE_BGRA(true) -- DRI_CONF_GLES_APPLY_BGRA_DEST_SWIZZLE(true) -+ DRI_CONF_GLES_EMULATE_BGRA(false) -+ DRI_CONF_GLES_APPLY_BGRA_DEST_SWIZZLE(false) - DRI_CONF_GLES_SAMPLES_PASSED_VALUE(1024, 1, 400000000) - - /* --- -2.30.2 - diff --git a/meta-agl-bsp/virtualization-layer/recipes-graphics/mesa/mesa_24.%.bbappend b/meta-agl-bsp/virtualization-layer/recipes-graphics/mesa/mesa_24.%.bbappend deleted file mode 100644 index 0a6606ebf..000000000 --- a/meta-agl-bsp/virtualization-layer/recipes-graphics/mesa/mesa_24.%.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" - -SRC_URI += "file://0001-virgl-virgl_driinfo.h.in-Disable-by-default-emulated.patch" diff --git a/meta-agl-core/conf/distro/poky-agl.conf b/meta-agl-core/conf/distro/poky-agl.conf index 8dab723cc..eea4ae82c 100644 --- a/meta-agl-core/conf/distro/poky-agl.conf +++ b/meta-agl-core/conf/distro/poky-agl.conf @@ -11,7 +11,7 @@ DISTRO_NAME = "Automotive Grade Linux" # Release flags DISTRO_CODENAME = "ricefish" AGL_BRANCH = "ricefish" -AGLVERSION = "18.0.2" +AGLVERSION = "18.0.4" # switch devel/release #AGLRELEASETYPE ?= "agldevelopment" @@ -29,8 +29,8 @@ DISTRO_BRANCH_VERSION_TAG = "${DISTRO_CODENAME}/${@'${DISTRO_VERSION}'.replace(' # reproducible builds: # Set the desired timestamps # E.g. update for (major) releases -export SOURCE_DATE_EPOCH = "1729779222" -REPRODUCIBLE_TIMESTAMP_ROOTFS = "1729779222" +export SOURCE_DATE_EPOCH = "1737110029" +REPRODUCIBLE_TIMESTAMP_ROOTFS = "1737110029" # SDK diff --git a/meta-app-framework/recipes-core/applaunchd/applaunchd/agl-app-flutter@.service b/meta-app-framework/recipes-core/applaunchd/applaunchd/agl-app-flutter@.service index a9a2527e0..b0018f791 100644 --- a/meta-app-framework/recipes-core/applaunchd/applaunchd/agl-app-flutter@.service +++ b/meta-app-framework/recipes-core/applaunchd/applaunchd/agl-app-flutter@.service @@ -4,9 +4,7 @@ Description=%I [Service] Type=simple User=agl-driver -Environment=FLUTTER_VERSION=3.3.7 -Environment=FLUTTER_RUNTIME=release EnvironmentFile=-/etc/default/flutter EnvironmentFile=-/etc/default/%I Environment=XDG_RUNTIME_DIR=/run/user/1001/ -ExecStart=/usr/bin/flutter-auto --b=/usr/share/flutter/%I/${FLUTTER_VERSION}/${FLUTTER_RUNTIME} --xdg-shell-app-id=%I +ExecStart=/usr/bin/flutter-auto -b /usr/share/flutter/%I/${FLUTTER_VERSION}/${FLUTTER_RUNTIME} --xdg-shell-app-id %I diff --git a/meta-pipewire/recipes-multimedia/wireplumber/wireplumber/0001-linking-reset-link-when-moving-target.patch b/meta-pipewire/recipes-multimedia/wireplumber/wireplumber/0001-linking-reset-link-when-moving-target.patch new file mode 100644 index 000000000..690d3de1f --- /dev/null +++ b/meta-pipewire/recipes-multimedia/wireplumber/wireplumber/0001-linking-reset-link-when-moving-target.patch @@ -0,0 +1,30 @@ +From 658e9bbe4daee17844cd5b5bf5014bca9ec76ba4 Mon Sep 17 00:00:00 2001 +From: George Kiagiadakis <george.kiagiadakis@collabora.com> +Date: Fri, 13 Dec 2024 11:58:24 +0200 +Subject: [PATCH] linking: reset link when moving target + +This ensures that the real pipewire links will be +destroyed, since the link may not be fully activated yet. +This fix is not entirely correct, because it will likely +leak the si-standard-link, but it will get audio working. + +Upstream-Status: Inappropriate [not entirely correct] +--- + src/scripts/linking/prepare-link.lua | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/scripts/linking/prepare-link.lua b/src/scripts/linking/prepare-link.lua +index 69da939c..38fee98f 100644 +--- a/src/scripts/linking/prepare-link.lua ++++ b/src/scripts/linking/prepare-link.lua +@@ -57,6 +57,7 @@ SimpleEventHook { + log:warning (link, "Link was not activated before removing") + end + si_flags.peer_id = nil ++ link:reset () + link:remove () + log:info (si, "... moving to new target") + end +-- +2.45.2 + diff --git a/meta-pipewire/recipes-multimedia/wireplumber/wireplumber_%.bbappend b/meta-pipewire/recipes-multimedia/wireplumber/wireplumber_%.bbappend index 16d3817cd..bf71dc3c3 100644 --- a/meta-pipewire/recipes-multimedia/wireplumber/wireplumber_%.bbappend +++ b/meta-pipewire/recipes-multimedia/wireplumber/wireplumber_%.bbappend @@ -1,3 +1,9 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" + +SRC_URI += " \ + file://0001-linking-reset-link-when-moving-target.patch \ +" + do_install:append() { systemd_dir="${D}${sysconfdir}/systemd/system/" diff --git a/templates/feature/agl-ci/99_local.conf.inc b/templates/feature/agl-ci/99_local.conf.inc index d9451d519..ab2d99251 100644 --- a/templates/feature/agl-ci/99_local.conf.inc +++ b/templates/feature/agl-ci/99_local.conf.inc @@ -15,7 +15,9 @@ https://.*/.* ${AGL_HOST_PREMIRROR}/AGL/mirror/ \n \ SSTATE_MIRRORS = " file://.* ${AGL_HOST_SSTATE_MIRROR}/sstate-mirror/ricefish/${DEFAULTTUNE}/PATH;downloadfilename=PATH \n " -INHERIT += "cve-check" +# disable due to fetch issues +#INHERIT += "cve-check" + INHERIT += "buildhistory" INHERIT += "buildstats" INHERIT += "buildstats-summary" diff --git a/templates/machine/imx8mq-evk-viv/40_bblayers.conf.inc b/templates/machine/imx8mq-evk-viv/40_bblayers.conf.inc deleted file mode 100644 index edcb6a3a2..000000000 --- a/templates/machine/imx8mq-evk-viv/40_bblayers.conf.inc +++ /dev/null @@ -1,5 +0,0 @@ -# This must be parsed after qt5, etc. layers so that they are correctly -# recognized by meta-freescale/dynamic-layers -BBLAYERS =+ "\ - ${METADIR}/bsp/meta-freescale \ - " diff --git a/templates/machine/imx8mq-evk-viv/50_setup.sh b/templates/machine/imx8mq-evk-viv/50_setup.sh deleted file mode 100644 index eefd1eb7f..000000000 --- a/templates/machine/imx8mq-evk-viv/50_setup.sh +++ /dev/null @@ -1,2 +0,0 @@ -find_and_ack_eula $METADIR/bsp/meta-freescale EULA -export EULA_FLAG_NAME="ACCEPT_FSL_EULA" diff --git a/templates/machine/imx8mq-evk-viv/README_machine_imx8mq-evk-viv.md b/templates/machine/imx8mq-evk-viv/README_machine_imx8mq-evk-viv.md deleted file mode 100644 index be30e00fe..000000000 --- a/templates/machine/imx8mq-evk-viv/README_machine_imx8mq-evk-viv.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -description: i.MX8MQ EVK with Vivante GPU driver -authors: Scott Murray <scott.murray@konsulko.com> ---- - -### Machine imx8mqevk-viv - -i.MX8MQ EVK and EVKB boards with Vivante GPU driver support. - |