psplash: Raise alternatives priority to 200

Alternatives priority of psplash in poky is now 100,
so we need something higher (fixes #381).

Signed-off-by: Gianluigi Tiesi <sherpya@netfarm.it>

.github/CODE_OF_CONDUCT.md

@@ -1,7 +0,0 @@
-## Code of Conduct
-
-This project has adopted the [Contributor
-Covenant](https://www.contributor-covenant.org/). For details, see the full
-text [here](https://www.contributor-covenant.org/version/2/1/code_of_conduct/).
-For more information, additional questions or comments contact the project's
-maintainers.

.github/actions/docker-build/action.yml

@@ -1,47 +0,0 @@
-# SPDX-FileCopyrightText: Andrei Gherzan <andrei.gherzan@huawei.com>
-#
-# SPDX-License-Identifier: MIT
-
-name: "Build a docker image"
-
-inputs:
-  docker_image:
-    required: true
-    description: "The name of the docker image"
-  id:
-    required: true
-    description: "Namespace for the image"
-
-runs:
-  using: "composite"
-  steps:
-    - name: Build the ${{ inputs.docker_image }} docker image
-      shell: bash
-      # We run this unconditionally even if the change doesn't touch the
-      # relevant docker files because there is a chance that another PR (or
-      # something else) rebuilt the local image. For example if the first
-      # version of the PR included change for the relevant docker image but a
-      # subsequent push to the PR branch dropped them. In this way we rebuild
-      # the image to avoid using the changes from the previous push.
-      run: |
-        cd .github/workflows/docker-images/
-        # We build a temporary image namespaced by the PR number so we can
-        # handle multiple runners on the same host using the same docker
-        # storage.
-        tries=3
-        n=1
-        until [ "$n" -gt "$tries" ]; do
-          echo "Building the docker image ${{ inputs.docker_image }}-${{ inputs.id }}... try $n..."
-          if docker build --no-cache . -f "${{ inputs.docker_image }}/Dockerfile" -t "${{ inputs.docker_image }}-${{ inputs.id }}"; then
-            # This can fail if a dangling images cleaning job runs in
-            # parallel. So we try this a couple of times to minimize
-            # conflict. This is because while building, docker creates a
-            # untagged image first (dangling) before tagging it at the end.
-            # If between these two operations a dangling cleanup happens,
-            # build fails.
-            break
-          fi
-          n=$((n+1))
-        done
-        [ "$n" -lt "$tries" ]
-        echo "Temporary image built in ${{ inputs.docker_image }}."

.github/actions/docker-clean-dangling/action.yml

@@ -1,18 +0,0 @@
-# SPDX-FileCopyrightText: Andrei Gherzan <andrei.gherzan@huawei.com>
-#
-# SPDX-License-Identifier: MIT
-
-name: "Cleanup dangling docker images"
-
-runs:
-  using: "composite"
-  steps:
-    - name: Cleanup dangling images
-      shell: bash
-      run: |
-        echo -n "Cleanup dangling images... "
-        if ! docker rmi $(docker images --filter "dangling=true" -q --no-trunc) > /dev/null 2>&1; then
-          echo "no dangling images found."
-        else
-          echo "done."
-        fi

.github/actions/docker-clean-image/action.yml

@@ -1,19 +0,0 @@
-# SPDX-FileCopyrightText: Andrei Gherzan <andrei.gherzan@huawei.com>
-#
-# SPDX-License-Identifier: MIT
-
-name: "Cleanup docker storage"
-
-inputs:
-  docker_image:
-    required: true
-    description: "The name of the docker image"
-
-runs:
-  using: "composite"
-  steps:
-    - name: Cleanup temporary image
-      shell: bash
-      run: |
-        echo "Cleanup ${{ inputs.docker_image }} image..."
-        docker rmi "${{ inputs.docker_image }}" || true

.github/workflows/cancel-redundant-workflows.yml

@@ -1,23 +0,0 @@
-# SPDX-FileCopyrightText: Andrei Gherzan <andrei.gherzan@huawei.com>
-#
-# SPDX-License-Identifier: MIT
-
-name: Cancel redundant workflows
-
-on:
-  workflow_run:
-    workflows:
-      - "Builds"
-      - "Compliance"
-      - "Yocto Compatible"
-    types:
-      - requested
-
-jobs:
-  cancel-redundant-workflows:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: styfle/cancel-workflow-action@0.10.0
-      with:
-        all_but_latest: true
-        workflow_id: ${{ github.event.workflow.id }}

.github/workflows/compliance.yml

@@ -1,49 +0,0 @@
-# SPDX-FileCopyrightText: Andrei Gherzan <andrei.gherzan@huawei.com>
-#
-# SPDX-License-Identifier: MIT
-
-name: Compliance
-
-on:
-  pull_request:
-
-jobs:
-  dco:
-    name: DCO
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout the code
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - name: Build a temporary DCO image
-        uses: ./.github/actions/docker-build
-        with:
-          docker_image: dco-check
-          id: ${{ github.event.number }}
-      - name: Do DCO check
-        run: |
-          docker run --rm --security-opt apparmor=unconfined \
-            --security-opt seccomp=unconfined \
-            -v "$GITHUB_WORKSPACE:/work:ro" \
-            --env "BASE_REF=$GITHUB_BASE_REF" \
-            "dco-check-${{ github.event.number }}"
-      - name: Cleanup temporary docker image
-        uses: ./.github/actions/docker-clean-image
-        with:
-          docker_image: dco-check-${{ github.event.number }}
-        if: always()
-      - name: Cleanup dangling docker images
-        uses: ./.github/actions/docker-clean-dangling
-        if: always()
-  reuse:
-    name: reuse
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout the code
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - name: Do reuse check
-        continue-on-error: true
-        uses: fsfe/reuse-action@v1

.github/workflows/docker-images/README.md

@@ -1,21 +0,0 @@
-<!--
-SPDX-FileCopyrightText: Andrei Gherzan <andrei.gherzan@huawei.com>
-
-SPDX-License-Identifier: MIT
--->
-
-# Docker images for CI
-
-Each directory contains the files for a docker image.
-
-## Building an image
-
-When building a docker image, the build context is expected to be where this
-`README.md` file resides. This means that building the images will require
-passing the appropriate `-f` argument.
-
-Here is an example for building the `dco-check` image:
-
-```
-docker build --no-cache . -f dco-check/Dockerfile -t dco-check
-```

.github/workflows/docker-images/dco-check/Dockerfile

@@ -1,13 +0,0 @@
-# SPDX-FileCopyrightText: Andrei Gherzan <andrei.gherzan@huawei.com>
-#
-# SPDX-License-Identifier: MIT
-
-FROM christophebedard/dco-check:latest
-
-# Run under normal user called 'ci'
-RUN useradd --create-home --uid 1000 --shell /usr/bin/bash ci
-USER ci
-
-COPY ./dco-check/entrypoint.sh /
-COPY ./utils.sh /
-ENTRYPOINT ["/entrypoint.sh"]

.github/workflows/docker-images/dco-check/README.md

@@ -1,16 +0,0 @@
-<!--
-SPDX-FileCopyrightText: Andrei Gherzan <andrei.gherzan@huawei.com>
-
-SPDX-License-Identifier: MIT
--->
-
-# Docker image for DCO checks
-
-This image provides the environment and the logic of running a DCO check
-against a repository.
-
-## Configuration
-
-The `entrypoint.sh` script assumes at runtime that the repository to be checked
-is available under `/work`. This path is to be populated via bind mounts when
-running the container.

.github/workflows/docker-images/dco-check/entrypoint.sh

@@ -1,29 +0,0 @@
-#!/bin/sh
-
-# SPDX-FileCopyrightText: Andrei Gherzan <andrei.gherzan@huawei.com>
-#
-# SPDX-License-Identifier: MIT
-
-set -e
-
-# shellcheck disable=SC1091
-. /utils.sh
-
-GIT_REPO_PATH="/work"
-
-[ -n "$BASE_REF" ] ||
-	error "DCO checks needs to know the target branch. Make sure that is set in BASE_REF."
-[ -d "$GIT_REPO_PATH/.git" ] ||
-	error "Can't find a git checkout under $GIT_REPO_PATH ."
-cd "$GIT_REPO_PATH"
-
-# The GitHub runner user and the container user might differ making git error
-# out with:
-# 	error: fatal: detected dubious ownership in repository at '/work'
-# Avoid this as the security risk is minimum here while guarding the git hooks
-# via PRs.
-git config --global --add safe.directory /work
-
-dco-check \
-	--verbose \
-	--default-branch "origin/$BASE_REF"

.github/workflows/docker-images/utils.sh

@@ -1,28 +0,0 @@
-#!/bin/sh
-
-# SPDX-FileCopyrightText: Andrei Gherzan <andrei.gherzan@huawei.com>
-#
-# SPDX-License-Identifier: MIT
-
-_log() {
-	_level="$1"
-	_msg="$2"
-	echo "[$_level] $_msg"
-}
-
-error() {
-	_msg="$1"
-	_log "ERR" "$1"
-	exit 1
-}
-
-warn() {
-	_msg="$1"
-	_log "WRN" "$1"
-	exit 1
-}
-
-log() {
-	_msg="$1"
-	_log "LOG" "$1"
-}

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

@@ -1,43 +0,0 @@
-# SPDX-FileCopyrightText: Andrei Gherzan <andrei.gherzan@huawei.com>
-#
-# SPDX-License-Identifier: MIT
-
-FROM ubuntu:22.04
-
-ARG DEBIAN_FRONTEND="noninteractive"
-RUN apt-get update -qq
-RUN apt-get install -y eatmydata
-
-# Yocto/OE build host dependencies
-# Keep this in sync with
-# https://git.yoctoproject.org/poky/tree/documentation/poky.yaml.in
-# https://git.yoctoproject.org/poky/tree/documentation/tools/host_packages_scripts/ubuntu_essential.sh
-RUN eatmydata apt-get install -qq -y \
-	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
-
-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
-
-# Fix the resource exhaustion problem on the build infrastructure
-RUN echo 'vm.max_map_count = 4048576' >> /etc/sysctl.conf
-
-# Run under normal user called 'ci'
-RUN useradd --create-home --uid 1000 --shell /usr/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 /

.github/workflows/docker-images/yocto-builder/README.md

@@ -1,16 +0,0 @@
-<!--
-SPDX-FileCopyrightText: Andrei Gherzan <andrei.gherzan@huawei.com>
-
-SPDX-License-Identifier: MIT
--->
-
-# Docker image for builds
-
-This defines the docker image for running Yocto/OE based operations/builds. It
-privides multiple scripts for driving different operations.
-
-## Configuration
-
-The `entrypoint` scripts assumes at runtime that the repository to drive the
-operation against is available under `/work`. This path is to be populated via
-bind mounts when running the container.

.github/workflows/docker-images/yocto-builder/entrypoint-build.sh

@@ -1,68 +0,0 @@
-#!/bin/sh
-
-# SPDX-FileCopyrightText: Andrei Gherzan <andrei.gherzan@huawei.com>
-#
-# SPDX-License-Identifier: MIT
-
-set -ex
-
-# shellcheck disable=SC1091
-. /utils.sh
-
-META_RASPBERRYPI_PATH="/work"
-
-[ -n "$BASE_REF" ] ||
-    error "Target branch is needed. Make sure that is set in BASE_REF."
-[ -d "$META_RASPBERRYPI_PATH/.git" ] ||
-    error "Can't find a git checkout under $META_RASPBERRYPI_PATH ."
-[ -n "$MACHINE" ] ||
-    error "Machine to be used for build not provided."
-[ -n "$IMAGE" ] ||
-    error "Image to build not provided."
-
-TEMP_DIR="$(mktemp -d)"
-cd "$TEMP_DIR"
-
-REPOS=" \
-    git://git.openembedded.org/openembedded-core \
-    git://git.openembedded.org/bitbake \
-    git://git.yoctoproject.org/meta-yocto \
-"
-for repo in $REPOS; do
-    log "Cloning $repo on branch $BASE_REF..."
-    git clone --depth 1 --branch "$BASE_REF" "$repo"
-done
-
-# shellcheck disable=SC1091,SC2240
-. ./openembedded-core/oe-init-build-env build
-
-# Build configuration
-printf "\n# ------ ci ------\n" >> conf/local.conf
-[ -z "$SSTATE_DIR" ] || echo SSTATE_DIR = \""$SSTATE_DIR"\" >> conf/local.conf
-[ -z "$DL_DIR" ] || echo DL_DIR = \""$DL_DIR"\" >> conf/local.conf
-[ -z "$DISTRO" ] || echo DISTRO = \""$DISTRO"\" >> conf/local.conf
-cat <<EOCONF >>conf/local.conf
-BB_NUMBER_THREADS = "6"
-PARALLEL_MAKE = "-j 6"
-# unmerged-usr is deprecated
-# https://lore.kernel.org/all/3f2f03085301d22854e5429019fb010f27d98bc7.camel@linuxfoundation.org/t/
-DISTRO_FEATURES:append = " systemd usrmerge"
-VIRTUAL-RUNTIME_init_manager = "systemd"
-DISTRO_FEATURES_BACKFILL_CONSIDERED:append = " sysvinit"
-VIRTUAL-RUNTIME_initscripts = "systemd-compat-units"
-LICENSE_FLAGS_ACCEPTED = "synaptics-killswitch"
-EOCONF
-
-# Add the BSP layer
-bitbake-layers add-layer "../meta-yocto/meta-poky"
-bitbake-layers add-layer "../meta-yocto/meta-yocto-bsp"
-bitbake-layers add-layer "$META_RASPBERRYPI_PATH"
-
-# Log configs for debugging purposes
-for f in 'conf/local.conf' 'conf/bblayers.conf'; do
-    printf "\n------ %s ------\n" "$f"
-    cat "$f"
-done
-
-# Fire!
-MACHINE="$MACHINE" bitbake "$IMAGE"

.github/workflows/docker-images/yocto-builder/entrypoint-yocto-check-layer.sh

@@ -1,34 +0,0 @@
-#!/bin/sh
-
-# SPDX-FileCopyrightText: Andrei Gherzan <andrei.gherzan@huawei.com>
-#
-# SPDX-License-Identifier: MIT
-
-set -ex
-
-# shellcheck disable=SC1091
-. /utils.sh
-
-GIT_REPO_PATH="/work"
-
-[ -n "$BASE_REF" ] ||
-    error "Target branch is needed. Make sure that is set in BASE_REF."
-[ -d "$GIT_REPO_PATH/.git" ] ||
-    error "Can't find a git checkout under $GIT_REPO_PATH ."
-
-TEMP_DIR="$(mktemp -d)"
-cd "$TEMP_DIR"
-
-REPOS=" \
-    git://git.openembedded.org/openembedded-core \
-    git://git.openembedded.org/bitbake \
-"
-for repo in $REPOS; do
-    log "Cloning $repo on branch $BASE_REF..."
-    git clone --depth 1 --branch "$BASE_REF" "$repo"
-done
-
-# shellcheck disable=SC1091,SC2240
-. ./openembedded-core/oe-init-build-env build
-yocto-check-layer --with-software-layer-signature-check --debug \
-    "$GIT_REPO_PATH"

.github/workflows/mirror.yml

@@ -1,22 +0,0 @@
-# SPDX-FileCopyrightText: Andrei Gherzan <andrei.gherzan@huawei.com>
-#
-# SPDX-License-Identifier: MIT
-
-name: Mirrors
-
-on: [ push, delete, create ]
-
-concurrency:
-  group: git-mirror-me
-
-jobs:
-  yocto-mirror:
-    name: Yocto Git Mirror
-    runs-on: ubuntu-latest
-    steps:
-      - uses: agherzan/git-mirror-me-action@11f54c7186724daafbe5303b5075954f1a19a63e
-        env:
-          GMM_SSH_PRIVATE_KEY: ${{ secrets.YOCTO_META_RASPBERRYPI_SSH_PRIVATE_KEY }}
-          GMM_SSH_KNOWN_HOSTS: ${{ secrets.YOCTO_META_RASPBERRYPI_SSH_KNOWN_HOSTS }}
-          GMM_DST_REPO: "ssh://git@push.yoctoproject.org/meta-raspberrypi"
-          GMM_DEBUG: "1"

.github/workflows/yocto-builds.yml

@@ -1,92 +0,0 @@
-# SPDX-FileCopyrightText: Andrei Gherzan <andrei.gherzan@huawei.com>
-#
-# SPDX-License-Identifier: MIT
-
----
-
-name: Builds
-
-on:
-  pull_request:
-
-jobs:
-  build:
-    strategy:
-      fail-fast: true
-      matrix:
-        machine:
-          - raspberrypi
-          - raspberrypi0-2w-64
-          - raspberrypi0-2w
-          - raspberrypi0
-          - raspberrypi0-wifi
-          - raspberrypi2-64
-          - raspberrypi2
-          - raspberrypi3-64
-          - raspberrypi3
-          - raspberrypi4-64
-          - raspberrypi4
-          - raspberrypi5
-          - raspberrypi-cm3
-          - raspberrypi-cm
-          - raspberrypi-armv7
-          - raspberrypi-armv8
-        image: [rpi-test-image]
-        distro: [poky]
-    runs-on: [self-hosted, Linux]
-    name: ${{ matrix.machine }}/${{ matrix.image }}/poky/systemd
-    env:
-      DL_DIR: /var/lib/ci/yocto/downloads
-      SSTATE_DIR: /var/lib/ci/yocto/sstate
-    steps:
-      - name: Checkout the code
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - name: Define Yocto build files
-        id: changed-files-specific
-        uses: tj-actions/changed-files@v24
-        with:
-          files: |
-            .github/actions/**
-            .github/workflows/docker-images/yocto-builder/**
-            .github/workflows/docker-images/*.sh
-            .github/workflows/yocto-builds.yml
-            classes/**
-            conf/**
-            dynamic-layers/**
-            files/**
-            lib/**
-            recipes-**
-            wic/**
-      - name: Build a temporary yocto-builder image
-        uses: ./.github/actions/docker-build
-        with:
-          docker_image: yocto-builder
-          id: ${{ github.event.number }}
-        if: steps.changed-files-specific.outputs.any_changed == 'true'
-      - name: Build the image
-        run: |
-          docker run --rm --security-opt apparmor=unconfined \
-            --security-opt seccomp=unconfined \
-            -v "$GITHUB_WORKSPACE:/work:ro" \
-            -v "$DL_DIR:$DL_DIR:rw" \
-            -v "$SSTATE_DIR:$SSTATE_DIR:rw" \
-            --env "BASE_REF=$GITHUB_BASE_REF" \
-            --env "MACHINE=${{ matrix.machine }}" \
-            --env "DISTRO=${{ matrix.distro }}" \
-            --env "IMAGE=${{ matrix.image }}" \
-            --env "DL_DIR=$DL_DIR" \
-            --env "SSTATE_DIR=$SSTATE_DIR" \
-            --ulimit "nofile=1024:1048576" \
-            "yocto-builder-${{ github.event.number }}" \
-            /entrypoint-build.sh
-        if: steps.changed-files-specific.outputs.any_changed == 'true'
-      - name: Cleanup temporary docker image
-        uses: ./.github/actions/docker-clean-image
-        with:
-          docker_image: yocto-builder-${{ github.event.number }}
-        if: always()
-      - name: Cleanup dangling docker images
-        uses: ./.github/actions/docker-clean-dangling
-        if: always()

.github/workflows/yocto-layer.yml

@@ -1,58 +0,0 @@
-# SPDX-FileCopyrightText: Andrei Gherzan <andrei.gherzan@huawei.com>
-#
-# SPDX-License-Identifier: MIT
-
----
-
-name: Yocto Compatible
-
-on:
-  pull_request:
-
-jobs:
-  yocto-check-layer:
-    name: Validate with yocto-check-layer
-    runs-on: [self-hosted, Linux]
-    steps:
-      - name: Checkout the code
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - name: Define Yocto build files
-        id: changed-files-specific
-        uses: tj-actions/changed-files@v24
-        with:
-          files: |
-            .github/actions/**
-            .github/workflows/docker-images/yocto-builder/**
-            .github/workflows/docker-images/*.sh
-            .github/workflows/yocto-builds.yml
-            classes/**
-            conf/**
-            dynamic-layers/**
-            files/**
-            lib/**
-            recipes-**
-            wic/**
-      - name: Build a temporary yocto-builder image
-        uses: ./.github/actions/docker-build
-        with:
-          docker_image: yocto-builder
-          id: ${{ github.event.number }}
-        if: steps.changed-files-specific.outputs.any_changed == 'true'
-      - name: Run yocto-check-layer
-        run: |
-          docker run --rm --security-opt apparmor=unconfined \
-            -v "$GITHUB_WORKSPACE:/work:ro" \
-            --env "BASE_REF=$GITHUB_BASE_REF" \
-            "yocto-builder-${{ github.event.number }}" \
-            /entrypoint-yocto-check-layer.sh
-        if: steps.changed-files-specific.outputs.any_changed == 'true'
-      - name: Cleanup temporary docker image
-        uses: ./.github/actions/docker-clean-image
-        with:
-          docker_image: yocto-builder-${{ github.event.number }}
-        if: always()
-      - name: Cleanup dangling docker images
-        uses: ./.github/actions/docker-clean-dangling
-        if: always()

.gitignore

@@ -5,5 +5,3 @@ build*
 *.rej
 *.log
 docs/_build
-/layers
-*.pyc

.readthedocs.yaml

@@ -1,11 +0,0 @@
-version: 2
-
-sphinx:
-  configuration: docs/conf.py
-build:
-  os: ubuntu-22.04
-  tools:
-    python: "3.7"
-python:
-  install:
-    - requirements: docs/requirements.txt

README.md

@@ -2,31 +2,16 @@
 
 Yocto BSP layer for the Raspberry Pi boards - <http://www.raspberrypi.org/>.
 
-[![Documentation Status](https://readthedocs.org/projects/meta-raspberrypi/badge/?version=latest)](https://meta-raspberrypi.readthedocs.io/en/latest/?badge=latest)
-[![Matrix](https://img.shields.io/badge/chat-meta--raspberrypi-brightgreen)](https://matrix.to/#/#meta-raspberrypi:matrix.org)
-
-<table border="0" rules="none">
-<tr border="0">
-<td width="140" height="100" align="center">
-  <br />
-  <a href="https://www.yoctoproject.org/ecosystem/branding/">
-    <img alt="Yocto Project Layer Compatible" src="img/LF_17_02_Yocto-Badge-Update_Compatible_Final_Blank.png">
-  </a>
-</td>
-<td width="150" height="100" align="center">
-  Sponsored by:<br />
-  <a href="https://balena.io">
-    <img alt="balena.io" src="img/balena.png">
-  </a>
-</td>
-</tr>
-</table>
+[![Build Status](https://yocto-ci.resin.io/job/meta-raspberrypi1/badge/icon)](https://yocto-ci.resin.io/job/meta-raspberrypi1)
+[![Build Status](https://yocto-ci.resin.io/job/meta-raspberrypi2/badge/icon)](https://yocto-ci.resin.io/job/meta-raspberrypi2)
+[![Build Status](https://yocto-ci.resin.io/job/meta-raspberrypi3/badge/icon)](https://yocto-ci.resin.io/job/meta-raspberrypi3)
+[![Gitter chat](https://badges.gitter.im/gitterHQ/gitter.png)](https://gitter.im/agherzan/meta-raspberrypi)
 
 ## Quick links
 
 * Git repository web frontend:
   <https://github.com/agherzan/meta-raspberrypi>
-* Mailing list (yocto mailing list): <yocto@lists.yoctoproject.org>
+* Mailing list (yocto mailing list): <yocto@yoctoproject.org>
 * Issues management (Github Issues):
   <https://github.com/agherzan/meta-raspberrypi/issues>
 * Documentation: <http://meta-raspberrypi.readthedocs.io/en/latest/>
@@ -41,69 +26,31 @@ The core BSP part of meta-raspberrypi should work with different
 OpenEmbedded/Yocto distributions and layer stacks, such as:
 
 * Distro-less (only with OE-Core).
-* Yoe Disto (Video and Camera Products).
+* Angstrom.
 * Yocto/Poky (main focus of testing).
 
-## Yocto Project Compatible Layer
-
-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/development/yocto-project-compatible-layers/).
-
 ## Dependencies
 
 This layer depends on:
-* URI: https://git.openembedded.org/bitbake
+
+* URI: git://git.yoctoproject.org/poky
   * branch: master
   * revision: HEAD
 
-* URI: https://git.openembedded.org/openembedded-core
-  * branch: master
-  * revision: HEAD
-
-* URI: https://git.yoctoproject.org/meta-yocto
+* URI: git://git.openembedded.org/meta-openembedded
+  * layers: meta-oe, meta-multimedia, meta-networking, meta-python
   * branch: master
   * revision: HEAD
 
 ## Quick Start
 
-1. source openembedded-core/oe-init-build-env rpi-build
+1. source poky/oe-init-build-env rpi-build
 2. Add this layer to bblayers.conf and the dependencies above
 3. Set MACHINE in local.conf to one of the supported boards
 4. bitbake core-image-base
-5. Use bmaptool to copy the generated .wic.bz2 file to the SD card
-6. Boot your RPI
-
-## Quick Start with kas
-
-1. Install kas build tool from PyPi (sudo pip3 install kas)
-2. Set the `machine: ` in kas-poky-rpi.yml to one of the supported boards (see conf/machine/*.conf)
-3. kas build meta-raspberrypi/kas-poky-rpi.yml
-4. Use bmaptool to copy the generated .wic.bz2 file to the SD card
-5. Boot your RPI
-
-To adjust the build configuration with specific options (I2C, SPI, ...), simply add
-a section as follows:
-
-```
-local_conf_header:
-  rpi-specific: |
-    ENABLE_I2C = "1"
-    RPI_EXTRA_CONFIG = "dtoverlay=disable-bt"
-```
-
-To configure the machine, you have to update the `machine` variable.
-And the same for the `distro`.
-
-For further information, you can read more at <https://kas.readthedocs.io/en/latest/index.html>
-
-## Contributing
-
-You can send patches using the GitHub pull request process or/and through the
-Yocto mailing list. Refer to the
-[documentation](https://meta-raspberrypi.readthedocs.io/en/latest/contributing.html)
-for more information.
+5. dd to a SD card the generated sdimg file (use xzcat if rpi-sdimg.xz is used)
+6. Boot your RPI.
 
 ## Maintainers
 
-* Andrei Gherzan `<andrei at gherzan.com>`
+* Andrei Gherzan `<andrei at gherzan.ro>`

SECURITY.md

@@ -1,20 +0,0 @@
-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.

classes/sdcard_image-rpi.bbclass

@@ -13,25 +13,31 @@ inherit image_types
 #                                                     Default Free space = 1.3x
 #                                                     Use IMAGE_OVERHEAD_FACTOR to add more space
 #                                                     <--------->
-#            4MiB              48MiB           SDIMG_ROOTFS
+#            4MiB              40MiB           SDIMG_ROOTFS
 # <-----------------------> <----------> <---------------------->
 #  ------------------------ ------------ ------------------------
 # | IMAGE_ROOTFS_ALIGNMENT | BOOT_SPACE | ROOTFS_SIZE            |
 #  ------------------------ ------------ ------------------------
 # ^                        ^            ^                        ^
 # |                        |            |                        |
-# 0                      4MiB     4MiB + 48MiB       4MiB + 48Mib + SDIMG_ROOTFS
+# 0                      4MiB     4MiB + 40MiB       4MiB + 40Mib + SDIMG_ROOTFS
 
 # This image depends on the rootfs image
-IMAGE_TYPEDEP:rpi-sdimg = "${SDIMG_ROOTFS_TYPE}"
+IMAGE_TYPEDEP_rpi-sdimg = "${SDIMG_ROOTFS_TYPE}"
+
+# Set kernel and boot loader
+IMAGE_BOOTLOADER ?= "bcm2835-bootfiles"
+
+# Kernel image name
+SDIMG_KERNELIMAGE_raspberrypi  ?= "kernel.img"
+SDIMG_KERNELIMAGE_raspberrypi2 ?= "kernel7.img"
+SDIMG_KERNELIMAGE_raspberrypi3-64 ?= "kernel8.img"
 
 # Boot partition volume id
-# Shorten raspberrypi to just rpi to keep it under 11 characters
-# now enforced by mkfs.vfat from dosfstools-4.2
-BOOTDD_VOLUME_ID ?= "${@d.getVar('MACHINE').replace('raspberrypi', 'rpi')}"
+BOOTDD_VOLUME_ID ?= "${MACHINE}"
 
 # Boot partition size [in KiB] (will be rounded up to IMAGE_ROOTFS_ALIGNMENT)
-BOOT_SPACE ?= "49152"
+BOOT_SPACE ?= "40960"
 
 # Set alignment to 4MB [in KiB]
 IMAGE_ROOTFS_ALIGNMENT = "4096"
@@ -43,24 +49,27 @@ SDIMG_ROOTFS = "${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.${SDIMG_ROOTFS_TYPE}"
 # For the names of kernel artifacts
 inherit kernel-artifact-names
 
-RPI_SDIMG_EXTRA_DEPENDS ?= ""
-
 do_image_rpi_sdimg[depends] = " \
     parted-native:do_populate_sysroot \
     mtools-native:do_populate_sysroot \
     dosfstools-native:do_populate_sysroot \
     virtual/kernel:do_deploy \
-    rpi-bootfiles:do_deploy \
-    ${@bb.utils.contains('MACHINE_FEATURES', 'armstub', 'armstubs:do_deploy', '' ,d)} \
+    ${IMAGE_BOOTLOADER}:do_deploy \
     ${@bb.utils.contains('RPI_USE_U_BOOT', '1', 'u-boot:do_deploy', '',d)} \
-    ${@bb.utils.contains('RPI_USE_U_BOOT', '1', 'u-boot-default-script:do_deploy', '',d)} \
-    ${RPI_SDIMG_EXTRA_DEPENDS} \
+    ${@bb.utils.contains('RPI_USE_U_BOOT', '1', 'rpi-u-boot-scr:do_deploy', '',d)} \
 "
 
 do_image_rpi_sdimg[recrdeps] = "do_build"
 
 # SD card image name
-SDIMG = "${IMGDEPLOYDIR}/${IMAGE_NAME}.rpi-sdimg"
+SDIMG = "${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.rpi-sdimg"
+
+# Compression method to apply to SDIMG after it has been created. Supported
+# compression formats are "gzip", "bzip2" or "xz". The original .rpi-sdimg file
+# is kept and a new compressed file is created if one of these compression
+# formats is chosen. If SDIMG_COMPRESSION is set to any other value it is
+# silently ignored.
+#SDIMG_COMPRESSION ?= ""
 
 # Additional files and/or directories to be copied into the vfat partition from the IMAGE_ROOTFS.
 FATPAYLOAD ?= ""
@@ -70,7 +79,19 @@ SDIMG_VFAT_DEPLOY ?= "${RPI_USE_U_BOOT}"
 SDIMG_VFAT = "${IMAGE_NAME}.vfat"
 SDIMG_LINK_VFAT = "${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.vfat"
 
-IMAGE_CMD:rpi-sdimg () {
+def split_overlays(d, out, ver=None):
+    dts = d.getVar("KERNEL_DEVICETREE")
+    # Device Tree Overlays are assumed to be suffixed by '-overlay.dtb' (4.1.x) or by '.dtbo' (4.4.9+) string and will be put in a dedicated folder
+    if out:
+        overlays = oe.utils.str_filter_out('\S+\-overlay\.dtb$', dts, d)
+        overlays = oe.utils.str_filter_out('\S+\.dtbo$', overlays, d)
+    else:
+        overlays = oe.utils.str_filter('\S+\-overlay\.dtb$', dts, d) + \
+                   " " + oe.utils.str_filter('\S+\.dtbo$', dts, d)
+
+    return overlays
+
+IMAGE_CMD_rpi-sdimg () {
 
     # Align partitions
     BOOT_SPACE_ALIGNED=$(expr ${BOOT_SPACE} + ${IMAGE_ROOTFS_ALIGNMENT} - 1)
@@ -80,7 +101,7 @@ IMAGE_CMD:rpi-sdimg () {
     echo "Creating filesystem with Boot partition ${BOOT_SPACE_ALIGNED} KiB and RootFS $ROOTFS_SIZE KiB"
 
     # Check if we are building with device tree support
-    DTS="${@make_dtb_boot_files(d)}"
+    DTS="${KERNEL_DEVICETREE}"
 
     # Initialize sdcard image file
     dd if=/dev/zero of=${SDIMG} bs=1024 count=0 seek=${SDIMG_SIZE}
@@ -98,70 +119,48 @@ IMAGE_CMD:rpi-sdimg () {
     BOOT_BLOCKS=$(LC_ALL=C parted -s ${SDIMG} unit b print | awk '/ 1 / { print substr($4, 1, length($4 -1)) / 512 /2 }')
     rm -f ${WORKDIR}/boot.img
     mkfs.vfat -F32 -n "${BOOTDD_VOLUME_ID}" -S 512 -C ${WORKDIR}/boot.img $BOOT_BLOCKS
-    mcopy -v -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${BOOTFILES_DIR_NAME}/* ::/ || bbfatal "mcopy cannot copy ${DEPLOY_DIR_IMAGE}/${BOOTFILES_DIR_NAME}/* into boot.img"
-    if [ "${@bb.utils.contains("MACHINE_FEATURES", "armstub", "1", "0", d)}" = "1" ]; then
-        mcopy -v -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/armstubs/${ARMSTUB} ::/ || bbfatal "mcopy cannot copy ${DEPLOY_DIR_IMAGE}/armstubs/${ARMSTUB} into boot.img"
-    fi
+    mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/* ::/
     if test -n "${DTS}"; then
-        # Copy board device trees (including overlays)
-        # There is an assumption here - no DTB in other directories than root
-        # and root/overlays. mmd/mcopy are not very flexible tools.
+        # Copy board device trees to root folder
+        for dtbf in ${@split_overlays(d, True)}; do
+            dtb=`basename $dtbf`
+            mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/$dtb ::$dtb
+        done
+
+        # Copy device tree overlays to dedicated folder
         mmd -i ${WORKDIR}/boot.img overlays
-        for entry in ${DTS} ; do
-            # Split entry at optional ';'
-            if [ $(echo "$entry" | grep -c \;) = "0" ] ; then
-                DEPLOY_FILE="$entry"
-                DEST_FILENAME="$entry"
-            else
-                DEPLOY_FILE="$(echo "$entry" | cut -f1 -d\;)"
-                DEST_FILENAME="$(echo "$entry" | cut -f2- -d\;)"
-            fi
-            mcopy -v -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${DEPLOY_FILE} ::${DEST_FILENAME} || bbfatal "mcopy cannot copy ${DEPLOY_DIR_IMAGE}/${DEPLOY_FILE} into boot.img"
+        for dtbf in ${@split_overlays(d, False)}; do
+            dtb=`basename $dtbf`
+            mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/$dtb ::overlays/$dtb
         done
     fi
     if [ "${RPI_USE_U_BOOT}" = "1" ]; then
-        mcopy -v -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/u-boot.bin ::${SDIMG_KERNELIMAGE} || bbfatal "mcopy cannot copy ${DEPLOY_DIR_IMAGE}/u-boot.bin into boot.img"
-        mcopy -v -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/boot.scr ::boot.scr || bbfatal "mcopy cannot copy ${DEPLOY_DIR_IMAGE}/boot.scr into boot.img"
+        mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/u-boot.bin ::${SDIMG_KERNELIMAGE}
+        mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/boot.scr ::boot.scr
         if [ ! -z "${INITRAMFS_IMAGE}" -a "${INITRAMFS_IMAGE_BUNDLE}" = "1" ]; then
-            mcopy -v -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${INITRAMFS_LINK_NAME}.bin ::${KERNEL_IMAGETYPE} || bbfatal "mcopy cannot copy ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${INITRAMFS_LINK_NAME}.bin into boot.img"
+            mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${INITRAMFS_LINK_NAME}.bin ::${KERNEL_IMAGETYPE}
         else
-            mcopy -v -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE} ::${KERNEL_IMAGETYPE} || bbfatal "mcopy cannot copy ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE} into boot.img"
+            mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE} ::${KERNEL_IMAGETYPE}
         fi
     else
         if [ ! -z "${INITRAMFS_IMAGE}" -a "${INITRAMFS_IMAGE_BUNDLE}" = "1" ]; then
-            mcopy -v -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${INITRAMFS_LINK_NAME}.bin ::${SDIMG_KERNELIMAGE} || bbfatal "mcopy cannot copy ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${INITRAMFS_LINK_NAME}.bin into boot.img"
+            mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${INITRAMFS_LINK_NAME}.bin ::${SDIMG_KERNELIMAGE}
         else
-            mcopy -v -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE} ::${SDIMG_KERNELIMAGE} || bbfatal "mcopy cannot copy ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE} into boot.img"
+            mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE} ::${SDIMG_KERNELIMAGE}
         fi
     fi
 
-    # Add files (eg. hypervisor binaries) from the deploy dir
-    if [ -n "${DEPLOYPAYLOAD}" ] ; then
-        echo "Copying deploy file payload into VFAT"
-        for entry in ${DEPLOYPAYLOAD} ; do
-            # Split entry at optional ':' to enable file renaming for the destination
-            if [ $(echo "$entry" | grep -c :) = "0" ] ; then
-                DEPLOY_FILE="$entry"
-                DEST_FILENAME="$entry"
-            else
-                DEPLOY_FILE="$(echo "$entry" | cut -f1 -d:)"
-                DEST_FILENAME="$(echo "$entry" | cut -f2- -d:)"
-            fi
-            mcopy -v -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${DEPLOY_FILE} ::${DEST_FILENAME} || bbfatal "mcopy cannot copy ${DEPLOY_DIR_IMAGE}/${DEPLOY_FILE} into boot.img"
-        done
-    fi
-
-    if [ -n "${FATPAYLOAD}" ] ; then
+    if [ -n ${FATPAYLOAD} ] ; then
         echo "Copying payload into VFAT"
         for entry in ${FATPAYLOAD} ; do
-            # use bbwarn instead of bbfatal to stop aborting on vfat issues like not supporting .~lock files
-            mcopy -v -i ${WORKDIR}/boot.img -s ${IMAGE_ROOTFS}$entry :: || bbwarn "mcopy cannot copy ${IMAGE_ROOTFS}$entry into boot.img"
+            # add the || true to stop aborting on vfat issues like not supporting .~lock files
+            mcopy -i ${WORKDIR}/boot.img -s -v ${IMAGE_ROOTFS}$entry :: || true
         done
     fi
 
     # Add stamp file
     echo "${IMAGE_NAME}" > ${WORKDIR}/image-version-info
-    mcopy -v -i ${WORKDIR}/boot.img ${WORKDIR}/image-version-info :: || bbfatal "mcopy cannot copy ${WORKDIR}/image-version-info into boot.img"
+    mcopy -i ${WORKDIR}/boot.img -v ${WORKDIR}/image-version-info ::
 
     # Deploy vfat partition
     if [ "${SDIMG_VFAT_DEPLOY}" = "1" ]; then
@@ -178,6 +177,19 @@ IMAGE_CMD:rpi-sdimg () {
     else
         dd if=${SDIMG_ROOTFS} of=${SDIMG} conv=notrunc seek=1 bs=$(expr 1024 \* ${BOOT_SPACE_ALIGNED} + ${IMAGE_ROOTFS_ALIGNMENT} \* 1024)
     fi
+
+    # Optionally apply compression
+    case "${SDIMG_COMPRESSION}" in
+    "gzip")
+        gzip -k9 "${SDIMG}"
+        ;;
+    "bzip2")
+        bzip2 -k9 "${SDIMG}"
+        ;;
+    "xz")
+        xz -k "${SDIMG}"
+        ;;
+    esac
 }
 
 ROOTFS_POSTPROCESS_COMMAND += " rpi_generate_sysctl_config ; "

conf/layer.conf

@@ -9,8 +9,7 @@ BBFILE_COLLECTIONS += "raspberrypi"
 BBFILE_PATTERN_raspberrypi := "^${LAYERDIR}/"
 BBFILE_PRIORITY_raspberrypi = "9"
 
-LAYERSERIES_COMPAT_raspberrypi = "whinlatter"
-LAYERDEPENDS_raspberrypi = "core"
+LAYERSERIES_COMPAT_raspberrypi = "sumo thud"
 
 # Additional license directories.
 LICENSE_PATH += "${LAYERDIR}/files/custom-licenses"
@@ -20,18 +19,14 @@ 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 \
-    networking-layer:${LAYERDIR}/dynamic-layers/networking-layer/*/*/*.bb \
-    networking-layer:${LAYERDIR}/dynamic-layers/networking-layer/*/*/*.bbappend \
     qt5-layer:${LAYERDIR}/dynamic-layers/qt5-layer/*/*/*.bb \
     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"
-DEFAULT_TEST_SUITES:append:rpi = " parselogs_rpi"

conf/machine/include/rpi-base.inc

@@ -5,7 +5,7 @@ include conf/machine/include/rpi-default-providers.inc
 SOC_FAMILY = "rpi"
 include conf/machine/include/soc-family.inc
 
-IMAGE_FSTYPES ?= "tar.bz2 ext3 wic.bz2 wic.bmap"
+IMAGE_FSTYPES ?= "tar.bz2 ext3 rpi-sdimg"
 WKS_FILE ?= "sdimage-raspberrypi.wks"
 
 XSERVER = " \
@@ -15,100 +15,42 @@ XSERVER = " \
     "
 
 RPI_KERNEL_DEVICETREE_OVERLAYS ?= " \
-    overlays/overlay_map.dtb \
-    overlays/hat_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 \
     overlays/gpio-key.dtbo \
-    overlays/gpio-poweroff.dtbo \
-    overlays/gpio-shutdown.dtbo \
     overlays/hifiberry-amp.dtbo \
-    overlays/hifiberry-amp100.dtbo \
-    overlays/hifiberry-amp3.dtbo \
-    overlays/hifiberry-amp4pro.dtbo \
     overlays/hifiberry-dac.dtbo \
     overlays/hifiberry-dacplus.dtbo \
-    overlays/hifiberry-dacplusadc.dtbo \
-    overlays/hifiberry-dacplusadcpro.dtbo \
-    overlays/hifiberry-dacplusdsp.dtbo \
-    overlays/hifiberry-dacplushd.dtbo \
-    overlays/hifiberry-digi-pro.dtbo \
     overlays/hifiberry-digi.dtbo \
-    overlays/justboom-both.dtbo \
-    overlays/justboom-dac.dtbo \
-    overlays/justboom-digi.dtbo \
-    overlays/i2c-gpio.dtbo \
     overlays/i2c-rtc.dtbo \
-    overlays/imx219.dtbo \
-    overlays/imx477.dtbo \
-    overlays/imx708.dtbo \
     overlays/iqaudio-dac.dtbo \
     overlays/iqaudio-dacplus.dtbo \
-    overlays/mcp2515-can0.dtbo \
-    overlays/mcp2515-can1.dtbo \
-    overlays/seeed-can-fd-hat-v2.dtbo \
-    overlays/mcp3008.dtbo \
-    overlays/miniuart-bt.dtbo \
+    overlays/lirc-rpi.dtbo \
+    overlays/pi3-disable-bt.dtbo \
+    overlays/pi3-miniuart-bt.dtbo \
     overlays/pitft22.dtbo \
-    overlays/pitft28-capacitive.dtbo \
     overlays/pitft28-resistive.dtbo \
     overlays/pitft35-resistive.dtbo \
     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 \
-    overlays/vc4-kms-v3d-pi4.dtbo \
-    overlays/vc4-kms-v3d-pi5.dtbo \
-    overlays/vc4-kms-dsi-7inch.dtbo \
-    overlays/vc4-kms-dsi-ili9881-7inch.dtbo \
-    overlays/vc4-kms-dsi-ili9881-5inch.dtbo \
-    overlays/rpi-backlight.dtbo \
-    overlays/w1-gpio.dtbo \
     overlays/w1-gpio-pullup.dtbo \
-    overlays/w1-gpio-pi5.dtbo \
-    overlays/wm8960-soundcard.dtbo \
-    overlays/bcm2712d0.dtbo \
+    overlays/w1-gpio.dtbo \
     "
 
 RPI_KERNEL_DEVICETREE ?= " \
-    broadcom/bcm2708-rpi-zero.dtb \
-    broadcom/bcm2708-rpi-zero-w.dtb \
-    broadcom/bcm2708-rpi-b.dtb \
-    broadcom/bcm2708-rpi-b-rev1.dtb \
-    broadcom/bcm2708-rpi-b-plus.dtb \
-    broadcom/bcm2709-rpi-2-b.dtb \
-    broadcom/bcm2710-rpi-2-b.dtb \
-    broadcom/bcm2710-rpi-3-b.dtb \
-    broadcom/bcm2710-rpi-3-b-plus.dtb \
-    broadcom/bcm2710-rpi-zero-2.dtb \
-    broadcom/bcm2711-rpi-4-b.dtb \
-    broadcom/bcm2711-rpi-400.dtb \
-    broadcom/bcm2708-rpi-cm.dtb \
-    broadcom/bcm2710-rpi-cm3.dtb \
-    broadcom/bcm2711-rpi-cm4.dtb \
-    broadcom/bcm2711-rpi-cm4s.dtb \
+    bcm2708-rpi-0-w.dtb \
+    bcm2708-rpi-b.dtb \
+    bcm2708-rpi-b-plus.dtb \
+    bcm2709-rpi-2-b.dtb \
+    bcm2710-rpi-3-b.dtb \
+    bcm2710-rpi-3-b-plus.dtb \
+    bcm2708-rpi-cm.dtb \
+    bcm2710-rpi-cm3.dtb \
     "
 
-KERNEL_DEVICETREE ??= " \
+KERNEL_DEVICETREE ?= " \
     ${RPI_KERNEL_DEVICETREE} \
     ${RPI_KERNEL_DEVICETREE_OVERLAYS} \
     "
@@ -126,63 +68,47 @@ KERNEL_IMAGETYPE_DIRECT ??= "zImage"
 KERNEL_IMAGETYPE ?= "${@bb.utils.contains('RPI_USE_U_BOOT', '1', \
         '${KERNEL_IMAGETYPE_UBOOT}', '${KERNEL_IMAGETYPE_DIRECT}', d)}"
 
-MACHINE_FEATURES += "apm usbhost keyboard vfat ext2 screen touchscreen alsa bluetooth wifi sdio ${@bb.utils.contains('DISABLE_VC4GRAPHICS', '1', '', 'vc4graphics', d)}"
+MACHINE_FEATURES += "apm usbhost keyboard vfat ext2 screen touchscreen alsa bluetooth wifi sdio"
 
 # Raspberry Pi has no hardware clock
 MACHINE_FEATURES_BACKFILL_CONSIDERED = "rtc"
 
-MACHINE_EXTRA_RRECOMMENDS += "kernel-modules udev-rules-rpi"
-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "${@oe.utils.conditional('ENABLE_I2C', '1', 'kernel-module-i2c-dev kernel-module-i2c-bcm2708', '', d)}"
-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "${@oe.utils.conditional('ENABLE_IR', '1', 'kernel-module-gpio-ir kernel-module-gpio-ir-tx', '', d)}"
-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "${@oe.utils.conditional('ENABLE_GPIO_SHUTDOWN', '1', 'gpio-shutdown kernel-module-gpio-keys', '', d)}"
+MACHINE_EXTRA_RRECOMMENDS += " kernel-modules udev-rules-rpi"
 
-SERIAL_CONSOLES_CHECK ??= "${SERIAL_CONSOLES}"
-
-# The name of the deploy directory for raspberry pi boot files.
-# This variable is referred to by recipes fetching / generating the files.
-BOOTFILES_DIR_NAME ?= "bootfiles"
+# Set Raspberrypi splash image
+SPLASH = "psplash-raspberrypi"
 
 def make_dtb_boot_files(d):
     # Generate IMAGE_BOOT_FILES entries for device tree files listed in
     # KERNEL_DEVICETREE.
     alldtbs = d.getVar('KERNEL_DEVICETREE')
-
-    # DTBs may be built out of kernel with devicetree.bbclass
-    if not alldtbs:
-        return ''
+    imgtyp = d.getVar('KERNEL_IMAGETYPE')
 
     def transform(dtb):
         base = os.path.basename(dtb)
-        if dtb.endswith('dtbo') or base == 'overlay_map.dtb' or base == 'hat_map.dtb':
+        if dtb.endswith('dtb'):
+            # eg: whatever/bcm2708-rpi-b.dtb has:
+            #     DEPLOYDIR file: bcm2708-rpi-b.dtb
+            #     destination: bcm2708-rpi-b.dtb
+            return base
+        elif dtb.endswith('dtbo'):
             # overlay dtb:
             # eg: overlays/hifiberry-amp.dtbo has:
             #     DEPLOYDIR file: hifiberry-amp.dtbo
             #     destination: overlays/hifiberry-amp.dtbo
             return '{};{}'.format(base, dtb)
-        elif dtb.endswith('dtb'):
-            # eg: whatever/bcm2708-rpi-b.dtb has:
-            #     DEPLOYDIR file: bcm2708-rpi-b.dtb
-            #     destination: bcm2708-rpi-b.dtb
-            return base
 
     return ' '.join([transform(dtb) for dtb in alldtbs.split(' ') if dtb])
 
-RPI_EXTRA_IMAGE_BOOT_FILES ?= " \
-	${@bb.utils.contains('RPI_USE_U_BOOT', '1', \
-		'${KERNEL_IMAGETYPE} u-boot.bin;${SDIMG_KERNELIMAGE} boot.scr', \
-		'${KERNEL_IMAGETYPE};${SDIMG_KERNELIMAGE}', d)} \
-	"
 
-IMAGE_BOOT_FILES ?= "${BOOTFILES_DIR_NAME}/* \
+IMAGE_BOOT_FILES ?= "bcm2835-bootfiles/* \
                  ${@make_dtb_boot_files(d)} \
-                 ${RPI_EXTRA_IMAGE_BOOT_FILES} \
+                 ${@bb.utils.contains('RPI_USE_U_BOOT', '1', \
+                    '${KERNEL_IMAGETYPE} u-boot.bin;${SDIMG_KERNELIMAGE} boot.scr', \
+                    '${KERNEL_IMAGETYPE};${SDIMG_KERNELIMAGE}', d)} \
                  "
-
-EXTRA_IMAGEDEPENDS += "rpi-bootfiles"
-
 do_image_wic[depends] += " \
-    virtual/kernel:do_deploy \
-    rpi-bootfiles:do_deploy \
+    bcm2835-bootfiles:do_deploy \
     ${@bb.utils.contains('RPI_USE_U_BOOT', '1', 'u-boot:do_deploy', '',d)} \
     "
 
@@ -190,4 +116,4 @@ do_image_wic[recrdeps] = "do_build"
 
 # The kernel image is installed into the FAT32 boot partition and does not need
 # to also be installed into the rootfs.
-RDEPENDS:${KERNEL_PACKAGE_NAME}-base = ""
+RDEPENDS_${KERNEL_PACKAGE_NAME}-base = ""

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

@@ -1,6 +1,6 @@
 # RaspberryPi BSP default providers
 
-PREFERRED_PROVIDER_virtual/kernel ??= "linux-raspberrypi"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-raspberrypi"
 PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
 PREFERRED_PROVIDER_virtual/egl ?= "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "mesa", "userland", d)}"
 PREFERRED_PROVIDER_virtual/libgles2 ?= "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "mesa", "userland", d)}"
@@ -8,8 +8,3 @@ PREFERRED_PROVIDER_virtual/libgl ?= "${@bb.utils.contains("MACHINE_FEATURES", "v
 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_jpeg ?= "jpeg"
-
-PREFERRED_PROVIDER_virtual/libomxil ?= "userland"
-VIRTUAL-RUNTIME_libomxil = "userland"
-
-PREFERRED_PROVIDER_u-boot-default-script ??= "rpi-u-boot-scr"

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

@@ -1,9 +1,3 @@
 # RaspberryPi BSP default settings
 
 IMAGE_CLASSES += "sdcard_image-rpi"
-
-# RPI kernel has errors of its own which should be filtered
-# therefore use parselogs_rpi test instead of parselogs from oe-core
-#
-DEFAULT_TEST_SUITES:append:rpi = " parselogs_rpi"
-DEFAULT_TEST_SUITES:remove:rpi = " parselogs"

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

@@ -1,4 +1,3 @@
 # RaspberryPi BSP default versions
 
-PREFERRED_VERSION_linux-raspberrypi ??= "6.12.%"
-PREFERRED_VERSION_linux-raspberrypi-v7 ??= "${PREFERRED_VERSION_linux-raspberrypi}"
+PREFERRED_VERSION_linux-raspberrypi ??= "4.14.%"

conf/machine/include/tune-arm1176jzf-s.inc

@@ -1,17 +1,15 @@
-DEFAULTTUNE ?= "arm1176jzfshf"
+DEFAULTTUNE ?= "armv6"
 
 require conf/machine/include/arm/arch-armv6.inc
 
 TUNEVALID[arm1176jzfs] = "Enable arm1176jzfs specific processor optimizations"
-TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'arm1176jzfs', ' -mcpu=arm1176jzf-s', '', d)}"
-MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'arm1176jzfs', 'armv6:', '', d)}"
+TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "arm1176jzfs", "-mtune=arm1176jzf-s", "", d)}"
+TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "vfp", "-mfpu=vfp", "", d)}"
 
-AVAILTUNES += "arm1176jzfs"
-ARMPKGARCH:tune-arm1176jzfs = "arm1176jzfs"
-TUNE_FEATURES:tune-arm1176jzfs = "arm thumb vfp arm1176jzfs"
-PACKAGE_EXTRA_ARCHS:tune-arm1176jzfs = "${PACKAGE_EXTRA_ARCHS:tune-armv6} arm1176jzfs"
-
-AVAILTUNES += "arm1176jzfshf"
-ARMPKGARCH:tune-arm1176jzfshf = "${ARMPKGARCH:tune-arm1176jzfs}"
-TUNE_FEATURES:tune-arm1176jzfshf = "${TUNE_FEATURES:tune-arm1176jzfs} callconvention-hard"
-PACKAGE_EXTRA_ARCHS:tune-arm1176jzfshf = "${PACKAGE_EXTRA_ARCHS:tune-armv6thf} arm1176jzfshf-vfp"
+AVAILTUNES += "arm1176jzfs arm1176jzfshf"
+ARMPKGARCH_tune-arm1176jzfs = "arm1176jzfs"
+ARMPKGARCH_tune-arm1176jzfshf = "arm1176jzfs"
+TUNE_FEATURES_tune-arm1176jzfs = "${TUNE_FEATURES_tune-armv6} arm1176jzfs"
+TUNE_FEATURES_tune-arm1176jzfshf = "${TUNE_FEATURES_tune-arm1176jzfs} callconvention-hard"
+PACKAGE_EXTRA_ARCHS_tune-arm1176jzfs = "${PACKAGE_EXTRA_ARCHS_tune-armv6}"
+PACKAGE_EXTRA_ARCHS_tune-arm1176jzfshf = "${PACKAGE_EXTRA_ARCHS_tune-armv6hf} arm1176jzfshf-vfp"

conf/machine/raspberrypi-armv7.conf

@@ -1,39 +0,0 @@
-# SPDX-FileCopyrightText: Andrei Gherzan <andrei.gherzan@huawei.com>
-#
-# SPDX-License-Identifier: MIT
-
-#@TYPE: Machine
-#@NAME: RaspberryPi Development Boards (32bit)
-#@DESCRIPTION: Machine configuration for the RaspberryPi boards in 32 bit mode
-
-DEFAULTTUNE ?= "cortexa7thf-neon-vfpv4"
-require conf/machine/include/arm/armv7a/tune-cortexa7.inc
-include conf/machine/include/rpi-base.inc
-
-# This machine includes by default the kernel for v7l. We hook in support for
-# v7.
-RASPBERRYPI_v7_KERNEL = "linux-raspberrypi-v7"
-RASPBERRYPI_v7_KERNEL_PACKAGE_NAME = "kernel-v7"
-RASPBERRYPI_v7_KERNEL_FILE ?= "kernel7.img"
-# We don't need a lot for v7l because it is the default provider,
-# virtual/kernel.
-RASPBERRYPI_v7l_KERNEL_FILE ?= "kernel7l.img"
-
-MACHINE_FEATURES += "pci"
-MACHINE_EXTRA_RRECOMMENDS += "\
-    linux-firmware-rpidistro-bcm43430 \
-    linux-firmware-rpidistro-bcm43436 \
-    linux-firmware-rpidistro-bcm43436s \
-    linux-firmware-rpidistro-bcm43455 \
-    linux-firmware-rpidistro-bcm43456 \
-    bluez-firmware-rpidistro-bcm43430a1-hcd \
-    bluez-firmware-rpidistro-bcm43430b0-hcd \
-    bluez-firmware-rpidistro-bcm4345c0-hcd \
-    bluez-firmware-rpidistro-bcm4345c5-hcd \
-"
-
-# FIXME: This machine doesn't support u-boot (yet)
-RPI_EXTRA_IMAGE_BOOT_FILES = " \
-	${KERNEL_IMAGETYPE};${RASPBERRYPI_v7l_KERNEL_FILE} \
-	${RASPBERRYPI_v7_KERNEL_PACKAGE_NAME}/${KERNEL_IMAGETYPE};${RASPBERRYPI_v7_KERNEL_FILE} \
-"

conf/machine/raspberrypi-armv8.conf

@@ -1,50 +0,0 @@
-# SPDX-FileCopyrightText: Andrei Gherzan <andrei.gherzan@huawei.com>
-#
-# SPDX-License-Identifier: MIT
-
-#@TYPE: Machine
-#@NAME: RaspberryPi Development Boards (64bit)
-#@DESCRIPTION: Machine configuration for the RaspberryPi boards in 64 bit mode
-
-require conf/machine/include/arm/armv8a/tune-cortexa53.inc
-include conf/machine/include/rpi-base.inc
-
-MACHINE_FEATURES += "pci"
-MACHINE_EXTRA_RRECOMMENDS += "\
-    linux-firmware-rpidistro-bcm43430 \
-    linux-firmware-rpidistro-bcm43455 \
-    linux-firmware-rpidistro-bcm43456 \
-    linux-firmware-rpidistro-bcm43436 \
-    linux-firmware-rpidistro-bcm43436s \
-    bluez-firmware-rpidistro-bcm43430a1-hcd \
-    bluez-firmware-rpidistro-bcm43430b0-hcd \
-    bluez-firmware-rpidistro-bcm4345c0-hcd \
-    bluez-firmware-rpidistro-bcm4345c5-hcd \
-"
-
-RPI_KERNEL_DEVICETREE = " \
-    broadcom/bcm2710-rpi-2-b.dtb \
-    broadcom/bcm2710-rpi-3-b.dtb \
-    broadcom/bcm2710-rpi-3-b-plus.dtb \
-    broadcom/bcm2837-rpi-3-b.dtb \
-    broadcom/bcm2710-rpi-cm3.dtb \
-    broadcom/bcm2710-rpi-zero-2.dtb \
-    broadcom/bcm2711-rpi-4-b.dtb \
-    broadcom/bcm2711-rpi-400.dtb \
-    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"
-KERNEL_IMAGETYPE_UBOOT ?= "Image"
-KERNEL_IMAGETYPE_DIRECT ?= "Image"
-KERNEL_BOOTCMD ?= "booti"
-UBOOT_MACHINE = "rpi_arm64_config"
-SERIAL_CONSOLES ?= "115200;ttyS0"
-
-VC4DTBO ?= "vc4-fkms-v3d"

conf/machine/raspberrypi-cm.conf

@@ -2,7 +2,5 @@
 #@NAME: RaspberryPi Compute Module (CM1)
 #@DESCRIPTION: Machine configuration for the RaspberryPi Compute Module (CM1)
 
-MACHINEOVERRIDES =. "raspberrypi:"
+MACHINEOVERRIDES = "raspberrypi:${MACHINE}"
 include conf/machine/raspberrypi.conf
-
-ARMSTUB ?= "armstub.bin"

conf/machine/raspberrypi-cm3.conf

@@ -3,11 +3,10 @@
 #@DESCRIPTION: Machine configuration for the RaspberryPi Compute Module 3 (CM3)
 
 DEFAULTTUNE ?= "cortexa7thf-neon-vfpv4"
-require conf/machine/include/arm/armv7a/tune-cortexa7.inc
+require conf/machine/include/tune-cortexa7.inc
 include conf/machine/include/rpi-base.inc
 
+KBUILD_DEFCONFIG ?= "bcm2709_defconfig"
 SDIMG_KERNELIMAGE ?= "kernel7.img"
 UBOOT_MACHINE = "rpi_3_32b_config"
 SERIAL_CONSOLES ?= "115200;ttyAMA0"
-
-ARMSTUB ?= "armstub.bin"

conf/machine/raspberrypi-cm5-io-board.conf

@@ -1,7 +0,0 @@
-#@TYPE: Machine
-#@NAME: Raspberry Pi Compute Module 5 IO Board (64-bit)
-#@DESCRIPTION: Machine configuration for the Raspberry Pi Compute Module 5 IO Board in 64 bits mode
-
-MACHINEOVERRIDES =. "raspberrypi5:"
-
-include conf/machine/raspberrypi5.conf

conf/machine/raspberrypi.conf

@@ -7,8 +7,6 @@ DEFAULTTUNE ?= "arm1176jzfshf"
 require conf/machine/include/tune-arm1176jzf-s.inc
 include conf/machine/include/rpi-base.inc
 
-SDIMG_KERNELIMAGE  ?= "kernel.img"
-UBOOT_MACHINE = "rpi_config"
 SERIAL_CONSOLES ?= "115200;ttyAMA0"
 
-ARMSTUB ?= "armstub.bin"
+UBOOT_MACHINE = "rpi_config"

conf/machine/raspberrypi0-2w-64.conf

@@ -1,17 +0,0 @@
-#@TYPE: Machine
-#@NAME: RaspberryPi0 2 Wifi Development Board
-#@DESCRIPTION: Machine configuration for the RaspberryPi0 2 Wifi in 64 bits mode
-
-MACHINEOVERRIDES =. "raspberrypi3-64:"
-
-include conf/machine/raspberrypi3-64.conf
-
-MACHINE_EXTRA_RRECOMMENDS += "\
-    linux-firmware-rpidistro-bcm43436 \
-    linux-firmware-rpidistro-bcm43436s \
-    bluez-firmware-rpidistro-bcm43430b0-hcd \
-"
-
-RPI_KERNEL_DEVICETREE = " \
-    broadcom/bcm2710-rpi-zero-2.dtb \
-    "

conf/machine/raspberrypi0-2w.conf

@@ -1,13 +0,0 @@
-#@TYPE: Machine
-#@NAME: RaspberryPi0 2 Wifi Development Board
-#@DESCRIPTION: Machine configuration for the RaspberryPi0 2 Wifi in 32 bits mode
-
-MACHINEOVERRIDES =. "raspberrypi3:"
-
-include conf/machine/raspberrypi3.conf
-
-MACHINE_EXTRA_RRECOMMENDS += "\
-    linux-firmware-rpidistro-bcm43436 \
-    linux-firmware-rpidistro-bcm43436s \
-    bluez-firmware-rpidistro-bcm43430b0-hcd \
-"

conf/machine/raspberrypi0-wifi.conf

@@ -14,5 +14,3 @@ MACHINE_EXTRA_RRECOMMENDS += "\
 SDIMG_KERNELIMAGE ?= "kernel.img"
 UBOOT_MACHINE ?= "rpi_0_w_defconfig"
 SERIAL_CONSOLES ?= "115200;ttyS0"
-
-ARMSTUB ?= "armstub.bin"

conf/machine/raspberrypi0.conf

@@ -2,7 +2,7 @@
 #@NAME: RaspberryPi Zero Development Board
 #@DESCRIPTION: Machine configuration for the RaspberryPi Zero board (https://www.raspberrypi.org/blog/raspberry-pi-zero)
 
-MACHINEOVERRIDES =. "raspberrypi:"
+MACHINEOVERRIDES = "raspberrypi:${MACHINE}"
 include conf/machine/raspberrypi.conf
 
 SERIAL_CONSOLES ?= "115200;ttyAMA0"

conf/machine/raspberrypi2-64.conf

@@ -1,30 +0,0 @@
-#@TYPE: Machine
-#@NAME: RaspberryPi 2 V1.2 Development Board
-#@DESCRIPTION: Machine configuration for the RaspberryPi 2 in 64 bits mode
-
-MACHINEOVERRIDES =. "raspberrypi3-64:"
-
-DEFAULTTUNE ?= "cortexa53-nocrypto"
-require conf/machine/include/arm/armv8a/tune-cortexa53.inc
-include conf/machine/include/rpi-base.inc
-
-RPI_KERNEL_DEVICETREE = " \
-    broadcom/bcm2710-rpi-2-b.dtb \
-    broadcom/bcm2710-rpi-3-b.dtb \
-    broadcom/bcm2710-rpi-3-b-plus.dtb \
-    broadcom/bcm2837-rpi-3-b.dtb \
-    broadcom/bcm2710-rpi-cm3.dtb \
-    "
-
-SDIMG_KERNELIMAGE ?= "kernel8.img"
-# When u-boot is enabled we need to use the "Image" format and the "booti"
-# command to load the kernel
-KERNEL_IMAGETYPE_UBOOT ?= "Image"
-# "zImage" not supported on arm64 and ".gz" images not supported by bootloader yet
-KERNEL_IMAGETYPE_DIRECT ?= "Image"
-KERNEL_BOOTCMD ?= "booti"
-UBOOT_MACHINE = "rpi_arm64_config"
-SERIAL_CONSOLES ?= "115200;ttyAMA0"
-
-VC4DTBO ?= "vc4-fkms-v3d"
-ARMSTUB ?= "armstub8.bin"

conf/machine/raspberrypi2.conf

@@ -4,27 +4,9 @@
 
 DEFAULTTUNE ?= "cortexa7thf-neon-vfpv4"
 
-require conf/machine/include/arm/armv7a/tune-cortexa7.inc
+require conf/machine/include/tune-cortexa7.inc
 include conf/machine/include/rpi-base.inc
 
-SDIMG_KERNELIMAGE ?= "kernel7.img"
 SERIAL_CONSOLES ?= "115200;ttyAMA0"
+
 UBOOT_MACHINE = "rpi_2_config"
-
-ARMSTUB ?= "armstub7.bin"
-
-#
-# Below are variables ONLY needed for running with Yocto/OE's runqemu script
-#
-IMAGE_CLASSES += "qemuboot"
-
-QB_SYSTEM_NAME = "qemu-system-arm"
-QB_MACHINE = "-machine raspi2b"
-QB_MEM = "-m 1024"
-QB_DTB = "bcm2709-rpi-2-b.dtb"
-QB_NET = "none"
-QB_KERNEL_ROOT = "/dev/mmcblk0"
-QB_KERNEL_CMDLINE_APPEND = "rootwait"
-QB_RNG = ""
-QB_ROOTFS_OPT = "-drive id=disk0,file=@ROOTFS@,if=sd,format=raw"
-QB_DEFAULT_FSTYPE = "ext3"

conf/machine/raspberrypi3-64.conf

@@ -2,7 +2,7 @@
 #@NAME: RaspberryPi 3 Development Board
 #@DESCRIPTION: Machine configuration for the RaspberryPi 3 in 64 bits mode
 
-MACHINEOVERRIDES =. "raspberrypi3:"
+MACHINEOVERRIDES = "raspberrypi3:${MACHINE}"
 
 MACHINE_EXTRA_RRECOMMENDS += "\
     linux-firmware-rpidistro-bcm43430 \
@@ -11,27 +11,23 @@ MACHINE_EXTRA_RRECOMMENDS += "\
     bluez-firmware-rpidistro-bcm4345c0-hcd \
 "
 
-DEFAULTTUNE ?= "cortexa53-nocrypto"
-require conf/machine/include/arm/armv8a/tune-cortexa53.inc
+require conf/machine/include/arm/arch-armv8.inc
 include conf/machine/include/rpi-base.inc
 
 RPI_KERNEL_DEVICETREE = " \
-    broadcom/bcm2710-rpi-2-b.dtb \
     broadcom/bcm2710-rpi-3-b.dtb \
     broadcom/bcm2710-rpi-3-b-plus.dtb \
     broadcom/bcm2837-rpi-3-b.dtb \
-    broadcom/bcm2710-rpi-cm3.dtb \
     "
 
-SDIMG_KERNELIMAGE ?= "kernel8.img"
+SERIAL_CONSOLES ?= "115200;ttyS0"
+
+UBOOT_MACHINE = "rpi_3_config"
+MACHINE_FEATURES_append = " vc4graphics"
+
 # When u-boot is enabled we need to use the "Image" format and the "booti"
 # command to load the kernel
 KERNEL_IMAGETYPE_UBOOT ?= "Image"
 # "zImage" not supported on arm64 and ".gz" images not supported by bootloader yet
 KERNEL_IMAGETYPE_DIRECT ?= "Image"
 KERNEL_BOOTCMD ?= "booti"
-UBOOT_MACHINE = "rpi_arm64_config"
-SERIAL_CONSOLES ?= "115200;ttyS0"
-
-VC4DTBO ?= "vc4-fkms-v3d"
-ARMSTUB ?= "armstub8.bin"

conf/machine/raspberrypi3.conf

@@ -1,9 +1,9 @@
 #@TYPE: Machine
-#@NAME: RaspberryPi 3 Development Board (32bit)
-#@DESCRIPTION: Machine configuration for the RaspberryPi 3 in 32 bits mode
+#@NAME: RaspberryPi 3 Development Board
+#@DESCRIPTION: Machine configuration for the RaspberryPi 3
 
 DEFAULTTUNE ?= "cortexa7thf-neon-vfpv4"
-require conf/machine/include/arm/armv7a/tune-cortexa7.inc
+require conf/machine/include/tune-cortexa7.inc
 include conf/machine/include/rpi-base.inc
 
 MACHINE_EXTRA_RRECOMMENDS += "\
@@ -16,6 +16,3 @@ MACHINE_EXTRA_RRECOMMENDS += "\
 SDIMG_KERNELIMAGE ?= "kernel7.img"
 UBOOT_MACHINE = "rpi_3_32b_config"
 SERIAL_CONSOLES ?= "115200;ttyS0"
-
-VC4DTBO ?= "vc4-fkms-v3d"
-ARMSTUB ?= "armstub7.bin"

conf/machine/raspberrypi4-64.conf

@@ -1,41 +0,0 @@
-#@TYPE: Machine
-#@NAME: RaspberryPi 4 Development Board (64bit)
-#@DESCRIPTION: Machine configuration for the RaspberryPi 4 in 64 bits mode
-
-MACHINEOVERRIDES =. "raspberrypi4:"
-
-MACHINE_FEATURES += "pci"
-MACHINE_EXTRA_RRECOMMENDS += "\
-    linux-firmware-rpidistro-bcm43455 \
-    bluez-firmware-rpidistro-bcm4345c0-hcd \
-    linux-firmware-rpidistro-bcm43456 \
-    bluez-firmware-rpidistro-bcm4345c5-hcd \
-"
-
-DEFAULTTUNE = "cortexa72-nocrypto"
-
-require conf/machine/include/arm/armv8a/tune-cortexa72.inc
-include conf/machine/include/rpi-base.inc
-
-RPI_KERNEL_DEVICETREE = " \
-    broadcom/bcm2711-rpi-4-b.dtb \
-    broadcom/bcm2711-rpi-400.dtb \
-    broadcom/bcm2711-rpi-cm4.dtb \
-    broadcom/bcm2711-rpi-cm4s.dtb \
-"
-
-SDIMG_KERNELIMAGE ?= "kernel8.img"
-SERIAL_CONSOLES ?= "115200;ttyS0"
-
-UBOOT_MACHINE = "rpi_arm64_config"
-
-VC4DTBO ?= "vc4-kms-v3d"
-
-# When u-boot is enabled we need to use the "Image" format and the "booti"
-# command to load the kernel
-KERNEL_IMAGETYPE_UBOOT ?= "Image"
-# "zImage" not supported on arm64 and ".gz" images not supported by bootloader yet
-KERNEL_IMAGETYPE_DIRECT ?= "Image"
-KERNEL_BOOTCMD ?= "booti"
-
-ARMSTUB ?= "armstub8-gic.bin"

conf/machine/raspberrypi4.conf

@@ -1,23 +0,0 @@
-#@TYPE: Machine
-#@NAME: RaspberryPi 4 Development Board (32bit)
-#@DESCRIPTION: Machine configuration for the RaspberryPi 4 in 32 bit mode
-
-DEFAULTTUNE ?= "cortexa7thf-neon-vfpv4"
-require conf/machine/include/arm/armv7a/tune-cortexa7.inc
-include conf/machine/include/rpi-base.inc
-
-MACHINE_FEATURES += "pci"
-MACHINE_EXTRA_RRECOMMENDS += "\
-    linux-firmware-rpidistro-bcm43455 \
-    bluez-firmware-rpidistro-bcm4345c0-hcd \
-    linux-firmware-rpidistro-bcm43456 \
-    bluez-firmware-rpidistro-bcm4345c5-hcd \
-"
-
-# 'l' stands for LPAE
-SDIMG_KERNELIMAGE ?= "kernel7l.img"
-UBOOT_MACHINE = "rpi_4_32b_config"
-SERIAL_CONSOLES ?= "115200;ttyS0"
-
-VC4DTBO ?= "vc4-kms-v3d"
-ARMSTUB ?= "armstub7.bin"

conf/machine/raspberrypi5.conf

@@ -1,36 +0,0 @@
-#@TYPE: Machine
-#@NAME: RaspberryPi 5 Development Board (64bit)
-#@DESCRIPTION: Machine configuration for the RaspberryPi 5 in 64 bits mode
-
-require conf/machine/include/arm/armv8-2a/tune-cortexa76.inc
-include conf/machine/include/rpi-base.inc
-
-MACHINE_FEATURES += "pci"
-MACHINE_EXTRA_RRECOMMENDS += "\
-    linux-firmware-rpidistro-bcm43455 \
-    bluez-firmware-rpidistro-bcm4345c0-hcd \
-    linux-firmware-rpidistro-bcm43456 \
-    bluez-firmware-rpidistro-bcm4345c5-hcd \
-"
-
-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"
-SERIAL_CONSOLES ?= "115200;ttyAMA10"
-
-VC4DTBO ?= "vc4-kms-v3d"
-
-# When u-boot is enabled we need to use the "Image" format and the "booti"
-# command to load the kernel
-KERNEL_IMAGETYPE_UBOOT ?= "Image"
-# "zImage" not supported on arm64 and ".gz" images not supported by bootloader yet
-KERNEL_IMAGETYPE_DIRECT ?= "Image"
-KERNEL_BOOTCMD ?= "booti"
-
-UBOOT_MACHINE = "rpi_arm64_config"

docs/conf.py

@@ -30,10 +30,7 @@
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
-extensions = [
-    'myst_parser',
-    'sphinx_rtd_theme'
-]
+extensions = []
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
@@ -53,7 +50,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = 'meta-raspberrypi'
-copyright = '2022, meta-raspberrypi contributors'
+copyright = '2017, meta-raspberrypi contributors'
 author = 'meta-raspberrypi contributors'
 
 # The version info for the project you're documenting, acts as replacement for
@@ -124,7 +121,6 @@ todo_include_todos = False
 # a list of builtin themes.
 #
 # html_theme = 'alabaster'
-html_theme = "sphinx_rtd_theme"
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
@@ -158,7 +154,7 @@ html_theme = "sphinx_rtd_theme"
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-#html_static_path = ['_static']
+html_static_path = ['_static']
 
 # Add any extra paths that contain custom files (such as robots.txt or
 # .htaccess) here, relative to this directory. These files are copied
@@ -341,3 +337,7 @@ texinfo_documents = [
 # If true, do not generate a @detailmenu in the "Top" node's menu.
 #
 # texinfo_no_detailmenu = False
+
+source_parsers = {
+    '.md': 'recommonmark.parser.CommonMarkParser',
+}

docs/contributing.md

@@ -4,8 +4,8 @@
 
 The main communication tool in use is the Yocto Project mailing list:
 
-* <yocto@lists.yoctoproject.org>
-* <https://lists.yoctoproject.org/g/yocto>
+* <yocto@yoctoproject.org>
+* <https://lists.yoctoproject.org/listinfo/yocto>
 
 Feel free to ask any kind of questions but please always prepend your email
 subject with `[meta-raspberrypi]` as this is the global *Yocto* mailing
@@ -84,11 +84,7 @@ sure to use the following formatting for the message subject:
 
 Then, for sending patches to the mailing list, you may use this command:
 
-    git send-email --to yocto@lists.yoctoproject.org <generated patch>
-
-When patches are sent through the mailing list, the maintainer will include
-them in a GitHub pull request that will take the patches through the CI
-workflows. This process happens periodically.
+    git send-email --to yocto@yoctoproject.org <generated patch>
 
 ## GitHub issues
 

docs/extra-apps.md

@@ -6,4 +6,4 @@ omxplayer depends on libav which has a commercial license. So in order to be
 able to compile omxplayer you will need to whiteflag the commercial
 license in your local.conf:
 
-    LICENSE_FLAGS_ACCEPTED = "commercial"
+    LICENSE_FLAGS_WHITELIST = "commercial"

docs/extra-build-config.md

@@ -1,6 +1,6 @@
 # Optional build configuration
 
-There are a set of ways in which a user can influence different parameters of
+There are a set of ways in which a user can influence different paramenters of
 the build. We list here the ones that are closely related to this BSP or
 specific to it. For the rest please check:
 <http://www.yoctoproject.org/docs/latest/ref-manual/ref-manual.html>
@@ -13,6 +13,9 @@ specific to it. For the rest please check:
 2. Overwrite SDIMG_ROOTFS_TYPE in local.conf
     * `SDIMG_ROOTFS_TYPE = "ext3.xz"`
 
+3. Overwrite SDIMG_COMPRESSION in local.conf
+    * `SDIMG_COMPRESSION = "xz"`
+
 Accommodate the values above to your own needs (ex: ext3 / ext4).
 
 ## GPU memory
@@ -29,15 +32,11 @@ Accommodate the values above to your own needs (ex: ext3 / ext4).
 * `GPU_MEM_1024`: GPU memory in megabyte for the 1024MB Raspberry Pi. Ignored by
   the 256MB/512MB RP. Overrides gpu_mem. Max 944. Default not set.
 
-See: <https://www.raspberrypi.com/documentation/computers/config_txt.html#memory-options>
-
-## VC4
-
-By default, each machine uses `vc4` for graphics. This will in turn sets mesa as provider for `gl` libraries. `DISABLE_VC4GRAPHICS` can be set to `1` to disable this behaviour falling back to using `userland`. Be aware that `userland` has not support for 64-bit arch. If you disable `vc4` on a 64-bit Raspberry Pi machine, expect build breakage.
+See: <https://www.raspberrypi.org/documentation/configuration/config-txt/memory.md>
 
 ## Add purchased license codecs
 
-To add your own licenses use variables `KEY_DECODE_MPG2` and `KEY_DECODE_WVC1` in
+To add you own licenses use variables `KEY_DECODE_MPG2` and `KEY_DECODE_WVC1` in
 local.conf. Example:
 
     KEY_DECODE_MPG2 = "12345678"
@@ -47,7 +46,7 @@ You can supply more licenses separated by comma. Example:
 
     KEY_DECODE_WVC1 = "0x12345678,0xabcdabcd,0x87654321"
 
-See: <https://www.raspberrypi.com/documentation/computers/config_txt.html#licence-key-and-codec-options>
+See: <https://www.raspberrypi.org/documentation/configuration/config-txt/codeclicence.md>
 
 ## Disable overscan
 
@@ -74,26 +73,10 @@ To remove (or adjust) this delay set these variables in local.conf:
     BOOT_DELAY = "0"
     BOOT_DELAY_MS = "0"
 
-## Boot media
-
-The Raspberry Pi 4 board can load the boot image files from SD card and USB memory.
-By default SD card media is used as boot media.
-
-To switch the boot media from SD card to USB memory, the following variables are supported
-in local.conf: `CMDLINE_ROOT_PARTITION` and `BOOT_MEDIA`.
-The default value of `CMDLINE_ROOT_PARTITION` is "/dev/mmcblk0p2" to mount SD card. If you want to mount USB memory partition, set CMDLINE_ROOT_PARTITION to "/dev/sda2".
-`BOOT_MEDIA` allows  `mmc` and `usb`. The "mmc" is required to load an image from the SD card, following the u-boot specification. Similarly, if you want to load a boot image file from USB memory, set BOOT_MEDIA to "usb".
-
-For example, if you want to use USB boot, please define
-the following parameters in your local.conf file.
-
-    CMDLINE_ROOT_PARTITION = "/dev/sda2"
-    BOOT_MEDIA = "usb"
-
 ## Set overclocking options
 
 The Raspberry Pi can be overclocked. As of now overclocking up to the "Turbo
-Mode" is officially supported by the Raspberry Pi and does not void warranty. Check
+Mode" is officially supported by the raspbery and does not void warranty. Check
 the config.txt for a detailed description of options and modes. The following
 variables are supported in local.conf: `ARM_FREQ`, `GPU_FREQ`, `CORE_FREQ`,
 `SDRAM_FREQ` and `OVER_VOLTAGE`.
@@ -105,7 +88,7 @@ Example official settings for Turbo Mode in Raspberry Pi 2:
     SDRAM_FREQ = "500"
     OVER_VOLTAGE = "6"
 
-See: <https://www.raspberrypi.com/documentation/computers/config_txt.html#overclocking-options>
+See: <https://www.raspberrypi.org/documentation/configuration/config-txt/overclocking.md>
 
 ## HDMI and composite video options
 
@@ -115,14 +98,14 @@ selected according to the connected monitor's EDID information and the composite
 mode is defaulted to NTSC using a 4:3 aspect ratio. Check the config.txt for a
 detailed description of options and modes. The following variables are supported in
 local.conf: `HDMI_FORCE_HOTPLUG`, `HDMI_DRIVE`, `HDMI_GROUP`, `HDMI_MODE`,
-`HDMI_CVT`, `CONFIG_HDMI_BOOST`, `SDTV_MODE`, `SDTV_ASPECT` and `DISPLAY_ROTATE`.
+`CONFIG_HDMI_BOOST`, `SDTV_MODE`, `SDTV_ASPECT` and `DISPLAY_ROTATE`.
 
 Example to force HDMI output to 720p in CEA mode:
 
     HDMI_GROUP = "1"
     HDMI_MODE = "4"
 
-See: <https://www.raspberrypi.com/documentation/computers/configuration.html#hdmi-configuration>
+See: <https://www.raspberrypi.org/documentation/configuration/config-txt/video.md>
 
 ## Video camera support with V4L2 drivers
 
@@ -171,22 +154,11 @@ For further customisation the KERNEL_IMAGETYPE and KERNEL_BOOTCMD variables can
 be overridden to select the exact kernel image type (eg. zImage) and u-boot
 command (eg. bootz) to be used.
 
-To operate correctly, U-Boot requires `enable_uart=1` in `config.txt` file for
-the following boards:
-* Raspberry Pi Zero W
-* Raspberry Pi 3 32-bit
-* 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"`.
-
 ## Image with Initramfs
 
 To build an initramfs image:
 
-* Set this 3 kernel variables (in kernel's do_configure:prepend in linux-raspberrypi.inc after the line kernel_configure_variable LOCALVERSION "\"\""
+* Set this 3 kernel variables (in kernel's do_configure_prepend in linux-raspberrypi.inc after the line kernel_configure_variable LOCALVERSION "\"\""
 )
   - kernel_configure_variable BLK_DEV_INITRD y
   - kernel_configure_variable INITRAMFS_SOURCE ""
@@ -197,32 +169,7 @@ To build an initramfs image:
   - `INITRAMFS_IMAGE_BUNDLE = "1"`
   - `BOOT_SPACE = "1073741"`
   - `INITRAMFS_MAXSIZE = "315400"`
-  - `IMAGE_FSTYPES:pn-${INITRAMFS_IMAGE} = "${INITRAMFS_FSTYPES}"`
-
-## Including additional files in the SD card image boot partition
-
-The SD card image class supports adding extra files into the boot
-partition, where the files are copied from either the image root
-partition or from the build image deploy directory.
-
-To copy files that are present in the root partition into boot,
-FATPAYLOAD is a simple space-separated list of files to be copied:
-
-    FATPAYLOAD = "/boot/example1 /boot/example2"
-
-To copy files from the image deploy directory, the files should be
-listed in the DEPLOYPAYLOAD as a space-separated list of entries.
-Each entry lists a file to be copied, and an optional destination
-filename can be specified by supplying it after a colon separator.
-
-    DEPLOYPAYLOAD = "example1-${MACHINE}:example1 example2"
-
-Files that are to be included from the deploy directory will be produced
-by tasks that image building task must depend upon, to ensure that the
-files are available when they are needed, so these component deploy
-tasks must be added to: RPI_SDIMG_EXTRA_DEPENDS.
-
-    RPI_SDIMG_EXTRA_DEPENDS:append = " example:do_deploy"
+  - `IMAGE_FSTYPES_pn-${INITRAMFS_IMAGE} = "${INITRAMFS_FSTYPES}"`
 
 ## Enable SPI bus
 
@@ -236,10 +183,6 @@ When using device tree kernels, set this variable to enable I2C:
 
     ENABLE_I2C = "1"
 
-Furthermore, to auto-load I2C kernel modules set:
-
-    KERNEL_MODULE_AUTOLOAD:rpi += "i2c-dev i2c-bcm2708"
-
 ## Enable PiTFT support
 
 Basic support for using PiTFT screens can be enabled by adding below in
@@ -260,7 +203,6 @@ modelname should be added as a MACHINE_FEATURES in local.conf like below:
 List of currently supported models:
 * pitft22
 * pitft28r
-* pitft28c
 * pitft35r
 
 ## Misc. display
@@ -276,11 +218,11 @@ Screen LCD, HDMI interface (<http://www.waveshare.com/7inch-HDMI-LCD-C.htm>) Rev
 RaspberryPi 0, 1, 2 and CM will have UART console enabled by default.
 
 RaspberryPi 0 WiFi and 3 does not have the UART enabled by default because this
-needs a fixed core frequency and enable_uart will set it to the minimum. Certain
+needs a fixed core frequency and enable_uart wil set it to the minimum. Certain
 operations - 60fps h264 decode, high quality deinterlace - which aren't
 performed on the ARM may be affected, and we wouldn't want to do that to users
 who don't want to use the serial port. Users who want serial console support on
-RaspberryPi 0 Wifi or 3 will have to explicitly set in local.conf:
+RaspberryPi3 will have to explicitly set in local.conf:
 
     ENABLE_UART = "1"
 
@@ -296,27 +238,6 @@ local.conf:
 
     ENABLE_DWC2_PERIPHERAL = "1"
 
-## Enable USB host support
-
-By default in case of the Compute Module 4 IO Board the standard USB driver
-that usually supports host mode operations is disabled for power saving reasons.
-Users who want to use the 2 USB built-in ports or the other ports provided via
-the header extension should set the following in local.conf:
-
-    ENABLE_DWC2_HOST = "1"
-
-## Set CPUs to be isolated from the standard Linux scheduler
-
-By default Linux will use all available CPUs for scheduling tasks. For real time
-purposes there can be an advantage to isolating one or more CPUs from the
-standard scheduler. It should be noted that CPU 0 is special, it is the only CPU
-available during the early stages of the boot process and cannot be isolated.
-
-The string assigned to this variable may be a single CPU number, a comma
-separated list ("1,2"), a range("1-3"), or a mixture of these ("1,3-5")
-
-    ISOLATED_CPUS = "1-2"
-
 ## Enable Openlabs 802.15.4 radio module
 
 When using device tree kernels, set this variable to enable the 802.15.4 hat:
@@ -325,85 +246,6 @@ When using device tree kernels, set this variable to enable the 802.15.4 hat:
 
 See: <https://openlabs.co/OSHW/Raspberry-Pi-802.15.4-radio>
 
-## Enable CAN
-
-In order to use CAN with an MCP2515-based module, set the following variables:
-
-    ENABLE_SPI_BUS = "1"
-    ENABLE_CAN = "1"
-
-In case of dual CAN module (e.g. PiCAN2 Duo), set following variables instead:
-
-    ENABLE_SPI_BUS = "1"
-    ENABLE_DUAL_CAN = "1"
-
-Some modules may require setting the frequency of the crystal oscillator used on the particular board. The frequency is usually marked on the package of the crystal. By default, it is set to 16 MHz. To change that to 8 MHz, the following variable also has to be set:
-
-    CAN_OSCILLATOR="8000000"
-
-Configure the interrupt pin to the one connected to the CAN module. By default,
-the pins are set to 25 for can0 and 24 for can1. To change them to 12 and 16,
-the following variables also have to be set:
-
-    CAN0_INTERRUPT_PIN = "12"
-    CAN1_INTERRUPT_PIN = "16"
-
-Tested modules:
-
-* PiCAN2 (16 MHz crystal): <http://skpang.co.uk/catalog/pican2-canbus-board-for-raspberry-pi-23-p-1475.html>
-* WaveShare RS485 CAN HAT (8 MHz or 12 MHz crystal): <https://www.waveshare.com/rs485-can-hat.htm>
-* PiCAN2 Duo (16 MHz crystal): <http://skpang.co.uk/catalog/pican2-duo-canbus-board-for-raspberry-pi-23-p-1480.html>
-
-To enable the 2-Channel CAN-BUS(FD) Shield (MCP2518FD), set:
-
-    ENABLE_DUAL_CAN_SEED_FD_HAT_V2 = "1"
-
-* Seed Studio (2-Channel CAN-BUS(FD) Shield): <https://wiki.seeedstudio.com/2-Channel-CAN-BUS-FD-Shield-for-Raspberry-Pi/>
-
-## Enable infrared
-
-Users who want to enable infrared support, for example for using LIRC (Linux
-Infrared Remote Control), have to explicitly set in local.conf:
-
-    ENABLE_IR = "1"
-
-This will add device tree overlays gpio-ir and gpio-ir-tx to config.txt.
-Appropriate kernel modules will be also included in the image. By default the
-GPIO pin for gpio-ir is set to 18 and the pin for gpio-ir-tx is 17. Both pins
-can be easily changed by modifying variables `GPIO_IR` and `GPIO_IR_TX`.
-
-## Enable gpio-shutdown
-
-When using device tree kernels, set this variable to enable gpio-shutdown:
-
-    ENABLE_GPIO_SHUTDOWN = "1"
-
-This will add the corresponding device tree overlay to config.txt and include
-the gpio-keys kernel module in the image. If System V init is used, additional
-mapping is applied to bind the button event to shutdown command. Systemd init
-should handle the event out of the box.
-
-By default the feature uses gpio pin 3 (except RPi 1 Model B rev 1 enumerates
-the pin as gpio 1). This conflicts with the I2C bus. If you set `ENABLE_I2C`
-to `1` or enabled `PiTFT` support, or otherwise want to use another pin, use
-`GPIO_SHUTDOWN_PIN` to assign another pin. Example using gpio pin 25:
-
-     GPIO_SHUTDOWN_PIN = "25"
-
-## Enable One-Wire Interface
-
-One-wire is a single-wire communication bus typically used to connect sensors
-to the RaspberryPi. The Raspberry Pi supports one-wire on any GPIO pin, but
-the default is GPIO 4. To enable the one-wire interface explicitly set it in
-`local.conf`
-
-    ENABLE_W1 = "1"
-
-Once discovery is complete you can list the devices that your Raspberry Pi has
-discovered via all 1-Wire busses check the interface with this command
-
-`ls /sys/bus/w1/devices/`
-
 ## Manual additions to config.txt
 
 The `RPI_EXTRA_CONFIG` variable can be used to manually add additional lines to
@@ -419,94 +261,3 @@ option:
         # Raspberry Pi 7\" display/touch screen \n \
         lcd_rotate=2 \n \
         '
-## Enable Raspberry Pi Camera Module
-
-Raspberry Pi does not have the unicam device ( Raspberry Pi Camera ) enabled by default.
-Because this unicam device ( bcm2835-unicam ) as of now is used by libcamera opensource.
-So we have to explicitly enable it in local.conf.
-
-    RASPBERRYPI_CAMERA_V2 = "1"
-
-This will add the device tree overlay imx219 ( Raspberry Pi Camera Module V2 sensor driver 
-) to config.txt. Also, this will enable adding Contiguous Memory Allocation value in the 
-cmdline.txt.
-
-Similarly, the Raspberry Pi Camera Module v3 also has to be explicitly enabled in local.conf.
-
-    RASPBERRYPI_CAMERA_V3 = "1"
-
-This will add the device tree overlay imx708 ( Raspberry Pi Camera Module V3 sensor driver ) 
-to config.txt.
-
-See:
-* <https://www.raspberrypi.com/documentation/computers/camera_software.html>
-* <https://www.raspberrypi.org/blog/an-open-source-camera-stack-for-raspberry-pi-using-libcamera/>
-
-## WM8960 soundcard support
-
-Support for WM8960 based sound cards such as the WM8960 Hi-Fi Sound Card HAT for Raspberry Pi from Waveshare, and ReSpeaker 2 / 4 / 6 Mics Pi HAT from Seeed Studio, can be enabled in `local.conf`
-
-    MACHINE_FEATURES += "wm8960"
-
-You may need to adjust volume and toggle switches that are off by default
-
-    amixer -c1 sset 'Headphone',0 80%,80%
-    amixer -c1 sset 'Speaker',0 80%,80%
-    amixer -c1 sset 'Left Input Mixer Boost' toggle
-    amixer -c1 sset 'Left Output Mixer PCM' toggle
-    amixer -c1 sset 'Right Input Mixer Boost' toggle
-    amixer -c1 sset 'Right Output Mixer PCM' toggle
-
-Audio capture on ReSpeaker 2 / 4 / 6 Mics Pi HAT from Seeed Studio is very noisy.
-
-## Support for RTC devices
-
-The RaspberryPi boards don't feature an RTC module and the machine
-configurations provided in this BSP layer have this assumption (until, if at
-all, some later boards will come with one).
-
-`rtc` is handled as a `MACHINE_FEATURES` in the context of the build system
-which means that if an attached device is provided for which support is needed,
-the recommended way forward is to write a new machine configuration based on an
-existing one. Check the documentation for
-`MACHINE_FEATURES_BACKFILL_CONSIDERED` for how this is disabled for the
-relevant machines.
-
-Even when `MACHINE_FEATURES` is tweaked to include the needed `rtc` string,
-make sure that your kernel configuration is supporting the attached device and
-the device tree is properly tweaked. Also, mind the runtime components that
-take advantage of your RTC device. You can do that by checking what is
-included/configured in the build system based on the inclusion of `rtc` in
-`MACHINE_FEATURES`.
-
-## Raspberry Pi Distro VLC
-
-To enable Raspberry Pi Distro VLC, the `meta-openembedded/meta-multimedia` layer must be
-included in your `bblayers.conf`.
-
-VLC does not support HW accelerated video decode through MMAL on a 64-bit OS.
-
-See:
-* <https://forums.raspberrypi.com/viewtopic.php?t=275370>
-* <https://forums.raspberrypi.com/viewtopic.php?t=325218#p1946169>
-
-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 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_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.
-
-    DISPLAYNUM=$(tvservice -l | tail -c 2)
-    MMAL_DISPLAY=$(expr $DISPLAYNUM + 1)
-    VLC_SETTINGS="-I dummy --vout=mmal_vout --mmal-resize --mmal-display hdmi-$MMAL_DISPLAY --no-dbus"
-    cvlc $VLC_SETTINGS <video/playlist>

docs/index.rst

@@ -15,7 +15,6 @@ Contents:
    layer-contents
    extra-build-config
    extra-apps
-   ipcompliance
    contributing
 
 Indices and tables

docs/ipcompliance.md

@@ -1,23 +0,0 @@
-# IP Compliance
-
-## linux-firmware-rpidistro
-
-By default, some of the machine configurations recommend packages for the
-WiFi/BT firmware, provided by
-[linux-firmware-rpidistro](https://github.com/RPi-Distro/firmware-nonfree).
-This package includes some firmware blobs under the `Synaptics` license which
-could carry a legal risk: one of the clauses can be (at least theoretically)
-used as a `killswitch`. This was
-[reported](https://github.com/RPi-Distro/firmware-nonfree/issues/29) in the
-upstream repository.
-
-You can find the full license text body in the content of the above mentioned
-package.
-
-Due to the above, the build system will only allow this recipe to be built if
-the user acknowledges this risk by adding the following configuration:
-
-    LICENSE_FLAGS_ACCEPTED = "synaptics-killswitch"
-
-You can provide this configuration as part of your `local.conf`, `distro.conf`,
-etc.

docs/layer-contents.md

@@ -5,44 +5,14 @@
 * raspberrypi
 * raspberrypi0
 * raspberrypi0-wifi
-* raspberrypi0-2w-64
 * raspberrypi2
-* raspberrypi2-64 (64 bit kernel & userspace)
 * raspberrypi3
 * raspberrypi3-64 (64 bit kernel & userspace)
-* raspberrypi4
-* raspberrypi4-64 (64 bit kernel & userspace)
-* raspberrypi5
 * raspberrypi-cm (dummy alias for raspberrypi)
 * raspberrypi-cm3
 
-Note: The raspberrypi2-64 machine includes 64-bit support for Raspberry Pi 2B
-V1.2.
-
 Note: The raspberrypi3 machines include support for Raspberry Pi 3B+.
 
-## Multi-board Machines
-
-This layer generally provides support for machines that are targetting a single
-Raspberry Pi board (or a very few subsets of them). This is so that the build
-infrastructure can tune and tweak the configuration with the flexibility to
-optimise for both runtime performance and disk storage.
-
-For usecases where compatibility of more boards is required, the layer provides
-machines that are tagetting a wider support of Raspberry Pi boards.
-
-### raspberrypi-armv7
-
-This machine targets support for all the ARMv7-based Raspberry Pi boards. It
-will pull in the firmware and deploy the kernel image and kernel modules for
-all the relevant boards.
-
-### raspberrypi-armv8
-
-This machine targets support for all the ARMv8-based Raspberry Pi boards. It
-will pull in the firmware and deploy the kernel image and kernel modules for
-all the relevant boards.
-
 ## Images
 
 * rpi-test-image
@@ -50,7 +20,8 @@ all the relevant boards.
     layer and some media samples.
 
 For other uses it's recommended to base images on `core-image-minimal` or
-`core-image-base` as appropriate.
+`core-image-base` as appropriate. The old image names (`rpi-hwup-image` and
+`rpi-basic-image`) are deprecated.
 
 ## WiFi and Bluetooth Firmware
 

docs/requirements.txt

@@ -1,2 +0,0 @@
-myst_parser
-sphinx_rtd_theme

dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/lircd.service

@@ -1,11 +0,0 @@
-[Unit]
-Description=LIRC Infrared Signal Decoder
-Wants=lircd-setup.service
-After=network.target lircd-setup.service
-
-[Service]
-Type=simple
-ExecStart=/usr/sbin/lircd --nodaemon
-
-[Install]
-WantedBy=multi-user.target

dynamic-layers/meta-python/recipes-connectivity/lirc/lirc_0.10.%.bbappend

@@ -1,5 +0,0 @@
-FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
-
-SRC_URI:append:rpi = " \
-        file://lircd.service \
-"

dynamic-layers/meta-python/recipes-core/packagegroups/packagegroup-rpi-test.bbappend

@@ -1,4 +0,0 @@
-FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
-
-RDEPENDS:${PN} += "python3-sense-hat"
-

dynamic-layers/multimedia-layer/recipes-multimedia/libcamera-apps/libcamera-apps/0001-utils-version.py-use-usr-bin-env-in-shebang.patch

@@ -1,42 +0,0 @@
-From bbc1ea3e4119c665723cfd1c5a364bc8c7cbb464 Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Thu, 4 May 2023 18:07:16 +0000
-Subject: [PATCH] utils/version.py: use /usr/bin/env in shebang
-
-* it uses subprocess text=True which is available only since python-3.7
-  when running on host with python-3.6 it fails with:
-Traceback (most recent call last):
-  File "TOPDIR/BUILD/work/raspberrypi4_64-oe-linux/rpi-libcamera-apps/git-r0/git/utils/version.py", line 19, in generate_version
-    stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, text=True)
-  File "/usr/lib/python3.6/subprocess.py", line 423, in run
-    with Popen(*popenargs, **kwargs) as process:
-TypeError: __init__() got an unexpected keyword argument 'text'
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File "TOPDIR/BUILD/work/raspberrypi4_64-oe-linux/rpi-libcamera-apps/git-r0/git/utils/version.py", line 52, in <module>
-    generate_version()
-  File "TOPDIR/BUILD/work/raspberrypi4_64-oe-linux/rpi-libcamera-apps/git-r0/git/utils/version.py", line 48, in generate_version
-    print(f'{commit} {datetime.now().strftime("%d-%m-%Y (%H:%M:%S)")}', end="")
-UnboundLocalError: local variable 'commit' referenced before assignment
-Generating version string:
-
-  even when newer python3 is in PATH (either from buildtools or from python3native)
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-Upstream-Status: Pending
----
- utils/version.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/utils/version.py b/utils/version.py
-index 48d7e05..4a5e35c 100755
---- a/utils/version.py
-+++ b/utils/version.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/env python3
- 
- # Copyright (C) 2021, Raspberry Pi (Trading) Limited
- # Generate version information for rpicam-apps

dynamic-layers/multimedia-layer/recipes-multimedia/libcamera-apps/libcamera-apps/add-missing-header.patch

@@ -1,24 +0,0 @@
-add missing header
-
-When compiling with gcc15, compiliation fails with the following error:
-
-| In file included from ../sources/libcamera-apps-1.9.0/post_processing_stages/segmentation_tf_stage.cpp:8:
-| ../sources/libcamera-apps-1.9.0/post_processing_stages/segmentation.hpp:15:82: error: 'uint8_t' was not declared in this scope
-|    15 |         Segmentation(int w, int h, std::vector<std::string> l, const std::vector<uint8_t> &s)
-
-To avoid it, add the cstdint header to the offending file.
-
-Upstream-Status: Submitted [https://github.com/raspberrypi/rpicam-apps/pull/861]
-Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
-diff --git a/post_processing_stages/segmentation.hpp b/post_processing_stages/segmentation.hpp
-index ac87228..82d7939 100644
---- a/post_processing_stages/segmentation.hpp
-+++ b/post_processing_stages/segmentation.hpp
-@@ -7,6 +7,7 @@
- 
- #pragma once
- 
-+#include <cstdint>
- #include <string>
- #include <vector>
- 

dynamic-layers/multimedia-layer/recipes-multimedia/libcamera-apps/libcamera-apps_1.9.0.bb

@@ -1,47 +0,0 @@
-SUMMARY = "A suite of libcamera-based apps"
-DESCRIPTION = "This is a small suite of libcamera-based apps that aim to \
-copy the functionality of the existing \"raspicam\" apps."
-HOMEPAGE = "https://github.com/raspberrypi/rpicam-apps"
-SECTION = "console/utils"
-
-LICENSE = "BSD-2-Clause"
-LIC_FILES_CHKSUM = "file://license.txt;md5=a0013d1b383d72ba4bdc5b750e7d1d77"
-
-SRC_URI = "\
-    git://github.com/raspberrypi/rpicam-apps.git;protocol=https;branch=main \
-    file://0001-utils-version.py-use-usr-bin-env-in-shebang.patch \
-    file://add-missing-header.patch \
-"
-
-SRCREV = "eca9928b76c106141667288f1cef935d02ba59b3"
-
-PROVIDES += "rpicam-apps"
-
-DEPENDS = "libcamera libexif jpeg tiff libpng boost"
-
-PACKAGECONFIG ??= "drm"
-PACKAGECONFIG[libav] = "-Denable_libav=enabled, -Denable_libav=disabled, libav"
-PACKAGECONFIG[drm] = "-Denable_drm=enabled, -Denable_drm=disabled, libdrm"
-PACKAGECONFIG[egl] = "-Denable_egl=enabled, -Denable_egl=disabled, virtual/egl"
-PACKAGECONFIG[qt] = "-Denable_qt=enabled, -Denable_qt=disabled, qtbase"
-PACKAGECONFIG[opencv] = "-Denable_opencv=enabled, -Denable_opencv=disabled, opencv"
-PACKAGECONFIG[tflite] = "-Denable_tflite=enabled, -Denable_tflite=disabled, tensorflow-lite"
-
-inherit meson pkgconfig
-
-NEON_FLAGS = ""
-NEON_FLAGS:aarch64 = "-Dneon_flags=arm64"
-NEON_FLAGS:arm:raspberrypi3 = "-Dneon_flags=armv8-neon"
-NEON_FLAGS:arm:raspberrypi4 = "-Dneon_flags=armv8-neon"
-EXTRA_OEMESON += "${NEON_FLAGS}"
-
-# QA Issue: /usr/bin/camera-bug-report contained in package libcamera-apps requires /usr/bin/python3
-# QA Issue: File /usr/lib/pkgconfig/rpicam_app.pc in package libcamera-apps-dev contains reference to TMPDIR
-do_install:append() {
-    rm -v ${D}/${bindir}/camera-bug-report
-    sed -i "s,${RECIPE_SYSROOT}${libdir},$\{libdir},g" ${D}${libdir}/pkgconfig/rpicam_app.pc
-}
-
-FILES:${PN} += "${libdir}/rpicam-apps-postproc \
-                ${libdir}/rpicam-apps-preview \
-                ${datadir}/rpi-camera-assets"

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

@@ -1,3 +0,0 @@
-EXTRA_OEMESON:append:rpi = " -Dipas=rpi/vc4,rpi/pisp"
-PACKAGECONFIG:append:rpi = " raspberrypi"
-CXXFLAGS:append:rpi = " -Wno-unaligned-access "

dynamic-layers/multimedia-layer/recipes-multimedia/libpisp/libpisp_1.3.0.bb

@@ -1,14 +0,0 @@
-DESCRIPTION = "A helper library to generate run-time configuration for the Raspberry Pi \
-ISP (PiSP), consisting of the Frontend and Backend hardware components."
-HOMEPAGE = "https://github.com/raspberrypi/libpisp"
-LICENSE = "BSD-2-Clause & GPL-2.0-only & GPL-2.0-or-later"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3417a46e992fdf62e5759fba9baef7a7 \
-                    file://LICENSES/GPL-2.0-only.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-                    file://LICENSES/GPL-2.0-or-later.txt;md5=fed54355545ffd980b814dab4a3b312c"
-
-SRC_URI = "git://github.com/raspberrypi/libpisp.git;protocol=https;branch=main;tag=v${PV}"
-SRCREV = "9ba67e6680f03f31f2b1741a53e8fd549be82cbe"
-
-DEPENDS = "nlohmann-json"
-
-inherit meson pkgconfig

dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/0001-configure-fix-linking-on-RISC-V-ISA.patch

@@ -1,25 +0,0 @@
-From: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= <remi@remlab.net>
-Date: Sat, 16 Jun 2018 21:31:45 +0300
-Subject: configure: fix linking on RISC-V ISA
-
-Upstream-Status: Inappropriate
-
-RPI-Distro repo forks original vlc and applies patches
-to enable raspiberry pi support.
-
----
- configure.ac | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/configure.ac b/configure.ac
-index 2037a9e..df26367 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -113,6 +113,7 @@ case "${host_os}" in
-     ;;
-   linux*)
-     SYS=linux
-+    test "${host_cpu}" = "riscv64" && CFLAGS="${CFLAGS} -pthread"
-     ;;
-   bsdi*)
-     SYS=bsdi

dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/0002-Revert-configure-Require-libmodplug-0.8.9.patch

@@ -1,27 +0,0 @@
-From: Sebastian Ramacher <sramacher@debian.org>
-Date: Mon, 19 Aug 2019 21:08:26 +0200
-Subject: Revert "configure: Require libmodplug >= 0.8.9"
-
-Upstream-Status: Inappropriate
-
-RPI-Distro repo forks original vlc and applies patches
-to enable raspiberry pi support.
-
-This reverts commit 48f014768dc22ecad23d0e9f53c38805a3aff832.
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index df26367..b8580ec 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2207,7 +2207,7 @@ AC_ARG_ENABLE(mod,
-   [AS_HELP_STRING([--disable-mod],
-     [do not use libmodplug (default auto)])])
- if test "${enable_mod}" != "no" ; then
--    PKG_CHECK_MODULES(LIBMODPLUG, [libmodplug >= 0.8.9.0], [
-+    PKG_CHECK_MODULES(LIBMODPLUG, [libmodplug >= 0.8.4 libmodplug != 0.8.8], [
-           VLC_ADD_PLUGIN([mod])
-           VLC_ADD_CXXFLAGS([mod],[$LIBMODPLUG_CFLAGS])
-           VLC_ADD_CFLAGS([mod],[$LIBMODPLUG_CFLAGS]) #modules/demux/mod.c needs CFLAGS_mod, not CXXFLAGS_mod

dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/0003-CVE-2022-41325.patch

@@ -1,83 +0,0 @@
-From 4fcace61801f418786c42487c6b06b693ee87666 Mon Sep 17 00:00:00 2001
-From: Romain Vimont <rom1v@videolabs.io>
-Date: Mon, 19 Sep 2022 17:17:01 +0200
-Subject: [PATCH] vnc: fix possible buffer overflow
-
-Upstream-Status: Inappropriate
-
-RPI-Distro repo forks original vlc and applies patches
-to enable raspiberry pi support.
-
-Thanks to 0xMitsurugi [1] from Synacktiv [2] for the bug report and fix.
-
-[1] https://twitter.com/0xMitsurugi
-[2] https://www.synacktiv.com/
-
-Fixes #27335
-
-(cherry picked from commit 5eb783fd44ed6298db3e38f7765f21c42e4405f9)
----
- modules/access/vnc.c | 23 ++++++++++++++++-------
- 1 file changed, 16 insertions(+), 7 deletions(-)
-
---- a/modules/access/vnc.c
-+++ b/modules/access/vnc.c
-@@ -33,6 +33,7 @@
- #ifdef HAVE_CONFIG_H
- # include "config.h"
- #endif
-+#include <assert.h>
- 
- #include <vlc_common.h>
- #include <vlc_plugin.h>
-@@ -115,7 +116,7 @@
-     int i_cancel_state;
- 
-     rfbClient* p_client;
--    int i_framebuffersize;
-+    size_t i_framebuffersize;
-     block_t *p_block;
- 
-     float f_fps;
-@@ -143,11 +144,16 @@
-         p_sys->es = NULL;
-     }
- 
--    int i_width = p_client->width;
--    int i_height = p_client->height;
--    int i_depth = p_client->format.bitsPerPixel;
-+    assert(!(p_client->width & ~0xffff)); // fits in 16 bits
-+    uint16_t i_width = p_client->width;
- 
--    switch( i_depth )
-+    assert(!(p_client->height & ~0xffff)); // fits in 16 bits
-+    uint16_t i_height = p_client->height;
-+
-+    uint8_t i_bits_per_pixel = p_client->format.bitsPerPixel;
-+    assert((i_bits_per_pixel & 0x7) == 0); // multiple of 8
-+
-+    switch( i_bits_per_pixel )
-     {
-         case 8:
-             i_chroma = VLC_CODEC_RGB8;
-@@ -180,7 +186,10 @@
-     }
- 
-     /* Set up framebuffer */
--    p_sys->i_framebuffersize = i_width * i_height * i_depth / 8;
-+    if (mul_overflow(i_width, i_height * (i_bits_per_pixel / 8), &p_sys->i_framebuffersize)) {
-+        msg_Err(p_demux, "VNC framebuffersize overflow");
-+        return FALSE;
-+    }
- 
-     /* Reuse unsent block */
-     if ( p_sys->p_block )
-@@ -211,7 +220,7 @@
-     fmt.video.i_frame_rate_base = 1000;
-     fmt.video.i_frame_rate = 1000 * p_sys->f_fps;
- 
--    fmt.video.i_bits_per_pixel = i_depth;
-+    fmt.video.i_bits_per_pixel = i_bits_per_pixel;
-     fmt.video.i_rmask = p_client->format.redMax << p_client->format.redShift;
-     fmt.video.i_gmask = p_client->format.greenMax << p_client->format.greenShift;
-     fmt.video.i_bmask = p_client->format.blueMax << p_client->format.blueShift;

dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/0005-mmal_exit_fix.patch

@@ -1,19 +0,0 @@
-Upstream-Status: Inappropriate
-
-RPI-Distro repo forks original vlc and applies patches
-to enable raspiberry pi support.
-
---- a/bin/vlc.c
-+++ b/bin/vlc.c
-@@ -106,7 +106,10 @@ static void vlc_kill (void *data)
- static void exit_timeout (int signum)
- {
-     (void) signum;
--    signal (SIGINT, SIG_DFL);
-+// This doesn't seem to be strong enough to reliably kill us if we fail to exit
-+// in a timely fashion - so upgrade to _exit().
-+//    signal (SIGINT, SIG_DFL);
-+    _exit(0);
- }
- 
- /*****************************************************************************

dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/0006-mmal_chain.patch

@@ -1,19 +0,0 @@
-Upstream-Status: Inappropriate
-
-RPI-Distro repo forks original vlc and applies patches
-to enable raspiberry pi support.
-
---- a/modules/video_chroma/chain.c
-+++ b/modules/video_chroma/chain.c
-@@ -280,8 +280,9 @@ static int BuildTransformChain( filter_t
-         return VLC_SUCCESS;
- 
-     /* Lets try resize+chroma first, then transform */
--    msg_Dbg( p_filter, "Trying to build chroma+resize" );
--    EsFormatMergeSize( &fmt_mid, &p_filter->fmt_out, &p_filter->fmt_in );
-+    msg_Dbg( p_filter, "Trying to build chroma+resize, then transform" );
-+    es_format_Copy( &fmt_mid, &p_filter->fmt_out );
-+    video_format_TransformTo(&fmt_mid.video, p_filter->fmt_in.video.orientation);
-     i_ret = CreateChain( p_filter, &fmt_mid );
-     es_format_Clean( &fmt_mid );
-     if( i_ret == VLC_SUCCESS )

dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/0007-armv6.patch

@@ -1,53 +0,0 @@
-Upstream-Status: Inappropriate
-
-RPI-Distro repo forks original vlc and applies patches
-to enable raspiberry pi support.
-
---- a/modules/hw/mmal/blend_rgba_neon.S
-+++ b/modules/hw/mmal/blend_rgba_neon.S
-@@ -1,10 +1,10 @@
--        .syntax unified
--        .arm
--//      .thumb
--        .text
-+#include "../../arm_neon/asm.S"
-         .align 16
-         .arch armv7-a
--        .fpu neon-vfpv4
-+        .syntax unified
-+#if HAVE_AS_FPU_DIRECTIVE
-+        .fpu    neon-vfpv4
-+#endif
- 
- @ blend_rgbx_rgba_neon
- 
---- a/modules/hw/mmal/codec.c
-+++ b/modules/hw/mmal/codec.c
-@@ -29,6 +29,7 @@
- #include <stdatomic.h>
- 
- #include <vlc_common.h>
-+#include <vlc_cpu.h>
- #include <vlc_plugin.h>
- #include <vlc_codec.h>
- #include <vlc_filter.h>
-@@ -2311,6 +2312,9 @@ static int OpenBlendMmal(vlc_object_t *o
-     filter_t * const p_filter = (filter_t *)object;
-     const vlc_fourcc_t vfcc_dst = p_filter->fmt_out.video.i_chroma;
- 
-+    if (!vlc_CPU_ARM_NEON())
-+        return VLC_EGENERIC;
-+
-     if (!hw_mmal_chroma_is_mmal(vfcc_dst) ||
-         !hw_mmal_vzc_subpic_fmt_valid(&p_filter->fmt_in.video))
-     {
-@@ -2421,6 +2425,9 @@ static int OpenBlendNeon(vlc_object_t *o
-     MMAL_FOURCC_T mfcc_dst = vlc_to_mmal_video_fourcc(&p_filter->fmt_out.video);
-     blend_neon_fn * blend_fn = (blend_neon_fn *)0;
- 
-+    if (!vlc_CPU_ARM_NEON())
-+        return VLC_EGENERIC;
-+
-     // Non-alpha RGB only for dest
-     if (vfcc_dst != VLC_CODEC_RGB32)
-         return VLC_EGENERIC;

dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/0008-configure-Disable-incompatible-function-pointer-type.patch

@@ -1,26 +0,0 @@
-From 048e4fdd08ac588feb27b03e3ec1824e24f77d62 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sun, 5 Mar 2023 14:13:25 -0800
-Subject: [PATCH 3/3] configure: Disable incompatible-function-pointer-types
- warning
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- configure.ac | 5 +++++
- 1 file changed, 5 insertions(+)
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -105,6 +105,11 @@ AC_SUBST([AM_CFLAGS], [-fcommon])
- dnl Prevent clang from accepting unknown flags with a mere warning
- AX_APPEND_COMPILE_FLAGS([-Werror=unknown-warning-option -Werror=invalid-command-line-argument], [CFLAGS])
- AX_APPEND_COMPILE_FLAGS([-Werror=unknown-warning-option -Werror=invalid-command-line-argument], [CXXFLAGS])
-+dnl disable clang from erroring on function pointer protype mismatch, vlc seems to rely on that
-+dnl especially in  modules/video_filter/deinterlace/algo_yadif.c how it interpolates 'filter` variable
-+dnl between different functions yadif_filter_line_c_16bit() and yadif_filter_line_c()
-+AX_APPEND_COMPILE_FLAGS([-Wno-error=incompatible-function-pointer-types -Wno-error=incompatible-function-pointer-types], [CFLAGS])
-+AX_APPEND_COMPILE_FLAGS([-Wno-error=incompatible-function-pointer-types -Wno-error=incompatible-function-pointer-types], [CXXFLAGS])
- 
- dnl
- dnl  Check the operating system

dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/0009-demux-dash-include-cstdint-needed-for-uint64_t.patch

@@ -1,30 +0,0 @@
-From 6fca76ebd76bf8fce9b111e31bda64015cdc770f Mon Sep 17 00:00:00 2001
-From: Johannes Kauffmann <johanneskauffmann@hotmail.com>
-Date: Mon, 11 Jul 2022 19:35:57 +0000
-Subject: [PATCH] demux: dash: include cstdint, needed for uint64_t
-
-Fixes #27077.
-
-Upstream-Status: Backport
-
-https://github.com/videolan/vlc/commit/6fca76ebd76bf8fce9b111e31bda64015cdc770f
-
----
- modules/demux/dash/mpd/TemplatedUri.hpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/modules/demux/dash/mpd/TemplatedUri.hpp b/modules/demux/dash/mpd/TemplatedUri.hpp
-index 1eeb70cbb6..7f7264a9c8 100644
---- a/modules/demux/dash/mpd/TemplatedUri.hpp
-+++ b/modules/demux/dash/mpd/TemplatedUri.hpp
-@@ -21,6 +21,7 @@
- #ifndef TEMPLATEDURI_HPP
- #define TEMPLATEDURI_HPP
- 
-+#include <cstdint>
- #include <string>
- 
- namespace dash
--- 
-2.34.1
-

dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/2001-fix-luaL-checkint.patch

@@ -1,236 +0,0 @@
-* luaL_checkint and luaL_optint were deprecated in lua 5.3
-* replacement functions are luaL_checkinteger and luaL_optinteger
-
-Upstream-Status: Inappropriate
-
-RPI-Distro repo forks original vlc and applies patches to enable
-raspiberry pi support.
-
-Signed-off-by: Tim Orling <TicoTimo@gmail.com>
-
---- a/modules/lua/demux.c
-+++ b/modules/lua/demux.c
-@@ -52,7 +52,7 @@ struct vlclua_playlist
- static int vlclua_demux_peek( lua_State *L )
- {
-     stream_t *s = (stream_t *)vlclua_get_this(L);
--    int n = luaL_checkint( L, 1 );
-+    int n = luaL_checkinteger( L, 1 );
-     const uint8_t *p_peek;
- 
-     ssize_t val = vlc_stream_Peek(s->p_source, &p_peek, n);
-@@ -66,7 +66,7 @@ static int vlclua_demux_peek( lua_State
- static int vlclua_demux_read( lua_State *L )
- {
-     stream_t *s = (stream_t *)vlclua_get_this(L);
--    int n = luaL_checkint( L, 1 );
-+    int n = luaL_checkinteger( L, 1 );
-     char *buf = malloc(n);
- 
-     if (buf != NULL)
---- a/modules/lua/libs/net.c
-+++ b/modules/lua/libs/net.c
-@@ -179,7 +179,7 @@ static int vlclua_net_listen_tcp( lua_St
- {
-     vlc_object_t *p_this = vlclua_get_this( L );
-     const char *psz_host = luaL_checkstring( L, 1 );
--    int i_port = luaL_checkint( L, 2 );
-+    int i_port = luaL_checkinteger( L, 2 );
-     int *pi_fd = net_ListenTCP( p_this, psz_host, i_port );
-     if( pi_fd == NULL )
-         return luaL_error( L, "Cannot listen on %s:%d", psz_host, i_port );
-@@ -251,7 +251,7 @@ static int vlclua_net_connect_tcp( lua_S
- {
-     vlc_object_t *p_this = vlclua_get_this( L );
-     const char *psz_host = luaL_checkstring( L, 1 );
--    int i_port = luaL_checkint( L, 2 );
-+    int i_port = luaL_checkinteger( L, 2 );
-     int i_fd = net_ConnectTCP( p_this, psz_host, i_port );
-     lua_pushinteger( L, vlclua_fd_map_safe( L, i_fd ) );
-     return 1;
-@@ -259,14 +259,14 @@ static int vlclua_net_connect_tcp( lua_S
- 
- static int vlclua_net_close( lua_State *L )
- {
--    int i_fd = luaL_checkint( L, 1 );
-+    int i_fd = luaL_checkinteger( L, 1 );
-     vlclua_fd_unmap_safe( L, i_fd );
-     return 0;
- }
- 
- static int vlclua_net_send( lua_State *L )
- {
--    int fd = vlclua_fd_get( L, luaL_checkint( L, 1 ) );
-+    int fd = vlclua_fd_get( L, luaL_checkinteger( L, 1 ) );
-     size_t i_len;
-     const char *psz_buffer = luaL_checklstring( L, 2, &i_len );
- 
-@@ -278,7 +278,7 @@ static int vlclua_net_send( lua_State *L
- 
- static int vlclua_net_recv( lua_State *L )
- {
--    int fd = vlclua_fd_get( L, luaL_checkint( L, 1 ) );
-+    int fd = vlclua_fd_get( L, luaL_checkinteger( L, 1 ) );
-     size_t i_len = (size_t)luaL_optinteger( L, 2, 1 );
-     char psz_buffer[i_len];
- 
-@@ -312,7 +312,7 @@ static int vlclua_net_poll( lua_State *L
-     lua_pushnil( L );
-     for( int i = 0; lua_next( L, 1 ); i++ )
-     {
--        luafds[i] = luaL_checkint( L, -2 );
-+        luafds[i] = luaL_checkinteger( L, -2 );
-         p_fds[i].fd = vlclua_fd_get( L, luafds[i] );
-         p_fds[i].events = luaL_checkinteger( L, -1 );
-         p_fds[i].events &= POLLIN | POLLOUT | POLLPRI;
-@@ -360,7 +360,7 @@ static int vlclua_fd_open( lua_State *L
- #ifndef _WIN32
- static int vlclua_fd_write( lua_State *L )
- {
--    int fd = vlclua_fd_get( L, luaL_checkint( L, 1 ) );
-+    int fd = vlclua_fd_get( L, luaL_checkinteger( L, 1 ) );
-     size_t i_len;
-     const char *psz_buffer = luaL_checklstring( L, 2, &i_len );
- 
-@@ -371,7 +371,7 @@ static int vlclua_fd_write( lua_State *L
- 
- static int vlclua_fd_read( lua_State *L )
- {
--    int fd = vlclua_fd_get( L, luaL_checkint( L, 1 ) );
-+    int fd = vlclua_fd_get( L, luaL_checkinteger( L, 1 ) );
-     size_t i_len = (size_t)luaL_optinteger( L, 2, 1 );
-     char psz_buffer[i_len];
- 
---- a/modules/lua/libs/osd.c
-+++ b/modules/lua/libs/osd.c
-@@ -154,7 +154,7 @@ static int vlc_osd_slider_type_from_stri
- 
- static int vlclua_osd_slider( lua_State *L )
- {
--    int i_position = luaL_checkint( L, 1 );
-+    int i_position = luaL_checkinteger( L, 1 );
-     const char *psz_type = luaL_checkstring( L, 2 );
-     int i_type = vlc_osd_slider_type_from_string( psz_type );
-     int i_chan = (int)luaL_optinteger( L, 3, VOUT_SPU_CHANNEL_OSD );
-@@ -198,7 +198,7 @@ static int vlclua_spu_channel_register(
- 
- static int vlclua_spu_channel_clear( lua_State *L )
- {
--    int i_chan = luaL_checkint( L, 1 );
-+    int i_chan = luaL_checkinteger( L, 1 );
-     input_thread_t *p_input = vlclua_get_input_internal( L );
-     if( !p_input )
-         return luaL_error( L, "Unable to find input." );
---- a/modules/lua/libs/playlist.c
-+++ b/modules/lua/libs/playlist.c
-@@ -69,7 +69,7 @@ static int vlclua_playlist_next( lua_Sta
- 
- static int vlclua_playlist_skip( lua_State * L )
- {
--    int i_skip = luaL_checkint( L, 1 );
-+    int i_skip = luaL_checkinteger( L, 1 );
-     playlist_t *p_playlist = vlclua_get_playlist_internal( L );
-     playlist_Skip( p_playlist, i_skip );
-     return 0;
-@@ -127,7 +127,7 @@ static int vlclua_playlist_random( lua_S
- 
- static int vlclua_playlist_gotoitem( lua_State * L )
- {
--    int i_id = luaL_checkint( L, 1 );
-+    int i_id = luaL_checkinteger( L, 1 );
-     playlist_t *p_playlist = vlclua_get_playlist_internal( L );
-     PL_LOCK;
-     playlist_ViewPlay( p_playlist, NULL,
-@@ -138,7 +138,7 @@ static int vlclua_playlist_gotoitem( lua
- 
- static int vlclua_playlist_delete( lua_State * L )
- {
--    int i_id = luaL_checkint( L, 1 );
-+    int i_id = luaL_checkinteger( L, 1 );
-     playlist_t *p_playlist = vlclua_get_playlist_internal( L );
- 
-     PL_LOCK;
-@@ -152,8 +152,8 @@ static int vlclua_playlist_delete( lua_S
- 
- static int vlclua_playlist_move( lua_State * L )
- {
--    int i_item = luaL_checkint( L, 1 );
--    int i_target = luaL_checkint( L, 2 );
-+    int i_item = luaL_checkinteger( L, 1 );
-+    int i_target = luaL_checkinteger( L, 2 );
-     playlist_t *p_playlist = vlclua_get_playlist_internal( L );
-     PL_LOCK;
-     playlist_item_t *p_item = playlist_ItemGetById( p_playlist, i_item );
---- a/modules/lua/libs/stream.c
-+++ b/modules/lua/libs/stream.c
-@@ -123,7 +123,7 @@ static int vlclua_stream_read( lua_State
- {
-     int i_read;
-     stream_t **pp_stream = (stream_t **)luaL_checkudata( L, 1, "stream" );
--    int n = luaL_checkint( L, 2 );
-+    int n = luaL_checkinteger( L, 2 );
-     uint8_t *p_read = malloc( n );
-     if( !p_read ) return vlclua_error( L );
- 
---- a/modules/lua/libs/volume.c
-+++ b/modules/lua/libs/volume.c
-@@ -48,7 +48,7 @@
- static int vlclua_volume_set( lua_State *L )
- {
-     playlist_t *p_this = vlclua_get_playlist_internal( L );
--    int i_volume = luaL_checkint( L, 1 );
-+    int i_volume = luaL_checkinteger( L, 1 );
-     if( i_volume < 0 )
-         i_volume = 0;
-     int i_ret = playlist_VolumeSet( p_this, i_volume/(float)AOUT_VOLUME_DEFAULT );
---- a/modules/lua/libs/dialog.c
-+++ b/modules/lua/libs/dialog.c
-@@ -382,7 +382,7 @@ static int lua_GetDialogUpdate( lua_Stat
-     /* Read entry in the Lua registry */
-     lua_pushlightuserdata( L, (void*) &key_update );
-     lua_gettable( L, LUA_REGISTRYINDEX );
--    return luaL_checkint( L, -1 );
-+    return luaL_checkinteger( L, -1 );
- }
- 
- /** Manually update a dialog
-@@ -573,22 +573,22 @@ static int vlclua_create_widget_inner( l
- 
-     /* Set common arguments: col, row, hspan, vspan, width, height */
-     if( lua_isnumber( L, arg ) )
--        p_widget->i_column = luaL_checkint( L, arg );
-+        p_widget->i_column = luaL_checkinteger( L, arg );
-     else goto end_of_args;
-     if( lua_isnumber( L, ++arg ) )
--        p_widget->i_row = luaL_checkint( L, arg );
-+        p_widget->i_row = luaL_checkinteger( L, arg );
-     else goto end_of_args;
-     if( lua_isnumber( L, ++arg ) )
--        p_widget->i_horiz_span = luaL_checkint( L, arg );
-+        p_widget->i_horiz_span = luaL_checkinteger( L, arg );
-     else goto end_of_args;
-     if( lua_isnumber( L, ++arg ) )
--        p_widget->i_vert_span = luaL_checkint( L, arg );
-+        p_widget->i_vert_span = luaL_checkinteger( L, arg );
-     else goto end_of_args;
-     if( lua_isnumber( L, ++arg ) )
--        p_widget->i_width = luaL_checkint( L, arg );
-+        p_widget->i_width = luaL_checkinteger( L, arg );
-     else goto end_of_args;
-     if( lua_isnumber( L, ++arg ) )
--        p_widget->i_height = luaL_checkint( L, arg );
-+        p_widget->i_height = luaL_checkinteger( L, arg );
-     else goto end_of_args;
- 
- end_of_args:
---- a/modules/lua/libs/io.c
-+++ b/modules/lua/libs/io.c
-@@ -139,7 +139,7 @@ static int vlclua_io_file_seek( lua_Stat
-     const char* psz_mode = luaL_optstring( L, 2, NULL );
-     if ( psz_mode != NULL )
-     {
--        long i_offset = luaL_optlong( L, 3, 0 );
-+        long i_offset = (long)luaL_optinteger( L, 3, 0 );
-         int i_mode;
-         if ( !strcmp( psz_mode, "set" ) )
-             i_mode = SEEK_SET;

dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/2002-use-vorbisidec.patch

@@ -1,33 +0,0 @@
-From d0a7ba506fd302ad195f79f287b5a5a154ac02a3 Mon Sep 17 00:00:00 2001
-From: Vincent Davis Jr <vince@underview.tech>
-Date: Sun, 4 Dec 2022 16:09:51 -0600
-Subject: [PATCH] tremor provides libvorbisidec, use it instead of libvorbisdec
-
-Upstream-Status: Inappropriate
-
-RPI-Distro repo forks original vlc and applies patches to enable
-raspiberry pi support.
-
-THIS PATCHES HAS BEEN REIMPLEMENTED INORDER TO APPLY PROPERLY.
-
-Signed-off-by: Tim Orling <TicoTimo@gmail.com>
----
- modules/codec/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/modules/codec/Makefile.am b/modules/codec/Makefile.am
-index 3dadf1119..8b6189e92 100644
---- a/modules/codec/Makefile.am
-+++ b/modules/codec/Makefile.am
-@@ -324,7 +324,7 @@ codec_LTLIBRARIES += $(LTLIBdaala)
- libtremor_plugin_la_SOURCES = codec/vorbis.c
- libtremor_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -DMODULE_NAME_IS_tremor
- libtremor_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)'
--libtremor_plugin_la_LIBADD = -lvorbisdec -logg
-+libtremor_plugin_la_LIBADD = -lvorbisidec -logg
- EXTRA_LTLIBRARIES += libtremor_plugin.la
- codec_LTLIBRARIES += $(LTLIBtremor)
- 
--- 
-2.38.1
-

dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/3001-configure.ac-setup-for-OE-usage.patch

@@ -1,124 +0,0 @@
-From ddc2ea76058466b45a1acf37bed0d794cd3112a3 Mon Sep 17 00:00:00 2001
-From: Vincent Davis Jr <vince@underview.tech>
-Date: Fri, 9 Dec 2022 19:04:42 -0600
-Subject: [PATCH] configure.ac: setup for OE usage
-
-Upstream-Status: Inappropriate
-
-RPI-Distro repo forks original vlc and applies patches to enable
-raspiberry pi support.
-
-Need to use userland graphics libraries package files as it's best
-to not assume /opt/vc is where all libs and headers are installed per
-distro. Also, needed to include $BCMHOST_MMAL_LIBS variable as
-AC_CHECK_LIB(bcm_host) fails to find `vc_tv_unregister_callback_full`.
-Adding $BCMHOST_MMAL_LIBS uses all libs inside
-bcm_host.pc, mmal.pc, vcsm.pc, openmaxil.pc files when checking
-for `vc_tv_unregister_callback_full` function.
-
-Supposed to change linked version to opengl to GLESv2
-
-Ensure correct package config file is used for:
-* opencv
-* freerdp
-
-Adds Workaround for modules/codec/omxil/omxil_core.h
-   multiple definition of `pf_enable_graphic_buffers'
-   multiple definition of `pf_get_graphic_buffer_usage'
-   multiple definition of `pf_get_hal_format'
-
-Signed-off-by: Vincent Davis Jr <vince@underview.tech>
----
- configure.ac | 34 ++++++++++++++++++++++------------
- 1 file changed, 22 insertions(+), 12 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index a72dca0b6..5b8585a26 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -95,6 +95,13 @@ AS_IF([test -n "${with_binary_version}"],[
-          [Binary specific version])
- ])
- 
-+# Workaround for modules/codec/omxil/omxil_core.h
-+#   multiple definition of `pf_enable_graphic_buffers'
-+#   multiple definition of `pf_get_graphic_buffer_usage'
-+#   multiple definition of `pf_get_hal_format'
-+AC_SUBST([AM_CXXFLAGS], [-fcommon])
-+AC_SUBST([AM_CFLAGS], [-fcommon])
-+
- dnl Prevent clang from accepting unknown flags with a mere warning
- AX_APPEND_COMPILE_FLAGS([-Werror=unknown-warning-option -Werror=invalid-command-line-argument], [CFLAGS])
- AX_APPEND_COMPILE_FLAGS([-Werror=unknown-warning-option -Werror=invalid-command-line-argument], [CXXFLAGS])
-@@ -1900,7 +1907,7 @@ PKG_ENABLE_MODULES_VLC([BLURAY], [libbluray], [libbluray >= 0.6.2], (libbluray f
- dnl
- dnl  OpenCV wrapper and example filters
- dnl
--PKG_ENABLE_MODULES_VLC([OPENCV], [opencv_example opencv_wrapper], [opencv > 2.0], (OpenCV (computer vision) filter), [auto])
-+PKG_ENABLE_MODULES_VLC([OPENCV], [opencv_example opencv_wrapper], [opencv4 >= 2.0], (OpenCV (computer vision) filter), [auto])
- 
- 
- dnl
-@@ -2077,7 +2084,7 @@ PKG_ENABLE_MODULES_VLC([VNC], [vnc], [libvncclient >= 0.9.9], (VNC/rfb client su
- 
- dnl  RDP/Remote Desktop access module
- dnl
--PKG_ENABLE_MODULES_VLC([FREERDP], [rdp], [freerdp >= 1.0.1], (RDP/Remote Desktop client support) )
-+PKG_ENABLE_MODULES_VLC([FREERDP], [rdp], [freerdp2 >= 1.0.1], (RDP/Remote Desktop client support) )
- 
- dnl
- dnl  Real RTSP plugin
-@@ -3089,14 +3096,14 @@ PKG_CHECK_MODULES([GL], [gl], [
- #ifdef _WIN32
- # include <GL/glew.h>
- #endif
--#include <GL/gl.h>
-+#include <GLES2/gl2.h>
- ]], [
-     [int t0 = GL_TEXTURE0;]])
-   ], [
-     GL_CFLAGS=""
-     have_gl="yes"
-     AS_IF([test "${SYS}" != "mingw32"], [
--      GL_LIBS="-lGL"
-+      GL_LIBS="-lGLESv2"
-     ], [
-       GL_LIBS="-lopengl32"
-     ])
-@@ -3483,15 +3490,14 @@ AC_ARG_ENABLE(mmal_avcodec,
-     [Use MMAL enabled avcodec libs (default disable)]))
- if test "${enable_mmal}" != "no"; then
-   VLC_SAVE_FLAGS
--  LDFLAGS="${LDFLAGS} -L/opt/vc/lib -lvchostif"
--  CPPFLAGS="${CPPFLAGS} -isystem /opt/vc/include -isystem /opt/vc/include/interface/vcos/pthreads -isystem /opt/vc/include/interface/vmcs_host/linux"
--  AC_CHECK_HEADERS(interface/mmal/mmal.h,
--    [ AC_CHECK_LIB(bcm_host, vc_tv_unregister_callback_full, [
-+  PKG_CHECK_MODULES(BCMHOST_MMAL, [bcm_host mmal vcsm openmaxil egl], [
-+    HAVE_MMAL=yes
-+    AC_CHECK_HEADERS(interface/mmal/mmal.h,
-+      [ AC_CHECK_LIB(bcm_host $BCMHOST_MMAL_LIBS, vc_tv_unregister_callback_full, [
-         have_mmal="yes"
--        VLC_ADD_PLUGIN([mmal])
--        VLC_ADD_LDFLAGS([mmal],[ -L/opt/vc/lib ])
--        VLC_ADD_CFLAGS([mmal],[ -isystem /opt/vc/include -isystem /opt/vc/include/interface/vcos/pthreads -isystem /opt/vc/include/interface/vmcs_host/linux ])
--        VLC_ADD_LIBS([mmal],[ -lbcm_host -lmmal -lmmal_core -lmmal_components -lmmal_util -lvchostif -lvchiq_arm -lvcsm ]) ], [
-+        VLC_ADD_PLUGIN([bcm_host mmal vcsm openmaxil egl])
-+        VLC_ADD_CFLAGS([bcm_host mmal vcsm openmaxil egl],[$BCMHOST_MMAL_CFLAGS])
-+        VLC_ADD_LIBS([bcm_host mmal vcsm openmaxil egl],[$BCMHOST_MMAL_LIBS -lmmal_components]) ], [
-           AS_IF([test "${enable_mmal}" = "yes"],
-             [ AC_MSG_ERROR([Cannot find bcm library...]) ],
-             [ AC_MSG_WARN([Cannot find bcm library...]) ])
-@@ -3500,6 +3506,10 @@ if test "${enable_mmal}" != "no"; then
-     ] , [ AS_IF([test "${enable_mmal}" = "yes"],
-       [ AC_MSG_ERROR([Cannot find development headers for mmal...]) ],
-       [ AC_MSG_WARN([Cannot find development headers for mmal...]) ]) ])
-+  ],:[
-+    AC_MSG_WARN([${BCMHOST_PKG_ERRORS}: userland graphics not available.])
-+    HAVE_MMAL=NO
-+  ])
-   VLC_RESTORE_FLAGS
- fi
- AM_CONDITIONAL([HAVE_MMAL], [test "${have_mmal}" = "yes"])
--- 
-2.38.1
-

dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/3002-fix-EGL-macro-undeclared-and-EGLImageKHR.patch

@@ -1,61 +0,0 @@
-From: Vincent Davis Jr <vince@underview.tech>
-Date: Fri, 07 Jan 2022 07:01:47 PM CST
-Subject: [PATCH] Fix EGL macro undeclared and EGLImageKHR
-
-Upstream-Status: Inappropriate
-
-RPI-Distro repo forks original vlc and applies patches to enable
-raspiberry pi support.
-
-* Fixes compiler issues related to EGL macro constant/enum value type not being defined
-* Updates EGLImage to EGLImageKHR
-
-Signed-off-by: Vincent Davis Jr <vince@underview.tech>
-diff --git a/modules/hw/mmal/converter_mmal.c b/modules/hw/mmal/converter_mmal.c
-index f31cb81d8..426af668b 100644
---- a/modules/hw/mmal/converter_mmal.c
-+++ b/modules/hw/mmal/converter_mmal.c
-@@ -28,6 +28,34 @@
-
- #define TRACE_ALL 0
-
-+// Pass Yocto related build errors
-+#define EGL_LINUX_DMA_BUF_EXT           0x3270
-+#define EGL_LINUX_DRM_FOURCC_EXT        0x3271
-+#define EGL_DMA_BUF_PLANE0_FD_EXT       0x3272
-+#define EGL_DMA_BUF_PLANE0_OFFSET_EXT   0x3273
-+#define EGL_DMA_BUF_PLANE0_PITCH_EXT    0x3274
-+#define EGL_DMA_BUF_PLANE1_FD_EXT       0x3275
-+#define EGL_DMA_BUF_PLANE1_OFFSET_EXT   0x3276
-+#define EGL_DMA_BUF_PLANE1_PITCH_EXT    0x3277
-+#define EGL_DMA_BUF_PLANE2_FD_EXT       0x3278
-+#define EGL_DMA_BUF_PLANE2_OFFSET_EXT   0x3279
-+#define EGL_DMA_BUF_PLANE2_PITCH_EXT    0x327A
-+#define EGL_YUV_COLOR_SPACE_HINT_EXT    0x327B
-+#define EGL_SAMPLE_RANGE_HINT_EXT       0x327C
-+#define EGL_YUV_CHROMA_HORIZONTAL_SITING_HINT_EXT  0x327D
-+#define EGL_YUV_CHROMA_VERTICAL_SITING_HINT_EXT    0x327E
-+#define EGL_DMA_BUF_PLANE0_MODIFIER_LO_EXT 0x3443
-+#define EGL_DMA_BUF_PLANE0_MODIFIER_HI_EXT 0x3444
-+#define EGL_DMA_BUF_PLANE1_MODIFIER_LO_EXT 0x3445
-+#define EGL_DMA_BUF_PLANE1_MODIFIER_HI_EXT 0x3446
-+#define EGL_DMA_BUF_PLANE2_MODIFIER_LO_EXT 0x3447
-+#define EGL_DMA_BUF_PLANE2_MODIFIER_HI_EXT 0x3448
-+#define EGL_DMA_BUF_PLANE3_FD_EXT          0x3440
-+#define EGL_DMA_BUF_PLANE3_OFFSET_EXT      0x3441
-+#define EGL_DMA_BUF_PLANE3_PITCH_EXT       0x3442
-+#define EGL_DMA_BUF_PLANE3_MODIFIER_LO_EXT 0x3449
-+#define EGL_DMA_BUF_PLANE3_MODIFIER_HI_EXT 0x344A
-+
- typedef struct mmal_gl_converter_s
- {
-     EGLint drm_fourcc;
-@@ -199,7 +227,7 @@ static tex_context_t * get_tex_context(const opengl_tex_converter_t * const tc,
-
-         *a = EGL_NONE;
-
--        const EGLImage image = tc->gl->egl.createImageKHR(tc->gl, EGL_LINUX_DMA_BUF_EXT, NULL, attribs);
-+        const EGLImageKHR image = tc->gl->egl.createImageKHR(tc->gl, EGL_LINUX_DMA_BUF_EXT, NULL, attribs);
-         if (!image) {
-            msg_Err(tc, "Failed to import fd %d: Err=%#x", fd, tc->vt->GetError());
-            goto fail;

dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/3003-codec-omxil_core-replace-opt-vc-path-with-usr-lib.patch

@@ -1,43 +0,0 @@
-From 85f6603aca1d174848b42e696a4cff8af57613d6 Mon Sep 17 00:00:00 2001
-From: Vincent Davis Jr <vince@underview.tech>
-Date: Thu, 8 Dec 2022 23:38:36 -0600
-Subject: [PATCH] codec: omxil_core replace /opt/vc path with /usr/lib
-
-Upstream-Status: Inappropriate
-
-RPI-Distro repo clones original VLC and applies patches to enable
-raspiberry pi support.
-
-Configures omxil_core.c for OE usages as libbcm_host.so
-and libopenmaxil.so are located in a different location.
-
-Signed-off-by: Vincent Davis Jr <vince@underview.tech>
----
- modules/codec/omxil/omxil_core.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/modules/codec/omxil/omxil_core.c b/modules/codec/omxil/omxil_core.c
-index 5098f517a..5922d9034 100644
---- a/modules/codec/omxil/omxil_core.c
-+++ b/modules/codec/omxil/omxil_core.c
-@@ -56,7 +56,7 @@ static const char *ppsz_dll_list[] =
- #if defined(USE_IOMX)
-     "libiomx.so", /* Not used when using IOMX, the lib should already be loaded */
- #elif defined(RPI_OMX)
--    "/opt/vc/lib/libopenmaxil.so",  /* Broadcom IL core */
-+    "/usr/lib/libopenmaxil.so",  /* Broadcom IL core */
- #elif 1
-     "libOMX_Core.so", /* TI OMAP IL core */
-     "libOmxCore.so", /* Qualcomm IL core */
-@@ -70,7 +70,7 @@ static const char *ppsz_dll_list[] =
- #ifdef RPI_OMX
- static const char *ppsz_extra_dll_list[] =
- {
--    "/opt/vc/lib/libbcm_host.so",  /* Broadcom host library */
-+    "/usr/lib/libbcm_host.so",  /* Broadcom host library */
-     0
- };
- #endif
--- 
-2.38.1
-

dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/3004-use-GLESv2-headers-over-GL-headers.patch

@@ -1,60 +0,0 @@
-From 377a67af6c3f7c38f6f7ba24f042ba1a6cfd3f24 Mon Sep 17 00:00:00 2001
-From: Vincent Davis Jr <vince@underview.tech>
-Date: Fri, 9 Dec 2022 00:21:43 -0600
-Subject: [PATCH] use GLESv2 headers over GL headers
-
-Upstream-Status: Inappropriate
-
-RPI-Distro repo forks original vlc and applies patches to enable
-raspiberry pi support.
-
-We utilize GLESv2 during compilation. Patches ensures
-we utilize headers for it.
-
-Signed-off-by: Vincent Davis Jr <vince@underview.tech>
----
- modules/video_output/opengl/converter.h | 12 +++---------
- modules/visualization/glspectrum.c      |  4 +++-
- 2 files changed, 6 insertions(+), 10 deletions(-)
-
-diff --git a/modules/video_output/opengl/converter.h b/modules/video_output/opengl/converter.h
-index 7000e1f38..a3fe32671 100644
---- a/modules/video_output/opengl/converter.h
-+++ b/modules/video_output/opengl/converter.h
-@@ -41,15 +41,9 @@
- #  include <OpenGLES/ES2/glext.h>
- # endif
- #else /* !defined (__APPLE__) */
--# if defined (USE_OPENGL_ES2)
--#  include <GLES2/gl2.h>
--#  include <GLES2/gl2ext.h>
--# else
--#  ifdef _WIN32
--#   include <GL/glew.h>
--#  endif
--#  include <GL/gl.h>
--# endif
-+#define USE_OPENGL_ES2
-+#include <GLES2/gl2.h>
-+#include <GLES2/gl2ext.h>
- #endif
- 
- #define VLCGL_PICTURE_MAX 128
-diff --git a/modules/visualization/glspectrum.c b/modules/visualization/glspectrum.c
-index 06f8d1bdf..470080b1a 100644
---- a/modules/visualization/glspectrum.c
-+++ b/modules/visualization/glspectrum.c
-@@ -37,7 +37,9 @@
- #ifdef __APPLE__
- # include <OpenGL/gl.h>
- #else
--# include <GL/gl.h>
-+#define USE_OPENGL_ES2
-+#include <GLES2/gl2.h>
-+#include <GLES2/gl2ext.h>
- #endif
- 
- #include <math.h>
--- 
-2.38.1
-

dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/3005-modules-remove-glspectrum-usage.patch

@@ -1,149 +0,0 @@
-From 5f1bb5889d838719e381350b25c00ef3a75d0e02 Mon Sep 17 00:00:00 2001
-From: Vincent Davis Jr <vince@underview.tech>
-Date: Fri, 9 Dec 2022 01:07:55 -0600
-Subject: [PATCH] modules: remove glspectrum usage
-
-Upstream-Status: Inappropriate
-
-RPI-Distro repo forks original vlc and applies patches to enable
-raspiberry pi support.
-
-The glspectrum modules requries OpenGL
-while we only want to utilize GLESv2.
-
-Signed-off-by: Vincent Davis Jr <vince@underview.tech>
----
- modules/Makefile.in               | 24 ------------------------
- modules/visualization/Makefile.am | 10 ----------
- 2 files changed, 34 deletions(-)
-
-diff --git a/modules/Makefile.in b/modules/Makefile.in
-index bde45db53..c9c4342ad 100644
---- a/modules/Makefile.in
-+++ b/modules/Makefile.in
-@@ -481,7 +481,6 @@ TESTS = hpack_test$(EXEEXT) hpackenc_test$(EXEEXT) \
- @HAVE_WIN32_FALSE@am__append_247 = $(X_LIBS) $(X_PRE_LIBS) -lX11
- @HAVE_DARWIN_FALSE@@HAVE_WIN32_FALSE@am__append_248 = $(X_LIBS) $(X_PRE_LIBS) -lX11
- @HAVE_EVAS_TRUE@am__append_249 = libevas_plugin.la
--@HAVE_GL_TRUE@am__append_250 = libglspectrum_plugin.la
- @ENABLE_SOUT_TRUE@@HAVE_GCRYPT_TRUE@am__append_251 = libaccess_output_livehttp_plugin.la
- @ENABLE_SOUT_TRUE@am__append_252 = libaccess_output_shout_plugin.la \
- @ENABLE_SOUT_TRUE@	libaccess_output_srt_plugin.la \
-@@ -2028,13 +2027,7 @@ libgles2_plugin_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
- 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
- 	$(libgles2_plugin_la_CFLAGS) $(CFLAGS) \
- 	$(libgles2_plugin_la_LDFLAGS) $(LDFLAGS) -o $@
--libglspectrum_plugin_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- 	$(am__DEPENDENCIES_1)
--am_libglspectrum_plugin_la_OBJECTS = visualization/glspectrum.lo \
--	visualization/visual/fft.lo visualization/visual/window.lo
--libglspectrum_plugin_la_OBJECTS =  \
--	$(am_libglspectrum_plugin_la_OBJECTS)
--@HAVE_GL_TRUE@am_libglspectrum_plugin_la_rpath = -rpath $(visudir)
- libglwin32_plugin_la_DEPENDENCIES = libchroma_copy.la \
- 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_5)
- am__objects_23 =  \
-@@ -6507,7 +6500,6 @@ am__depfiles_remade =  \
- 	video_splitter/$(DEPDIR)/clone.Plo \
- 	video_splitter/$(DEPDIR)/libpanoramix_plugin_la-panoramix.Plo \
- 	video_splitter/$(DEPDIR)/wall.Plo \
--	visualization/$(DEPDIR)/glspectrum.Plo \
- 	visualization/$(DEPDIR)/libgoom_plugin_la-goom.Plo \
- 	visualization/$(DEPDIR)/libprojectm_plugin_la-projectm.Plo \
- 	visualization/$(DEPDIR)/libvsxu_plugin_la-vsxu.Plo \
-@@ -6731,7 +6723,6 @@ SOURCES = $(liba52_plugin_la_SOURCES) $(libaa_plugin_la_SOURCES) \
- 	$(libglconv_vaapi_x11_plugin_la_SOURCES) \
- 	$(libglconv_vdpau_plugin_la_SOURCES) \
- 	$(libgles2_plugin_la_SOURCES) \
--	$(libglspectrum_plugin_la_SOURCES) \
- 	$(libglwin32_plugin_la_SOURCES) $(libglx_plugin_la_SOURCES) \
- 	$(libgme_plugin_la_SOURCES) $(libgnutls_plugin_la_SOURCES) \
- 	$(libgoom_plugin_la_SOURCES) $(libgradfun_plugin_la_SOURCES) \
-@@ -7130,7 +7121,6 @@ DIST_SOURCES = $(liba52_plugin_la_SOURCES) $(libaa_plugin_la_SOURCES) \
- 	$(libglconv_vaapi_x11_plugin_la_SOURCES) \
- 	$(libglconv_vdpau_plugin_la_SOURCES) \
- 	$(libgles2_plugin_la_SOURCES) \
--	$(libglspectrum_plugin_la_SOURCES) \
- 	$(libglwin32_plugin_la_SOURCES) $(libglx_plugin_la_SOURCES) \
- 	$(libgme_plugin_la_SOURCES) $(libgnutls_plugin_la_SOURCES) \
- 	$(libgoom_plugin_la_SOURCES) $(libgradfun_plugin_la_SOURCES) \
-@@ -12696,13 +12686,6 @@ libevent_thread_la_LDFLAGS = -static
- visudir = $(pluginsdir)/visualization
- visu_LTLIBRARIES = $(am__append_250) $(LTLIBgoom) $(LTLIBprojectm) \
- 	libvisual_plugin.la $(LTLIBvsxu)
--libglspectrum_plugin_la_SOURCES = \
--	visualization/glspectrum.c \
--	visualization/visual/fft.c visualization/visual/fft.h \
--	visualization/visual/window.c visualization/visual/window.h \
--	visualization/visual/window_presets.h
--
--libglspectrum_plugin_la_LIBADD = $(GL_LIBS) $(LIBM)
- libgoom_plugin_la_SOURCES = visualization/goom.c
- libgoom_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(GOOM_CFLAGS)
- libgoom_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(visudir)'
-@@ -15715,8 +15698,6 @@ visualization/$(am__dirstamp):
- visualization/$(DEPDIR)/$(am__dirstamp):
- 	@$(MKDIR_P) visualization/$(DEPDIR)
- 	@: > visualization/$(DEPDIR)/$(am__dirstamp)
--visualization/glspectrum.lo: visualization/$(am__dirstamp) \
--	visualization/$(DEPDIR)/$(am__dirstamp)
- visualization/visual/$(am__dirstamp):
- 	@$(MKDIR_P) visualization/visual
- 	@: > visualization/visual/$(am__dirstamp)
-@@ -15728,8 +15709,6 @@ visualization/visual/fft.lo: visualization/visual/$(am__dirstamp) \
- visualization/visual/window.lo: visualization/visual/$(am__dirstamp) \
- 	visualization/visual/$(DEPDIR)/$(am__dirstamp)
- 
--libglspectrum_plugin.la: $(libglspectrum_plugin_la_OBJECTS) $(libglspectrum_plugin_la_DEPENDENCIES) $(EXTRA_libglspectrum_plugin_la_DEPENDENCIES) 
--	$(AM_V_CCLD)$(LINK) $(am_libglspectrum_plugin_la_rpath) $(libglspectrum_plugin_la_OBJECTS) $(libglspectrum_plugin_la_LIBADD) $(LIBS)
- video_output/opengl/libglwin32_plugin_la-vout_helper.lo:  \
- 	video_output/opengl/$(am__dirstamp) \
- 	video_output/opengl/$(DEPDIR)/$(am__dirstamp)
-@@ -21420,7 +21399,6 @@ distclean-compile:
- @AMDEP_TRUE@@am__include@ @am__quote@video_splitter/$(DEPDIR)/clone.Plo@am__quote@ # am--include-marker
- @AMDEP_TRUE@@am__include@ @am__quote@video_splitter/$(DEPDIR)/libpanoramix_plugin_la-panoramix.Plo@am__quote@ # am--include-marker
- @AMDEP_TRUE@@am__include@ @am__quote@video_splitter/$(DEPDIR)/wall.Plo@am__quote@ # am--include-marker
--@AMDEP_TRUE@@am__include@ @am__quote@visualization/$(DEPDIR)/glspectrum.Plo@am__quote@ # am--include-marker
- @AMDEP_TRUE@@am__include@ @am__quote@visualization/$(DEPDIR)/libgoom_plugin_la-goom.Plo@am__quote@ # am--include-marker
- @AMDEP_TRUE@@am__include@ @am__quote@visualization/$(DEPDIR)/libprojectm_plugin_la-projectm.Plo@am__quote@ # am--include-marker
- @AMDEP_TRUE@@am__include@ @am__quote@visualization/$(DEPDIR)/libvsxu_plugin_la-vsxu.Plo@am__quote@ # am--include-marker
-@@ -30324,7 +30302,6 @@ distclean: distclean-recursive
- 	-rm -f video_splitter/$(DEPDIR)/clone.Plo
- 	-rm -f video_splitter/$(DEPDIR)/libpanoramix_plugin_la-panoramix.Plo
- 	-rm -f video_splitter/$(DEPDIR)/wall.Plo
--	-rm -f visualization/$(DEPDIR)/glspectrum.Plo
- 	-rm -f visualization/$(DEPDIR)/libgoom_plugin_la-goom.Plo
- 	-rm -f visualization/$(DEPDIR)/libprojectm_plugin_la-projectm.Plo
- 	-rm -f visualization/$(DEPDIR)/libvsxu_plugin_la-vsxu.Plo
-@@ -31722,7 +31699,6 @@ maintainer-clean: maintainer-clean-recursive
- 	-rm -f video_splitter/$(DEPDIR)/clone.Plo
- 	-rm -f video_splitter/$(DEPDIR)/libpanoramix_plugin_la-panoramix.Plo
- 	-rm -f video_splitter/$(DEPDIR)/wall.Plo
--	-rm -f visualization/$(DEPDIR)/glspectrum.Plo
- 	-rm -f visualization/$(DEPDIR)/libgoom_plugin_la-goom.Plo
- 	-rm -f visualization/$(DEPDIR)/libprojectm_plugin_la-projectm.Plo
- 	-rm -f visualization/$(DEPDIR)/libvsxu_plugin_la-vsxu.Plo
-diff --git a/modules/visualization/Makefile.am b/modules/visualization/Makefile.am
-index 10619e030..aafc97f87 100644
---- a/modules/visualization/Makefile.am
-+++ b/modules/visualization/Makefile.am
-@@ -1,16 +1,6 @@
- visudir = $(pluginsdir)/visualization
- visu_LTLIBRARIES =
- 
--libglspectrum_plugin_la_SOURCES = \
--	visualization/glspectrum.c \
--	visualization/visual/fft.c visualization/visual/fft.h \
--	visualization/visual/window.c visualization/visual/window.h \
--	visualization/visual/window_presets.h
--libglspectrum_plugin_la_LIBADD = $(GL_LIBS) $(LIBM)
--if HAVE_GL
--visu_LTLIBRARIES += libglspectrum_plugin.la
--endif
--
- libgoom_plugin_la_SOURCES = visualization/goom.c
- libgoom_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(GOOM_CFLAGS)
- libgoom_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(visudir)'
--- 
-2.38.1
-

dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/3006-codec-omxil_core.h-fix-multiple-definition-of.patch

@@ -1,43 +0,0 @@
-From fd4d233757cc46cd89f68b45ec4b059940dd84ae Mon Sep 17 00:00:00 2001
-From: Vincent Davis Jr <vince@underview.tech>
-Date: Fri, 9 Dec 2022 19:58:11 -0600
-Subject: [PATCH] codec: omxil_core.h fix multiple definition of
-
-Upstream-Status: Inappropriate
-
-RPI-Distro repo forks original vlc and applies patches
-to enable raspiberry pi support.
-
-Issue occurs during compilation as
-* pf_enable_graphic_buffers
-* pf_get_graphic_buffer_usage
-* pf_get_hal_format
-
-Apears to be defined multiple times as the omxil_core.h
-is included in multiple files.
-
-Signed-off-by: Vincent Davis Jr <vince@underview.tech>
----
- modules/codec/omxil/omxil_core.h | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/modules/codec/omxil/omxil_core.h b/modules/codec/omxil/omxil_core.h
-index ac3db510b..f6e42f5ed 100644
---- a/modules/codec/omxil/omxil_core.h
-+++ b/modules/codec/omxil/omxil_core.h
-@@ -34,9 +34,9 @@ extern OMX_ERRORTYPE (*pf_component_enum)(OMX_STRING, OMX_U32, OMX_U32);
- extern OMX_ERRORTYPE (*pf_get_roles_of_component)(OMX_STRING, OMX_U32 *, OMX_U8 **);
- 
- /* Extra IOMX android functions. Can be NULL if we don't link with libiomx */
--OMX_ERRORTYPE (*pf_enable_graphic_buffers)(OMX_HANDLETYPE, OMX_U32, OMX_BOOL);
--OMX_ERRORTYPE (*pf_get_graphic_buffer_usage)(OMX_HANDLETYPE, OMX_U32, OMX_U32*);
--OMX_ERRORTYPE (*pf_get_hal_format) (const char *, int *);
-+extern OMX_ERRORTYPE (*pf_enable_graphic_buffers)(OMX_HANDLETYPE, OMX_U32, OMX_BOOL);
-+extern OMX_ERRORTYPE (*pf_get_graphic_buffer_usage)(OMX_HANDLETYPE, OMX_U32, OMX_U32*);
-+extern OMX_ERRORTYPE (*pf_get_hal_format) (const char *, int *);
- 
- int InitOmxCore(vlc_object_t *p_this);
- void DeinitOmxCore(void);
--- 
-2.38.1
-

dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/3007-remove-xorg-related-link-libs.patch

@@ -1,36 +0,0 @@
-From 34e4f4dad923095989ccb0ab8efb883c592bdbfd Mon Sep 17 00:00:00 2001
-From: Vincent Davis Jr <vince@underview.tech>
-Date: Fri, 9 Dec 2022 20:04:27 -0600
-Subject: [PATCH] remove xorg related link libs
-
-Upstream-Status: Inappropriate
-
-RPI-Distro repo forks original vlc and applies patches
-to enable raspiberry pi support.
-
-If x11 isn't defined in DISTRO_FEATURES
-required xorg related libs are not included
-in recipe-sysroot resulting in compilation
-failure.
-
-Signed-off-by: Vincent Davis Jr <vince@underview.tech>
----
- modules/hw/mmal/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/modules/hw/mmal/Makefile.am b/modules/hw/mmal/Makefile.am
-index 4abe68e2e..86dad2c2d 100644
---- a/modules/hw/mmal/Makefile.am
-+++ b/modules/hw/mmal/Makefile.am
-@@ -8,7 +8,7 @@ libmmal_vout_plugin_la_SOURCES = vout.c mmal_cma.c mmal_picture.c subpic.c\
-   mmal_cma.h mmal_picture.h subpic.h transform_ops.h\
-   mmal_piccpy_neon.S
- libmmal_vout_plugin_la_CFLAGS = $(AM_CFLAGS)
--libmmal_vout_plugin_la_LDFLAGS = $(AM_LDFLAGS) -lm -lX11 -lXrandr
-+libmmal_vout_plugin_la_LDFLAGS = $(AM_LDFLAGS) -lm
- libmmal_vout_plugin_la_LIBADD = $(LIBS_mmal)
- mmal_LTLIBRARIES = libmmal_vout_plugin.la
- 
--- 
-2.38.1
-

dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/3008-vo-Makefile.am-exclude-libgl_plugin.patch

@@ -1,97 +0,0 @@
-From 28917a258a4173af0abda0eef7faef5cbf95f123 Mon Sep 17 00:00:00 2001
-From: Vincent Davis Jr <vince@underview.tech>
-Date: Fri, 9 Dec 2022 21:28:48 -0600
-Subject: [PATCH] vo: Makefile.am exclude libgl_plugin
-
-Upstream-Status: Inappropriate
-
-RPI-Distro repo forks original vlc and applies patches
-to enable raspiberry pi support.
-
-In the situation where opengl isn't included in
-DISTRO_FEATURES. We need to exclude the opengl
-vout plugin from being built.
-
-Signed-off-by: Vincent Davis Jr <vince@underview.tech>
----
- modules/video_output/Makefile.am | 64 --------------------------------
- 1 file changed, 64 deletions(-)
-
-diff --git a/modules/video_output/Makefile.am b/modules/video_output/Makefile.am
-index 78c06cfc4..14a330e68 100644
---- a/modules/video_output/Makefile.am
-+++ b/modules/video_output/Makefile.am
-@@ -57,70 +57,6 @@ if HAVE_TVOS
- vout_LTLIBRARIES += libvout_ios_plugin.la libglconv_cvpx_plugin.la
- endif
- 
--### OpenGL ###
--libgles2_plugin_la_SOURCES = $(OPENGL_COMMONSOURCES) video_output/opengl/display.c
--libgles2_plugin_la_CFLAGS = $(AM_CFLAGS) $(GLES2_CFLAGS) -DUSE_OPENGL_ES2 $(OPENGL_COMMONCLFAGS)
--libgles2_plugin_la_LIBADD = $(GLES2_LIBS) $(LIBM) $(OPENGL_COMMONLIBS)
--libgles2_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
--
--EXTRA_LTLIBRARIES += libgles2_plugin.la
--vout_LTLIBRARIES += $(LTLIBgles2)
--
--libgl_plugin_la_SOURCES = $(OPENGL_COMMONSOURCES) video_output/opengl/display.c
--libgl_plugin_la_CFLAGS = $(AM_CFLAGS) $(GL_CFLAGS) $(OPENGL_COMMONCLFAGS)
--libgl_plugin_la_LIBADD = $(LIBM) $(OPENGL_COMMONLIBS)
--if HAVE_WIN32
--libgl_plugin_la_CFLAGS += -DHAVE_GL_CORE_SYMBOLS
--libgl_plugin_la_LIBADD += $(GL_LIBS)
--endif
--
--libglconv_vaapi_wl_plugin_la_SOURCES = video_output/opengl/converter_vaapi.c \
--	video_output/opengl/converter.h \
--	hw/vaapi/vlc_vaapi.c hw/vaapi/vlc_vaapi.h
--libglconv_vaapi_wl_plugin_la_CFLAGS = $(AM_CFLAGS) $(GL_CFLAGS) -DHAVE_VA_WL $(LIBVA_WL_CFLAGS)
--libglconv_vaapi_wl_plugin_la_LIBADD = $(LIBVA_LIBS) $(LIBVA_EGL_LIBS) \
--	$(LIBVA_WL_LIBS)
--
--libglconv_vaapi_x11_plugin_la_SOURCES = $(libglconv_vaapi_wl_plugin_la_SOURCES)
--libglconv_vaapi_x11_plugin_la_CFLAGS = $(AM_CFLAGS) -DHAVE_VA_X11
--libglconv_vaapi_x11_plugin_la_LIBADD = $(LIBVA_LIBS) $(LIBVA_EGL_LIBS) \
--	$(LIBVA_X11_LIBS) $(X_LIBS) $(X_PRE_LIBS) -lX11
--
--libglconv_vaapi_drm_plugin_la_SOURCES = $(libglconv_vaapi_wl_plugin_la_SOURCES)
--libglconv_vaapi_drm_plugin_la_CFLAGS = $(AM_CFLAGS) -DHAVE_VA_DRM
--libglconv_vaapi_drm_plugin_la_LIBADD = $(LIBVA_LIBS) $(LIBVA_EGL_LIBS) \
--	$(LIBVA_DRM_LIBS)
--
--libglconv_vdpau_plugin_la_SOURCES = video_output/opengl/converter_vdpau.c \
--	video_output/opengl/converter.h hw/vdpau/vlc_vdpau.h
--libglconv_vdpau_plugin_la_CFLAGS = $(AM_CFLAGS) $(VDPAU_CFLAGS)
--libglconv_vdpau_plugin_la_LIBADD = $(LIBDL) libvlc_vdpau.la $(X_LIBS) $(X_PRE_LIBS) -lX11
--
--if HAVE_GL
--vout_LTLIBRARIES += libgl_plugin.la
--if HAVE_EGL
--if HAVE_VAAPI
--if HAVE_WAYLAND_EGL
--if HAVE_VAAPI_WL
--vout_LTLIBRARIES += libglconv_vaapi_wl_plugin.la
--endif
--endif
--if HAVE_XCB
--if HAVE_VAAPI_X11
--vout_LTLIBRARIES += libglconv_vaapi_x11_plugin.la
--endif
--endif
--if HAVE_VAAPI_DRM
--vout_LTLIBRARIES += libglconv_vaapi_drm_plugin.la
--endif
--endif
--endif # HAVE_EGL
--
--if HAVE_VDPAU
--vout_LTLIBRARIES += libglconv_vdpau_plugin.la
--endif
--endif # HAVE_GL
--
- ### XCB ###
- libvlc_xcb_events_la_SOURCES = \
- 	video_output/xcb/events.c video_output/xcb/events.h
--- 
-2.38.1
-

dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/3009-vo-converter_vaapi-Fix-EGL-macro-undeclared.patch

@@ -1,59 +0,0 @@
-From 35276c4b02b9114436108e74727d192f1e21f239 Mon Sep 17 00:00:00 2001
-From: Vincent Davis Jr <vince@underview.tech>
-Date: Fri, 9 Dec 2022 23:31:33 -0600
-Subject: [PATCH] vo: converter_vaapi Fix EGL macro undeclared
-
-Upstream-Status: Inappropriate
-
-RPI-Distro repo forks original vlc and applies patches to enable
-raspiberry pi support.
-
-Fixes compiler issues related to EGL macro constant/enum value type
-not being defined
-
-Signed-off-by: Vincent Davis Jr <vince@underview.tech>
----
- modules/video_output/opengl/converter_vaapi.c | 27 +++++++++++++++++++
- 1 file changed, 27 insertions(+)
-
-diff --git a/modules/video_output/opengl/converter_vaapi.c b/modules/video_output/opengl/converter_vaapi.c
-index cd842f711..59245fe4c 100644
---- a/modules/video_output/opengl/converter_vaapi.c
-+++ b/modules/video_output/opengl/converter_vaapi.c
-@@ -55,6 +55,33 @@
- 
- #define DRM_FORMAT_MOD_INVALID  fourcc_mod_code(NONE, DRM_FORMAT_RESERVED)
- 
-+#define EGL_LINUX_DMA_BUF_EXT           0x3270
-+#define EGL_LINUX_DRM_FOURCC_EXT        0x3271
-+#define EGL_DMA_BUF_PLANE0_FD_EXT       0x3272
-+#define EGL_DMA_BUF_PLANE0_OFFSET_EXT   0x3273
-+#define EGL_DMA_BUF_PLANE0_PITCH_EXT    0x3274
-+#define EGL_DMA_BUF_PLANE1_FD_EXT       0x3275
-+#define EGL_DMA_BUF_PLANE1_OFFSET_EXT   0x3276
-+#define EGL_DMA_BUF_PLANE1_PITCH_EXT    0x3277
-+#define EGL_DMA_BUF_PLANE2_FD_EXT       0x3278
-+#define EGL_DMA_BUF_PLANE2_OFFSET_EXT   0x3279
-+#define EGL_DMA_BUF_PLANE2_PITCH_EXT    0x327A
-+#define EGL_YUV_COLOR_SPACE_HINT_EXT    0x327B
-+#define EGL_SAMPLE_RANGE_HINT_EXT       0x327C
-+#define EGL_YUV_CHROMA_HORIZONTAL_SITING_HINT_EXT  0x327D
-+#define EGL_YUV_CHROMA_VERTICAL_SITING_HINT_EXT    0x327E
-+#define EGL_DMA_BUF_PLANE0_MODIFIER_LO_EXT 0x3443
-+#define EGL_DMA_BUF_PLANE0_MODIFIER_HI_EXT 0x3444
-+#define EGL_DMA_BUF_PLANE1_MODIFIER_LO_EXT 0x3445
-+#define EGL_DMA_BUF_PLANE1_MODIFIER_HI_EXT 0x3446
-+#define EGL_DMA_BUF_PLANE2_MODIFIER_LO_EXT 0x3447
-+#define EGL_DMA_BUF_PLANE2_MODIFIER_HI_EXT 0x3448
-+#define EGL_DMA_BUF_PLANE3_FD_EXT          0x3440
-+#define EGL_DMA_BUF_PLANE3_OFFSET_EXT      0x3441
-+#define EGL_DMA_BUF_PLANE3_PITCH_EXT       0x3442
-+#define EGL_DMA_BUF_PLANE3_MODIFIER_LO_EXT 0x3449
-+#define EGL_DMA_BUF_PLANE3_MODIFIER_HI_EXT 0x344A
-+
- struct priv
- {
-     struct vlc_vaapi_instance *vainst;
--- 
-2.38.1
-

dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/3010-po-Fix-typos-in-oc.po-for-gettext-compatibility.patch

@@ -1,59 +0,0 @@
-From 4caba7560aec54f6d944accd1a8d216e8d9b1d92 Mon Sep 17 00:00:00 2001
-From: Vincent Davis Jr <vince@underview.tech>
-Date: Tue, 14 Nov 2023 20:17:11 -0500
-Subject: [PATCH] po: Fix typos in oc.po for gettext compatibility
-
-Upstream-Status: Inappropriate
-
-Ws moved upstream, but upstream patch couldn't be applied.
-
-https://code.videolan.org/videolan/vlc/-/commit/9d67e20c2edd25251b46d1780a7973b44ac5e5ba
-
-gettext-0.22 became stricter and started to validate format strings. Fix
-the typos.
-
-Bug: https://bugs.gentoo.org/909015
-
-Signed-off-by: Vincent Davis Jr <vince@underview.tech>
----
- po/oc.po | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/po/oc.po b/po/oc.po
-index 86f2ed8a1..ce68c581f 100644
---- a/po/oc.po
-+++ b/po/oc.po
-@@ -5298,18 +5298,18 @@ msgstr "Comanda+"
- #: src/misc/update.c:482
- #, c-format
- msgid "%.1f GiB"
--msgstr "%.lf Gio"
-+msgstr "%.1f Gio"
- 
- #: src/misc/update.c:484
- #, c-format
- msgid "%.1f MiB"
--msgstr "%.lf Mio"
-+msgstr "%.1f Mio"
- 
- #: src/misc/update.c:486 modules/gui/macosx/VLCPlaylistInfo.m:138
- #: modules/gui/macosx/VLCPlaylistInfo.m:140
- #, c-format
- msgid "%.1f KiB"
--msgstr "%.lf Kio"
-+msgstr "%.1f Kio"
- 
- #: src/misc/update.c:488
- #, c-format
-@@ -33071,7 +33071,7 @@ msgstr "Lista del gestionari de mèdias"
- 
- #, fuzzy
- #~ msgid "%.1f kB"
--#~ msgstr "%.lf Gio"
-+#~ msgstr "%.1f Gio"
- 
- #, fuzzy
- #~ msgid "Speed"
--- 
-2.34.1
-

dynamic-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/rpidistro-vlc_3.0.17.bb

@@ -1,163 +0,0 @@
-DESCRIPTION = "Video player and streamer - davinci edition"
-HOMEPAGE = "http://www.videolan.org"
-SECTION = "multimedia"
-
-LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
-
-SRC_URI = "\
-    git://git@github.com/RPi-Distro/vlc;protocol=https;branch=buster-rpt \
-    file://0001-configure-fix-linking-on-RISC-V-ISA.patch \
-    file://0002-Revert-configure-Require-libmodplug-0.8.9.patch \
-    file://0003-CVE-2022-41325.patch \
-    file://0004-mmal_20.patch \
-    file://0005-mmal_exit_fix.patch \
-    file://0006-mmal_chain.patch \
-    file://0007-armv6.patch \
-    file://0008-configure-Disable-incompatible-function-pointer-type.patch \
-    file://0009-demux-dash-include-cstdint-needed-for-uint64_t.patch \
-    file://2001-fix-luaL-checkint.patch \
-    file://2002-use-vorbisidec.patch \
-    file://3001-configure.ac-setup-for-OE-usage.patch \
-    file://3002-fix-EGL-macro-undeclared-and-EGLImageKHR.patch \
-    file://3003-codec-omxil_core-replace-opt-vc-path-with-usr-lib.patch \
-    file://3004-use-GLESv2-headers-over-GL-headers.patch \
-    file://3005-modules-remove-glspectrum-usage.patch \
-    file://3006-codec-omxil_core.h-fix-multiple-definition-of.patch \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'file://3007-remove-xorg-related-link-libs.patch', d)} \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '', 'file://3008-vo-Makefile.am-exclude-libgl_plugin.patch', d)} \
-    file://3009-vo-converter_vaapi-Fix-EGL-macro-undeclared.patch \
-    file://3010-po-Fix-typos-in-oc.po-for-gettext-compatibility.patch \
-    "
-
-SRCREV = "b276eb0d7bc3213363e97dbb681ef7c927be6c73"
-
-PROVIDES = "vlc"
-RPROVIDES:${PN} = "${PROVIDES}"
-DEPENDS = "coreutils-native fribidi libtool libgcrypt libgcrypt-native \
-           dbus libxml2 gnutls tremor faad2 ffmpeg flac alsa-lib libidn \
-           jpeg xz libmodplug mpeg2dec libmtp libopus orc libsamplerate0 \
-           avahi libusb1 schroedinger taglib tiff"
-
-inherit autotools gettext pkgconfig mime-xdg
-
-export BUILDCC = "${BUILD_CC} -std=c11"
-EXTRA_OECONF = "\
-    --enable-run-as-root \
-    --enable-xvideo \
-    --disable-lua \
-    --disable-screen \
-    --disable-caca \
-    --enable-vlm \
-    --enable-tremor \
-    --disable-aa \
-    --disable-faad \
-    --enable-dbus \
-    --without-contrib \
-    --without-kde-solid \
-    --enable-realrtsp \
-    --disable-libtar \
-    --enable-avcodec \
-    --disable-css \
-    "
-
-PACKAGECONFIG ?= "\
-    ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
-    ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', 'mmal', d)} \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gles2', '', d)} \
-    ${@bb.utils.contains_any('DISTRO_FEATURES', 'x11', 'notify', '', d)} \
-    live555 dv1394 fontconfig fluidsynth freetype png udev \
-    x264 alsa harfbuzz jack neon fribidi dvbpsi a52 v4l2 \
-    "
-
-PACKAGECONFIG[mmal] = "--enable-omxil --enable-omxil-vout --enable-rpi-omxil --enable-mmal --enable-mmal-avcodec,,userland"
-PACKAGECONFIG[x264] = "--enable-x264,--disable-x264,x264"
-PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad"
-PACKAGECONFIG[a52] = "--enable-a52,--disable-a52,liba52"
-PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack"
-PACKAGECONFIG[live555] = "--enable-live555 LIVE555_PREFIX=${STAGING_DIR_HOST}${prefix},--disable-live555,live555"
-PACKAGECONFIG[libass] = "--enable-libass,--disable-libass,libass"
-PACKAGECONFIG[postproc] = "--enable-postproc,--disable-postproc,libpostproc"
-PACKAGECONFIG[libva] = "--enable-libva,--disable-libva,libva"
-#PACKAGECONFIG[opencv] = "--enable-opencv,--disable-opencv,opencv"
-PACKAGECONFIG[speex] = "--enable-speex,--disable-speex,speex"
-PACKAGECONFIG[gstreamer] = "--enable-gst-decode,--disable-gst-decode,gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad"
-PACKAGECONFIG[vpx] = "--enable-vpx,--disable-vpx, libvpx"
-#PACKAGECONFIG[freerdp] = "--enable-freerdp,--disable-freerdp, freerdp"
-PACKAGECONFIG[dvbpsi] = "--enable-dvbpsi,--disable-dvbpsi, libdvbpsi"
-#PACKAGECONFIG[samba] = "--enable-smbclient,--disable-smbclient, samba"
-PACKAGECONFIG[upnp] = "--enable-upnp,--disable-upnp,libupnp"
-PACKAGECONFIG[dvdnav] = "--enable-dvdnav,--disable-dvdnav,libdvdnav libdvdcss"
-PACKAGECONFIG[sftp] = "--enable-sftp,--disable-sftp,libssh2"
-PACKAGECONFIG[vorbis] = "--enable-vorbis,--disable-vorbis,libvorbis libogg"
-PACKAGECONFIG[ogg] = "--enable-ogg,--disable-ogg,libvorbis libogg"
-PACKAGECONFIG[dc1394] = "--enable-dc1394,--disable-dc1394,libdc1394"
-PACKAGECONFIG[dv1394] = "--enable-dv1394,--disable-dv1394,libraw1394 libavc1394"
-PACKAGECONFIG[svg] = "--enable-svg,--disable-svg,librsvg"
-PACKAGECONFIG[svgdec] = "--enable-svgdec,--disable-svgdec,librsvg cairo"
-PACKAGECONFIG[notify] = "--enable-notify,--disable-notify, libnotify gtk+3"
-PACKAGECONFIG[fontconfig] = "--enable-fontconfig,--disable-fontconfig, fontconfig"
-PACKAGECONFIG[freetype] = "--enable-freetype,--disable-freetype, freetype"
-#PACKAGECONFIG[dvdread] = "--enable-dvdread,--disable-dvdread, libdvdread libdvdcss"
-PACKAGECONFIG[vnc] = "--enable-vnc,--disable-vnc, libvncserver"
-PACKAGECONFIG[x11] = "--with-x --enable-xcb,--without-x --disable-xcb, xcb-util-keysyms libxpm libxinerama"
-PACKAGECONFIG[png] = "--enable-png,--disable-png,libpng"
-#PACKAGECONFIG[vdpau] = "--enable-vdpau,--disable-vdpau,libvdpau"
-#PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,wayland wayland-native"
-PACKAGECONFIG[gles2] = "--enable-gles2,--disable-gles2,virtual/libgles2"
-#PACKAGECONFIG[dca] = "--enable-dca,--disable-dca,libdca"
-PACKAGECONFIG[fribidi] = "--enable-fribidi,,fribidi"
-PACKAGECONFIG[gnutls] = "--enable-gnutls,,gnutls"
-PACKAGECONFIG[fluidsynth] = "--enable-fluidsynth,,fluidsynth"
-PACKAGECONFIG[harfbuzz] = "--enable-harfbuzz,--disable-harfbuzz,harfbuzz"
-PACKAGECONFIG[udev] = "--enable-udev,--disable-udev,udev"
-PACKAGECONFIG[neon] = "--enable-neon,--disable-neon,"
-PACKAGECONFIG[opus] = "--enable-opus,--disable-opus,libopus libogg"
-PACKAGECONFIG[ncurses] = "--enable-ncurses,--disable-ncurses,ncurses"
-PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib"
-PACKAGECONFIG[pulseaudio] = "--enable-pulse,--disable-pulse,pulseaudio"
-PACKAGECONFIG[sdl-image] = "--enable-sdl-image,,libsdl-image"
-PACKAGECONFIG[v4l2] = "--enable-v4l2,,v4l-utils"
-
-TARGET_CFLAGS:append = " -I${STAGING_INCDIR}/drm"
-TARGET_LDFLAGS:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '-lGLESv2', '', d)}"
-
-# Ensures the --enable-mmal-avcodec flag is available for usage
-do_configure:prepend() {
-    olddir=`pwd`
-    cd ${S}
-    ./bootstrap
-    cd $olddir 
-}
-
-# This recipe packages vlc as a library as well, so qt4 dependencies
-# can be avoided when only the library is installed.
-PACKAGES =+ "libvlc"
-
-LEAD_SONAME_libvlc = "libvlc.so.5"
-FILES:libvlc = "${libdir}/lib*.so.*"
-
-FILES:${PN} += "\
-    ${bindir}/vlc \
-    ${libdir}/vlc \
-    ${datadir}/applications \
-    ${datadir}/vlc \
-    ${datadir}/icons \
-    ${datadir}/metainfo/vlc.appdata.xml \
-    "
-
-FILES:${PN}-dbg += "\
-    ${libdir}/vlc/*/.debug \
-    ${libdir}/vlc/plugins/*/.debug \
-    "
-
-FILES:${PN}-staticdev += "\
-    ${libdir}/vlc/plugins/*/*.a \
-    ${libdir}/vlc/libcompat.a \
-    "
-
-# Only enable it for rpi class of machines
-COMPATIBLE_HOST = "null"
-COMPATIBLE_HOST:rpi = "(.*)"
-
-INSANE_SKIP:${PN} = "dev-so"

dynamic-layers/networking-layer/recipes-support/drbd/drbd_%.bbappend

@@ -1,3 +0,0 @@
-FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
-
-COMPATIBLE_MACHINE:rpi = "(null)"

dynamic-layers/openembedded-layer/recipes-core/packagegroups/packagegroup-meta-oe.bbappend

@@ -1 +1 @@
-RDEPENDS:packagegroup-meta-oe-kernel:remove:rpi = "bpftool"
+RDEPENDS_packagegroup-meta-oe-kernel_remove_rpi = "bpftool"

dynamic-layers/openembedded-layer/recipes-devtools/python/python3-adafruit-blinka_6.2.2.bb

@@ -1,31 +0,0 @@
-SUMMARY = "CircuitPython APIs for non-CircuitPython versions of Python such as CPython on Linux and MicroPython."
-HOMEPAGE = "https://github.com/adafruit/Adafruit_Blinka"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=660e614bc7efb0697cc793d8a22a55c2"
-
-SRC_URI = "git://github.com/adafruit/Adafruit_Blinka.git;branch=main;protocol=https"
-SRCREV = "dc688f354fe779c9267c208b99f310af87e79272"
-
-inherit setuptools3
-
-DEPENDS += "python3-setuptools-scm-native"
-
-do_install:append() {
-# it ships ./bcm283x/pulseio/libgpiod_pulsein which is a prebuilt
-# 32bit binary therefore we should make this specific to 32bit rpi machines (based on bcm283x) only
-    if [ ${@bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', '1', '0', d)} = "0" ]; then
-        rm -rf ${D}${PYTHON_SITEPACKAGES_DIR}/adafruit_blinka/microcontroller/bcm283x
-    fi
-}
-
-RDEPENDS:${PN} += " \
-    libgpiod \
-    python3-adafruit-platformdetect \
-    python3-adafruit-pureio \
-    python3-core \
-"
-
-RDEPENDS:${PN}:append:rpi = " rpi-gpio"
-
-COMPATIBLE_HOST:libc-musl:class-target = "null"
-

dynamic-layers/openembedded-layer/recipes-devtools/python/python3-adafruit-circuitpython-busdevice_5.0.5.bb

@@ -1,17 +0,0 @@
-SUMMARY = "CircuitPython bus device classes to manage bus sharing."
-HOMEPAGE = "https://github.com/adafruit/Adafruit_CircuitPython_BusDevice"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=6ec69d6e9e6c85adfb7799d7f8cf044e"
-
-SRC_URI = "git://github.com/adafruit/Adafruit_CircuitPython_BusDevice.git;branch=main;protocol=https"
-SRCREV = "1bfe8005293205e2f7b2cc498ab5a946f1133b40"
-
-inherit setuptools3
-
-DEPENDS += "python3-setuptools-scm-native"
-
-RDEPENDS:${PN} += " \
-    python3-adafruit-blinka \
-    python3-core \
-"
-COMPATIBLE_HOST:libc-musl:class-target = "null"

dynamic-layers/openembedded-layer/recipes-devtools/python/python3-adafruit-circuitpython-motor_3.2.6.bb

@@ -1,17 +0,0 @@
-SUMMARY = "CircuitPython helper library provides higher level objects to control motors and servos."
-HOMEPAGE = "https://github.com/adafruit/Adafruit_CircuitPython_Motor"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=b72678307cc7c10910b5ef460216af07"
-
-SRC_URI = "git://github.com/adafruit/Adafruit_CircuitPython_Motor.git;branch=main;protocol=https"
-SRCREV = "2251bfc0501d0acfb96c0a43f4f2b4c6a10ca14e"
-
-inherit setuptools3
-
-DEPENDS += "python3-setuptools-scm-native"
-
-RDEPENDS:${PN} += " \
-    python3-adafruit-blinka \
-    python3-core \
-"
-COMPATIBLE_HOST:libc-musl:class-target = "null"

dynamic-layers/openembedded-layer/recipes-devtools/python/python3-adafruit-circuitpython-motorkit_1.6.1.bb

@@ -1,21 +0,0 @@
-SUMMARY = "CircuitPython helper library for DC & Stepper Motor FeatherWing, Shield, and Pi Hat kits."
-HOMEPAGE = "https://github.com/adafruit/Adafruit_CircuitPython_MotorKit"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=6ad4a8854b39ad474755ef1aea813bac"
-
-SRC_URI = "git://github.com/adafruit/Adafruit_CircuitPython_MotorKit.git;branch=main;protocol=https"
-SRCREV = "8c1462b4129b21f6db156d1517abb017bb74b982"
-
-inherit setuptools3
-
-DEPENDS += "python3-setuptools-scm-native"
-
-RDEPENDS:${PN} += " \
-    python3-adafruit-blinka \
-    python3-adafruit-circuitpython-busdevice \
-    python3-adafruit-circuitpython-motor \
-    python3-adafruit-circuitpython-pca9685 \
-    python3-adafruit-circuitpython-register \
-    python3-core \
-"
-COMPATIBLE_HOST:libc-musl:class-target = "null"

dynamic-layers/openembedded-layer/recipes-devtools/python/python3-adafruit-circuitpython-pca9685_3.3.4.bb

@@ -1,19 +0,0 @@
-SUMMARY = "CircuitPython driver for motor, stepper, and servo based on PCA9685."
-HOMEPAGE = "https://github.com/adafruit/Adafruit_CircuitPython_PCA9685"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=e7eb6b599fb0cfb06485c64cd4242f62"
-
-SRC_URI = "git://github.com/adafruit/Adafruit_CircuitPython_PCA9685.git;branch=main;protocol=https"
-SRCREV = "2780c4102f4c23fbab252aa1198b61ba7e2d1b2c"
-
-inherit setuptools3
-
-DEPENDS += "python3-setuptools-scm-native"
-
-RDEPENDS:${PN} += " \
-    python3-adafruit-blinka \
-    python3-adafruit-circuitpython-busdevice \
-    python3-adafruit-circuitpython-register \
-    python3-core \
-"
-COMPATIBLE_HOST:libc-musl:class-target = "null"

dynamic-layers/openembedded-layer/recipes-kernel/linux/bpftool.bbappend

@@ -0,0 +1,3 @@
+# remove it when we upgrade to kernel > 4.14
+#
+COMPATIBLE_HOST_rpi = "null"

dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend

@@ -1,19 +1,17 @@
-PACKAGECONFIG_GL:rpi = "${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'gl', \
+PACKAGECONFIG_GL_rpi = "${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'gl', \
                         bb.utils.contains('DISTRO_FEATURES',     'opengl', 'eglfs gles2', \
                                                                        '', d), d)}"
-PACKAGECONFIG_GL:append:rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', ' kms', '', d)}"
-PACKAGECONFIG_GL:append:rpi = " gbm"
-PACKAGECONFIG_FONTS:rpi = "fontconfig"
-PACKAGECONFIG:append:rpi = " libinput examples tslib xkbcommon"
-PACKAGECONFIG:remove:rpi = "tests"
+PACKAGECONFIG_GL_append_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', ' gbm kms', '', d)}"
+PACKAGECONFIG_FONTS_rpi = "fontconfig"
+PACKAGECONFIG_append_rpi = " libinput examples tslib xkb xkbcommon-evdev"
+PACKAGECONFIG_remove_rpi = "tests"
 
-OE_QTBASE_EGLFS_DEVICE_INTEGRATION:rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', 'eglfs_brcm', d)}"
+OE_QTBASE_EGLFS_DEVICE_INTEGRATION_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', 'eglfs_brcm', d)}"
 
-do_configure:prepend:rpi() {
+do_configure_prepend_rpi() {
     # Add the appropriate EGLFS_DEVICE_INTEGRATION
     if [ "${@d.getVar('OE_QTBASE_EGLFS_DEVICE_INTEGRATION')}" != "" ]; then
         echo "EGLFS_DEVICE_INTEGRATION = ${OE_QTBASE_EGLFS_DEVICE_INTEGRATION}" >> ${S}/mkspecs/oe-device-extra.pri
     fi
 }
-RDEPENDS:${PN}:append:rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', ' userland', d)}"
-DEPENDS:append:rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', ' userland', d)}"
+RDEPENDS_${PN}_append_rpi = " userland"

files/custom-licenses/Broadcom

@@ -0,0 +1,25 @@
+Copyright (c) 2012, Broadcom Europe Ltd
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the copyright holder nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+

files/custom-licenses/Broadcom-RPi

@@ -1,29 +0,0 @@
-Copyright (c) 2006, Broadcom Corporation.
-Copyright (c) 2015, Raspberry Pi (Trading) Ltd
-All rights reserved.
-
-Redistribution.  Redistribution and use in binary form, without
-modification, are permitted provided that the following conditions are
-met:
-
-* This software may only be used for the purposes of developing for, 
-  running or using a Raspberry Pi device.
-* Redistributions must reproduce the above copyright notice and the
-  following disclaimer in the documentation and/or other materials
-  provided with the distribution.
-* Neither the name of Broadcom Corporation nor the names of its suppliers
-  may be used to endorse or promote products derived from this software
-  without specific prior written permission.
-
-DISCLAIMER.  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
-CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
-TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.

kas-poky-rpi.yml

@@ -1,78 +0,0 @@
-header:
-  version: 8
-
-machine: raspberrypi4
-distro: poky
-target:
-  - core-image-base
-
-repos:
-  meta-raspberry:
-
-  bitbake:
-    url: https://git.openembedded.org/bitbake
-    path: layers/bitbake
-    branch: master
-    layers:
-      bitbake: disabled
-
-  openembedded-core:
-    url: https://git.openembedded.org/openembedded-core
-    path: layers/openembedded-core
-    branch: master
-    layers:
-      meta:
-
-  meta-yocto:
-    url: https://git.yoctoproject.org/meta-yocto
-    path: layers/meta-yocto
-    branch: master
-    layers:
-      meta-poky:
-      meta-yocto-bsp:
-
-  meta-openembedded:
-    url: http://git.openembedded.org/meta-openembedded
-    path: layers/meta-openembedded
-    branch: master
-    layers:
-      meta-oe:
-      meta-python:
-      meta-networking:
-      meta-perl:
-
-  meta-qt5:
-    url: https://github.com/meta-qt5/meta-qt5/
-    path: layers/meta-qt5
-    branch: master
-
-bblayers_conf_header:
-  standard: |
-    POKY_BBLAYERS_CONF_VERSION = "2"
-    BBPATH = "${TOPDIR}"
-    BBFILES ?= ""
-local_conf_header:
-  reduce_diskspace: |
-    INHERIT += "rm_work_and_downloads"
-  standard: |
-    CONF_VERSION = "2"
-    PACKAGE_CLASSES = "package_rpm"
-    SDKMACHINE = "x86_64"
-    USER_CLASSES = "buildstats"
-    PATCHRESOLVE = "noop"
-  debug-tweaks: |
-    IMAGE_FEATURES += "empty-root-password allow-empty-password allow-root-login post-install-logging"
-  diskmon: |
-    BB_DISKMON_DIRS = "\
-        STOPTASKS,${TMPDIR},1G,100K \
-        STOPTASKS,${DL_DIR},1G,100K \
-        STOPTASKS,${SSTATE_DIR},1G,100K \
-        STOPTASKS,/tmp,100M,100K \
-        HALT,${TMPDIR},100M,1K \
-        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"

lib/oeqa/runtime/cases/parselogs_rpi.py

@@ -1,12 +0,0 @@
-from oeqa.runtime.cases.parselogs import *
-
-rpi_errors = [
-]
-
-ignore_errors['raspberrypi4'] = rpi_errors + common_errors
-ignore_errors['raspberrypi4-64'] = rpi_errors + common_errors
-ignore_errors['raspberrypi3'] = rpi_errors + common_errors
-ignore_errors['raspberrypi3-64'] = rpi_errors + common_errors
-
-class ParseLogsTestRpi(ParseLogsTest):
-    pass

recipes-bsp/armstubs/armstubs.bb

@@ -1,38 +0,0 @@
-DESCRIPTION = "Boot strap code that the GPU puts on memory to start running the boot loader"
-LICENSE = "BSD-3-Clause"
-
-LIC_FILES_CHKSUM = "file://armstub.S;beginline=1;endline=26;md5=9888f34ac06a676129416c952a6a521e"
-
-inherit deploy nopackages
-
-include recipes-bsp/common/raspberrypi-tools.inc
-
-COMPATIBLE_MACHINE = "^rpi$"
-
-S = "${RPITOOLS_S}/armstubs"
-
-export CC7 = "${CC}"
-export LD7 = "${LD}"
-export OBJCOPY7 = "${OBJCOPY}"
-export OBJDUMP7 = "${OBJDUMP}"
-export CC8 = "${CC}"
-export LD8 = "${LD}"
-export OBJCOPY8 = "${OBJCOPY}"
-export OBJDUMP8 = "${OBJDUMP} -maarch64"
-
-do_compile() {
-    [ -z "${ARMSTUB}" ] && bbfatal "No ARMSTUB defined for your machine."
-    oe_runmake ${ARMSTUB}
-}
-
-do_deploy() {
-    install -d ${DEPLOYDIR}/${PN}
-    cp ${S}/armstub*.bin ${DEPLOYDIR}/${PN}
-}
-
-addtask deploy before do_build after do_install
-do_deploy[dirs] += "${DEPLOYDIR}/${PN}"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-TOOLCHAIN = "gcc"