From a9ee279bd941f12fae718bbfcc777959049f12e6 Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Wed, 27 Oct 2021 12:46:18 +0000
Subject: ffmpeg: update to 4.4.1

---
 ffmpeg/build/ffmpeg.SlackBuild | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

(limited to 'ffmpeg')

diff --git a/ffmpeg/build/ffmpeg.SlackBuild b/ffmpeg/build/ffmpeg.SlackBuild
index 4fb8f44c..6eb5d7be 100755
--- a/ffmpeg/build/ffmpeg.SlackBuild
+++ b/ffmpeg/build/ffmpeg.SlackBuild
@@ -200,6 +200,8 @@
 # 4.4-2:      14/oct/2021 by Eric Hameleers <alien@slackware.com>
 #             * Rebuilt for -current against new vid.stab.
 #               Refreshed internal libraries ass, dav1d, fribidi, libva, sdl2.
+# 4.4.1-1:    27/oct/2021 by Eric Hameleers <alien@slackware.com>
+#             * Update. Enable HDR10+ in the HEVC codec.
 #               
 # Run 'sh ffmpeg.SlackBuild' to build a Slackware package.
 # The package (.txz) plus descriptive .txt file are created in /tmp .
@@ -209,8 +211,8 @@
 
 
 PRGNAM=ffmpeg
-VERSION=${VERSION:-4.4}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-4.4.1}
+BUILD=${BUILD:-1}
 NUMJOBS=${NUMJOBS:-"-j$(nproc)"}
 TAG=${TAG:-"alien"}
 
@@ -868,9 +870,7 @@ if [ "$ARCH" = "x86_64" ]; then
   cd build-12
     cmake ../source \
       -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-      -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
       -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-      -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
       -DCMAKE_INSTALL_PREFIX=/usr \
       -DLIB_INSTALL_DIR=lib${LIBDIRSUFFIX} \
       -DHIGH_BIT_DEPTH=ON \
@@ -886,9 +886,7 @@ if [ "$ARCH" = "x86_64" ]; then
   cd build-10
     cmake ../source \
       -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-      -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
       -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-      -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
       -DCMAKE_INSTALL_PREFIX=/usr \
       -DLIB_INSTALL_DIR=lib${LIBDIRSUFFIX} \
       -DHIGH_BIT_DEPTH=ON \
@@ -912,6 +910,8 @@ if [ "$ARCH" = "x86_64" ]; then
       -DEXTRA_LINK_FLAGS="-L." \
       -DLINKED_10BIT=ON \
       -DLINKED_12BIT=ON \
+      -DENABLE_CLI=OFF \
+      -DENABLE_HDR10_PLUS=ON \
       -DENABLE_SHARED=OFF \
       -DCMAKE_BUILD_TYPE=Release \
     2>&1 | tee -a $OUTPUT/configure-${PRGNAM}_x265.log
@@ -920,6 +920,7 @@ if [ "$ARCH" = "x86_64" ]; then
     mv libx265.a libx265_main.a
     ar -M <<EOF
 CREATE libx265.a
+ADDLIB libhdr10plus.a
 ADDLIB libx265_main.a
 ADDLIB libx265_main10.a
 ADDLIB libx265_main12.a
@@ -931,17 +932,17 @@ else
   cd build-8
     cmake ../source \
       -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-      -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
       -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-      -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
       -DCMAKE_INSTALL_PREFIX=/usr \
       -DLIB_INSTALL_DIR=lib${LIBDIRSUFFIX} \
+      -DENABLE_HDR10_PLUS=ON \
       -DENABLE_SHARED=OFF \
       -DCMAKE_BUILD_TYPE=Release \
     2>&1 | tee $OUTPUT/configure-${PRGNAM}_x265.log
     make ${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_x265.log
 fi
-
+# Strip the static lib to prevent linking errors in 64-bit,
+find . -name "*.a" | xargs strip --strip-unneeded
 # We were left in the final build directory:
 # Install x265 into a temp location so ffmpeg can pickup the library
 make install DESTDIR=$FFMPEGDEPSDIR \
@@ -1683,7 +1684,7 @@ cd - 1>/dev/null
 
 # Add DOCS to the ffmpegdeps to have it added to ffmpeg package later:
 mkdir -p $FFMPEGDEPSDIR/doc/gme/
-cp $DOCS_DAV1D \
+cp $DOCS_GME \
   $FFMPEGDEPSDIR/doc/gme/ || true
 cd -
 }
-- 
cgit v1.2.3