From 0f296ddecc0529a2ac4fccbeacb1d4b9ee3813d9 Mon Sep 17 00:00:00 2001
From: Martin Pulec <martin.pulec@cesnet.cz>
Date: Fri, 22 Sep 2023 16:29:57 +0200
Subject: [PATCH] CI ARM: build RPi stuff also in 64b build

---
 .github/scripts/Linux/arm/bootstrap.sh | 19 +++++++++++--------
 .github/scripts/Linux/arm/build.sh     |  7 +++----
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/.github/scripts/Linux/arm/bootstrap.sh b/.github/scripts/Linux/arm/bootstrap.sh
index e97f3ac7c4..39b83715c4 100755
--- a/.github/scripts/Linux/arm/bootstrap.sh
+++ b/.github/scripts/Linux/arm/bootstrap.sh
@@ -3,30 +3,33 @@
 # If changing the file, do not forget to regenerate cache in ARM Build GitHub action
 
 OLDPWD=$(pwd)
+readonly debver=bullseye
 
 apt -y install curl gnupg
 echo -k > ~/.curlrc
 
-if grep -q Raspbian /etc/os-release; then
-        curl http://archive.raspberrypi.org/debian/raspberrypi.gpg.key | apt-key add -
-        echo 'deb http://archive.raspberrypi.org/debian bullseye main' >> /etc/apt/sources.list
-        apt -y update
-        apt -y install libraspberrypi-dev
+if grep -q Debian /etc/os-release; then
+cat >/etc/apt/sources.list <<EOF
+deb http://deb.debian.org/debian $debver main contrib non-free
+deb http://security.debian.org/debian-security $debver-security main contrib non-free
+deb http://deb.debian.org/debian $debver-updates main contrib non-free
+EOF
 fi
+curl http://archive.raspberrypi.org/debian/raspberrypi.gpg.key | apt-key add -
+echo "deb http://archive.raspberrypi.org/debian $debver main" >> /etc/apt/sources.list
+apt -y update
 
 apt -y install autoconf automake build-essential cmake git pkg-config libtool sudo
 apt -y install libcurl4-openssl-dev libsoxr-dev libspeexdsp-dev libssl-dev
 apt -y install libasound2-dev portaudio19-dev libjack-dev
 apt -y install libglew-dev libglfw3-dev libglm-dev
 apt -y install libcaca-dev libmagickwand-dev libnatpmp-dev libopencv-core-dev libopencv-imgproc-dev
+apt -y install libavcodec-dev libavformat-dev libsdl2-dev libswscale-dev libraspberrypi-dev
 
 /.github/scripts/install-common-deps.sh
 /.github/scripts/Linux/install_others.sh ndi
 /.github/scripts/Linux/install_others.sh ximea
 
-# FFmpeg
-apt -y install libavcodec-dev libavformat-dev libsdl2-dev libswscale-dev
-
 # mkappimage
 mkai_arch=$(dpkg --print-architecture)
 if [ "$mkai_arch" = arm64 ]; then
diff --git a/.github/scripts/Linux/arm/build.sh b/.github/scripts/Linux/arm/build.sh
index 140735f809..b8f83eeaaa 100755
--- a/.github/scripts/Linux/arm/build.sh
+++ b/.github/scripts/Linux/arm/build.sh
@@ -16,11 +16,10 @@ set -- "$@" --enable-alsa --enable-jack --enable-jack-transport
 set -- "$@" --enable-decklink --enable-file --enable-ndi --enable-rtsp \
             --enable-screen=x11 --enable-swmix --enable-v4l2 --enable-ximea
 set -- "$@" --enable-caca --enable-gl-display --enable-panogl_disp --enable-sdl                         # display
-set -- "$@" --enable-libavcodec --enable-rtdxt --enable-libswscale --enable-uyvy                        # compression
+set -- "$@" --enable-libavcodec --enable-lavc-hw-accel-rpi4        # compression
+set -- "$@" --enable-libswscale --enable-rtdxt --enable-uyvy
 set -- "$@" --enable-blank --enable-holepunch --enable-natpmp --enable-pcp --enable-resize --enable-scale --enable-sdp-http --enable-testcard-extras --enable-text --enable-video-mixer --enable-zfec # extras (pp. etc)
-if [ "$ARCH" = armhf ]; then # Raspbian
-        set -- "$@" --enable-lavc-hw-accel-rpi4
-fi
+set -- "$@"
 set -- "$@" --disable-vulkan
 
 ./autogen.sh "$@"