(lib)x265: Add versions 3.6 and 4.1

recipes/libx265/all/conandata.yml

@@ -1,10 +1,18 @@
 sources:
-  "3.4":
-    url: "https://github.com/videolan/x265/archive/refs/tags/3.4.tar.gz"
-    sha256: "544d147bf146f8994a7bf8521ed878c93067ea1c7c6e93ab602389be3117eaaf"
+  "4.1":
+    url: "https://downloads.videolan.org/videolan/x265/x265_4.1.tar.gz"
+    sha256: "a31699c6a89806b74b0151e5e6a7df65de4b49050482fe5ebf8a4379d7af8f29"
+  "3.6":
+    url: "https://downloads.videolan.org/videolan/x265/x265_3.6.tar.gz"
+    sha256: "663531f341c5389f460d730e62e10a4fcca3428ca2ca109693867bc5fe2e2807"
 patches:
-  "3.4":
+  "4.1":
     - patch_file: "patches/3.2.1-0001-remove_register_classifier.patch"
-    - patch_file: "patches/3.4-0002-cmake-min-required.patch"
-    - patch_file: "patches/3.4-0001-numa.patch"
-    - patch_file: "patches/3.4-0003-windows-arm64.patch"
+    - patch_file: "patches/4.1-0001-cmake-min-required.patch"
+    - patch_file: "patches/4.1-0002-numa.patch"
+    - patch_file: "patches/4.1-0003-windows-arm64.patch"
+  "3.6":
+    - patch_file: "patches/3.2.1-0001-remove_register_classifier.patch"
+    - patch_file: "patches/3.6-0001-cmake-min-required.patch"
+    - patch_file: "patches/3.6-0002-numa.patch"
+    - patch_file: "patches/3.6-0003-windows-arm64.patch"

recipes/libx265/all/patches/3.4-0002-cmake-min-required.patch → recipes/libx265/all/patches/3.6-0001-cmake-min-required.patch

@@ -25,7 +25,7 @@
  include(CheckIncludeFiles)
  include(CheckFunctionExists)
  include(CheckSymbolExists)
-@@ -138,7 +129,7 @@ if(APPLE)
+@@ -147,7 +138,7 @@ if(APPLE)
    add_definitions(-DMACOS=1)
  endif()
 

recipes/libx265/all/patches/3.4-0001-numa.patch → recipes/libx265/all/patches/3.6-0002-numa.patch

@@ -1,6 +1,6 @@
 --- a/source/CMakeLists.txt
 +++ b/source/CMakeLists.txt
-@@ -88,20 +88,10 @@ if(UNIX)
+@@ -97,20 +97,10 @@ if(UNIX)
      endif()
      option(ENABLE_LIBNUMA "Enable libnuma usage (Linux only)" ON)
      if(ENABLE_LIBNUMA)

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

@@ -0,0 +1,13 @@
+diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
+index a9f6512..7a67b51 100644
+--- a/source/CMakeLists.txt
++++ b/source/CMakeLists.txt
+@@ -36,7 +36,7 @@ SET(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" "${CMAKE_MODULE_PATH}")
+ endif()
+ set(X86_ALIASES x86 i386 i686 x86_64 amd64)
+ set(ARM_ALIASES armv6l armv7l)
+-set(ARM64_ALIASES arm64 arm64e aarch64)
++set(ARM64_ALIASES arm64 ARM64 arm64e aarch64)
+ list(FIND X86_ALIASES "${SYSPROC}" X86MATCH)
+ list(FIND ARM_ALIASES "${SYSPROC}" ARMMATCH)
+ list(FIND ARM64_ALIASES "${SYSPROC}" ARM64MATCH)

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

@@ -0,0 +1,38 @@
+diff --git source/CMakeLists.txt source/CMakeLists.txt
+index 5c6dda9e8..d276d7f55 100755
+--- source/CMakeLists.txt
++++ source/CMakeLists.txt
+@@ -1,4 +1,5 @@
+ # vim: syntax=cmake
++cmake_minimum_required (VERSION 3.5) # OBJECT libraries require 2.8.8
+ if(NOT CMAKE_BUILD_TYPE)
+     # default to Release build for GCC builds
+     set(CMAKE_BUILD_TYPE Release CACHE STRING
+@@ -6,18 +7,8 @@ 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
+ include(CheckIncludeFiles)
+ include(CheckFunctionExists)
+ include(CheckSymbolExists)
+@@ -168,7 +159,7 @@ if(APPLE)
+   add_definitions(-DMACOS=1)
+ endif()
+
+-if(${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
++if(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
+     set(CLANG 1)
+ endif()
+ if(${CMAKE_CXX_COMPILER_ID} STREQUAL "Intel")

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

@@ -0,0 +1,29 @@
+diff --git source/CMakeLists.txt source/CMakeLists.txt
+index d276d7f55..c53d28861 100755
+--- source/CMakeLists.txt
++++ source/CMakeLists.txt
+@@ -118,20 +118,10 @@ if(UNIX)
+     endif()
+     option(ENABLE_LIBNUMA "Enable libnuma usage (Linux only)" ON)
+     if(ENABLE_LIBNUMA)
+-        find_package(Numa)
+-        if(NUMA_FOUND)
+-            link_directories(${NUMA_LIBRARY_DIR})
+-            list(APPEND CMAKE_REQUIRED_LIBRARIES numa)
+-            list(APPEND CMAKE_REQUIRED_INCLUDES ${NUMA_INCLUDE_DIR})
+-            list(APPEND CMAKE_REQUIRED_LINK_OPTIONS "-L${NUMA_LIBRARY_DIR}")
+-            check_symbol_exists(numa_node_of_cpu numa.h NUMA_V2)
+-            if(NUMA_V2)
+-                add_definitions(-DHAVE_LIBNUMA)
+-                message(STATUS "libnuma found, building with support for NUMA nodes")
+-                list(APPEND PLATFORM_LIBS numa)
+-                include_directories(${NUMA_INCLUDE_DIR})
+-            endif()
+-        endif()
++        find_package(libnuma REQUIRED)
++        list(APPEND PLATFORM_LIBS ${libnuma_LIBRARIES})
++        include_directories(${libnuma_INCLUDE_DIR})
++        add_definitions(-DHAVE_LIBNUMA)
+         mark_as_advanced(NUMA_FOUND)
+     endif(ENABLE_LIBNUMA)
+     option(NO_ATOMICS "Use a slow mutex to replace atomics" OFF)

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

@@ -0,0 +1,13 @@
+diff --git source/CMakeLists.txt source/CMakeLists.txt
+index c53d28861..5182dfd42 100755
+--- source/CMakeLists.txt
++++ source/CMakeLists.txt
+@@ -38,7 +38,7 @@ else()
+ endif()
+ set(X86_ALIASES x86 i386 i686 x86_64 amd64)
+ set(ARM_ALIASES armv6l armv7l)
+-set(ARM64_ALIASES arm64 arm64e aarch64)
++set(ARM64_ALIASES arm64 ARM64 arm64e aarch64)
+ list(FIND X86_ALIASES "${SYSPROC}" X86MATCH)
+ list(FIND ARM_ALIASES "${SYSPROC}" ARMMATCH)
+ list(FIND ARM64_ALIASES "${SYSPROC}" ARM64MATCH)

recipes/libx265/config.yml

@@ -1,3 +1,5 @@
 versions:
-  "3.4":
+  "4.1":
+    folder: "all"
+  "3.6":
     folder: "all"