Conan/conan-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[DO-971] ffmpeg recipe with requirements (!9)

Browse Source 
Co-authored-by: aleksandr.vodyanov <aleksandr.vodyanov@avroid.tech>
Reviewed-on: https://git.avroid.tech/Conan/conan_build/pulls/9
This commit is contained in:
Aleksandr Vodyanov
2024-12-25 17:47:28 +03:00
parent e58f90de0e
commit 39afe6a1dd
212 changed files with 9263 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
recipes/libx265/all/patches/3.2.1-0001-remove_register_classifier.patch Normal file
View File

@@ -0,0 +1,13 @@
diff --git a/source/common/md5.cpp b/source/common/md5.cpp
index 285b44a..c4964e7 100644
--- a/source/common/md5.cpp
+++ b/source/common/md5.cpp
@@ -185,7 +185,7 @@ void MD5Final(MD5Context *ctx, uint8_t *digest)
*/
void MD5Transform(uint32_t *buf, uint32_t *in)
{
- register uint32_t a, b, c, d;
+ uint32_t a, b, c, d;
a = buf[0];
b = buf[1];

22
recipes/libx265/all/patches/3.2.1-0002-cmake-min-required.patch Normal file
View File

@@ -0,0 +1,22 @@
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -1,10 +1,4 @@
-# vim: syntax=cmake
-if(NOT CMAKE_BUILD_TYPE)
- # default to Release build for GCC builds
- set(CMAKE_BUILD_TYPE Release CACHE STRING
- "Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel."
- FORCE)
-endif()
+cmake_minimum_required(VERSION 3.1)
message(STATUS "cmake version ${CMAKE_VERSION}")
if(POLICY CMP0025)
cmake_policy(SET CMP0025 OLD) # report Apple's Clang as just Clang
@@ -17,7 +11,6 @@ if(POLICY CMP0054)
endif()
project (x265)
-cmake_minimum_required (VERSION 2.8.8) # OBJECT libraries require 2.8.8
include(CheckIncludeFiles)
include(CheckFunctionExists)
include(CheckSymbolExists)

27
recipes/libx265/all/patches/3.4-0001-numa.patch Normal file
View File

@@ -0,0 +1,27 @@
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -90,20 +90,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)