From 1f304eb7e12f6a35c510b2498487ce930e286faf Mon Sep 17 00:00:00 2001
From: DPrieur <donavan@felixandpaul.com>
Date: Wed, 14 Aug 2024 00:24:52 -0400
Subject: [PATCH] Improved the alphabetical ordering

---
 Dockerfile | 78 ++++++++++++++++++++++++++----------------------------
 1 file changed, 38 insertions(+), 40 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b3c7f7d..137680d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -47,8 +47,8 @@ ENV \
   RAV1E=0.7.1 \
   RIST=0.2.10 \
   SHADERC=v2024.1 \
-  SVTAV1=2.1.2 \
   SRT=1.5.3 \
+  SVTAV1=2.1.2 \
   THEORA=1.1.1 \
   VORBIS=1.3.7 \
   VPLGPURT=24.2.5 \
@@ -618,6 +618,40 @@ RUN \
   cd /tmp/libplacebo && \
   meson build --buildtype release && \
   ninja -C build install
+RUN \
+  echo "**** grabbing rist ****" && \
+  mkdir -p /tmp/rist && \
+  git clone \
+    --branch v${RIST} \
+    --depth 1 https://code.videolan.org/rist/librist.git \
+    /tmp/rist
+RUN \
+  echo "**** compiling rist ****" && \
+  cd /tmp/rist && \
+  mkdir -p \
+    rist_build && \
+  cd rist_build && \
+  meson \
+    --default-library=shared .. && \
+  ninja && \
+  ninja install
+RUN \
+  echo "**** grabbing srt ****" && \
+  mkdir -p /tmp/srt && \
+  git clone \
+    --branch v${SRT} \
+    --depth 1 https://github.com/Haivision/srt.git \
+    /tmp/srt
+RUN \
+  echo "**** compiling srt ****" && \
+  cd /tmp/srt && \
+  mkdir -p \
+    srt_build && \
+  cd srt_build && \
+  cmake \
+    -DBUILD_SHARED_LIBS:BOOL=on .. && \
+  make && \
+  make install
 RUN \
   echo "**** grabbing SVT-AV1 ****" && \
   mkdir -p /tmp/svt-av1 && \
@@ -804,43 +838,6 @@ RUN \
   make && \
   make install
 
-RUN \
-  echo "**** grabbing srt ****" && \
-  mkdir -p /tmp/srt && \
-  git clone \
-    --branch v${SRT} \
-    --depth 1 https://github.com/Haivision/srt.git \
-    /tmp/srt
-RUN \
-  echo "**** compiling srt ****" && \
-  cd /tmp/srt && \
-  mkdir -p \
-    srt_build && \
-  cd srt_build && \
-  cmake \
-    -DBUILD_SHARED_LIBS:BOOL=on .. && \
-  make && \
-  make install
-
-RUN \
-  echo "**** grabbing rist ****" && \
-  mkdir -p /tmp/rist && \
-  git clone \
-    --branch v${RIST} \
-    --depth 1 https://code.videolan.org/rist/librist.git \
-    /tmp/rist
-RUN \
-  echo "**** compiling rist ****" && \
-  cd /tmp/rist && \
-  mkdir -p \
-    rist_build && \
-  cd rist_build && \
-  meson \
-    --default-library=shared .. && \
-  ninja && \
-  ninja install
-
-
 # main ffmpeg build
 RUN \
   echo "**** Versioning ****" && \
@@ -882,7 +879,9 @@ RUN \
     --enable-libopus \
     --enable-libplacebo \
     --enable-librav1e \
+    --enable-librist \
     --enable-libshaderc \
+    --enable-libsrt \
     --enable-libsvtav1 \
     --enable-libtheora \
     --enable-libv4l2 \
@@ -897,8 +896,6 @@ RUN \
     --enable-libxml2 \
     --enable-libxvid \
     --enable-libzimg \
-    --enable-librist \
-    --enable-libsrt \
     --enable-nonfree \
     --enable-nvdec \
     --enable-nvenc \
@@ -1032,3 +1029,4 @@ RUN \
 COPY /root /
 
 ENTRYPOINT ["/ffmpegwrapper.sh"]
+