From: Good Guy <good1.2guy@gmail.com>
Date: Thu, 10 Apr 2025 02:01:49 +0000 (-0600)
Subject: Credit Andrew-R cmake 4 mods require x265 and libsvtav1 accomodations + speed problem... 
X-Git-Tag: 2025-04~5
X-Git-Url: https://git.cinelerra-gg.org/git/?a=commitdiff_plain;h=f36cd9e67af7096aa3a9b4bdbca6f1c371783d06;p=goodguy%2Fcinelerra.git

Credit Andrew-R cmake 4 mods require x265 and libsvtav1 accomodations + speed problem fix by reverting line in auto.C
---

diff --git a/cinelerra-5.1/cinelerra/auto.C b/cinelerra-5.1/cinelerra/auto.C
index f4e751aa..0d05ab4d 100644
--- a/cinelerra-5.1/cinelerra/auto.C
+++ b/cinelerra-5.1/cinelerra/auto.C
@@ -70,7 +70,7 @@ void Auto::copy(int64_t start, int64_t end, FileXML *file, int default_only)
 
 void Auto::copy_from(Auto *that)
 {
-	this->orig_id = that->orig_id;
+	this->orig_id = orig_id;
 	this->position = that->position;
 }
 
diff --git a/cinelerra-5.1/thirdparty/src/libsvtav1-v2.3.0.patch0 b/cinelerra-5.1/thirdparty/src/libsvtav1-v2.3.0.patch0
index 286d33c8..2add8ce9 100644
--- a/cinelerra-5.1/thirdparty/src/libsvtav1-v2.3.0.patch0
+++ b/cinelerra-5.1/thirdparty/src/libsvtav1-v2.3.0.patch0
@@ -1,11 +1,8 @@
---- 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.
- #
+--- ./third_party/cpuinfo/CMakeLists.txx	2024-10-29 15:44:08.000000000 +0000
++++ /third_party/cpuinfo/CMakeLists.txt	2025-04-07 03:03:34.631263064 +0000
+@@ -1,4 +1,4 @@
+-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12 FATAL_ERROR)
++CMAKE_MINIMUM_REQUIRED(VERSION 3.5.1 FATAL_ERROR)
  
--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"
+ if(POLICY CMP0063)
+   cmake_policy(SET CMP0063 NEW)
diff --git a/cinelerra-5.1/thirdparty/src/libsvtav1-v2.3.0.patch1 b/cinelerra-5.1/thirdparty/src/libsvtav1-v2.3.0.patch1
new file mode 100644
index 00000000..942c12e9
--- /dev/null
+++ b/cinelerra-5.1/thirdparty/src/libsvtav1-v2.3.0.patch1
@@ -0,0 +1,8 @@
+--- ./third_party/cpuinfo/deps/clog/CmakeLists.txx	2024-10-29 15:44:08.000000000 +0000
++++ ./third_party/cpuinfo/deps/clog/CMakeLists.txt	2025-04-07 03:08:49.606466389 +0000
+@@ -1,4 +1,4 @@
+-CMAKE_MINIMUM_REQUIRED(VERSION 3.1 FATAL_ERROR)
++CMAKE_MINIMUM_REQUIRED(VERSION 3.5 FATAL_ERROR)
+ 
+ INCLUDE(GNUInstallDirs)
+ 
diff --git a/cinelerra-5.1/thirdparty/src/x265_4.0.patch4 b/cinelerra-5.1/thirdparty/src/x265_4.0.patch4
new file mode 100644
index 00000000..1f011575
--- /dev/null
+++ b/cinelerra-5.1/thirdparty/src/x265_4.0.patch4
@@ -0,0 +1,23 @@
+--- ./source/CMakeLists.txt	2024-09-13 13:02:55.000000000 +0000
++++ ./source/CMakeLists.txx.new	2025-04-07 02:22:44.552824274 +0000
+@@ -7,17 +7,17 @@
+ endif()
+ message(STATUS "cmake version ${CMAKE_VERSION}")
+ if(POLICY CMP0025)
+-    cmake_policy(SET CMP0025 OLD) # report Apple's Clang as just Clang
++    cmake_policy(SET CMP0025 NEW) # report Apple's Clang as just Clang
+ endif()
+ if(POLICY CMP0042)
+     cmake_policy(SET CMP0042 NEW) # MACOSX_RPATH
+ endif()
+ if(POLICY CMP0054)
+-    cmake_policy(SET CMP0054 OLD) # Only interpret if() arguments as variables or keywords when unquoted
++    cmake_policy(SET CMP0054 NEW) # Only interpret if() arguments as variables or keywords when unquoted
+ endif()
+ 
+ project (x265)
+-cmake_minimum_required (VERSION 2.8.8) # OBJECT libraries require 2.8.8
++cmake_minimum_required (VERSION 3.5.1) # OBJECT libraries require 2.8.8
+ include(CheckIncludeFiles)
+ include(CheckFunctionExists)
+ include(CheckSymbolExists)