Merge pull request #368 from nyanmisaka/next

[6.0] Add support for Ubuntu 24.04 LTS (Noble)

.github/workflows/build.yaml

@@ -30,7 +30,7 @@ jobs:
     uses: ./.github/workflows/_meta.yaml
     with:
       distro: 'ubuntu'
-      codenames: '["focal", "jammy"]'
+      codenames: '["focal", "jammy", "noble"]'
       architectures: '["amd64", "arm64", "armhf"]'
       release: false
 

.github/workflows/publish.yaml

@@ -22,7 +22,7 @@ jobs:
     uses: ./.github/workflows/_meta.yaml
     with:
       distro: 'ubuntu'
-      codenames: '["focal", "jammy"]'
+      codenames: '["focal", "jammy", "noble"]'
       architectures: '["amd64", "arm64", "armhf"]'
       release: true
     secrets:
@@ -76,7 +76,8 @@ jobs:
           {distro: 'debian', codename: 'bullseye'},
           {distro: 'debian', codename: 'bookworm'},
           {distro: 'ubuntu', codename: 'focal'},
-          {distro: 'ubuntu', codename: 'jammy'}
+          {distro: 'ubuntu', codename: 'jammy'},
+          {distro: 'ubuntu', codename: 'noble'}
         ]
     steps:
       - name: Import packages into reprepro

Dockerfile.make

@@ -1,7 +1,7 @@
 #!/usr/bin/make
-DISTRO=bullseye
-GCC_VER=10
-LLVM_VER=13
+DISTRO=noble
+GCC_VER=13
+LLVM_VER=17
 ARCH=amd64
 .PHONY: Dockerfile
 Dockerfile: Dockerfile.in

Dockerfile.win64.in

@@ -17,8 +17,8 @@ ENV DEBIAN_FRONTEND=noninteractive \
     FF_TARGET_FLAGS="--arch=x86_64 --target-os=mingw32 --cross-prefix=x86_64-w64-mingw32- --pkg-config=pkg-config --pkg-config-flags=--static" \
     PKG_CONFIG=pkg-config \
     PKG_CONFIG_LIBDIR=/opt/ffdeps/lib/pkgconfig:/opt/ffdeps/share/pkgconfig \
-    CFLAGS="-static-libgcc -static-libstdc++ -I/opt/ffdeps/include -mtune=generic -O2 -pipe -D_FORTIFY_SOURCE=0" \
-    CXXFLAGS="-static-libgcc -static-libstdc++ -I/opt/ffdeps/include -mtune=generic -O2 -pipe -D_FORTIFY_SOURCE=0" \
+    CFLAGS="-static-libgcc -static-libstdc++ -I/opt/ffdeps/include -mtune=generic -O2 -pipe -D_FORTIFY_SOURCE=0 -D_WIN32_WINNT=0x0601" \
+    CXXFLAGS="-static-libgcc -static-libstdc++ -I/opt/ffdeps/include -mtune=generic -O2 -pipe -D_FORTIFY_SOURCE=0 -D_WIN32_WINNT=0x0601" \
     LDFLAGS="-static-libgcc -static-libstdc++ -L/opt/ffdeps/lib -O2 -pipe" \
     DLLTOOL="x86_64-w64-mingw32-dlltool"
 
@@ -31,7 +31,7 @@ RUN apt-get update \
     help2man flex bison gperf gettext itstool ragel \
     libc6-dev libssl-dev gtk-doc-tools gobject-introspection \
     gawk meson ninja-build p7zip-full python3-distutils \
-    python3-apt python-is-python3 zip quilt \ 
+    python3-apt python-is-python3 zip quilt \
     binutils-mingw-w64-x86-64 gcc-mingw-w64-x86-64 \
     g++-mingw-w64-x86-64 gfortran-mingw-w64-x86-64 \
  && apt-get clean autoclean -y \
@@ -54,4 +54,4 @@ VOLUME ${ARTIFACT_DIR}/
 
 COPY . ${SOURCE_DIR}/
 
-ENTRYPOINT ["/docker-build-win64.sh"]
+ENTRYPOINT ["/docker-build-win64.sh"]

Dockerfile.win64.make

@@ -1,5 +1,5 @@
 #!/usr/bin/make
-DISTRO=ubuntu:mantic
+DISTRO=ubuntu:noble
 .PHONY: Dockerfile
 Dockerfile: Dockerfile.win64.in
 	sed 's/DISTRO/$(DISTRO)/' $< > $@ || rm -f $@

build

@@ -9,8 +9,7 @@ usage() {
     echo -e " * bookworm         * arm64"
     echo -e " * focal"
     echo -e " * jammy"
-    echo -e " * lunar"
-    echo -e " * mantic"
+    echo -e " * noble"
 }
 
 if [[ -z ${1} ]]; then
@@ -28,12 +27,12 @@ case ${cli_release} in
     'bullseye')
         release="debian:bullseye"
         gcc_version="10"
-        llvm_version="13"
+        llvm_version="16"
     ;;
     'bookworm')
         release="debian:bookworm"
         gcc_version="12"
-        llvm_version="15"
+        llvm_version="16"
     ;;
     'focal')
         release="ubuntu:focal"
@@ -45,13 +44,8 @@ case ${cli_release} in
         gcc_version="11"
         llvm_version="15"
     ;;
-    'lunar')
-        release="ubuntu:lunar"
-        gcc_version="12"
-        llvm_version="15"
-    ;;
-    'mantic')
-        release="ubuntu:mantic"
+    'noble')
+        release="ubuntu:noble"
         gcc_version="13"
         llvm_version="17"
     ;;

build-windows-win64

@@ -9,7 +9,7 @@ for dep in docker make; do
 done
 
 # Use the latest distro for toolchains
-distro="ubuntu:mantic"
+distro="ubuntu:noble"
 image_name="jellyfin-ffmpeg-build-windows-win64"
 package_temporary_dir="$( mktemp -d )"
 current_user="$( whoami )"

build.yaml

@@ -1,7 +1,7 @@
 ---
 # We just wrap `build` so this is really it
 name: "jellyfin-ffmpeg"
-version: "6.0.1-4"
+version: "6.0.1-5"
 packages:
   - buster-amd64
   - buster-armhf
@@ -18,9 +18,6 @@ packages:
   - jammy-amd64
   - jammy-armhf
   - jammy-arm64
-  - lunar-amd64
-  - lunar-armhf
-  - lunar-arm64
-  - mantic-amd64
-  - mantic-armhf
-  - mantic-arm64
+  - noble-amd64
+  - noble-armhf
+  - noble-arm64

builder/README.md

@@ -30,8 +30,8 @@ On success, the resulting `zip` or `tar.xz` file will be in the `artifacts` subd
 
 Available targets:
 * `win64` (x86_64 Windows, windows>=7)
-* `linux64` (x86_64 Linux, glibc>=2.23, linux>=4.4)
-* `linuxarm64` (arm64 (aarch64) Linux, glibc>=2.27, linux>=4.15)
+* `linux64` (x86_64 Linux, glibc>=2.28, linux>=4.18)
+* `linuxarm64` (arm64 (aarch64) Linux, glibc>=2.28, linux>=4.18)
 
 Available variants:
 * `gpl` Includes all dependencies, even those that require full GPL instead of just LGPL.