Replace buster, bullseye, and sid with trixie
This commit is contained in:
6
.gitmodules
vendored
6
.gitmodules
vendored
@@ -13,12 +13,6 @@
|
||||
[submodule "FFmpeg-rpi"]
|
||||
path = FFmpeg-rpi
|
||||
url = https://github.com/cgutman/FFmpeg.git
|
||||
[submodule "rpi-userland"]
|
||||
path = rpi-userland
|
||||
url = https://github.com/cgutman/userland.git
|
||||
[submodule "FFmpeg-l4t"]
|
||||
path = FFmpeg-l4t
|
||||
url = https://github.com/cgutman/FFmpeg.git
|
||||
[submodule "dav1d"]
|
||||
path = dav1d
|
||||
url = https://code.videolan.org/videolan/dav1d.git
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
FROM arm64v8/debian:bullseye
|
||||
FROM arm64v8/debian:trixie
|
||||
|
||||
ENV TARGET=embedded
|
||||
ENV DISTRO=bullseye
|
||||
ENV DISTRO=trixie
|
||||
|
||||
COPY scripts/install-base-deps.sh /opt/scripts/
|
||||
RUN /bin/bash -c /opt/scripts/install-base-deps.sh && \
|
||||
@@ -1,7 +1,7 @@
|
||||
FROM amd64/debian:buster
|
||||
FROM amd64/debian:trixie
|
||||
|
||||
ENV TARGET=desktop
|
||||
ENV DISTRO=buster
|
||||
ENV DISTRO=trixie
|
||||
|
||||
COPY scripts/install-base-deps.sh /opt/scripts/
|
||||
RUN /bin/bash -c /opt/scripts/install-base-deps.sh && \
|
||||
@@ -1,7 +1,7 @@
|
||||
FROM arm32v7/debian:bullseye
|
||||
FROM arm32v7/debian:trixie
|
||||
|
||||
ENV TARGET=embedded
|
||||
ENV DISTRO=bullseye
|
||||
ENV DISTRO=trixie
|
||||
|
||||
COPY scripts/install-base-deps.sh /opt/scripts/
|
||||
RUN /bin/bash -c /opt/scripts/install-base-deps.sh && \
|
||||
@@ -1,12 +1,10 @@
|
||||
FROM riscv64/debian:sid-20240211
|
||||
FROM riscv64/debian:trixie
|
||||
|
||||
ENV TARGET=embedded
|
||||
ENV DISTRO=sid
|
||||
ENV DISTRO=trixie
|
||||
|
||||
COPY scripts/install-base-deps.sh /opt/scripts/
|
||||
RUN sed -i 's|http://deb.debian.org/debian|http://snapshot.debian.org/archive/debian/20240211T000000Z|g' /etc/apt/sources.list.d/debian.sources && \
|
||||
echo "Acquire::Check-Valid-Until false;" > /etc/apt/apt.conf.d/10-nocheckvalid && \
|
||||
/bin/bash -c /opt/scripts/install-base-deps.sh && \
|
||||
RUN /bin/bash -c /opt/scripts/install-base-deps.sh && \
|
||||
apt-get clean -y && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
@@ -1,15 +1,10 @@
|
||||
FROM arm32v7/debian:buster
|
||||
FROM arm32v7/debian:trixie
|
||||
|
||||
ENV TARGET=rpi
|
||||
ENV DISTRO=buster
|
||||
ENV DISTRO=trixie
|
||||
|
||||
COPY scripts/install-base-deps.sh /opt/scripts/
|
||||
RUN /bin/bash -c /opt/scripts/install-base-deps.sh && \
|
||||
apt-get install -y --no-install-recommends gnupg && \
|
||||
echo "deb http://archive.raspberrypi.org/debian/ $DISTRO main" >> /etc/apt/sources.list && \
|
||||
apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 82B129927FA3303E && \
|
||||
apt-get update && \
|
||||
apt-get install -y --no-install-recommends libraspberrypi-dev linux-libc-dev && \
|
||||
apt-get clean -y && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
@@ -1,19 +1,13 @@
|
||||
FROM arm64v8/debian:buster
|
||||
FROM arm64v8/debian:trixie
|
||||
|
||||
ENV TARGET=rpi64
|
||||
ENV DISTRO=buster
|
||||
ENV DISTRO=trixie
|
||||
|
||||
COPY scripts/install-base-deps.sh /opt/scripts/
|
||||
RUN /bin/bash -c /opt/scripts/install-base-deps.sh && \
|
||||
apt-get install -y --no-install-recommends gnupg && \
|
||||
echo "deb http://archive.raspberrypi.org/debian/ $DISTRO main" >> /etc/apt/sources.list && \
|
||||
apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 82B129927FA3303E && \
|
||||
apt-get update && \
|
||||
apt-get install -y --no-install-recommends linux-libc-dev && \
|
||||
apt-get clean -y && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
COPY rpi-userland /opt/rpi-userland
|
||||
COPY dav1d /opt/dav1d
|
||||
COPY FFmpeg-rpi /opt/FFmpeg
|
||||
COPY SDL2 /opt/SDL2
|
||||
Submodule FFmpeg-l4t deleted from e119ff5f25
@@ -5,7 +5,7 @@ clone_depth: 1
|
||||
environment:
|
||||
matrix:
|
||||
- APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu2004
|
||||
BUILD_SCRIPT: ./build-single.sh amd64 buster
|
||||
BUILD_SCRIPT: ./build-single.sh amd64 trixie
|
||||
- APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu2004
|
||||
BUILD_SCRIPT: ./build-single.sh rpi bookworm
|
||||
- APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu2004
|
||||
|
||||
4
debian/control
vendored
4
debian/control
vendored
@@ -3,10 +3,10 @@ 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, libgl-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, libfreetype-dev, libwayland-dev, wayland-protocols, EXTRA_BUILD_DEPS
|
||||
|
||||
Package: moonlight-qt
|
||||
Architecture: any
|
||||
Depends: qml-module-qtquick2, qml-module-qtquick-controls2, qml-module-qtquick-layouts, qml-module-qtquick-window2, ${shlibs:Depends}, ${misc:Depends}, EXTRA_DEPS
|
||||
Depends: qml-module-qtquick2, qml-module-qtquick-controls2, qml-module-qtquick-layouts, qml-module-qtquick-window2, libdecor-0-0, ${shlibs:Depends}, ${misc:Depends}, EXTRA_DEPS
|
||||
Recommends: libgl1-mesa-dri, libgles2
|
||||
Description: NVIDIA GameStream client
|
||||
|
||||
@@ -13,13 +13,13 @@ set -e
|
||||
|
||||
# Build the packages
|
||||
./build-single.sh l4t noble $1 &
|
||||
./build-single.sh rpi buster $1 &
|
||||
./build-single.sh rpi64 buster $1 &
|
||||
./build-single.sh rpi trixie $1 &
|
||||
./build-single.sh rpi64 trixie $1 &
|
||||
./build-single.sh aarch64 jammy $1 &
|
||||
wait
|
||||
./build-single.sh armhf jammy $1 &
|
||||
./build-single.sh armhf bullseye $1 &
|
||||
./build-single.sh aarch64 bullseye $1 &
|
||||
./build-single.sh armhf trixie $1 &
|
||||
./build-single.sh aarch64 trixie $1 &
|
||||
./build-single.sh armhf noble $1 &
|
||||
./build-single.sh aarch64 noble $1 &
|
||||
wait
|
||||
@@ -27,24 +27,22 @@ wait
|
||||
./build-single.sh rpi64 bookworm $1 &
|
||||
./build-single.sh armhf bookworm $1 &
|
||||
./build-single.sh aarch64 bookworm $1 &
|
||||
./build-single.sh riscv64 sid $1 &
|
||||
./build-single.sh riscv64 trixie $1 &
|
||||
./build-single.sh l4t jammy $1 &
|
||||
wait
|
||||
|
||||
# Push the moonlight-qt packages to Cloudsmith repos
|
||||
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
|
||||
cloudsmith push deb moonlight-game-streaming/moonlight-qt/raspbian/bullseye out_rpi-buster/moonlight-qt_*.deb
|
||||
cloudsmith push deb moonlight-game-streaming/moonlight-qt/raspbian/trixie out_rpi-trixie/moonlight-qt_*.deb
|
||||
cloudsmith push deb moonlight-game-streaming/moonlight-qt/raspbian/bookworm out_rpi-bookworm/moonlight-qt_*.deb
|
||||
cloudsmith push deb moonlight-game-streaming/moonlight-qt/raspbian/buster out_rpi64-buster/moonlight-qt_*.deb
|
||||
cloudsmith push deb moonlight-game-streaming/moonlight-qt/raspbian/bullseye out_rpi64-buster/moonlight-qt_*.deb
|
||||
cloudsmith push deb moonlight-game-streaming/moonlight-qt/raspbian/trixie out_rpi64-trixie/moonlight-qt_*.deb
|
||||
cloudsmith push deb moonlight-game-streaming/moonlight-qt/raspbian/bookworm out_rpi64-bookworm/moonlight-qt_*.deb
|
||||
cloudsmith push deb moonlight-game-streaming/moonlight-qt/debian/bullseye out_armhf-bullseye/moonlight-qt_*.deb
|
||||
cloudsmith push deb moonlight-game-streaming/moonlight-qt/debian/bookworm out_armhf-bookworm/moonlight-qt_*.deb
|
||||
cloudsmith push deb moonlight-game-streaming/moonlight-qt/debian/bullseye out_aarch64-bullseye/moonlight-qt_*.deb
|
||||
cloudsmith push deb moonlight-game-streaming/moonlight-qt/debian/trixie out_armhf-trixie/moonlight-qt_*.deb
|
||||
cloudsmith push deb moonlight-game-streaming/moonlight-qt/debian/bookworm out_aarch64-bookworm/moonlight-qt_*.deb
|
||||
cloudsmith push deb moonlight-game-streaming/moonlight-qt/debian/sid out_riscv64-sid/moonlight-qt_*.deb
|
||||
cloudsmith push deb moonlight-game-streaming/moonlight-qt/debian/trixie out_aarch64-trixie/moonlight-qt_*.deb
|
||||
cloudsmith push deb moonlight-game-streaming/moonlight-qt/debian/trixie out_riscv64-trixie/moonlight-qt_*.deb
|
||||
cloudsmith push deb moonlight-game-streaming/moonlight-qt/ubuntu/jammy out_armhf-jammy/moonlight-qt_*.deb
|
||||
cloudsmith push deb moonlight-game-streaming/moonlight-qt/ubuntu/noble out_armhf-noble/moonlight-qt_*.deb
|
||||
cloudsmith push deb moonlight-game-streaming/moonlight-qt/ubuntu/jammy out_aarch64-jammy/moonlight-qt_*.deb
|
||||
@@ -53,17 +51,15 @@ cloudsmith push deb moonlight-game-streaming/moonlight-qt/ubuntu/noble out_aarch
|
||||
# Push the moonlight-qt-dbgsym packages to Cloudsmith repos
|
||||
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
|
||||
cloudsmith push deb moonlight-game-streaming/moonlight-qt/raspbian/bullseye out_rpi-buster/moonlight-qt-dbgsym_*.deb
|
||||
cloudsmith push deb moonlight-game-streaming/moonlight-qt/raspbian/bookworm out_rpi-bookworm/moonlight-qt-dbgsym_*.deb
|
||||
cloudsmith push deb moonlight-game-streaming/moonlight-qt/raspbian/buster out_rpi64-buster/moonlight-qt-dbgsym_*.deb
|
||||
cloudsmith push deb moonlight-game-streaming/moonlight-qt/raspbian/bullseye out_rpi64-buster/moonlight-qt-dbgsym_*.deb
|
||||
cloudsmith push deb moonlight-game-streaming/moonlight-qt/raspbian/trixie out_rpi-trixie/moonlight-qt-dbgsym_*.deb
|
||||
cloudsmith push deb moonlight-game-streaming/moonlight-qt/raspbian/bookworm out_rpi64-bookworm/moonlight-qt-dbgsym_*.deb
|
||||
cloudsmith push deb moonlight-game-streaming/moonlight-qt/debian/bullseye out_armhf-bullseye/moonlight-qt-dbgsym_*.deb
|
||||
cloudsmith push deb moonlight-game-streaming/moonlight-qt/raspbian/trixie out_rpi64-trixie/moonlight-qt-dbgsym_*.deb
|
||||
cloudsmith push deb moonlight-game-streaming/moonlight-qt/debian/bookworm out_armhf-bookworm/moonlight-qt-dbgsym_*.deb
|
||||
cloudsmith push deb moonlight-game-streaming/moonlight-qt/debian/bullseye out_aarch64-bullseye/moonlight-qt-dbgsym_*.deb
|
||||
cloudsmith push deb moonlight-game-streaming/moonlight-qt/debian/trixie out_armhf-trixie/moonlight-qt-dbgsym_*.deb
|
||||
cloudsmith push deb moonlight-game-streaming/moonlight-qt/debian/bookworm out_aarch64-bookworm/moonlight-qt-dbgsym_*.deb
|
||||
cloudsmith push deb moonlight-game-streaming/moonlight-qt/debian/sid out_riscv64-sid/moonlight-qt-dbgsym_*.deb
|
||||
cloudsmith push deb moonlight-game-streaming/moonlight-qt/debian/trixie out_aarch64-trixie/moonlight-qt-dbgsym_*.deb
|
||||
cloudsmith push deb moonlight-game-streaming/moonlight-qt/debian/trixie out_riscv64-trixie/moonlight-qt-dbgsym_*.deb
|
||||
cloudsmith push deb moonlight-game-streaming/moonlight-qt/ubuntu/jammy out_armhf-jammy/moonlight-qt-dbgsym_*.ddeb
|
||||
cloudsmith push deb moonlight-game-streaming/moonlight-qt/ubuntu/noble out_armhf-noble/moonlight-qt-dbgsym_*.ddeb
|
||||
cloudsmith push deb moonlight-game-streaming/moonlight-qt/ubuntu/jammy out_aarch64-jammy/moonlight-qt-dbgsym_*.ddeb
|
||||
|
||||
@@ -10,10 +10,10 @@ set -e
|
||||
|
||||
TAG_UNIQUE_ID=`git ls-tree HEAD | sha256sum | cut -c-16`
|
||||
|
||||
docker build --pull -f Dockerfile.rpi.buster -t cgutman/moonlight-packaging:rpi-buster_$TAG_UNIQUE_ID . &
|
||||
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.rpi.trixie -t cgutman/moonlight-packaging:rpi-trixie_$TAG_UNIQUE_ID . &
|
||||
docker build --pull -f Dockerfile.rpi64.trixie -t cgutman/moonlight-packaging:rpi64-trixie_$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 . &
|
||||
@@ -21,26 +21,26 @@ docker build --pull -f Dockerfile.aarch64.noble -t cgutman/moonlight-packaging:a
|
||||
docker build --pull -f Dockerfile.armhf.jammy -t cgutman/moonlight-packaging:armhf-jammy_$TAG_UNIQUE_ID . &
|
||||
docker build --pull -f Dockerfile.armhf.noble -t cgutman/moonlight-packaging:armhf-noble_$TAG_UNIQUE_ID . &
|
||||
wait
|
||||
docker build --pull -f Dockerfile.aarch64.bullseye -t cgutman/moonlight-packaging:aarch64-bullseye_$TAG_UNIQUE_ID . &
|
||||
docker build --pull -f Dockerfile.aarch64.bookworm -t cgutman/moonlight-packaging:aarch64-bookworm_$TAG_UNIQUE_ID . &
|
||||
docker build --pull -f Dockerfile.armhf.bullseye -t cgutman/moonlight-packaging:armhf-bullseye_$TAG_UNIQUE_ID . &
|
||||
docker build --pull -f Dockerfile.aarch64.trixie -t cgutman/moonlight-packaging:aarch64-trixie_$TAG_UNIQUE_ID . &
|
||||
docker build --pull -f Dockerfile.armhf.bookworm -t cgutman/moonlight-packaging:armhf-bookworm_$TAG_UNIQUE_ID . &
|
||||
docker build --pull -f Dockerfile.riscv64.sid -t cgutman/moonlight-packaging:riscv64-sid_$TAG_UNIQUE_ID . &
|
||||
docker build --pull -f Dockerfile.armhf.trixie -t cgutman/moonlight-packaging:armhf-trixie_$TAG_UNIQUE_ID . &
|
||||
docker build --pull -f Dockerfile.riscv64.trixie -t cgutman/moonlight-packaging:riscv64-trixie_$TAG_UNIQUE_ID . &
|
||||
docker build --pull -f Dockerfile.l4t.jammy -t cgutman/moonlight-packaging:l4t-jammy_$TAG_UNIQUE_ID . &
|
||||
wait
|
||||
|
||||
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:rpi-trixie_$TAG_UNIQUE_ID
|
||||
docker push cgutman/moonlight-packaging:rpi64-trixie_$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
|
||||
docker push cgutman/moonlight-packaging:armhf-bookworm_$TAG_UNIQUE_ID
|
||||
docker push cgutman/moonlight-packaging:aarch64-bullseye_$TAG_UNIQUE_ID
|
||||
docker push cgutman/moonlight-packaging:armhf-trixie_$TAG_UNIQUE_ID
|
||||
docker push cgutman/moonlight-packaging:aarch64-bookworm_$TAG_UNIQUE_ID
|
||||
docker push cgutman/moonlight-packaging:aarch64-trixie_$TAG_UNIQUE_ID
|
||||
docker push cgutman/moonlight-packaging:armhf-jammy_$TAG_UNIQUE_ID
|
||||
docker push cgutman/moonlight-packaging:armhf-noble_$TAG_UNIQUE_ID
|
||||
docker push cgutman/moonlight-packaging:aarch64-jammy_$TAG_UNIQUE_ID
|
||||
docker push cgutman/moonlight-packaging:aarch64-noble_$TAG_UNIQUE_ID
|
||||
docker push cgutman/moonlight-packaging:riscv64-sid_$TAG_UNIQUE_ID
|
||||
docker push cgutman/moonlight-packaging:riscv64-trixie_$TAG_UNIQUE_ID
|
||||
|
||||
Submodule rpi-userland deleted from 5c051a9208
@@ -4,31 +4,8 @@ BASE_FFMPEG_ARGS="--fatal-warnings --enable-pic --enable-static --disable-shared
|
||||
|
||||
echo "Building dependencies for $TARGET"
|
||||
if [ "$TARGET" == "rpi" ] || [ "$TARGET" == "rpi64" ]; then
|
||||
# We have to build MMAL libraries for aarch64 on Buster
|
||||
if [ "$TARGET" == "rpi64" ] && [ "$DISTRO" == "buster" ]; then
|
||||
cd /opt/rpi-userland
|
||||
mkdir build
|
||||
cd build
|
||||
cmake -DARM64=ON -DLIBRARY_TYPE=STATIC -DVCOS_PTHREADS_BUILD_SHARED=OFF ..
|
||||
make -j$(nproc)
|
||||
make install
|
||||
|
||||
# We also have to patch the FFmpeg configure script since it doesn't use pkg-config
|
||||
sed -i 's|add_ldflags -L/opt/vc/lib/|add_ldflags -L/opt/vc/lib/ -pthread|g' /opt/FFmpeg/configure
|
||||
sed -i 's|-lmmal_vc_client|-lmmal_vc_client -lbcm_host -lvcos -lvcsm -lvchostif -lvchiq_arm|g' /opt/FFmpeg/configure
|
||||
fi
|
||||
|
||||
# Enable HEVC VL42 stateless decoder (H.264 is stateful on Pi 4 and absent on Pi 5)
|
||||
EXTRA_FFMPEG_ARGS="--enable-sand --enable-libudev --enable-v4l2-request --enable-hwaccel=hevc_v4l2request"
|
||||
|
||||
if [ "$DISTRO" == "buster" ]; then
|
||||
# Copy libraspberrypi-dev pkgconfig files into the default location
|
||||
mkdir -p /usr/local/lib/pkgconfig
|
||||
cp /opt/vc/lib/pkgconfig/* /usr/local/lib/pkgconfig/
|
||||
|
||||
# Enable MMAL on Buster
|
||||
EXTRA_FFMPEG_ARGS="$EXTRA_FFMPEG_ARGS --enable-mmal --enable-decoder=h264_mmal"
|
||||
fi
|
||||
elif [ "$TARGET" == "l4t" ]; then
|
||||
# Enable NVV4L2 decoders (and VP9 decoder to work around compilation error in NVV4L2 fallback code)
|
||||
EXTRA_FFMPEG_ARGS="--enable-nvv4l2 --enable-decoder=h264_nvv4l2 --enable-decoder=hevc_nvv4l2 --enable-decoder=vp9"
|
||||
|
||||
@@ -13,45 +13,18 @@ git -c submodule.libs.update=none submodule update --init --recursive
|
||||
VERSION=`cat app/version.txt`
|
||||
|
||||
# Determine extra target-specific dependencies
|
||||
if [ "$TARGET" == "rpi" ]; then
|
||||
EXTRA_CONFIG="CONFIG+=gpuslow"
|
||||
if [ "$DISTRO" = "buster" ]; then
|
||||
EXTRA_BUILD_DEPS="libraspberrypi-dev | rbp-userland-dev-osmc"
|
||||
EXTRA_DEPS="libraspberrypi0 | rbp-userland-osmc"
|
||||
else
|
||||
EXTRA_DEPS="$EXTRA_DEPS, libdecor-0-0"
|
||||
EXTRA_CONFIG="$EXTRA_CONFIG CONFIG+=disable-mmal"
|
||||
fi
|
||||
elif [ "$TARGET" == "rpi64" ]; then
|
||||
EXTRA_CONFIG="CONFIG+=gpuslow"
|
||||
if [ "$DISTRO" != "buster" ]; then
|
||||
EXTRA_DEPS="$EXTRA_DEPS, libdecor-0-0"
|
||||
EXTRA_CONFIG="$EXTRA_CONFIG CONFIG+=disable-mmal"
|
||||
fi
|
||||
if [ "$TARGET" == "rpi" ] || [ "$TARGET" == "rpi64" ]; then
|
||||
EXTRA_CONFIG="CONFIG+=gpuslow CONFIG+=disable-mmal"
|
||||
elif [ "$TARGET" == "l4t" ]; then
|
||||
EXTRA_BUILD_DEPS="libwayland-dev, wayland-protocols"
|
||||
EXTRA_DEPS="$EXTRA_DEPS, libdecor-0-0"
|
||||
elif [ "$TARGET" == "desktop" ]; then
|
||||
EXTRA_BUILD_DEPS="libwayland-dev, wayland-protocols, libva-dev, libvdpau-dev"
|
||||
EXTRA_DEPS="$EXTRA_DEPS, libdecor-0-0"
|
||||
EXTRA_BUILD_DEPS="libva-dev, libvdpau-dev"
|
||||
elif [ "$TARGET" == "embedded" ]; then
|
||||
EXTRA_CONFIG="CONFIG+=gpuslow"
|
||||
if [ "$DISTRO" != "bullseye" ]; then
|
||||
EXTRA_BUILD_DEPS="libwayland-dev, wayland-protocols"
|
||||
EXTRA_DEPS="$EXTRA_DEPS, libdecor-0-0"
|
||||
fi
|
||||
else
|
||||
echo "Unrecognized target: $TARGET"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Determine extra distro-specific dependencies
|
||||
if [ "$DISTRO" != "buster" ]; then
|
||||
EXTRA_BUILD_DEPS="$EXTRA_BUILD_DEPS, libfreetype-dev"
|
||||
else
|
||||
EXTRA_BUILD_DEPS="$EXTRA_BUILD_DEPS, libfreetype6-dev"
|
||||
fi
|
||||
|
||||
# Create a build directory
|
||||
mkdir /opt/build
|
||||
|
||||
|
||||
@@ -3,20 +3,10 @@ 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 libgl-dev meson
|
||||
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 wayland-protocols libwayland-dev libdecor-0-dev libfreetype-dev libpipewire-0.3-dev
|
||||
apt-get install -y --no-install-recommends libssl-dev qtbase5-dev qtquickcontrols2-5-dev qtdeclarative5-dev libqt5svg5-dev libopus-dev gnupg
|
||||
|
||||
if [ "$DISTRO" != "buster" ]; then
|
||||
apt-get install -y libfreetype-dev libpipewire-0.3-dev
|
||||
else
|
||||
apt-get install -y libfreetype6-dev
|
||||
fi
|
||||
|
||||
if [ "$DISTRO" != "buster" ] && [ "$DISTRO" != "bullseye" ]; then
|
||||
apt-get install -y wayland-protocols libwayland-dev libdecor-0-dev
|
||||
fi
|
||||
|
||||
if [ "$TARGET" == "embedded" ] && [ "$DISTRO" != "sid" ]; then
|
||||
if [ "$TARGET" == "embedded" ] && [ "$DISTRO" != "sid" ] && [ "$DISTRO" != "trixie" ]; then
|
||||
# Grab latest kernel headers from Bookworm to pick up the latest V4L2 defs
|
||||
apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 6ED0E7B82643E131
|
||||
echo "deb http://deb.debian.org/debian bookworm-backports main" >> /etc/apt/sources.list
|
||||
|
||||
Reference in New Issue
Block a user