Skip to content

remove cmake restriction, patch x265 #215

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
WyattBlue merged 2 commits into from
Mar 13, 2026
Merged

remove cmake restriction, patch x265 #215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
60ab9ab
scripts/build-ffmpeg: remove cmake version restriction
threexc Feb 5, 2026
0bff12e
patches: add x265.patch
threexc Feb 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 34 additions & 0 deletions patches/x265.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
index 95218f5dc..488fd0d7d 100755
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -6,18 +6,12 @@ if(NOT CMAKE_BUILD_TYPE)
FORCE)
endif()
message(STATUS "cmake version ${CMAKE_VERSION}")
-if(POLICY CMP0025)
- cmake_policy(SET CMP0025 OLD) # 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
-endif()

project (x265)
-cmake_minimum_required (VERSION 2.8.8) # OBJECT libraries require 2.8.8
+cmake_minimum_required (VERSION 4.2.1) # OBJECT libraries require 2.8.8
include(CheckIncludeFiles)
include(CheckFunctionExists)
include(CheckSymbolExists)
@@ -141,6 +135,9 @@ endif()
if(${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
set(CLANG 1)
endif()
+if(${CMAKE_CXX_COMPILER_ID} STREQUAL "AppleClang")
+ set(CLANG 1)
+endif()
if(${CMAKE_CXX_COMPILER_ID} STREQUAL "Intel")
set(INTEL_CXX 1)
endif()
2 changes: 1 addition & 1 deletion scripts/build-ffmpeg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ def main():
run(["where", tool])

with log_group("install python packages"):
run(["pip", "install", "cmake==3.31.10", "meson", "ninja"])
run(["pip", "install", "cmake", "meson", "ninja"])

# build tools
build_tools = []
Expand Down
Loading