From 763cf5a481cf9810cb78c9e133e3907c97379466 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Tue, 13 Dec 2022 21:30:49 +0000 Subject: [PATCH 1/4] Rebase to jammy, bump to 5.1.2 --- Dockerfile | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3ce3c23..92b358d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-ubuntu:focal as buildstage +FROM ghcr.io/linuxserver/baseimage-ubuntu:jammy as buildstage # set version label ARG FFMPEG_VERSION @@ -12,14 +12,14 @@ ENV \ ENV \ AOM=v1.0.0 \ FDKAAC=2.0.1 \ - FFMPEG_HARD=4.4 \ + FFMPEG_HARD=5.1.2 \ FONTCONFIG=2.13.92 \ FREETYPE=2.9.1 \ FRIBIDI=1.0.8 \ KVAZAAR=2.0.0 \ LAME=3.100 \ LIBASS=0.14.0 \ - LIBDRM=2.4.100 \ + LIBDRM=2.4.114 \ LIBVA=2.6.0 \ LIBVDPAU=1.2 \ LIBVIDSTAB=1.1.0 \ @@ -44,7 +44,6 @@ RUN \ bzip2 \ ca-certificates \ cmake \ - curl \ diffutils \ doxygen \ g++ \ @@ -53,7 +52,7 @@ RUN \ gperf \ libexpat1-dev \ libxext-dev \ - libgcc-7-dev \ + libgcc-10-dev \ libgomp1 \ libpciaccess-dev \ libssl-dev \ @@ -67,7 +66,6 @@ RUN \ ocl-icd-opencl-dev \ perl \ pkg-config \ - python \ python3 \ python3-pip\ python3-setuptools \ @@ -224,16 +222,16 @@ RUN \ echo "**** grabbing libdrm ****" && \ mkdir -p /tmp/libdrm && \ curl -Lf \ - https://dri.freedesktop.org/libdrm/libdrm-${LIBDRM}.tar.gz | \ - tar -zx --strip-components=1 -C /tmp/libdrm + https://dri.freedesktop.org/libdrm/libdrm-${LIBDRM}.tar.xz | \ + tar -xJ --strip-components=1 -C /tmp/libdrm RUN \ echo "**** compiling libdrm ****" && \ cd /tmp/libdrm && \ - ./configure \ - --disable-static \ - --enable-shared && \ - make && \ - make install + meson \ + -Dvalgrind=disabled \ + . build && \ + ninja -C build && \ + ninja -C build install RUN \ echo "**** grabbing libva ****" && \ mkdir -p /tmp/libva && \ @@ -476,7 +474,6 @@ RUN \ --disable-doc \ --disable-ffplay \ --enable-ffprobe \ - --enable-avresample \ --enable-cuvid \ --enable-gpl \ --enable-libaom \ @@ -528,7 +525,7 @@ RUN \ | awk '/local/ {print $3}' \ | xargs -i cp -L {} /buildout/usr/lib/ && \ cp -a \ - /usr/local/lib/libdrm_* \ + /usr/local/lib/*/libdrm_* \ /buildout/usr/lib/ && \ echo \ 'libnvidia-opencl.so.1' > \ From 5482bc226de15aa23105db79a0bac816f88c1dc7 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Tue, 13 Dec 2022 22:12:02 +0000 Subject: [PATCH 2/4] Rebase to Jammy, bump to 5.1.2 --- .github/workflows/call_invalid_helper.yml | 12 ++++++++++++ .github/workflows/external_trigger.yml | 2 +- Dockerfile | 3 ++- Dockerfile.aarch64 | 14 +++++++------- Dockerfile.armhf | 14 +++++++------- Jenkinsfile | 2 +- jenkins-vars.yml | 2 +- 7 files changed, 31 insertions(+), 18 deletions(-) create mode 100644 .github/workflows/call_invalid_helper.yml diff --git a/.github/workflows/call_invalid_helper.yml b/.github/workflows/call_invalid_helper.yml new file mode 100644 index 0000000..773767c --- /dev/null +++ b/.github/workflows/call_invalid_helper.yml @@ -0,0 +1,12 @@ +name: Comment on invalid interaction +on: + issues: + types: + - labeled +jobs: + add-comment-on-invalid: + if: github.event.label.name == 'invalid' + permissions: + issues: write + uses: linuxserver/github-workflows/.github/workflows/invalid-interaction-helper.yml@v1 + secrets: inherit diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index 4aaed53..c4a8fac 100644 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -18,7 +18,7 @@ jobs: fi echo "**** External trigger running off of bin branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_FFMPEG_BIN\". ****" echo "**** Retrieving external version ****" - EXT_RELEASE=$(echo 4.4) + EXT_RELEASE=$(echo 5.1.2) if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then echo "**** Can't retrieve external version, exiting ****" FAILURE_REASON="Can't retrieve external version for ffmpeg branch bin" diff --git a/Dockerfile b/Dockerfile index 92b358d..6b2645e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,5 @@ +# syntax=docker/dockerfile:1 + FROM ghcr.io/linuxserver/baseimage-ubuntu:jammy as buildstage # set version label @@ -42,7 +44,6 @@ RUN \ autoconf \ automake \ bzip2 \ - ca-certificates \ cmake \ diffutils \ doxygen \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 15e20c0..82d228a 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,6 @@ -FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-focal as buildstage +# syntax=docker/dockerfile:1 + +FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-jammy as buildstage # set version label ARG FFMPEG_VERSION @@ -12,13 +14,13 @@ ENV \ ENV \ AOM=v1.0.0 \ FDKAAC=2.0.1 \ - FFMPEG_HARD=4.4 \ + FFMPEG_HARD=5.1.2 \ FREETYPE=2.9.1 \ FRIBIDI=1.0.8 \ KVAZAAR=2.0.0 \ LAME=3.100 \ LIBASS=0.14.0 \ - LIBDRM=2.4.98 \ + LIBDRM=2.4.114 \ LIBVA=2.6.0 \ LIBVDPAU=1.2 \ LIBVIDSTAB=1.1.0 \ @@ -40,9 +42,7 @@ RUN \ autoconf \ automake \ bzip2 \ - ca-certificates \ cmake \ - curl \ diffutils \ g++ \ gcc \ @@ -51,7 +51,7 @@ RUN \ libexpat1-dev \ libfontconfig1-dev \ libxext-dev \ - libgcc-7-dev \ + libgcc-10-dev \ libgomp1 \ libpciaccess-dev \ libssl-dev \ @@ -63,7 +63,7 @@ RUN \ nasm \ perl \ pkg-config \ - python \ + python3 \ x11proto-xext-dev \ xserver-xorg-dev \ yasm \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 6b8d3f8..51447e3 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,4 +1,6 @@ -FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-focal as buildstage +# syntax=docker/dockerfile:1 + +FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-jammy as buildstage # set version label ARG FFMPEG_VERSION @@ -12,13 +14,13 @@ ENV \ ENV \ AOM=v1.0.0 \ FDKAAC=2.0.1 \ - FFMPEG_HARD=4.4 \ + FFMPEG_HARD=5.1.2 \ FREETYPE=2.9.1 \ FRIBIDI=1.0.8 \ KVAZAAR=2.0.0 \ LAME=3.100 \ LIBASS=0.14.0 \ - LIBDRM=2.4.98 \ + LIBDRM=2.4.114 \ LIBVA=2.6.0 \ LIBVDPAU=1.2 \ LIBVIDSTAB=1.1.0 \ @@ -40,9 +42,7 @@ RUN \ autoconf \ automake \ bzip2 \ - ca-certificates \ cmake \ - curl \ diffutils \ g++ \ gcc \ @@ -51,7 +51,7 @@ RUN \ libexpat1-dev \ libfontconfig1-dev \ libxext-dev \ - libgcc-7-dev \ + libgcc-10-dev \ libgomp1 \ libpciaccess-dev \ libssl-dev \ @@ -63,7 +63,7 @@ RUN \ nasm \ perl \ pkg-config \ - python \ + python3 \ x11proto-xext-dev \ xserver-xorg-dev \ yasm \ diff --git a/Jenkinsfile b/Jenkinsfile index 958de96..9aa5bca 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -97,7 +97,7 @@ pipeline { steps{ script{ env.EXT_RELEASE = sh( - script: ''' echo 4.4 ''', + script: ''' echo 5.1.2 ''', returnStdout: true).trim() env.RELEASE_LINK = 'custom_command' } diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 3b5d6ed..a73a2a9 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -2,7 +2,7 @@ # jenkins variables project_name: docker-ffmpeg external_type: na -custom_version_command: "echo 4.4" +custom_version_command: "echo 5.1.2" release_type: prerelease release_tag: bin ls_branch: bin From 7fb0c49d1c64f998a702acbcdd14b063674d285c Mon Sep 17 00:00:00 2001 From: TheSpad Date: Tue, 13 Dec 2022 22:41:44 +0000 Subject: [PATCH 3/4] Remove obsolete options --- Dockerfile.aarch64 | 1 - Dockerfile.armhf | 1 - 2 files changed, 2 deletions(-) diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 82d228a..965aca1 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -386,7 +386,6 @@ RUN \ --disable-doc \ --disable-ffplay \ --enable-ffprobe \ - --enable-avresample \ --enable-gpl \ --enable-libaom \ --enable-libass \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 51447e3..4d3261c 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -396,7 +396,6 @@ RUN \ --disable-doc \ --disable-ffplay \ --enable-ffprobe \ - --enable-avresample \ --enable-gpl \ --enable-libaom \ --enable-libass \ From 638d65bfd71bd87062df366101fe06009688c695 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Wed, 14 Dec 2022 15:19:13 +0000 Subject: [PATCH 4/4] Match buildout path to build path --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6b2645e..ddde4ed 100644 --- a/Dockerfile +++ b/Dockerfile @@ -514,7 +514,7 @@ RUN \ ldconfig && \ mkdir -p \ /buildout/usr/local/bin \ - /buildout/usr/lib \ + /buildout/usr/lib/x86_64-linux-gnu \ /buildout/etc/OpenCL/vendors && \ cp \ /tmp/ffmpeg/ffmpeg \ @@ -526,8 +526,8 @@ RUN \ | awk '/local/ {print $3}' \ | xargs -i cp -L {} /buildout/usr/lib/ && \ cp -a \ - /usr/local/lib/*/libdrm_* \ - /buildout/usr/lib/ && \ + /usr/local/lib/x86_64-linux-gnu/libdrm_* \ + /buildout/usr/lib/x86_64-linux-gnu/ && \ echo \ 'libnvidia-opencl.so.1' > \ /buildout/etc/OpenCL/vendors/nvidia.icd