ci: Update build container images to Ubuntu 24.04

This fixes the latest Python version requirement.

Signed-off-by: Andrei Gherzan <andrei@gherzan.com>

.github/workflows/docker-images/yocto-builder/Dockerfile

@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: MIT
 
-FROM ubuntu:20.04
+FROM ubuntu:24.04
 
 ARG DEBIAN_FRONTEND="noninteractive"
 RUN apt-get update -qq
@@ -12,28 +12,26 @@ RUN apt-get install -y eatmydata
 # Keep this in sync with
 # https://git.yoctoproject.org/poky/tree/documentation/poky.yaml
 RUN eatmydata apt-get install -qq -y \
-	gawk wget git diffstat unzip texinfo gcc build-essential chrpath \
-	socat cpio python3 python3-pip python3-pexpect xz-utils debianutils \
-	iputils-ping python3-git python3-jinja2 libegl1-mesa libsdl1.2-dev \
-	pylint3 xterm python3-subunit mesa-common-dev zstd liblz4-tool
+	build-essential chrpath cpio debianutils diffstat file gawk gcc git \
+	iputils-ping libacl1 liblz4-tool locales python3 python3-git \
+	python3-jinja2 python3-pexpect python3-pip python3-subunit socat \
+	texinfo unzip wget xz-utils zstd
 
 # en_US.UTF-8 is required by the build system
 RUN eatmydata apt-get install -qq -y locales \
 	&& echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \
 	&& locale-gen
-ENV LANG en_US.utf8
+ENV LANG=en_US.utf8
 
 RUN eatmydata apt-get clean && rm -rf /var/lib/apt/lists/*
 
-# Have bash as shell
-RUN echo "dash dash/sh boolean false" | debconf-set-selections \
- && dpkg-reconfigure dash
-
 # Run under normal user called 'ci'
-RUN useradd --create-home --uid 1000 --shell /usr/bin/bash ci
+RUN useradd --create-home --uid 2000 --shell /bin/bash ci
 USER ci
 WORKDIR /home/ci
 
 COPY ./yocto-builder/entrypoint-yocto-check-layer.sh /
 COPY ./yocto-builder/entrypoint-build.sh /
 COPY ./utils.sh /
+
+ENTRYPOINT ["/bin/bash"]

.readthedocs.yaml

@@ -1,5 +1,7 @@
 version: 2
 
+sphinx:
+  configuration: docs/conf.py
 build:
   os: ubuntu-22.04
   tools:

README.md

@@ -48,7 +48,7 @@ OpenEmbedded/Yocto distributions and layer stacks, such as:
 
 This layer is officially approved as part of the `Yocto Project Compatible
 Layers Program`. You can find details of that on the official Yocto Project
-[website](https://www.yoctoproject.org/software-overview/layers/?searchTerm=meta-raspberrypi).
+[website](https://www.yoctoproject.org/development/yocto-project-compatible-layers/).
 
 ## Dependencies
 
@@ -81,7 +81,7 @@ a section as follows:
 local_conf_header:
   rpi-specific: |
     ENABLE_I2C = "1"
-    RPI_EXTRA_CONFIG = "dtoverlay=pi3-disable-bt"
+    RPI_EXTRA_CONFIG = "dtoverlay=disable-bt"
 ```
 
 To configure the machine, you have to update the `machine` variable.

SECURITY.md

@@ -0,0 +1,20 @@
+How to Report a Potential Vulnerability?
+========================================
+
+If you would like to report a public issue (for example, one with a released
+CVE number), please report it via GitHub issues:
+
+  https://github.com/agherzan/meta-raspberrypi/issues/new/choose
+
+If you are dealing with a not-yet released or urgent issue, please send a
+message to one of the maintainers listed in the [README.md](https://github.com/agherzan/meta-raspberrypi/blob/master/README.md).  Include as many
+details as possible:
+  - the layer or software module affected
+  - the recipe and its version
+  - any example code, if available
+
+Branches maintained with security fixes
+---------------------------------------
+
+See https://wiki.yoctoproject.org/wiki/Releases for the list of current
+releases.  We only accept patches for the LTS releases and the master branch.

conf/layer.conf

@@ -9,11 +9,8 @@ BBFILE_COLLECTIONS += "raspberrypi"
 BBFILE_PATTERN_raspberrypi := "^${LAYERDIR}/"
 BBFILE_PRIORITY_raspberrypi = "9"
 
-LAYERSERIES_COMPAT_raspberrypi = "nanbield scarthgap"
+LAYERSERIES_COMPAT_raspberrypi = "styhead walnascar"
 LAYERDEPENDS_raspberrypi = "core"
-# Recommended for u-boot support for raspberrypi5
-# https://git.yoctoproject.org/meta-lts-mixins 'scarthgap/u-boot' branch
-LAYERRECOMMENDS_raspberrypi = "lts-u-boot-mixin"
 
 # Additional license directories.
 LICENSE_PATH += "${LAYERDIR}/files/custom-licenses"
@@ -23,11 +20,6 @@ LICENSE_PATH += "${LAYERDIR}/files/custom-licenses"
 #
 # The .bbappend and .bb files are included if the respective layer
 # collection is available.
-BBFILES += "${@' '.join('${LAYERDIR}/dynamic-layers/%s/recipes*/*/*.bbappend' % layer \
-               for layer in BBFILE_COLLECTIONS.split())}"
-BBFILES += "${@' '.join('${LAYERDIR}/dynamic-layers/%s/recipes*/*/*.bb' % layer \
-               for layer in BBFILE_COLLECTIONS.split())}"
-
 BBFILES_DYNAMIC += " \
     openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/*/*/*.bb \
     openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/*/*/*.bbappend \
@@ -37,6 +29,8 @@ BBFILES_DYNAMIC += " \
     qt5-layer:${LAYERDIR}/dynamic-layers/qt5-layer/*/*/*.bbappend \
     multimedia-layer:${LAYERDIR}/dynamic-layers/multimedia-layer/*/*/*.bb \
     multimedia-layer:${LAYERDIR}/dynamic-layers/multimedia-layer/*/*/*.bbappend \
+    meta-python:${LAYERDIR}/dynamic-layers/meta-python/*/*/*.bb \
+    meta-python:${LAYERDIR}/dynamic-layers/meta-python/*/*/*.bbappend \
 "
 
 DEFAULT_TEST_SUITES:remove:rpi = "parselogs"

conf/machine/include/rpi-base.inc

@@ -18,7 +18,9 @@ RPI_KERNEL_DEVICETREE_OVERLAYS ?= " \
     overlays/overlay_map.dtb \
     overlays/at86rf233.dtbo \
     overlays/disable-bt.dtbo \
+    overlays/disable-bt-pi5.dtbo \
     overlays/disable-wifi.dtbo \
+    overlays/disable-wifi-pi5.dtbo \
     overlays/dwc2.dtbo \
     overlays/gpio-ir.dtbo \
     overlays/gpio-ir-tx.dtbo \
@@ -58,6 +60,17 @@ RPI_KERNEL_DEVICETREE_OVERLAYS ?= " \
     overlays/pps-gpio.dtbo \
     overlays/rpi-ft5406.dtbo \
     overlays/rpi-poe.dtbo \
+    overlays/uart0.dtbo \
+    overlays/uart0-pi5.dtbo \
+    overlays/uart1.dtbo \
+    overlays/uart1-pi5.dtbo \
+    overlays/uart2.dtbo \
+    overlays/uart2-pi5.dtbo \
+    overlays/uart3.dtbo \
+    overlays/uart3-pi5.dtbo \
+    overlays/uart4.dtbo \
+    overlays/uart4-pi5.dtbo \
+    overlays/uart5.dtbo \
     overlays/vc4-fkms-v3d.dtbo \
     overlays/vc4-fkms-v3d-pi4.dtbo \
     overlays/vc4-kms-v3d.dtbo \
@@ -67,6 +80,7 @@ RPI_KERNEL_DEVICETREE_OVERLAYS ?= " \
     overlays/w1-gpio.dtbo \
     overlays/w1-gpio-pullup.dtbo \
     overlays/wm8960-soundcard.dtbo \
+    overlays/bcm2712d0.dtbo \
     "
 
 RPI_KERNEL_DEVICETREE ?= " \
@@ -86,7 +100,6 @@ RPI_KERNEL_DEVICETREE ?= " \
     broadcom/bcm2710-rpi-cm3.dtb \
     broadcom/bcm2711-rpi-cm4.dtb \
     broadcom/bcm2711-rpi-cm4s.dtb \
-    broadcom/bcm2712-rpi-5-b.dtb \
     "
 
 KERNEL_DEVICETREE ??= " \

conf/machine/include/rpi-default-providers.inc

@@ -7,10 +7,6 @@ PREFERRED_PROVIDER_virtual/libgles2 ?= "${@bb.utils.contains("MACHINE_FEATURES",
 PREFERRED_PROVIDER_virtual/libgl ?= "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "mesa", "mesa-gl", d)}"
 PREFERRED_PROVIDER_virtual/mesa ?= "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "mesa", "mesa-gl", d)}"
 PREFERRED_PROVIDER_virtual/libgbm ?= "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "mesa", "mesa-gl", d)}"
-PREFERRED_PROVIDER_vlc ?= "rpidistro-vlc"
-PREFERRED_PROVIDER_ffmpeg ?= "rpidistro-ffmpeg"
-PREFERRED_PROVIDER_libav ?= "rpidistro-ffmpeg"
-PREFERRED_PROVIDER_libpostproc ?= "rpidistro-ffmpeg"
 PREFERRED_PROVIDER_jpeg ?= "jpeg"
 
 PREFERRED_PROVIDER_virtual/libomxil ?= "userland"

conf/machine/raspberrypi-armv8.conf

@@ -33,6 +33,10 @@ RPI_KERNEL_DEVICETREE = " \
     broadcom/bcm2711-rpi-cm4.dtb \
     broadcom/bcm2711-rpi-cm4s.dtb \
     broadcom/bcm2712-rpi-5-b.dtb \
+    broadcom/bcm2712-rpi-cm5-cm5io.dtb \
+    broadcom/bcm2712-rpi-cm5-cm4io.dtb \
+    broadcom/bcm2712-rpi-cm5l-cm5io.dtb \
+    broadcom/bcm2712-rpi-cm5l-cm4io.dtb \
 "
 
 SDIMG_KERNELIMAGE ?= "kernel8.img"

conf/machine/raspberrypi5.conf

@@ -15,6 +15,10 @@ MACHINE_EXTRA_RRECOMMENDS += "\
 
 RPI_KERNEL_DEVICETREE = " \
     broadcom/bcm2712-rpi-5-b.dtb \
+    broadcom/bcm2712-rpi-cm5-cm5io.dtb \
+    broadcom/bcm2712-rpi-cm5-cm4io.dtb \
+    broadcom/bcm2712-rpi-cm5l-cm5io.dtb \
+    broadcom/bcm2712-rpi-cm5l-cm4io.dtb \
 "
 
 SDIMG_KERNELIMAGE ?= "kernel_2712.img"

docs/extra-build-config.md

@@ -178,6 +178,7 @@ the following boards:
 * Raspberry Pi 3 64-bit
 * Raspberry Pi 4 32-bit
 * Raspberry Pi 4 64-bit
+
 It means that, for those boards, `RPI_USE_U_BOOT = "1"` is not compatible with
 `ENABLE_UART = "0"`.
 
@@ -487,14 +488,15 @@ MMAL is not enabled by default. To enable it add
 
     DISABLE_VC4GRAPHICS = "1"
 
-to `local.conf`. Adding `vlc` to `IMAGE_INSTALL` will then default to building the Raspberry
-Pi's Distro implementation of VLC with HW accelerated video decode through MMAL into the system
-image. It also defaults to building VLC with Raspberry PI's Distro implementation of ffmpeg. The
-oe-core implementation of ffmpeg and the meta-openembedded/meta-multimedia implementation of VLC
-can however be selected via:
+to `local.conf`. Adding `vlc` to `IMAGE_INSTALL` will then default to building the oe-core
+implementation of ffmpeg and the meta-openembedded/meta-multimedia implementation of VLC.
+The Raspberry Pi's Distro implementation of VLC with HW accelerated video decode through
+MMAL and the Raspberry PI's Distro implementation of ffmpeg. Can however be selected via:
 
-    PREFERRED_PROVIDER_ffmpeg = "ffmpeg"
-    PREFERRED_PROVIDER_vlc = "vlc"
+    PREFERRED_PROVIDER_vlc = "rpidistro-vlc"
+    PREFERRED_PROVIDER_ffmpeg = "rpidistro-ffmpeg"
+    PREFERRED_PROVIDER_libav = "rpidistro-ffmpeg"
+    PREFERRED_PROVIDER_libpostproc = "rpidistro-ffmpeg"
 
 Usage example: Start VLC with mmal_vout plugin and without an active display server.
 

dynamic-layers/multimedia-layer/recipes-multimedia/libcamera/libcamera_%.bbappend

@@ -1,2 +1,3 @@
-PACKAGECONFIG[raspberrypi] = "-Dpipelines=rpi/vc4 -Dipas=rpi/vc4 -Dcpp_args=-Wno-unaligned-access"
+PACKAGECONFIG[raspberrypi] = "-Dpipelines=rpi/vc4 -Dipas=rpi/vc4"
 PACKAGECONFIG:append:rpi = " raspberrypi"
+CXXFLAGS:append:rpi = " -Wno-unaligned-access "

kas-poky-rpi.yml

@@ -12,7 +12,7 @@ repos:
   poky:
     url: https://git.yoctoproject.org/git/poky
     path: layers/poky
-    refspec: master
+    branch: master
     layers:
       meta:
       meta-poky:
@@ -21,7 +21,7 @@ repos:
   meta-openembedded:
     url: http://git.openembedded.org/meta-openembedded
     path: layers/meta-openembedded
-    refspec: master
+    branch: master
     layers:
       meta-oe:
       meta-python:
@@ -31,7 +31,7 @@ repos:
   meta-qt5:
     url: https://github.com/meta-qt5/meta-qt5/
     path: layers/meta-qt5
-    refspec: master
+    branch: master
 
 bblayers_conf_header:
   standard: |
@@ -48,7 +48,7 @@ local_conf_header:
     USER_CLASSES = "buildstats"
     PATCHRESOLVE = "noop"
   debug-tweaks: |
-    EXTRA_IMAGE_FEATURES = "debug-tweaks"
+    IMAGE_FEATURES += "empty-root-password allow-empty-password allow-root-login post-install-logging"
   diskmon: |
     BB_DISKMON_DIRS = "\
         STOPTASKS,${TMPDIR},1G,100K \
@@ -59,3 +59,7 @@ local_conf_header:
         HALT,${DL_DIR},100M,1K \
         HALT,${SSTATE_DIR},100M,1K \
         HALT,/tmp,10M,1K"
+  license: |
+    # Uncomment next line to allow the license
+    # See: linux-firmware-rpidistro in docs/ipcompliance.md
+    #LICENSE_FLAGS_ACCEPTED = "synaptics-killswitch"

recipes-bsp/gpio-shutdown/gpio-shutdown.bb

@@ -19,8 +19,8 @@ do_install() {
             ${D}${sysconfdir}/inittab.d \
             ${D}${sysconfdir}/init.d
 
-        install -m 0755 ${WORKDIR}/gpio-shutdown-keymap.sh ${D}${sysconfdir}/init.d/
-        install -m 0755 ${WORKDIR}/bind_gpio_shutdown.tab ${D}${sysconfdir}/inittab.d/
+        install -m 0755 ${UNPACKDIR}/gpio-shutdown-keymap.sh ${D}${sysconfdir}/init.d/
+        install -m 0755 ${UNPACKDIR}/bind_gpio_shutdown.tab ${D}${sysconfdir}/inittab.d/
     elif ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
         # Systemd init does not require any configuration.
         # Note: cannot have an empty branch, hence the redundant dir install.

recipes-bsp/rpi-u-boot-scr/rpi-u-boot-scr.bb

@@ -15,12 +15,15 @@ do_compile() {
     sed -e 's/@@KERNEL_IMAGETYPE@@/${KERNEL_IMAGETYPE}/' \
         -e 's/@@KERNEL_BOOTCMD@@/${KERNEL_BOOTCMD}/' \
         -e 's/@@BOOT_MEDIA@@/${BOOT_MEDIA}/' \
-        "${WORKDIR}/boot.cmd.in" > "${WORKDIR}/boot.cmd"
+        "${UNPACKDIR}/boot.cmd.in" > "${WORKDIR}/boot.cmd"
     mkimage -A ${UBOOT_ARCH} -T script -C none -n "Boot script" -d "${WORKDIR}/boot.cmd" boot.scr
 }
 
 inherit kernel-arch deploy nopackages
 
+S = "${WORKDIR}/sources"
+UNPACKDIR = "${S}"
+
 do_deploy() {
     install -d ${DEPLOYDIR}
     install -m 0644 boot.scr ${DEPLOYDIR}

recipes-bsp/u-boot/files/maxsize.cfg

@@ -0,0 +1 @@
+CONFIG_SYS_BOOTM_LEN=0x1000000

recipes-bsp/u-boot/u-boot_%.bbappend

@@ -5,10 +5,11 @@ SRC_URI:append:rpi = " \
 "
 
 SRC_URI:append:rpi = " file://0001-rpi-always-set-fdt_addr-with-firmware-provided-FDT-address.patch"
+SRC_URI:append:raspberrypi4 = " file://maxsize.cfg"
 
 DEPENDS:append:rpi = " u-boot-default-script"
 
 do_install:append:rpi () {
     install -d ${D}${sysconfdir}
-    install -m 0644 ${WORKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config
+    install -m 0644 ${UNPACKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config
 }

recipes-core/psplash/psplash_%.bbappend

@@ -5,7 +5,7 @@ SRC_URI:append:rpi = " file://framebuf.conf"
 
 do_install:append:rpi() {
     if [ "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" ]; then
-        install -Dm 0644 ${WORKDIR}/framebuf.conf ${D}${systemd_system_unitdir}/psplash-start.service.d/framebuf.conf
+        install -Dm 0644 ${UNPACKDIR}/framebuf.conf ${D}${systemd_system_unitdir}/psplash-start.service.d/framebuf.conf
     fi
 }
 

recipes-core/udev/udev-rules-rpi.bb

@@ -15,5 +15,5 @@ INHIBIT_DEFAULT_DEPS = "1"
 do_install () {
     install -d ${D}${sysconfdir}/udev/rules.d
     install -m 0644 ${S}/etc.armhf/udev/rules.d/99-com.rules ${D}${sysconfdir}/udev/rules.d/
-    install -m 0644 ${WORKDIR}/can.rules ${D}${sysconfdir}/udev/rules.d/
+    install -m 0644 ${UNPACKDIR}/can.rules ${D}${sysconfdir}/udev/rules.d/
 }

recipes-core/udev/udev-rules-udisks-rpi_1.0.bb

@@ -7,7 +7,7 @@ INHIBIT_DEFAULT_DEPS = "1"
 
 do_install () {
 	install -d ${D}${base_libdir}/udev/rules.d
-	install -m 644 ${WORKDIR}/80-udisks-rpi.rules ${D}${base_libdir}/udev/rules.d
+	install -m 644 ${UNPACKDIR}/80-udisks-rpi.rules ${D}${base_libdir}/udev/rules.d
 }
 
 FILES:${PN} = "${base_libdir}/udev/rules.d"

recipes-devtools/raspi-utils/raspi-utils_git.bb

@@ -0,0 +1,22 @@
+SUMMARY = "A collection of scripts and simple applications"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://LICENCE;md5=4c01239e5c3a3d133858dedacdbca63c"
+
+DEPENDS:append = " dtc"
+
+PV = "1.0+git"
+
+SRC_URI = "git://github.com/raspberrypi/utils;protocol=https;branch=master"
+
+SRCREV = "b9c63214c535d7df2b0fa6743b7b3e508363c25a"
+
+S = "${WORKDIR}/git"
+
+FILES:${PN}:append = " \
+    ${datadir}/bash-completion/completions/pinctrl \
+"
+
+OECMAKE_TARGET_COMPILE = "pinctrl/all dtmerge/all"
+OECMAKE_TARGET_INSTALL = "pinctrl/install dtmerge/install"
+
+inherit cmake

recipes-graphics/vc-graphics/vc-graphics.inc

@@ -33,10 +33,10 @@ do_install () {
   cp -R include/* ${D}${includedir}
 
   install -d ${D}${libdir}/pkgconfig
-  install -m 0644 ${WORKDIR}/egl.pc ${D}${libdir}/pkgconfig/
+  install -m 0644 ${UNPACKDIR}/egl.pc ${D}${libdir}/pkgconfig/
 
   install -d ${D}/${sysconfdir}/init.d
-  install -m 0755 ${WORKDIR}/vchiq.sh ${D}${sysconfdir}/init.d/
+  install -m 0755 ${UNPACKDIR}/vchiq.sh ${D}${sysconfdir}/init.d/
 }
 
 # These are proprietary binaries generated elsewhere so don't check ldflags

recipes-graphics/wayland/weston-init.bbappend

@@ -1,10 +0,0 @@
-FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
-
-do_install:append:rpi() {
-    if [ -e ${D}/${sysconfdir}/init.d/weston ]; then
-        sed -i 's#weston-start --#weston-start -- --continue-without-input#' ${D}/${sysconfdir}/init.d/weston
-    fi
-    if [ -e ${D}${systemd_system_unitdir}/weston.service ]; then
-        sed -i 's#ExecStart=/usr/bin/weston#ExecStart=/usr/bin/weston --continue-without-input#' ${D}${systemd_system_unitdir}/weston.service
-    fi
-}

recipes-graphics/xorg-xserver/xserver-xf86-config_%.bbappend

@@ -8,8 +8,8 @@ do_install:append:rpi () {
     PITFT="${@bb.utils.contains("MACHINE_FEATURES", "pitft", "1", "0", d)}"
     if [ "${PITFT}" = "1" ]; then
         install -d ${D}/${sysconfdir}/X11/xorg.conf.d/
-        install -m 0644 ${WORKDIR}/xorg.conf.d/98-pitft.conf ${D}/${sysconfdir}/X11/xorg.conf.d/
-        install -m 0644 ${WORKDIR}/xorg.conf.d/99-calibration.conf ${D}/${sysconfdir}/X11/xorg.conf.d/
+        install -m 0644 ${UNPACKDIR}/xorg.conf.d/98-pitft.conf ${D}/${sysconfdir}/X11/xorg.conf.d/
+        install -m 0644 ${UNPACKDIR}/xorg.conf.d/99-calibration.conf ${D}/${sysconfdir}/X11/xorg.conf.d/
     fi
 }
 

recipes-kernel/linux-firmware-rpidistro/linux-firmware-rpidistro_git.bb

@@ -18,8 +18,8 @@ LICENSE_FLAGS = "synaptics-killswitch"
 SRC_URI = "git://github.com/RPi-Distro/firmware-nonfree;branch=bookworm;protocol=https \
     file://0001-Default-43455-firmware-to-standard-variant.patch \
 "
-SRCREV = "223ccf3a3ddb11b3ea829749fbbba4d65b380897"
-PV = "20230625-2+rpt2"
+SRCREV = "4b356e134e8333d073bd3802d767a825adec3807"
+PV = "20230625-2+rpt3"
 S = "${WORKDIR}/git"
 
 inherit allarch
@@ -27,6 +27,11 @@ inherit allarch
 do_configure[noexec] = "1"
 do_compile[noexec] = "1"
 
+# The minimal firmware doesn't work with Raspberry Pi 5, so default to the
+# standard firmware
+CYFMAC43455_SDIO_FIRMWARE ??= "minimal"
+CYFMAC43455_SDIO_FIRMWARE:raspberrypi5 ??= "standard"
+
 do_install() {
     install -d ${D}${nonarch_base_libdir}/firmware/brcm ${D}${nonarch_base_libdir}/firmware/cypress
 
@@ -34,6 +39,7 @@ do_install() {
 
     for fw in \
             brcmfmac43430-sdio \
+            brcmfmac43430b0-sdio \
             brcmfmac43436-sdio \
             brcmfmac43436s-sdio \
             brcmfmac43455-sdio \
@@ -42,6 +48,7 @@ do_install() {
     done
 
     cp -R --no-dereference --preserve=mode,links -v debian/config/brcm80211/cypress/* ${D}${nonarch_base_libdir}/firmware/cypress/
+    ln -s cyfmac43455-sdio-${CYFMAC43455_SDIO_FIRMWARE}.bin ${D}${nonarch_base_libdir}/firmware/cypress/cyfmac43455-sdio.bin
 
     rm ${D}${nonarch_base_libdir}/firmware/cypress/README.txt
 }
@@ -69,7 +76,10 @@ FILES:${PN}-bcm43430 = " \
     ${nonarch_base_libdir}/firmware/cypress/cyfmac43430-sdio.bin \
     ${nonarch_base_libdir}/firmware/cypress/cyfmac43430-sdio.clm_blob \
 "
-FILES:${PN}-bcm43436 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43436-*"
+FILES:${PN}-bcm43436 = " \
+    ${nonarch_base_libdir}/firmware/brcm/brcmfmac43436-* \
+    ${nonarch_base_libdir}/firmware/brcm/brcmfmac43430b0-* \
+"
 FILES:${PN}-bcm43436s = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43436s*"
 FILES:${PN}-bcm43439 = " \
     ${nonarch_base_libdir}/firmware/cypress/43439A0-7.95.49.00.combined \

recipes-kernel/linux/files/android-drivers.cfg

@@ -1,8 +1,3 @@
-CONFIG_ANDROID=y
-
 #CONFIG_ANDROID_BINDERFS is not set
 CONFIG_ANDROID_BINDER_IPC=y
 CONFIG_ANDROID_BINDER_DEVICES="binder"
-
-CONFIG_ASHMEM=y
-

recipes-kernel/linux/files/vc4graphics.cfg

@@ -1,4 +1,5 @@
 CONFIG_I2C_BCM2835=y
+CONFIG_I2C_BRCMSTB=y
 CONFIG_DRM=y
 CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_VC4=y

recipes-kernel/linux/linux-raspberrypi-v7_6.12.bb

@@ -0,0 +1,6 @@
+# SPDX-FileCopyrightText: Andrei Gherzan <andrei.gherzan@huawei.com>
+#
+# SPDX-License-Identifier: MIT
+
+require linux-raspberrypi-v7.inc
+require linux-raspberrypi_6.12.bb

recipes-kernel/linux/linux-raspberrypi_6.12.bb

@@ -0,0 +1,31 @@
+LINUX_VERSION ?= "6.12.1"
+LINUX_RPI_BRANCH ?= ""
+LINUX_RPI_KMETA_BRANCH ?= "yocto-6.12"
+
+SRCREV_machine = "614fa9b0b1a21c0cc320b9915393bdaa31357de9"
+SRCREV_meta = "96ce9b7ee67702aec75816c4d44a527061c418c5"
+
+KMETA = "kernel-meta"
+
+SRC_URI = " \
+    git://github.com/raspberrypi/linux.git;name=machine;nobranch=1;protocol=https \
+    git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=${LINUX_RPI_KMETA_BRANCH};destsuffix=${KMETA} \
+    file://powersave.cfg \
+    file://android-drivers.cfg \
+    "
+
+require linux-raspberrypi.inc
+
+KERNEL_DTC_FLAGS += "-@ -H epapr"
+
+RDEPENDS:${KERNEL_PACKAGE_NAME}:raspberrypi-armv7:append = " ${RASPBERRYPI_v7_KERNEL_PACKAGE_NAME}"
+RDEPENDS:${KERNEL_PACKAGE_NAME}-base:raspberrypi-armv7:append = " ${RASPBERRYPI_v7_KERNEL_PACKAGE_NAME}-base"
+RDEPENDS:${KERNEL_PACKAGE_NAME}-image:raspberrypi-armv7:append = " ${RASPBERRYPI_v7_KERNEL_PACKAGE_NAME}-image"
+RDEPENDS:${KERNEL_PACKAGE_NAME}-dev:raspberrypi-armv7:append = " ${RASPBERRYPI_v7_KERNEL_PACKAGE_NAME}-dev"
+RDEPENDS:${KERNEL_PACKAGE_NAME}-vmlinux:raspberrypi-armv7:append = " ${RASPBERRYPI_v7_KERNEL_PACKAGE_NAME}-vmlinux"
+RDEPENDS:${KERNEL_PACKAGE_NAME}-modules:raspberrypi-armv7:append = " ${RASPBERRYPI_v7_KERNEL_PACKAGE_NAME}-modules"
+RDEPENDS:${KERNEL_PACKAGE_NAME}-dbg:raspberrypi-armv7:append = " ${RASPBERRYPI_v7_KERNEL_PACKAGE_NAME}-dbg"
+
+DEPLOYDEP = ""
+DEPLOYDEP:raspberrypi-armv7 = "${RASPBERRYPI_v7_KERNEL}:do_deploy"
+do_deploy[depends] += "${DEPLOYDEP}"

recipes-kernel/linux/linux-raspberrypi_6.6.bb

@@ -1,9 +1,9 @@
-LINUX_VERSION ?= "6.6.22"
+LINUX_VERSION ?= "6.6.63"
 LINUX_RPI_BRANCH ?= "rpi-6.6.y"
 LINUX_RPI_KMETA_BRANCH ?= "yocto-6.6"
 
-SRCREV_machine = "c04af98514c26014a4f29ec87b3ece95626059bd"
-SRCREV_meta = "6a24861d6504575a4a9f92366285332d47c7e111"
+SRCREV_machine = "e442e5c1ab6bff5b5460b4fc949beb72aaf77970"
+SRCREV_meta = "52ff0d75713ce61962b325a2090bd55e216f0cf3"
 
 KMETA = "kernel-meta"
 

recipes-multimedia/gstreamer/gstreamer1.0-omx/0001-Don-t-try-to-acquire-buffer-when-src-pad-isn-t-activ.patch

@@ -1,50 +0,0 @@
-From 160181edf5fc73288abfe99fa04de4a550cd9c65 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 11 Feb 2016 12:53:20 -0800
-Subject: [PATCH] Don't try to acquire buffer when src pad isn't active
-
-From: =?UTF-8?q?Enrique=20Oca=C3=B1a=20Gonz=C3=A1lez?= <eocanha@igalia.com>
-
-This solves a race condition when setting the pipeline from PAUSE to
-NULL while the decoder loop is still running. Without this patch, the
-thread which interacts with the decode sink pad gets blocked here:
-
-  gst_element_change_state()
-  gst_element_change_state_func()
-  gst_element_pads_activate() --> Deactivating pads
-  activate_pads()
-  gst_pad_set_active()
-  gst_pad_activate_mode()
-  post_activate()
-  GST_PAD_STREAM_LOCK()
-
-while gst_omx_port_acquire_buffer() gets stalled forever in
-gst_omx_component_wait_message() waiting for a message that will never
-arrive:
-
-  gst_omx_video_dec_loop()
-  gst_omx_port_acquire_buffer()
-  gst_omx_component_wait_message()
-
----
-Upstream-Status: Pending
-
- omx/gstomxvideodec.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/omx/gstomxvideodec.c b/omx/gstomxvideodec.c
-index abe6e30..c4dc33f 100644
---- a/omx/gstomxvideodec.c
-+++ b/omx/gstomxvideodec.c
-@@ -1598,6 +1598,11 @@ gst_omx_video_dec_loop (GstOMXVideoDec * self)
-   GstOMXAcquireBufferReturn acq_return;
-   OMX_ERRORTYPE err;
- 
-+  if (!gst_pad_is_active(GST_VIDEO_DECODER_SRC_PAD (self))) {
-+    GST_DEBUG_OBJECT (self, "Src pad not active, not acquiring buffer and flushing instead");
-+      goto flushing;
-+  }
-+
- #if defined (USE_OMX_TARGET_RPI) && defined (HAVE_GST_GL)
-   port = self->eglimage ? self->egl_out_port : self->dec_out_port;
- #else

recipes-multimedia/gstreamer/gstreamer1.0-omx/0003-no-timeout-on-get-state.patch

@@ -1,26 +0,0 @@
-From 21f776bff596bc0bd09708efa6497f8bdcd065c0 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sat, 13 Feb 2016 11:42:29 -0800
-
----
-Upstream-Status: Pending
-
- omx/gstomxvideodec.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/omx/gstomxvideodec.c b/omx/gstomxvideodec.c
-index c4dc33f..ba5304f 100644
---- a/omx/gstomxvideodec.c
-+++ b/omx/gstomxvideodec.c
-@@ -2021,9 +2021,9 @@ gst_omx_video_dec_stop (GstVideoDecoder * decoder)
-   g_cond_broadcast (&self->drain_cond);
-   g_mutex_unlock (&self->drain_lock);
- 
--  gst_omx_component_get_state (self->dec, 5 * GST_SECOND);
-+  gst_omx_component_get_state (self->dec, 0);
- #if defined (USE_OMX_TARGET_RPI) && defined (HAVE_GST_GL)
--  gst_omx_component_get_state (self->egl_render, 1 * GST_SECOND);
-+  gst_omx_component_get_state (self->egl_render, 0);
- #endif
- 
-   gst_buffer_replace (&self->codec_data, NULL);

recipes-multimedia/gstreamer/gstreamer1.0-omx/0004-Properly-handle-drain-requests-while-flushing.patch

@@ -1,32 +0,0 @@
-From 140bf8548843a98b0af2ddc1765ab59c16c8994c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Enrique=20Oca=C3=B1a=20Gonz=C3=A1lez?= <eocanha@igalia.com>
-Date: Tue, 17 Nov 2015 16:51:27 +0000
-Subject: [PATCH] Properly handle drain requests while flushing
-
-Without this commit the decoder streaming thread stops without ever attending
-the drain request, leaving the decoder input thread waiting forever.
-
----
-Upstream-Status: Pending
-
- omx/gstomx.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/omx/gstomx.c b/omx/gstomx.c
-index 038ce32..5202d33 100644
---- a/omx/gstomx.c
-+++ b/omx/gstomx.c
-@@ -1011,6 +1011,13 @@ gst_omx_component_new (GstObject * parent, const gchar * core_name,
- 
-   g_mutex_lock (&comp->lock);
-   gst_omx_component_handle_messages (comp);
-+
-+  if (err != OMX_ErrorNone && comp->last_error == OMX_ErrorNone) {
-+    GST_ERROR_OBJECT (comp->parent,
-+        "Last operation returned an error. Setting last_error manually.");
-+    comp->last_error = err;
-+  }
-+
-   g_mutex_unlock (&comp->lock);
- 
-   return comp;

recipes-multimedia/gstreamer/gstreamer1.0-omx/0005-Don-t-abort-gst_omx_video_dec_set_format-if-there-s-.patch

@@ -1,36 +0,0 @@
-From cf6cf2060c5a7a7ddc0396a0c20c234fc56c79b6 Mon Sep 17 00:00:00 2001
-From: Andrei Gherzan <andrei@gherzan.ro>
-Date: Tue, 28 May 2019 18:02:24 +0100
-Subject: [PATCH] Don't abort gst_omx_video_dec_set_format() if there's a
- timeout releasing the buffers taken by the egl_render out port
-
-From 0d2ad639e6158c8023c157e206ef3ff7abdc089c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Enrique=20Oca=C3=B1a=20Gonz=C3=A1lez?=
-<eocanha@igalia.com>
-Date: Fri, 4 Dec 2015 18:39:59 +0100
-Subject: [PATCH] Don't abort gst_omx_video_dec_set_format() if there's a
-timeout releasing the buffers taken by the egl_render out port
-
-Upstream-Status: Pending
-Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
----
- omx/gstomxvideodec.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/omx/gstomxvideodec.c b/omx/gstomxvideodec.c
-index ba5304f..8bd5d3d 100644
---- a/omx/gstomxvideodec.c
-+++ b/omx/gstomxvideodec.c
-@@ -2229,7 +2229,9 @@ gst_omx_video_dec_disable (GstOMXVideoDec * self)
-       return FALSE;
-     if (gst_omx_port_wait_buffers_released (out_port,
-             1 * GST_SECOND) != OMX_ErrorNone)
-+#if !(defined (USE_OMX_TARGET_RPI) && defined (HAVE_GST_GL))
-       return FALSE;
-+#endif
-     if (!gst_omx_video_dec_deallocate_output_buffers (self))
-       return FALSE;
-     if (gst_omx_port_wait_enabled (out_port, 1 * GST_SECOND) != OMX_ErrorNone)
--- 
-2.17.1
-

recipes-multimedia/gstreamer/gstreamer1.0-omx_%.bbappend

@@ -1,12 +0,0 @@
-FILESEXTRAPATHS:prepend:rpi := "${THISDIR}/${PN}:"
-
-SRC_URI:append:rpi = " \
-    file://0001-Don-t-try-to-acquire-buffer-when-src-pad-isn-t-activ.patch \
-    file://0003-no-timeout-on-get-state.patch \
-    file://0004-Properly-handle-drain-requests-while-flushing.patch \
-    file://0005-Don-t-abort-gst_omx_video_dec_set_format-if-there-s-.patch \
-"
-
-GSTREAMER_1_0_OMX_TARGET:rpi = "rpi"
-GSTREAMER_1_0_OMX_CORE_NAME:rpi = "${libdir}/libopenmaxil.so"
-EXTRA_OEMESON:append:rpi = " -Dheader_path=${STAGING_DIR_TARGET}/usr/include/IL"

recipes-multimedia/picamera-libs/picamera-libs.bb

@@ -11,6 +11,7 @@ S = "${RPIFW_S}"
 do_install(){
     install -m 0755 -d ${D}${libdir}
     install -m 0755 ${S}/opt/vc/lib/*.so ${D}${libdir}
+    rm -f ${D}${libdir}/libGLES* ${D}${libdir}/libEGL* ${D}${libdir}/libWFC.so ${D}${libdir}/libOpenVG.so
 }
 
 FILES:${PN} = "${libdir}"

recipes-multimedia/rpidistro-ffmpeg/files/0001-avcodec-arm-sbcenc-avoid-callee-preserved-vfp-regist.patch

@@ -1,292 +0,0 @@
-From: James Cowgill <jcowgill@debian.org>
-Date: Sun, 11 Aug 2019 16:50:56 +0100
-Subject: avcodec/arm/sbcenc: avoid callee preserved vfp registers
-
-Upstream-Status: Inappropriate
-
-RPI-Distro repo clones original ffmpeg and applies patches to enable
-raspiberry pi support.
-
-When compiling FFmpeg with GCC-9, some very random segfaults were
-observed in code which had previously called down into the SBC encoder
-NEON assembly routines. This was caused by these functions clobbering
-some of the vfp callee saved registers (d8 - d15 aka q4 - q7). GCC was
-using these registers to save local variables, but after these
-functions returned, they would contain garbage.
-
-Fix by reallocating the registers in the two affected functions in
-the following way:
- ff_sbc_analyze_4_neon: q2-q5 => q8-q11, then q1-q4 => q8-q11
- ff_sbc_analyze_8_neon: q2-q9 => q8-q15
-
-The reason for using these replacements is to keep closely related
-sets of registers consecutively numbered which hopefully makes the
-code more easy to follow. Since this commit only reallocates
-registers, it should have no performance impact.
-
-Signed-off-by: James Cowgill <jcowgill@debian.org>
----
- libavcodec/arm/sbcdsp_neon.S | 220 +++++++++++++++++++++----------------------
- 1 file changed, 110 insertions(+), 110 deletions(-)
-
-diff --git a/libavcodec/arm/sbcdsp_neon.S b/libavcodec/arm/sbcdsp_neon.S
-index d83d21d..914abfb 100644
---- a/libavcodec/arm/sbcdsp_neon.S
-+++ b/libavcodec/arm/sbcdsp_neon.S
-@@ -38,49 +38,49 @@ function ff_sbc_analyze_4_neon, export=1
-         /* TODO: merge even and odd cases (or even merge all four calls to this
-          * function) in order to have only aligned reads from 'in' array
-          * and reduce number of load instructions */
--        vld1.16         {d4, d5}, [r0, :64]!
--        vld1.16         {d8, d9}, [r2, :128]!
-+        vld1.16         {d16, d17}, [r0, :64]!
-+        vld1.16         {d20, d21}, [r2, :128]!
- 
--        vmull.s16       q0, d4, d8
--        vld1.16         {d6,  d7}, [r0, :64]!
--        vmull.s16       q1, d5, d9
--        vld1.16         {d10, d11}, [r2, :128]!
-+        vmull.s16       q0, d16, d20
-+        vld1.16         {d18, d19}, [r0, :64]!
-+        vmull.s16       q1, d17, d21
-+        vld1.16         {d22, d23}, [r2, :128]!
- 
--        vmlal.s16       q0, d6, d10
--        vld1.16         {d4, d5}, [r0, :64]!
--        vmlal.s16       q1, d7, d11
--        vld1.16         {d8, d9}, [r2, :128]!
-+        vmlal.s16       q0, d18, d22
-+        vld1.16         {d16, d17}, [r0, :64]!
-+        vmlal.s16       q1, d19, d23
-+        vld1.16         {d20, d21}, [r2, :128]!
- 
--        vmlal.s16       q0, d4, d8
--        vld1.16         {d6,  d7}, [r0, :64]!
--        vmlal.s16       q1, d5, d9
--        vld1.16         {d10, d11}, [r2, :128]!
-+        vmlal.s16       q0, d16, d20
-+        vld1.16         {d18, d19}, [r0, :64]!
-+        vmlal.s16       q1, d17, d21
-+        vld1.16         {d22, d23}, [r2, :128]!
- 
--        vmlal.s16       q0, d6, d10
--        vld1.16         {d4, d5}, [r0, :64]!
--        vmlal.s16       q1, d7, d11
--        vld1.16         {d8, d9}, [r2, :128]!
-+        vmlal.s16       q0, d18, d22
-+        vld1.16         {d16, d17}, [r0, :64]!
-+        vmlal.s16       q1, d19, d23
-+        vld1.16         {d20, d21}, [r2, :128]!
- 
--        vmlal.s16       q0, d4, d8
--        vmlal.s16       q1, d5, d9
-+        vmlal.s16       q0, d16, d20
-+        vmlal.s16       q1, d17, d21
- 
-         vpadd.s32       d0, d0, d1
-         vpadd.s32       d1, d2, d3
- 
-         vrshrn.s32      d0, q0, SBC_PROTO_FIXED_SCALE
- 
--        vld1.16         {d2, d3, d4, d5}, [r2, :128]!
-+        vld1.16         {d16, d17, d18, d19}, [r2, :128]!
- 
-         vdup.i32        d1, d0[1]  /* TODO: can be eliminated */
-         vdup.i32        d0, d0[0]  /* TODO: can be eliminated */
- 
--        vmull.s16       q3, d2, d0
--        vmull.s16       q4, d3, d0
--        vmlal.s16       q3, d4, d1
--        vmlal.s16       q4, d5, d1
-+        vmull.s16       q10, d16, d0
-+        vmull.s16       q11, d17, d0
-+        vmlal.s16       q10, d18, d1
-+        vmlal.s16       q11, d19, d1
- 
--        vpadd.s32       d0, d6, d7 /* TODO: can be eliminated */
--        vpadd.s32       d1, d8, d9 /* TODO: can be eliminated */
-+        vpadd.s32       d0, d20, d21 /* TODO: can be eliminated */
-+        vpadd.s32       d1, d22, d23 /* TODO: can be eliminated */
- 
-         vst1.32         {d0, d1}, [r1, :128]
- 
-@@ -91,57 +91,57 @@ function ff_sbc_analyze_8_neon, export=1
-         /* TODO: merge even and odd cases (or even merge all four calls to this
-          * function) in order to have only aligned reads from 'in' array
-          * and reduce number of load instructions */
--        vld1.16         {d4, d5}, [r0, :64]!
--        vld1.16         {d8, d9}, [r2, :128]!
--
--        vmull.s16       q6, d4, d8
--        vld1.16         {d6,  d7}, [r0, :64]!
--        vmull.s16       q7, d5, d9
--        vld1.16         {d10, d11}, [r2, :128]!
--        vmull.s16       q8, d6, d10
--        vld1.16         {d4, d5}, [r0, :64]!
--        vmull.s16       q9, d7, d11
--        vld1.16         {d8, d9}, [r2, :128]!
--
--        vmlal.s16       q6, d4, d8
--        vld1.16         {d6,  d7}, [r0, :64]!
--        vmlal.s16       q7, d5, d9
--        vld1.16         {d10, d11}, [r2, :128]!
--        vmlal.s16       q8, d6, d10
--        vld1.16         {d4, d5}, [r0, :64]!
--        vmlal.s16       q9, d7, d11
--        vld1.16         {d8, d9}, [r2, :128]!
--
--        vmlal.s16       q6, d4, d8
--        vld1.16         {d6,  d7}, [r0, :64]!
--        vmlal.s16       q7, d5, d9
--        vld1.16         {d10, d11}, [r2, :128]!
--        vmlal.s16       q8, d6, d10
--        vld1.16         {d4, d5}, [r0, :64]!
--        vmlal.s16       q9, d7, d11
--        vld1.16         {d8, d9}, [r2, :128]!
--
--        vmlal.s16       q6, d4, d8
--        vld1.16         {d6,  d7}, [r0, :64]!
--        vmlal.s16       q7, d5, d9
--        vld1.16         {d10, d11}, [r2, :128]!
--        vmlal.s16       q8, d6, d10
--        vld1.16         {d4, d5}, [r0, :64]!
--        vmlal.s16       q9, d7, d11
--        vld1.16         {d8, d9}, [r2, :128]!
--
--        vmlal.s16       q6, d4, d8
--        vld1.16         {d6,  d7}, [r0, :64]!
--        vmlal.s16       q7, d5, d9
--        vld1.16         {d10, d11}, [r2, :128]!
--
--        vmlal.s16       q8, d6, d10
--        vmlal.s16       q9, d7, d11
--
--        vpadd.s32       d0, d12, d13
--        vpadd.s32       d1, d14, d15
--        vpadd.s32       d2, d16, d17
--        vpadd.s32       d3, d18, d19
-+        vld1.16         {d16, d17}, [r0, :64]!
-+        vld1.16         {d20, d21}, [r2, :128]!
-+
-+        vmull.s16       q12, d16, d20
-+        vld1.16         {d18, d19}, [r0, :64]!
-+        vmull.s16       q13, d17, d21
-+        vld1.16         {d22, d23}, [r2, :128]!
-+        vmull.s16       q14, d18, d22
-+        vld1.16         {d16, d17}, [r0, :64]!
-+        vmull.s16       q15, d19, d23
-+        vld1.16         {d20, d21}, [r2, :128]!
-+
-+        vmlal.s16       q12, d16, d20
-+        vld1.16         {d18, d19}, [r0, :64]!
-+        vmlal.s16       q13, d17, d21
-+        vld1.16         {d22, d23}, [r2, :128]!
-+        vmlal.s16       q14, d18, d22
-+        vld1.16         {d16, d17}, [r0, :64]!
-+        vmlal.s16       q15, d19, d23
-+        vld1.16         {d20, d21}, [r2, :128]!
-+
-+        vmlal.s16       q12, d16, d20
-+        vld1.16         {d18, d19}, [r0, :64]!
-+        vmlal.s16       q13, d17, d21
-+        vld1.16         {d22, d23}, [r2, :128]!
-+        vmlal.s16       q14, d18, d22
-+        vld1.16         {d16, d17}, [r0, :64]!
-+        vmlal.s16       q15, d19, d23
-+        vld1.16         {d20, d21}, [r2, :128]!
-+
-+        vmlal.s16       q12, d16, d20
-+        vld1.16         {d18, d19}, [r0, :64]!
-+        vmlal.s16       q13, d17, d21
-+        vld1.16         {d22, d23}, [r2, :128]!
-+        vmlal.s16       q14, d18, d22
-+        vld1.16         {d16, d17}, [r0, :64]!
-+        vmlal.s16       q15, d19, d23
-+        vld1.16         {d20, d21}, [r2, :128]!
-+
-+        vmlal.s16       q12, d16, d20
-+        vld1.16         {d18, d19}, [r0, :64]!
-+        vmlal.s16       q13, d17, d21
-+        vld1.16         {d22, d23}, [r2, :128]!
-+
-+        vmlal.s16       q14, d18, d22
-+        vmlal.s16       q15, d19, d23
-+
-+        vpadd.s32       d0, d24, d25
-+        vpadd.s32       d1, d26, d27
-+        vpadd.s32       d2, d28, d29
-+        vpadd.s32       d3, d30, d31
- 
-         vrshr.s32       q0, q0, SBC_PROTO_FIXED_SCALE
-         vrshr.s32       q1, q1, SBC_PROTO_FIXED_SCALE
-@@ -153,38 +153,38 @@ function ff_sbc_analyze_8_neon, export=1
-         vdup.i32        d1, d0[1]  /* TODO: can be eliminated */
-         vdup.i32        d0, d0[0]  /* TODO: can be eliminated */
- 
--        vld1.16         {d4, d5}, [r2, :128]!
--        vmull.s16       q6, d4, d0
--        vld1.16         {d6, d7}, [r2, :128]!
--        vmull.s16       q7, d5, d0
--        vmull.s16       q8, d6, d0
--        vmull.s16       q9, d7, d0
--
--        vld1.16         {d4, d5}, [r2, :128]!
--        vmlal.s16       q6, d4, d1
--        vld1.16         {d6, d7}, [r2, :128]!
--        vmlal.s16       q7, d5, d1
--        vmlal.s16       q8, d6, d1
--        vmlal.s16       q9, d7, d1
--
--        vld1.16         {d4, d5}, [r2, :128]!
--        vmlal.s16       q6, d4, d2
--        vld1.16         {d6, d7}, [r2, :128]!
--        vmlal.s16       q7, d5, d2
--        vmlal.s16       q8, d6, d2
--        vmlal.s16       q9, d7, d2
--
--        vld1.16         {d4, d5}, [r2, :128]!
--        vmlal.s16       q6, d4, d3
--        vld1.16         {d6, d7}, [r2, :128]!
--        vmlal.s16       q7, d5, d3
--        vmlal.s16       q8, d6, d3
--        vmlal.s16       q9, d7, d3
--
--        vpadd.s32       d0, d12, d13 /* TODO: can be eliminated */
--        vpadd.s32       d1, d14, d15 /* TODO: can be eliminated */
--        vpadd.s32       d2, d16, d17 /* TODO: can be eliminated */
--        vpadd.s32       d3, d18, d19 /* TODO: can be eliminated */
-+        vld1.16         {d16, d17}, [r2, :128]!
-+        vmull.s16       q12, d16, d0
-+        vld1.16         {d18, d19}, [r2, :128]!
-+        vmull.s16       q13, d17, d0
-+        vmull.s16       q14, d18, d0
-+        vmull.s16       q15, d19, d0
-+
-+        vld1.16         {d16, d17}, [r2, :128]!
-+        vmlal.s16       q12, d16, d1
-+        vld1.16         {d18, d19}, [r2, :128]!
-+        vmlal.s16       q13, d17, d1
-+        vmlal.s16       q14, d18, d1
-+        vmlal.s16       q15, d19, d1
-+
-+        vld1.16         {d16, d17}, [r2, :128]!
-+        vmlal.s16       q12, d16, d2
-+        vld1.16         {d18, d19}, [r2, :128]!
-+        vmlal.s16       q13, d17, d2
-+        vmlal.s16       q14, d18, d2
-+        vmlal.s16       q15, d19, d2
-+
-+        vld1.16         {d16, d17}, [r2, :128]!
-+        vmlal.s16       q12, d16, d3
-+        vld1.16         {d18, d19}, [r2, :128]!
-+        vmlal.s16       q13, d17, d3
-+        vmlal.s16       q14, d18, d3
-+        vmlal.s16       q15, d19, d3
-+
-+        vpadd.s32       d0, d24, d25 /* TODO: can be eliminated */
-+        vpadd.s32       d1, d26, d27 /* TODO: can be eliminated */
-+        vpadd.s32       d2, d28, d29 /* TODO: can be eliminated */
-+        vpadd.s32       d3, d30, d31 /* TODO: can be eliminated */
- 
-         vst1.32         {d0, d1, d2, d3}, [r1, :128]
- 

recipes-multimedia/rpidistro-ffmpeg/files/0002-Fix-build-on-powerpc-and-ppc64.patch

@@ -1,34 +0,0 @@
-From: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
-Date: Tue, 19 Jan 2021 20:35:29 +0100
-Subject: Fix build on powerpc and ppc64
-
-Upstream-Status: Inappropriate
-
-RPI-Distro repo clones original ffmpeg and applies patches to enable
-raspiberry pi support.
-
----
- libswscale/ppc/yuv2rgb_altivec.c | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/libswscale/ppc/yuv2rgb_altivec.c b/libswscale/ppc/yuv2rgb_altivec.c
-index 5365452..930ef6b 100644
---- a/libswscale/ppc/yuv2rgb_altivec.c
-+++ b/libswscale/ppc/yuv2rgb_altivec.c
-@@ -283,6 +283,16 @@ static inline void cvtyuvtoRGB(SwsContext *c, vector signed short Y,
-  * ------------------------------------------------------------------------------
-  */
- 
-+#if !HAVE_VSX
-+static inline vector unsigned char vec_xl(signed long long offset, const ubyte *addr)
-+{
-+    const vector unsigned char *v_addr = (const vector unsigned char *) (addr + offset);
-+    vector unsigned char align_perm = vec_lvsl(offset, addr);
-+
-+    return (vector unsigned char) vec_perm(v_addr[0], v_addr[1], align_perm);
-+}
-+#endif /* !HAVE_VSX */
-+
- #define DEFCSP420_CVT(name, out_pixels)                                       \
- static int altivec_ ## name(SwsContext *c, const unsigned char **in,          \
-                             int *instrides, int srcSliceY, int srcSliceH,     \

recipes-multimedia/rpidistro-ffmpeg/files/0003-avcodec-pngenc-remove-monowhite-from-apng-formats.patch

@@ -1,30 +0,0 @@
-From: Paul B Mahol <onemda@gmail.com>
-Date: Sun, 14 Feb 2021 17:20:03 +0100
-Subject: avcodec/pngenc: remove monowhite from apng formats
-
-Upstream-Status: Inappropriate
-
-RPI-Distro repo clones original ffmpeg and applies patches to enable
-raspiberry pi support.
-
-Monowhite pixel format is not supported, and it does not make sense
-to add support for it.
-
-Fixes #7989
----
- libavcodec/pngenc.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libavcodec/pngenc.c b/libavcodec/pngenc.c
-index efcae8c..eebb164 100644
---- a/libavcodec/pngenc.c
-+++ b/libavcodec/pngenc.c
-@@ -1174,7 +1174,7 @@ AVCodec ff_apng_encoder = {
-         AV_PIX_FMT_PAL8,
-         AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAY8A,
-         AV_PIX_FMT_GRAY16BE, AV_PIX_FMT_YA16BE,
--        AV_PIX_FMT_MONOBLACK, AV_PIX_FMT_NONE
-+        AV_PIX_FMT_NONE
-     },
-     .priv_class     = &apngenc_class,
- };

recipes-multimedia/rpidistro-ffmpeg/files/0005-fix-flags.diff

@@ -1,22 +0,0 @@
-Upstream-Status: Inappropriate
-
-RPI-Distro repo clones original ffmpeg and applies patches to enable
-raspiberry pi support.
-
---- a/configure
-+++ b/configure
-@@ -6471,11 +6471,9 @@ enabled mbedtls           && { check_pkg
-                                die "ERROR: mbedTLS not found"; }
- enabled mediacodec        && { enabled jni || die "ERROR: mediacodec requires --enable-jni"; }
- ( enabled rpi ||
--  enabled mmal )          && { check_lib mmal interface/mmal/mmal.h mmal_port_connect -lmmal_core -lmmal_util -lmmal_vc_client -lbcm_host ||
--                               { ! enabled cross_compile &&
--                                 add_cflags -isystem/opt/vc/include/ -isystem/opt/vc/include/interface/vmcs_host/linux -isystem/opt/vc/include/interface/vcos/pthreads -fgnu89-inline &&
--                                 add_ldflags -L/opt/vc/lib/ &&
--                                 check_lib mmal interface/mmal/mmal.h mmal_port_connect -lmmal_core -lmmal_util -lmmal_vc_client -lbcm_host -lvcos -lvcsm -lvchostif -lvchiq_arm; } ||
-+  enabled mmal )          && { { add_cflags -isystem/opt/vc/include/ -isystem/opt/vc/include/interface/vmcs_host/linux -isystem/opt/vc/include/interface/vcos/pthreads -fgnu89-inline &&
-+                               add_ldflags -L/opt/vc/lib/ &&
-+                               check_lib mmal interface/mmal/mmal.h mmal_port_connect -lmmal_core -lmmal_util -lmmal_vc_client -lbcm_host -lvcsm -lvchostif -lvchiq_arm -lvcos; } ||
-                                die "ERROR: mmal not found" &&
-                                check_func_headers interface/mmal/mmal.h "MMAL_PARAMETER_VIDEO_MAX_NUM_CALLBACKS"; }
- enabled openal            && { { for al_extralibs in "${OPENAL_LIBS}" "-lopenal" "-lOpenAL32"; do

recipes-multimedia/rpidistro-ffmpeg/files/2001-configure-setup-for-OE-core-usage.patch

@@ -1,6 +1,6 @@
-From 01e738a8f1414acd0102e432bbc15b4e603fd956 Mon Sep 17 00:00:00 2001
+From 702742f9575c87ac8c496d76daf51af7d4aaebd7 Mon Sep 17 00:00:00 2001
 From: Vincent Davis Jr <vince@underview.tech>
-Date: Thu, 8 Dec 2022 10:34:20 -0600
+Date: Sun, 9 Jun 2024 18:09:25 -0400
 Subject: [PATCH] configure: setup for OE-core usage
 
 Upstream-Status: Inappropriate
@@ -17,66 +17,63 @@ exists and we also should be using GLESv2.
 
 Update where compiler finds OMX_Core.h
 
-Only check that sdl2 version greater than 2.0.1
+Only check that sdl2 version greater than 3.0.0
 
 Signed-off-by: Vincent Davis Jr <vince@underview.tech>
 ---
- configure | 16 +++++++++-------
- 1 file changed, 9 insertions(+), 7 deletions(-)
+ configure | 14 +++++++++-----
+ 1 file changed, 9 insertions(+), 5 deletions(-)
 
 diff --git a/configure b/configure
-index 723b81f1..0c7f2654 100755
+index 7214c221..7a541e63 100755
 --- a/configure
 +++ b/configure
-@@ -5746,6 +5746,9 @@ enable_weak_pic() {
+@@ -5898,6 +5898,9 @@ enable_weak_pic() {
  }
  
  enabled pic && enable_weak_pic
 +# Set CFLAGS and LDFLAGS globally
 +add_cflags -I${sysroot}/usr/include/ -I${sysroot}/usr/include/IL -I${sysroot}/usr/include/drm
-+add_ldflags -L${sysroot}/usr/lib/
++add_ldflags -L${sysroot}/usr/lib
  
  test_cc <<EOF || die "Symbol mangling check failed."
  int ff_extern;
-@@ -6471,8 +6474,7 @@ enabled mbedtls           && { check_pkg_config mbedtls mbedtls mbedtls/x509_crt
-                                die "ERROR: mbedTLS not found"; }
+@@ -6716,8 +6719,8 @@ enabled mbedtls           && { check_pkg_config mbedtls mbedtls mbedtls/x509_crt
  enabled mediacodec        && { enabled jni || die "ERROR: mediacodec requires --enable-jni"; }
- ( enabled rpi ||
--  enabled mmal )          && { { add_cflags -isystem/opt/vc/include/ -isystem/opt/vc/include/interface/vmcs_host/linux -isystem/opt/vc/include/interface/vcos/pthreads -fgnu89-inline &&
--                               add_ldflags -L/opt/vc/lib/ &&
-+  enabled mmal )          && { { add_cflags -I${sysroot}/usr/include/interface/vmcs_host/linux -I${sysroot}/usr/include/interface/vcos/pthreads -fgnu89-inline &&
-                                check_lib mmal interface/mmal/mmal.h mmal_port_connect -lmmal_core -lmmal_util -lmmal_vc_client -lbcm_host -lvcsm -lvchostif -lvchiq_arm -lvcos; } ||
+ enabled mmal              && { check_lib mmal interface/mmal/mmal.h mmal_port_connect -lmmal_core -lmmal_util -lmmal_vc_client -lbcm_host ||
+                                { ! enabled cross_compile &&
+-                                 add_cflags -isystem/opt/vc/include/ -isystem/opt/vc/include/interface/vmcs_host/linux -isystem/opt/vc/include/interface/vcos/pthreads -fgnu89-inline &&
+-                                 add_ldflags -L/opt/vc/lib/ &&
++                                 add_cflags -I${sysroot}/usr/include -I${sysroot}/usr/include/interface/vmcs_host/linux -I${sysroot}/usr/include/interface/vcos/pthreads -fgnu89-inline &&
++                                 add_ldflags -L${sysroot}/usr/lib &&
+                                  check_lib mmal interface/mmal/mmal.h mmal_port_connect -lmmal_core -lmmal_util -lmmal_vc_client -lbcm_host; } ||
                                 die "ERROR: mmal not found" &&
                                 check_func_headers interface/mmal/mmal.h "MMAL_PARAMETER_VIDEO_MAX_NUM_CALLBACKS"; }
-@@ -6492,15 +6494,15 @@ enabled opengl            && { check_lib opengl GL/glx.h glXGetProcAddress "-lGL
+@@ -6737,12 +6740,13 @@ enabled opengl            && { check_lib opengl GL/glx.h glXGetProcAddress "-lGL
                                 check_lib opengl windows.h wglGetProcAddress "-lopengl32 -lgdi32" ||
                                 check_lib opengl OpenGL/gl3.h glGetError "-Wl,-framework,OpenGL" ||
                                 check_lib opengl ES2/gl.h glGetError "-isysroot=${sysroot} -Wl,-framework,OpenGLES" ||
-+                               check_lib opengl GLES2/gl2.h glGetError "-lGLESv2" ||
++			       check_lib opengl GLES2/gl2.h glGetError "-lGLESv2" ||
                                 die "ERROR: opengl not found."
                               }
--enabled omx_rpi           && { test_code cc OMX_Core.h OMX_IndexConfigBrcmVideoRequestIFrame ||
-+enabled omx_rpi           && { test_code cc IL/OMX_Core.h OMX_IndexConfigBrcmVideoRequestIFrame ||
+ enabled omx_rpi           && { test_code cc OMX_Core.h OMX_IndexConfigBrcmVideoRequestIFrame ||
                                 { ! enabled cross_compile &&
 -                                 add_cflags -isystem/opt/vc/include/IL &&
 -                                 test_code cc OMX_Core.h OMX_IndexConfigBrcmVideoRequestIFrame; } ||
++                                 add_cflags -I${sysroot}/usr/include/IL &&
 +                                 test_code cc IL/OMX_Core.h OMX_IndexConfigBrcmVideoRequestIFrame; } ||
                                 die "ERROR: OpenMAX IL headers from raspberrypi/firmware not found"; } &&
                               enable omx
--enabled omx               && require_headers OMX_Core.h
-+enabled omx               && require_headers IL/OMX_Core.h
- enabled openssl           && { check_pkg_config openssl openssl openssl/ssl.h OPENSSL_init_ssl ||
-                                check_pkg_config openssl openssl openssl/ssl.h SSL_library_init ||
-                                check_lib openssl openssl/ssl.h OPENSSL_init_ssl -lssl -lcrypto ||
-@@ -6540,7 +6542,7 @@ fi
+ enabled omx               && require_headers OMX_Core.h
+@@ -6788,7 +6792,7 @@ fi
  
  if enabled sdl2; then
      SDL2_CONFIG="${cross_prefix}sdl2-config"
--    test_pkg_config sdl2 "sdl2 >= 2.0.1 sdl2 < 2.1.0" SDL_events.h SDL_PollEvent
+-    test_pkg_config sdl2 "sdl2 >= 2.0.1 sdl2 < 3.0.0" SDL_events.h SDL_PollEvent
 +    test_pkg_config sdl2 "sdl2 >= 2.0.1" SDL_events.h SDL_PollEvent
      if disabled sdl2 && "${SDL2_CONFIG}" --version > /dev/null 2>&1; then
          sdl2_cflags=$("${SDL2_CONFIG}" --cflags)
          sdl2_extralibs=$("${SDL2_CONFIG}" --libs)
 -- 
-2.38.1
+2.34.1
 

recipes-multimedia/rpidistro-ffmpeg/files/2002-libavdevice-opengl_enc-update-dynamic-function-loader.patch

@@ -1,111 +0,0 @@
-From be426ad76c3e486f1364dd292cf8e1c633c80e91 Mon Sep 17 00:00:00 2001
-From: Vincent Davis Jr <vince@underview.tech>
-Date: Thu, 8 Dec 2022 10:39:47 -0600
-Subject: [PATCH] libavdevice: opengl_enc.c update dynamic function loader
-
-Upstream-Status: Inappropriate
-
-RPI-Distro repo clones original ffmpeg and applies patches to enable
-raspiberry pi support.
-
-For meta-raspberrypi ffmpeg builds, when opengl
-is enabled do_compile will fail. Reasion is that
-glGetProcAddress is undefined in either GLES2/gl2.h
-or GLES2/gl2ext.h.
-
-define SelectedGetProcAddress to SDL_GL_GetProcAddress
-if sdl2 is included. If not included, define function
-pointers at compile time versus runtime.
-
-Signed-off-by: Vincent Davis Jr <vince@underview.tech>
----
- libavdevice/opengl_enc.c | 44 ++++++++++++++++++++++++++++++++++++----
- 1 file changed, 40 insertions(+), 4 deletions(-)
-
-diff --git a/libavdevice/opengl_enc.c b/libavdevice/opengl_enc.c
-index 2bdb8da7..eabc1bf8 100644
---- a/libavdevice/opengl_enc.c
-+++ b/libavdevice/opengl_enc.c
-@@ -37,12 +37,13 @@
- #include <OpenGL/gl3.h>
- #elif HAVE_ES2_GL_H
- #include <ES2/gl.h>
--#else
--#include <GL/gl.h>
--#include <GL/glext.h>
- #endif
- #if HAVE_GLXGETPROCADDRESS
- #include <GL/glx.h>
-+#else
-+#define GL_GLEXT_PROTOTYPES
-+#include <GLES2/gl2.h>
-+#include <GLES2/gl2ext.h>
- #endif
- 
- #if CONFIG_SDL2
-@@ -493,8 +494,14 @@ static int av_cold opengl_load_procedures(OpenGLContext *opengl)
- 
- #if HAVE_GLXGETPROCADDRESS
- #define SelectedGetProcAddress glXGetProcAddress
-+#define CAN_DYNAMIC_LOAD 1
- #elif HAVE_WGLGETPROCADDRESS
- #define SelectedGetProcAddress wglGetProcAddress
-+#elif CONFIG_SDL2
-+#define SelectedGetProcAddress SDL_GL_GetProcAddress
-+#define CAN_DYNAMIC_LOAD 1
-+#else
-+#define CAN_DYNAMIC_LOAD 0
- #endif
- 
- #define LOAD_OPENGL_FUN(name, type) \
-@@ -504,7 +511,8 @@ static int av_cold opengl_load_procedures(OpenGLContext *opengl)
-         return AVERROR(ENOSYS); \
-     }
- 
--#if CONFIG_SDL2
-+#if CAN_DYNAMIC_LOAD
-+#if CONFIG_SDL2 
-     if (!opengl->no_window)
-         return opengl_sdl_load_procedures(opengl);
- #endif
-@@ -534,9 +542,37 @@ static int av_cold opengl_load_procedures(OpenGLContext *opengl)
-     LOAD_OPENGL_FUN(glGetShaderInfoLog, FF_PFNGLGETSHADERINFOLOGPROC)
-     LOAD_OPENGL_FUN(glEnableVertexAttribArray, FF_PFNGLENABLEVERTEXATTRIBARRAYPROC)
-     LOAD_OPENGL_FUN(glVertexAttribPointer, FF_PFNGLVERTEXATTRIBPOINTERPROC)
-+#else
-+    procs->glActiveTexture = glActiveTexture;
-+    procs->glGenBuffers = glGenBuffers;
-+    procs->glDeleteBuffers = glDeleteBuffers;
-+    procs->glBufferData = glBufferData;
-+    procs->glBindBuffer = glBindBuffer;
-+    procs->glGetAttribLocation = glGetAttribLocation;
-+    procs->glGetUniformLocation = glGetUniformLocation;
-+    procs->glUniform1f = glUniform1f;
-+    procs->glUniform1i = glUniform1i;
-+    procs->glUniformMatrix4fv = glUniformMatrix4fv;
-+    procs->glCreateProgram = glCreateProgram;
-+    procs->glDeleteProgram = glDeleteProgram;
-+    procs->glUseProgram = glUseProgram;
-+    procs->glLinkProgram = glLinkProgram;
-+    procs->glGetProgramiv = glGetProgramiv;
-+    procs->glGetProgramInfoLog = glGetProgramInfoLog;
-+    procs->glAttachShader = glAttachShader;
-+    procs->glCreateShader = glCreateShader;
-+    procs->glDeleteShader = glDeleteShader;
-+    procs->glCompileShader = glCompileShader;
-+    procs->glShaderSource = glShaderSource;
-+    procs->glGetShaderiv = glGetShaderiv;
-+    procs->glGetShaderInfoLog = glGetShaderInfoLog;
-+    procs->glEnableVertexAttribArray = glEnableVertexAttribArray;
-+    procs->glVertexAttribPointer = (FF_PFNGLVERTEXATTRIBPOINTERPROC) glVertexAttribPointer;
-+#endif
- 
-     return 0;
- 
-+#undef CAN_DYNAMIC_LOAD
- #undef SelectedGetProcAddress
- #undef LOAD_OPENGL_FUN
- }
--- 
-2.38.1
-

recipes-multimedia/rpidistro-ffmpeg/files/2003-libavcodec-fix-v4l2_req_devscan.patch

@@ -1,45 +0,0 @@
-From 62c2f041890a6e20770350721a0a2138d0b38634 Mon Sep 17 00:00:00 2001
-From: Vincent Davis Jr <vince@underview.tech>
-Date: Sat, 3 Dec 2022 23:35:51 -0600
-Subject: [PATCH] libavcodec: fix v4l2_req_devscan.h
-
-Upstream-Status: Inappropriate
-
-RPI-Distro repo clones original ffmpeg and applies patches to enable
-raspiberry pi support.
-
-Fixes minor differences between v4l2_req_devscan.c
-and v4l2_req_devscan.h after all patches have been
-applied.
-
-Signed-off-by: Vincent Davis Jr <vince@underview.tech>
----
- libavcodec/v4l2_req_devscan.h | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/libavcodec/v4l2_req_devscan.h b/libavcodec/v4l2_req_devscan.h
-index 0baef365..cd9c49ac 100644
---- a/libavcodec/v4l2_req_devscan.h
-+++ b/libavcodec/v4l2_req_devscan.h
-@@ -1,6 +1,8 @@
- #ifndef _DEVSCAN_H_
- #define _DEVSCAN_H_
- 
-+#include <stdint.h>
-+
- struct devscan;
- struct decdev;
- enum v4l2_buf_type;
-@@ -13,7 +15,8 @@ const char *decdev_video_path(const struct decdev *const dev);
- enum v4l2_buf_type decdev_src_type(const struct decdev *const dev);
- uint32_t decdev_src_pixelformat(const struct decdev *const dev);
- 
--const struct decdev *devscan_find(struct devscan *const scan, const uint32_t src_fmt_v4l2);
-+const struct decdev *devscan_find(struct devscan *const scan,
-+                                  const uint32_t src_fmt_v4l2);
- 
- int devscan_build(void * const dc, struct devscan **pscan);
- void devscan_delete(struct devscan **const pScan);
--- 
-2.38.1
-

recipes-multimedia/rpidistro-ffmpeg/rpidistro-ffmpeg_5.1.4.bb

@@ -33,27 +33,22 @@ RPROVIDES:${PN} = "${PROVIDES}"
 DEPENDS = "nasm-native"
 
 inherit autotools pkgconfig
-PACKAGECONFIG ??= "avdevice avfilter avcodec avformat swresample swscale postproc avresample ffplay \
+PACKAGECONFIG ??= "avdevice avfilter avcodec avformat swresample swscale postproc ffplay \
                    v4l2 drm udev alsa bzlib lzma pic pthreads shared theora zlib libvorbis x264 gpl \
-                   ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', 'mmal rpi sand vout-drm', d)} \
+                   ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', 'mmal sand vout-drm', d)} \
                    ${@bb.utils.contains('AVAILTUNES', 'mips32r2', 'mips32r2', '', d)} \
                    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'opengl', '', d)} \
-                   ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xv xcb vout-egl epoxy', '', d)}"
+                   ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xv xcb', '', d)} \
+                   ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'epoxy vout-egl', '', d)}"
 
 SRC_URI = "\
-    git://git@github.com/RPi-Distro/ffmpeg;protocol=https;branch=pios/bullseye \
-    file://0001-avcodec-arm-sbcenc-avoid-callee-preserved-vfp-regist.patch \
-    file://0002-Fix-build-on-powerpc-and-ppc64.patch \
-    file://0003-avcodec-pngenc-remove-monowhite-from-apng-formats.patch \
-    file://0004-ffmpeg-4.3.4-rpi_14.patch \
-    file://0005-fix-flags.diff \
+    git://git@github.com/RPi-Distro/ffmpeg;protocol=https;branch=pios/bookworm \
+    file://0001-ffmpeg-5.1.4-rpi_24.patch \
     file://2001-configure-setup-for-OE-core-usage.patch \
-    file://2002-libavdevice-opengl_enc-update-dynamic-function-loader.patch \
-    file://2003-libavcodec-fix-v4l2_req_devscan.patch \
     file://2004-libavcodec-omx-replace-opt-vc-path-with-usr-lib.patch \
     "
 
-SRCREV = "246e1a55a0eca931537d8706acd8b133c07beb05"
+SRCREV = "1c363463c432c5ed492c7b759abb6e015b93b6b5"
 
 S = "${WORKDIR}/git"
 
@@ -65,7 +60,7 @@ PACKAGECONFIG[avformat] = "--enable-avformat,--disable-avformat"
 PACKAGECONFIG[swresample] = "--enable-swresample,--disable-swresample"
 PACKAGECONFIG[swscale] = "--enable-swscale,--disable-swscale"
 PACKAGECONFIG[postproc] = "--enable-postproc,--disable-postproc"
-PACKAGECONFIG[avresample] = "--enable-avresample,--disable-avresample"
+#PACKAGECONFIG[avresample] = "--enable-avresample,--disable-avresample"
 
 # features to support
 PACKAGECONFIG[ffplay] = "--enable-ffplay,--disable-ffplay"
@@ -101,7 +96,6 @@ PACKAGECONFIG[epoxy] = "--enable-epoxy,--disable-epoxy,libepoxy"
 PACKAGECONFIG[v4l2] = "--enable-libv4l2 --enable-v4l2-m2m,,v4l-utils"
 PACKAGECONFIG[mmal] = "--enable-omx --enable-omx-rpi --enable-mmal,,userland"
 PACKAGECONFIG[sand] = "--enable-sand,,"
-PACKAGECONFIG[rpi] = "--enable-rpi,,"
 PACKAGECONFIG[vout-drm] = "--enable-vout-drm,,libdrm"
 PACKAGECONFIG[vout-egl] = "--enable-vout-egl,,virtual/egl"