Skip to content

Commit 3990da6

Browse files
iriegerfranramirez688ErniGH
authored
libx265: Add versions 3.6 and 4.1 (#28966)
* (lib)x265: Add versions 3.6 and 4.1 * Update recipes/libx265/all/conandata.yml Co-authored-by: Francisco Ramírez <[email protected]> * Update recipes/libx265/all/conandata.yml Co-authored-by: Francisco Ramírez <[email protected]> * remove -DHAVE_NEON from patches --------- Co-authored-by: Francisco Ramírez <[email protected]> Co-authored-by: Ernesto de Gracia Herranz <[email protected]>
1 parent 504a734 commit 3990da6

9 files changed

+113
-33
lines changed

‎recipes/libx265/all/conandata.yml‎

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,18 @@
11
sources:
2-
"3.4":
3-
url: "https://github.com/videolan/x265/archive/refs/tags/3.4.tar.gz"
4-
sha256: "544d147bf146f8994a7bf8521ed878c93067ea1c7c6e93ab602389be3117eaaf"
2+
"4.1":
3+
url: "https://downloads.videolan.org/videolan/x265/x265_4.1.tar.gz"
4+
sha256: "a31699c6a89806b74b0151e5e6a7df65de4b49050482fe5ebf8a4379d7af8f29"
5+
"3.6":
6+
url: "https://downloads.videolan.org/videolan/x265/x265_3.6.tar.gz"
7+
sha256: "663531f341c5389f460d730e62e10a4fcca3428ca2ca109693867bc5fe2e2807"
58
patches:
6-
"3.4":
9+
"4.1":
710
- patch_file: "patches/3.2.1-0001-remove_register_classifier.patch"
8-
- patch_file: "patches/3.4-0002-cmake-min-required.patch"
9-
- patch_file: "patches/3.4-0001-numa.patch"
10-
- patch_file: "patches/3.4-0003-windows-arm64.patch"
11+
- patch_file: "patches/4.1-0001-cmake-min-required.patch"
12+
- patch_file: "patches/4.1-0002-numa.patch"
13+
- patch_file: "patches/4.1-0003-windows-arm64.patch"
14+
"3.6":
15+
- patch_file: "patches/3.2.1-0001-remove_register_classifier.patch"
16+
- patch_file: "patches/3.6-0001-cmake-min-required.patch"
17+
- patch_file: "patches/3.6-0002-numa.patch"
18+
- patch_file: "patches/3.6-0003-windows-arm64.patch"

‎recipes/libx265/all/patches/3.4-0003-windows-arm64.patch‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎recipes/libx265/all/patches/3.4-0002-cmake-min-required.patch‎ renamed to ‎recipes/libx265/all/patches/3.6-0001-cmake-min-required.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
include(CheckIncludeFiles)
2626
include(CheckFunctionExists)
2727
include(CheckSymbolExists)
28-
@@ -138,7 +129,7 @@ if(APPLE)
28+
@@ -147,7 +138,7 @@ if(APPLE)
2929
add_definitions(-DMACOS=1)
3030
endif()
3131

‎recipes/libx265/all/patches/3.4-0001-numa.patch‎ renamed to ‎recipes/libx265/all/patches/3.6-0002-numa.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/source/CMakeLists.txt
22
+++ b/source/CMakeLists.txt
3-
@@ -88,20 +88,10 @@ if(UNIX)
3+
@@ -97,20 +97,10 @@ if(UNIX)
44
endif()
55
option(ENABLE_LIBNUMA "Enable libnuma usage (Linux only)" ON)
66
if(ENABLE_LIBNUMA)

‎recipes/libx265/all/patches/3.6-0003-windows-arm64.patch‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
2+
index a9f6512..7a67b51 100644
3+
--- a/source/CMakeLists.txt
4+
+++ b/source/CMakeLists.txt
5+
@@ -36,7 +36,7 @@ SET(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" "${CMAKE_MODULE_PATH}")
6+
endif()
7+
set(X86_ALIASES x86 i386 i686 x86_64 amd64)
8+
set(ARM_ALIASES armv6l armv7l)
9+
-set(ARM64_ALIASES arm64 arm64e aarch64)
10+
+set(ARM64_ALIASES arm64 ARM64 arm64e aarch64)
11+
list(FIND X86_ALIASES "${SYSPROC}" X86MATCH)
12+
list(FIND ARM_ALIASES "${SYSPROC}" ARMMATCH)
13+
list(FIND ARM64_ALIASES "${SYSPROC}" ARM64MATCH)

‎recipes/libx265/all/patches/4.1-0001-cmake-min-required.patch‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
diff --git source/CMakeLists.txt source/CMakeLists.txt
2+
index 5c6dda9e8..d276d7f55 100755
3+
--- source/CMakeLists.txt
4+
+++ source/CMakeLists.txt
5+
@@ -1,4 +1,5 @@
6+
# vim: syntax=cmake
7+
+cmake_minimum_required (VERSION 3.5) # OBJECT libraries require 2.8.8
8+
if(NOT CMAKE_BUILD_TYPE)
9+
# default to Release build for GCC builds
10+
set(CMAKE_BUILD_TYPE Release CACHE STRING
11+
@@ -6,18 +7,8 @@ if(NOT CMAKE_BUILD_TYPE)
12+
FORCE)
13+
endif()
14+
message(STATUS "cmake version ${CMAKE_VERSION}")
15+
-if(POLICY CMP0025)
16+
- cmake_policy(SET CMP0025 OLD) # report Apple's Clang as just Clang
17+
-endif()
18+
-if(POLICY CMP0042)
19+
- cmake_policy(SET CMP0042 NEW) # MACOSX_RPATH
20+
-endif()
21+
-if(POLICY CMP0054)
22+
- cmake_policy(SET CMP0054 OLD) # Only interpret if() arguments as variables or keywords when unquoted
23+
-endif()
24+
25+
project (x265)
26+
-cmake_minimum_required (VERSION 2.8.8) # OBJECT libraries require 2.8.8
27+
include(CheckIncludeFiles)
28+
include(CheckFunctionExists)
29+
include(CheckSymbolExists)
30+
@@ -168,7 +159,7 @@ if(APPLE)
31+
add_definitions(-DMACOS=1)
32+
endif()
33+
34+
-if(${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
35+
+if(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
36+
set(CLANG 1)
37+
endif()
38+
if(${CMAKE_CXX_COMPILER_ID} STREQUAL "Intel")

‎recipes/libx265/all/patches/4.1-0002-numa.patch‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
diff --git source/CMakeLists.txt source/CMakeLists.txt
2+
index d276d7f55..c53d28861 100755
3+
--- source/CMakeLists.txt
4+
+++ source/CMakeLists.txt
5+
@@ -118,20 +118,10 @@ if(UNIX)
6+
endif()
7+
option(ENABLE_LIBNUMA "Enable libnuma usage (Linux only)" ON)
8+
if(ENABLE_LIBNUMA)
9+
- find_package(Numa)
10+
- if(NUMA_FOUND)
11+
- link_directories(${NUMA_LIBRARY_DIR})
12+
- list(APPEND CMAKE_REQUIRED_LIBRARIES numa)
13+
- list(APPEND CMAKE_REQUIRED_INCLUDES ${NUMA_INCLUDE_DIR})
14+
- list(APPEND CMAKE_REQUIRED_LINK_OPTIONS "-L${NUMA_LIBRARY_DIR}")
15+
- check_symbol_exists(numa_node_of_cpu numa.h NUMA_V2)
16+
- if(NUMA_V2)
17+
- add_definitions(-DHAVE_LIBNUMA)
18+
- message(STATUS "libnuma found, building with support for NUMA nodes")
19+
- list(APPEND PLATFORM_LIBS numa)
20+
- include_directories(${NUMA_INCLUDE_DIR})
21+
- endif()
22+
- endif()
23+
+ find_package(libnuma REQUIRED)
24+
+ list(APPEND PLATFORM_LIBS ${libnuma_LIBRARIES})
25+
+ include_directories(${libnuma_INCLUDE_DIR})
26+
+ add_definitions(-DHAVE_LIBNUMA)
27+
mark_as_advanced(NUMA_FOUND)
28+
endif(ENABLE_LIBNUMA)
29+
option(NO_ATOMICS "Use a slow mutex to replace atomics" OFF)

‎recipes/libx265/all/patches/4.1-0003-windows-arm64.patch‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git source/CMakeLists.txt source/CMakeLists.txt
2+
index c53d28861..5182dfd42 100755
3+
--- source/CMakeLists.txt
4+
+++ source/CMakeLists.txt
5+
@@ -38,7 +38,7 @@ else()
6+
endif()
7+
set(X86_ALIASES x86 i386 i686 x86_64 amd64)
8+
set(ARM_ALIASES armv6l armv7l)
9+
-set(ARM64_ALIASES arm64 arm64e aarch64)
10+
+set(ARM64_ALIASES arm64 ARM64 arm64e aarch64)
11+
list(FIND X86_ALIASES "${SYSPROC}" X86MATCH)
12+
list(FIND ARM_ALIASES "${SYSPROC}" ARMMATCH)
13+
list(FIND ARM64_ALIASES "${SYSPROC}" ARM64MATCH)

‎recipes/libx265/config.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
versions:
2-
"3.4":
2+
"4.1":
3+
folder: "all"
4+
"3.6":
35
folder: "all"

0 commit comments

Comments
 (0)