From: Good Guy <good1.2guy@gmail.com>
Date: Sat, 24 Aug 2024 17:21:40 +0000 (-0600)
Subject: update SVT-AV1 from 1.8.0 to 2.2.1 plus cleanup
X-Git-Url: https://git.cinelerra-gg.org/git/?a=commitdiff_plain;h=92b41e47995528ac60a81748dceb3681c69331a6;p=goodguy%2Fcinelerra.git

update SVT-AV1 from 1.8.0 to 2.2.1 plus cleanup
---

diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac
index 9c22005f..2ec32c47 100644
--- a/cinelerra-5.1/configure.ac
+++ b/cinelerra-5.1/configure.ac
@@ -468,7 +468,7 @@ PKG_3RD([libaom],[auto],
   [ usr/local/include ])
 
 PKG_3RD([libsvtav1],[no],
-  [libsvtav1-v1.8.0],
+  [libsvtav1-v2.2.1],
   [ usr/local/lib*/libSvtAv1Enc.a ],
   [ usr/local/include/svt-av1 ])
 
diff --git a/cinelerra-5.1/thirdparty/downloads.txt b/cinelerra-5.1/thirdparty/downloads.txt
index bec71f52..08c84298 100644
--- a/cinelerra-5.1/thirdparty/downloads.txt
+++ b/cinelerra-5.1/thirdparty/downloads.txt
@@ -40,6 +40,7 @@ https://bitbucket.org/multicoreware/x265_git/downloads/x265_3.5.tar.gz (snapshot
 https://ffmpeg.org/releases/ffmpeg-7.0.tar.xz
 https://github.com/webmproject/libvpx/archive/v1.13.1.tar.gz
 https://code.videolan.org/videolan/dav1d/-/archive/0.5.1/dav1d-0.5.1.tar.gz
+https://gitlab.com/AOMediaCodec/SVT-AV1/-/releases  (2.2.1)
 https://github.com/swh/ladspa/releases/tag/v0.4.17, plugin.org.uk
 https://archive.mozilla.org/pub/opus/opus-1.3.1.tar.gz
 #https://github.com/webmproject/libwebp = libwebp-1.3.2
diff --git a/cinelerra-5.1/thirdparty/src/ffmpeg-5.1.tar.xz b/cinelerra-5.1/thirdparty/src/ffmpeg-5.1.tar.xz
deleted file mode 100644
index b832184c..00000000
Binary files a/cinelerra-5.1/thirdparty/src/ffmpeg-5.1.tar.xz and /dev/null differ
diff --git a/cinelerra-5.1/thirdparty/src/libsvtav1-v2.2.1.patch0 b/cinelerra-5.1/thirdparty/src/libsvtav1-v2.2.1.patch0
new file mode 100644
index 00000000..286d33c8
--- /dev/null
+++ b/cinelerra-5.1/thirdparty/src/libsvtav1-v2.2.1.patch0
@@ -0,0 +1,11 @@
+--- libsvtav1-v2.2.1/CMakeLists.txt
++++ libsvtav1-v2.2.1/CMakeLists.txt
+@@ -9,7 +9,7 @@
+ # PATENTS file, you can obtain it at https://www.aomedia.org/license/patent-license.
+ #
+ 
+-cmake_minimum_required(VERSION 3.16)
++cmake_minimum_required(VERSION 3.12)
+ 
+ if("${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
+     message(WARNING "Building in-source is highly not recommended\n"
diff --git a/cinelerra-5.1/thirdparty/src/ffmpeg-6.1.tar.xz b/cinelerra-5.1/thirdparty/src/libsvtav1-v2.2.1.tar.xz
similarity index 55%
rename from cinelerra-5.1/thirdparty/src/ffmpeg-6.1.tar.xz
rename to cinelerra-5.1/thirdparty/src/libsvtav1-v2.2.1.tar.xz
index 573e3b42..4f766f91 100644
Binary files a/cinelerra-5.1/thirdparty/src/ffmpeg-6.1.tar.xz and b/cinelerra-5.1/thirdparty/src/libsvtav1-v2.2.1.tar.xz differ