Remove upstream L4T Bionic support

Dockerfile.l4t.bionic

@@ -1,31 +0,0 @@
-FROM nvcr.io/nvidia/l4t-base:r32.3.1
-
-ENV TARGET=l4t
-ENV DISTRO=bionic
-
-COPY scripts/install-base-deps.sh /opt/scripts/
-RUN /bin/bash -c /opt/scripts/install-base-deps.sh && \
-    echo "deb https://repo.download.nvidia.com/jetson/common r32 main" >> /etc/apt/sources.list && \
-    echo "deb https://repo.download.nvidia.com/jetson/t210 r32 main" >> /etc/apt/sources.list && \
-    apt-key adv --fetch-key https://repo.download.nvidia.com/jetson/jetson-ota-public.asc && \
-    mkdir -p /opt/nvidia/l4t-packages/ && \
-    echo >> /opt/nvidia/l4t-packages/.nv-l4t-disable-boot-fw-update-in-preinstall && \
-    apt-get update && \
-    apt-get install -y -o Dpkg::Options::="--force-confold" libv4l-dev nvidia-l4t-multimedia-utils && \
-    wget http://http.us.debian.org/debian/pool/main/a/automake-1.16/automake_1.16.1-4_all.deb && \
-    dpkg -i automake_1.16*.deb && \
-    apt-get clean -y && \
-    rm -rf /var/lib/apt/lists/*
-
-COPY dav1d /opt/dav1d
-COPY FFmpeg-l4t /opt/FFmpeg
-COPY SDL2 /opt/SDL2
-COPY SDL_ttf /opt/SDL_ttf
-
-COPY scripts/build-deps.sh /opt/scripts/
-RUN /bin/bash -c /opt/scripts/build-deps.sh
-
-COPY scripts/build-package.sh /opt/scripts/
-
-VOLUME "/out"
-ENTRYPOINT [ "/bin/bash", "-c", "/opt/scripts/build-package.sh" ]

appveyor.yml

@@ -10,8 +10,6 @@ environment:
       BUILD_SCRIPT: ./build-rpi-buster.sh
     - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu2004
       BUILD_SCRIPT: ./build-rpi64-buster.sh
-    - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu2004
-      BUILD_SCRIPT: ./build-l4t-bionic.sh
 
 install:
   - sh: 'sudo apt update || true'

build-l4t-bionic.sh

@@ -1,4 +0,0 @@
-TARGET_NAME="l4t-bionic"
-DOCKERFILE="Dockerfile.l4t.bionic"
-
-. ./build-common.sh

debian/control

@@ -3,7 +3,7 @@ Maintainer: Cameron Gutman <aicommander@gmail.com>
 Section: misc
 Priority: optional
 Standards-Version: 4.3.0
-Build-Depends: debhelper (>= 10), libssl-dev, qtbase5-dev, qtquickcontrols2-5-dev, qtdeclarative5-dev, libqt5svg5-dev, libxkbcommon-dev, libopus-dev, libgbm-dev, libdrm-dev, libasound2-dev, libdbus-1-dev, libegl1-mesa-dev, libgles2-mesa-dev, libglu1-mesa-dev, libibus-1.0-dev, libpulse-dev, libudev-dev, libx11-dev, libxcursor-dev, libxext-dev, libxi-dev, libxinerama-dev, libxrandr-dev, libxss-dev, libxt-dev, libxv-dev, libxxf86vm-dev, EXTRA_BUILD_DEPS
+Build-Depends: debhelper (>= 10), libssl-dev, qtbase5-dev, qtquickcontrols2-5-dev, qtdeclarative5-dev, libqt5svg5-dev, libxkbcommon-dev, libopus-dev, libgbm-dev, libdrm-dev, libasound2-dev, libdbus-1-dev, libegl1-mesa-dev, libgles2-mesa-dev, libglu1-mesa-dev, libibus-1.0-dev, libpulse-dev, libudev-dev, libx11-dev, libxcursor-dev, libxext-dev, libxi-dev, libxinerama-dev, libxrandr-dev, libxss-dev, libxt-dev, libxv-dev, libxxf86vm-dev, libgl-dev, EXTRA_BUILD_DEPS
 
 Package: moonlight-qt
 Architecture: any

do-release.sh

@@ -12,7 +12,6 @@ set -e
 ./push-images.sh
 
 # Build the packages
-./build-l4t-bionic.sh $1 &
 ./build-l4t-noble.sh $1 &
 ./build-rpi-buster.sh $1 &
 ./build-rpi64-buster.sh $1 &
@@ -33,7 +32,6 @@ wait
 wait
 
 # Push the moonlight-qt packages to Cloudsmith repos
-cloudsmith push deb moonlight-game-streaming/moonlight-l4t/ubuntu/bionic out_l4t-bionic/moonlight-qt_*.deb
 cloudsmith push deb moonlight-game-streaming/moonlight-l4t/ubuntu/jammy out_l4t-jammy/moonlight-qt_*.deb
 cloudsmith push deb moonlight-game-streaming/moonlight-l4t/ubuntu/noble out_l4t-noble/moonlight-qt_*.deb
 cloudsmith push deb moonlight-game-streaming/moonlight-qt/raspbian/buster out_rpi-buster/moonlight-qt_*.deb
@@ -53,7 +51,6 @@ cloudsmith push deb moonlight-game-streaming/moonlight-qt/ubuntu/jammy out_aarch
 cloudsmith push deb moonlight-game-streaming/moonlight-qt/ubuntu/noble out_aarch64-noble/moonlight-qt_*.deb
 
 # Push the moonlight-qt-dbgsym packages to Cloudsmith repos
-cloudsmith push deb moonlight-game-streaming/moonlight-l4t/ubuntu/bionic out_l4t-bionic/moonlight-qt-dbgsym_*.ddeb
 cloudsmith push deb moonlight-game-streaming/moonlight-l4t/ubuntu/jammy out_l4t-jammy/moonlight-qt-dbgsym_*.ddeb
 cloudsmith push deb moonlight-game-streaming/moonlight-l4t/ubuntu/noble out_l4t-noble/moonlight-qt-dbgsym_*.ddeb
 cloudsmith push deb moonlight-game-streaming/moonlight-qt/raspbian/buster out_rpi-buster/moonlight-qt-dbgsym_*.deb

push-images.sh

@@ -14,7 +14,6 @@ docker build --pull -f Dockerfile.rpi.buster -t cgutman/moonlight-packaging:rpi-
 docker build --pull -f Dockerfile.rpi64.buster -t cgutman/moonlight-packaging:rpi64-buster_$TAG_UNIQUE_ID . &
 docker build --pull -f Dockerfile.rpi.bookworm -t cgutman/moonlight-packaging:rpi-bookworm_$TAG_UNIQUE_ID . &
 docker build --pull -f Dockerfile.rpi64.bookworm -t cgutman/moonlight-packaging:rpi64-bookworm_$TAG_UNIQUE_ID . &
-docker build --pull -f Dockerfile.l4t.bionic -t cgutman/moonlight-packaging:l4t-bionic_$TAG_UNIQUE_ID . &
 wait
 docker build --pull -f Dockerfile.l4t.noble -t cgutman/moonlight-packaging:l4t-noble_$TAG_UNIQUE_ID . &
 docker build --pull -f Dockerfile.aarch64.jammy -t cgutman/moonlight-packaging:aarch64-jammy_$TAG_UNIQUE_ID . &
@@ -34,7 +33,6 @@ docker push cgutman/moonlight-packaging:rpi-buster_$TAG_UNIQUE_ID
 docker push cgutman/moonlight-packaging:rpi64-buster_$TAG_UNIQUE_ID
 docker push cgutman/moonlight-packaging:rpi-bookworm_$TAG_UNIQUE_ID
 docker push cgutman/moonlight-packaging:rpi64-bookworm_$TAG_UNIQUE_ID
-docker push cgutman/moonlight-packaging:l4t-bionic_$TAG_UNIQUE_ID
 docker push cgutman/moonlight-packaging:l4t-jammy_$TAG_UNIQUE_ID
 docker push cgutman/moonlight-packaging:l4t-noble_$TAG_UNIQUE_ID
 docker push cgutman/moonlight-packaging:armhf-bullseye_$TAG_UNIQUE_ID

scripts/build-package.sh

@@ -29,12 +29,8 @@ elif [ "$TARGET" == "rpi64" ]; then
         EXTRA_CONFIG="$EXTRA_CONFIG CONFIG+=disable-mmal"
     fi
 elif [ "$TARGET" == "l4t" ]; then
-    if [ "$DISTRO" != "bionic" ]; then
+    EXTRA_BUILD_DEPS="libwayland-dev, wayland-protocols"
-        EXTRA_BUILD_DEPS="libwayland-dev, wayland-protocols"
+    EXTRA_DEPS="$EXTRA_DEPS, libdecor-0-0"
-        EXTRA_DEPS="$EXTRA_DEPS, libdecor-0-0"
-    else
-        EXTRA_DEPS=""
-    fi
 elif [ "$TARGET" == "desktop" ]; then
     EXTRA_BUILD_DEPS="libwayland-dev, wayland-protocols, libva-dev, libvdpau-dev"
     EXTRA_DEPS="$EXTRA_DEPS, libdecor-0-0"
@@ -50,16 +46,11 @@ else
 fi
 
 # Determine extra distro-specific dependencies
-if [ "$DISTRO" != "buster" ] && [ "$DISTRO" != "bionic" ]; then
+if [ "$DISTRO" != "buster" ]; then
     EXTRA_BUILD_DEPS="$EXTRA_BUILD_DEPS, libfreetype-dev"
 else
     EXTRA_BUILD_DEPS="$EXTRA_BUILD_DEPS, libfreetype6-dev"
 fi
-if [ "$DISTRO" != "bionic" ]; then
-    EXTRA_BUILD_DEPS="$EXTRA_BUILD_DEPS, libgl-dev"
-else
-    EXTRA_BUILD_DEPS="$EXTRA_BUILD_DEPS, libgl1-mesa-dev"
-fi
 
 # Create a build directory
 mkdir /opt/build

scripts/install-base-deps.sh

@@ -3,23 +3,16 @@ set -e
 export DEBIAN_FRONTEND=noninteractive
 
 apt-get update
-apt-get install -y curl g++ make ninja-build devscripts fakeroot debhelper git nasm libgbm-dev libdrm-dev libasound2-dev libdbus-1-dev libegl1-mesa-dev libgl1-mesa-dev libgles2-mesa-dev libglu1-mesa-dev libibus-1.0-dev libpulse-dev libudev-dev libx11-dev libxcursor-dev libxext-dev libxi-dev libxinerama-dev libxkbcommon-dev libxrandr-dev libxss-dev libxt-dev libxv-dev libxxf86vm-dev cmake
+apt-get install -y curl g++ make ninja-build devscripts fakeroot debhelper git nasm libgbm-dev libdrm-dev libasound2-dev libdbus-1-dev libegl1-mesa-dev libgl1-mesa-dev libgles2-mesa-dev libglu1-mesa-dev libibus-1.0-dev libpulse-dev libudev-dev libx11-dev libxcursor-dev libxext-dev libxi-dev libxinerama-dev libxkbcommon-dev libxrandr-dev libxss-dev libxt-dev libxv-dev libxxf86vm-dev cmake libgl-dev meson
 apt-get install -y --no-install-recommends libssl-dev qtbase5-dev qtquickcontrols2-5-dev qtdeclarative5-dev libqt5svg5-dev libopus-dev gnupg
 
-if [ "$DISTRO" != "buster" ] && [ "$DISTRO" != "bionic" ]; then
+if [ "$DISTRO" != "buster" ]; then
     apt-get install -y libfreetype-dev libpipewire-0.3-dev
 else
     apt-get install -y libfreetype6-dev
 fi
 
-if [ "$DISTRO" != "bionic" ]; then
+if [ "$DISTRO" != "buster" ] && [ "$DISTRO" != "bullseye" ]; then
-    apt-get install -y libgl-dev meson
-else
-    apt-get install -y libgl1-mesa-dev python3-pip
-    pip3 install meson==0.61.5 # Last version compatible with Python 3.6 on Bionic
-fi
-
-if [ "$DISTRO" != "buster" ] && [ "$DISTRO" != "bullseye" ] && [ "$DISTRO" != "bionic" ]; then
     apt-get install -y wayland-protocols libwayland-dev libdecor-0-dev
 fi