From eb9368c3f3833fa9d808fbb5a3808a9dbceedc2d Mon Sep 17 00:00:00 2001
From: nhyatt <nhyatt@smoothnet.org>
Date: Sun, 8 Dec 2024 20:23:56 -0600
Subject: [PATCH] Corrects ffmpeg build script

---
 ...ild-ffmpeg.jenkins => build-ffmpeg.jenkins | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)
 rename deprecated/build-ffmpeg.jenkins => build-ffmpeg.jenkins (78%)

diff --git a/deprecated/build-ffmpeg.jenkins b/build-ffmpeg.jenkins
similarity index 78%
rename from deprecated/build-ffmpeg.jenkins
rename to build-ffmpeg.jenkins
index acac681..e0a3cfc 100644
--- a/deprecated/build-ffmpeg.jenkins
+++ b/build-ffmpeg.jenkins
@@ -10,7 +10,13 @@ podTemplate(
         repo: repository,
         templateName: templateName,
         alpine: true,
-        fedora: true
+        [
+            [
+                name: "ubuntu",
+                path: "${repository}/dockerhub/library/ubuntu:24.04",
+                command: "/bin/bash"
+            ]
+        ],
     )
 ) {
     node (label) {
@@ -45,14 +51,16 @@ podTemplate(
         }
 
         stage ("Build FFMpeg") {
-            container ("fedora") {
+            container ("ubuntu") {
                 writeFile(file: workspace + "/test-chamber-13.lan.root.crt", text: functions.getCurrentRootCA())
                 sh """
+                    apt update
+                    apt -y --no-install-recommends install build-essential curl ca-certificates python3 python-is-python3 ninja-build meson git
+                    apt clean
+                    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*
+                    update-ca-certificates
                     cd ${workspace}/ffmpeg
-                    sed -r -i -e 's~^LDFLAGS="-L\\\$WORKSPACE\\/lib"\$~LDFLAGS="-L\\\$WORKSPACE\\/lib -L\\\$WORKSPACE\\/lib64"~g' ./build-ffmpeg
-                    sed -r -i -e 's~-DJPEGXL_ENABLE_JNI=OFF~-DJPEGXL_ENABLE_JNI=OFF CMAKE_CXX_FLAGS:STRING=-fPIC~g' ./build-ffmpeg
-                    dnf install curl gcc-g++ libtool make xz python perl perl-devel openssl-devel diffutils bzip2 glibc-static libstdc++-static vid.stab-devel -y
-                    SKIPINSTALL=yes ./build-ffmpeg --full-static --enable-gpl-and-non-free --build
+                    AUTOINSTALL=yes ./build-ffmpeg --build --full-static --enable-gpl-and-non-free
                 """
             }
         }