From 5482bc226de15aa23105db79a0bac816f88c1dc7 Mon Sep 17 00:00:00 2001
From: TheSpad <git@spad.co.uk>
Date: Tue, 13 Dec 2022 22:12:02 +0000
Subject: [PATCH] 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