From 0dc2103432bdab8cd9a7cf41ae7389ad37222782 Mon Sep 17 00:00:00 2001
From: aptalca <541623+aptalca@users.noreply.github.com>
Date: Thu, 18 Jan 2024 21:07:04 -0500
Subject: [PATCH] let wrapper pass exit code to docker run, bump libs

---
 Dockerfile            | 18 +++++++++---------
 Dockerfile.aarch64    |  6 +++---
 README.md             |  1 +
 readme-vars.yml       |  1 +
 root/ffmpegwrapper.sh |  1 -
 5 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 38cb9c0..f6a671d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,13 +19,13 @@ ENV \
   FONTCONFIG=2.14.2 \
   FREETYPE=2.13.2 \
   FRIBIDI=1.0.13 \
-  GMMLIB=22.3.12 \
-  IHD=23.3.5 \
+  GMMLIB=22.3.15 \
+  IHD=23.4.3 \
   KVAZAAR=2.2.0 \
   LAME=3.100 \
   LIBASS=0.17.1 \
   LIBDOVI=2.1.0 \
-  LIBDRM=2.4.119 \
+  LIBDRM=2.4.120 \
   LIBMFX=22.5.4 \
   LIBPLACEBO=6.338.1 \
   LIBVA=2.20.0 \
@@ -33,20 +33,20 @@ ENV \
   LIBVIDSTAB=1.1.1 \
   LIBVMAF=3.0.0 \
   LIBVPL=2.10.1 \
-  MESA=23.3.2 \
+  MESA=23.3.3 \
   NVCODEC=n12.1.14.0 \
   OGG=1.3.5 \
-  ONEVPL=23.3.4 \
+  ONEVPL=23.4.3 \
   OPENCOREAMR=0.1.6 \
   OPENJPEG=2.5.0 \
   OPUS=1.4 \
-  RAV1E=0.7.0 \
-  SHADERC=v2023.7 \
+  RAV1E=0.7.1 \
+  SHADERC=v2023.8 \
   SVTAV1=1.8.0 \
   THEORA=1.1.1 \
   VORBIS=1.3.7 \
-  VPX=1.13.1 \
-  VULKANSDK=vulkan-sdk-1.3.268.0 \
+  VPX=1.14.0 \
+  VULKANSDK=vulkan-sdk-1.3.275.0 \
   WEBP=1.3.2 \
   X265=3.5 \
   XVID=1.3.7
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index c37de2f..24e263e 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -21,7 +21,7 @@ ENV \
   KVAZAAR=2.2.0 \
   LAME=3.100 \
   LIBASS=0.17.1 \
-  LIBDRM=2.4.119 \
+  LIBDRM=2.4.120 \
   LIBVA=2.20.0 \
   LIBVDPAU=1.5 \
   LIBVIDSTAB=1.1.1 \
@@ -30,11 +30,11 @@ ENV \
   OPENCOREAMR=0.1.6 \
   OPENJPEG=2.5.0 \
   OPUS=1.4 \
-  RAV1E=0.7.0 \
+  RAV1E=0.7.1 \
   SVTAV1=1.8.0 \
   THEORA=1.1.1 \
   VORBIS=1.3.7 \
-  VPX=1.13.1 \
+  VPX=1.14.0 \
   WEBP=1.3.2 \
   X265=master \
   XVID=1.3.7
diff --git a/README.md b/README.md
index 45564c7..13e49fb 100644
--- a/README.md
+++ b/README.md
@@ -173,6 +173,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **18.01.24:** - Let the wrapper pass the ffmpeg exit code to docker run. Bump various libs.
 * **01.01.24:** - Add rav1e support. Bump libaom, fdkaac, libdrm, libvmaf, libvpl, mesa and svt-av1.
 * **06.12.23:** - Add libplacebo and libdobi to x86_64.
 * **05.12.23:** - Bump Mesa. Fix vdpau. Fix AMD VAAPI.
diff --git a/readme-vars.yml b/readme-vars.yml
index 2a2f6ac..bfc2570 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -177,6 +177,7 @@ full_custom_readme: |
 
   ## Versions
 
+  * **18.01.24:** - Let the wrapper pass the ffmpeg exit code to docker run. Bump various libs.
   * **01.01.24:** - Add rav1e support. Bump libaom, fdkaac, libdrm, libvmaf, libvpl, mesa and svt-av1.
   * **06.12.23:** - Add libplacebo and libdobi to x86_64.
   * **05.12.23:** - Bump Mesa. Fix vdpau. Fix AMD VAAPI.
diff --git a/root/ffmpegwrapper.sh b/root/ffmpegwrapper.sh
index bb1a19c..3ab30cc 100755
--- a/root/ffmpegwrapper.sh
+++ b/root/ffmpegwrapper.sh
@@ -20,7 +20,6 @@ run_ffmpeg () {
     s6-setuidgid abc \
       /usr/local/bin/ffmpeg "${FULL_ARGS[@]}"
   fi
-  exit 0
 }
 
 # look for input file value