Merge pull request #21 from jellyfin/bullseye

Support Debian Bullseye (testing)
jellyfin · Feb 15, 2020 · 5492654 · 5492654
2 parents 3075919 + 32bec16
commit 5492654
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/build b/build
@@ -6,7 +6,8 @@ usage() {
     echo -e "Releases:          Arches:"
     echo -e " * stretch          * amd64"
     echo -e " * buster           * armhf"
-    echo -e " * xenial           * arm64"
+    echo -e " * bullseye         * arm64"
+    echo -e " * xenial"
     echo -e " * bionic"
     echo -e " * cosmic"
     echo -e " * disco"
@@ -28,6 +29,10 @@ case ${cli_release} in
         release="debian:buster"
         gcc_version="7"
     ;;
+    'bullseye')
+        release="debian:bullseye"
+        gcc_version="8"
+    ;;
     'xenial')
         release="ubuntu:xenial"
         gcc_version="5"

diff --git a/build.yaml b/build.yaml
@@ -1,14 +1,17 @@
 ---
 # We just wrap `build` so this is really it
 name: "jellyfin-ffmpeg"
-version: "4.2.1-2"
+version: "4.2.1-4"
 packages:
   - stretch-amd64
   - stretch-armhf
   - stretch-arm64
   - buster-amd64
   - buster-armhf
   - buster-arm64
+  - bullseye-amd64
+  - bullseye-armhf
+  - bullseye-arm64
   - xenial-amd64
   - bionic-amd64
   - bionic-armhf

diff --git a/docker-build.sh b/docker-build.sh
@@ -36,7 +36,7 @@ EOF
     # Install dependencies
     pushd cross-gcc-packages-amd64/cross-gcc-${GCC_VER}-armhf
     ln -fs /usr/share/zoneinfo/America/Toronto /etc/localtime
-    yes | apt-get install -y gcc-${GCC_VER}-source libstdc++6-armhf-cross binutils-arm-linux-gnueabihf bison flex libtool gdb sharutils netbase libmpc-dev libmpfr-dev libgmp-dev systemtap-sdt-dev autogen expect chrpath zlib1g-dev zip libc6-dev:armhf linux-libc-dev:armhf libgcc1:armhf libcurl4-openssl-dev:armhf libfontconfig1-dev:armhf libfreetype6-dev:armhf liblttng-ust0:armhf libstdc++6:armhf
+    yes | apt-get install -y -o APT::Immediate-Configure=0 gcc-${GCC_VER}-source libstdc++6-armhf-cross binutils-arm-linux-gnueabihf bison flex libtool gdb sharutils netbase libmpc-dev libmpfr-dev libgmp-dev systemtap-sdt-dev autogen expect chrpath zlib1g-dev zip libc6-dev:armhf linux-libc-dev:armhf libgcc1:armhf libcurl4-openssl-dev:armhf libfontconfig1-dev:armhf libfreetype6-dev:armhf liblttng-ust0:armhf libstdc++6:armhf
     popd
 
     # Fetch RasPi headers to build MMAL support
@@ -78,7 +78,7 @@ EOF
     # Install dependencies
     pushd cross-gcc-packages-amd64/cross-gcc-${GCC_VER}-arm64
     ln -fs /usr/share/zoneinfo/America/Toronto /etc/localtime
-    yes | apt-get install -y gcc-${GCC_VER}-source libstdc++6-arm64-cross binutils-aarch64-linux-gnu bison flex libtool gdb sharutils netbase libmpc-dev libmpfr-dev libgmp-dev systemtap-sdt-dev autogen expect chrpath zlib1g-dev zip libc6-dev:arm64 linux-libc-dev:arm64 libgcc1:arm64 libcurl4-openssl-dev:arm64 libfontconfig1-dev:arm64 libfreetype6-dev:arm64 liblttng-ust0:arm64 libstdc++6:arm64
+    yes | apt-get install -y -o APT::Immediate-Configure=0 gcc-${GCC_VER}-source libstdc++6-arm64-cross binutils-aarch64-linux-gnu bison flex libtool gdb sharutils netbase libmpc-dev libmpfr-dev libgmp-dev systemtap-sdt-dev autogen expect chrpath zlib1g-dev zip libc6-dev:arm64 linux-libc-dev:arm64 libgcc1:arm64 libcurl4-openssl-dev:arm64 libfontconfig1-dev:arm64 libfreetype6-dev:arm64 liblttng-ust0:arm64 libstdc++6:arm64
     popd
 }