From 7cc7413cb5098b52b8aff82d3a07545556609fc0 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Mon, 24 Jan 2022 12:58:46 +0100 Subject: [PATCH] svt-av1: bump version --- ...-0.8.6.patchset => svt_av1-0.9.0.patchset} | 62 +++++++++---------- ..._av1-0.8.6.recipe => svt_av1-0.9.0.recipe} | 9 +-- 2 files changed, 36 insertions(+), 35 deletions(-) rename media-libs/svt-av1/patches/{svt_av1-0.8.6.patchset => svt_av1-0.9.0.patchset} (59%) rename media-libs/svt-av1/{svt_av1-0.8.6.recipe => svt_av1-0.9.0.recipe} (87%) diff --git a/media-libs/svt-av1/patches/svt_av1-0.8.6.patchset b/media-libs/svt-av1/patches/svt_av1-0.9.0.patchset similarity index 59% rename from media-libs/svt-av1/patches/svt_av1-0.8.6.patchset rename to media-libs/svt-av1/patches/svt_av1-0.9.0.patchset index c1c115f23..5968aef4e 100644 --- a/media-libs/svt-av1/patches/svt_av1-0.8.6.patchset +++ b/media-libs/svt-av1/patches/svt_av1-0.9.0.patchset @@ -1,28 +1,28 @@ -From 14fab4b1f5f53967c4f5cee63520936f98bec022 Mon Sep 17 00:00:00 2001 +From c287567888d42e619d6a1accf841301e5bba2556 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Thu, 14 Jan 2021 18:29:12 +0100 Subject: Haiku patch diff --git a/CMakeLists.txt b/CMakeLists.txt -index e5f3351..64f1d76 100644 +index d320f27..88108cb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -135,7 +135,7 @@ else() +@@ -320,7 +320,7 @@ else() endif() if(MINGW) - list(APPEND flags_to_test -mxsave -fno-asynchronous-unwind-tables) + check_both_flags_add(-mxsave -fno-asynchronous-unwind-tables) - else() + elseif(NOT HAIKU) - list(APPEND flags_to_test -fstack-protector-strong -D_FORTIFY_SOURCE=2) + check_both_flags_add(-fstack-protector-strong) + check_both_flags_add(PREPEND -fno-stack-clash-protection) endif() - endif() diff --git a/Source/Lib/Common/Codec/EbThreads.c b/Source/Lib/Common/Codec/EbThreads.c -index 25619f3..f9c96a5 100644 +index da2d950..f601aca 100644 --- a/Source/Lib/Common/Codec/EbThreads.c +++ b/Source/Lib/Common/Codec/EbThreads.c @@ -84,11 +84,15 @@ EbHandle svt_create_thread(void *thread_function(void *), void *thread_context) - #ifndef EB_THREAD_SANITIZER_ENABLED + #if !defined(EB_THREAD_SANITIZER_ENABLED) && !DISABLE_REALTIME pthread_attr_t attr; pthread_attr_init(&attr); +#if !defined(__HAIKU__) @@ -38,19 +38,19 @@ index 25619f3..f9c96a5 100644 ret = pthread_create(th, &attr, thread_function, thread_context); pthread_attr_destroy(&attr); diff --git a/third_party/cpuinfo/CMakeLists.txt b/third_party/cpuinfo/CMakeLists.txt -index eba602b..70593c6 100644 +index 4f32f9c..3a3116c 100644 --- a/third_party/cpuinfo/CMakeLists.txt +++ b/third_party/cpuinfo/CMakeLists.txt -@@ -65,7 +65,7 @@ IF(NOT CMAKE_SYSTEM_NAME) +@@ -72,7 +72,7 @@ IF(NOT CMAKE_SYSTEM_NAME) "Target operating system is not specified. " "cpuinfo will compile, but cpuinfo_initialize() will always fail.") SET(CPUINFO_SUPPORTED_PLATFORM FALSE) --ELSEIF(NOT CMAKE_SYSTEM_NAME MATCHES "^(Windows|CYGWIN|MSYS|Darwin|Linux|Android)$") -+ELSEIF(NOT CMAKE_SYSTEM_NAME MATCHES "^(Windows|CYGWIN|MSYS|Darwin|Linux|Android|Haiku)$") +-ELSEIF(NOT CMAKE_SYSTEM_NAME MATCHES "^(Windows|CYGWIN|MSYS|Darwin|Linux|Android|DragonFly|FreeBSD|NetBSD|OpenBSD)$") ++ELSEIF(NOT CMAKE_SYSTEM_NAME MATCHES "^(Windows|CYGWIN|MSYS|Darwin|Linux|Android|DragonFly|FreeBSD|NetBSD|OpenBSD|Haiku)$") IF(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.14" AND NOT CMAKE_SYSTEM_NAME STREQUAL "iOS") MESSAGE(WARNING "Target operating system \"${CMAKE_SYSTEM_NAME}\" is not supported in cpuinfo. " -@@ -85,7 +85,7 @@ IF(CPUINFO_SUPPORTED_PLATFORM) +@@ -92,7 +92,7 @@ IF(CPUINFO_SUPPORTED_PLATFORM) src/x86/x86_init.c src/x86/vendor.c src/x86/isa.c) @@ -58,29 +58,29 @@ index eba602b..70593c6 100644 + IF(CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "Android" OR HAIKU) LIST(APPEND CPUINFO_SRCS src/x86/linux/init.c) - ELSEIF(CMAKE_SYSTEM_NAME STREQUAL "Darwin" OR CMAKE_SYSTEM_NAME STREQUAL "iOS") + ELSEIF(CMAKE_SYSTEM_NAME MATCHES "^(DragonFly|FreeBSD|NetBSD|OpenBSD)$") diff --git a/third_party/cpuinfo/src/init.c b/third_party/cpuinfo/src/init.c -index f703e8e..13eff98 100644 +index e183d2e..2b6979c 100644 --- a/third_party/cpuinfo/src/init.c +++ b/third_party/cpuinfo/src/init.c @@ -25,7 +25,7 @@ bool CPUINFO_ABI cpuinfo_initialize(void) { #if CPUINFO_ARCH_X86 || CPUINFO_ARCH_X86_64 - #if defined(__MACH__) && defined(__APPLE__) - pthread_once(&init_guard, &cpuinfo_x86_mach_init); -- #elif defined(__linux__) -+ #elif defined(__linux__) || defined(__HAIKU__) - pthread_once(&init_guard, &cpuinfo_x86_linux_init); - #elif defined(_WIN32) || defined(__CYGWIN__) - InitOnceExecuteOnce(&init_guard, &cpuinfo_x86_windows_init, NULL, NULL); -@@ -33,7 +33,7 @@ bool CPUINFO_ABI cpuinfo_initialize(void) { - cpuinfo_log_error("operating system is not supported in cpuinfo"); - #endif + #if defined(__MACH__) && defined(__APPLE__) + pthread_once(&init_guard, &cpuinfo_x86_mach_init); +- #elif defined(__linux__) ++ #elif defined(__linux__) || defined(__HAIKU__) + pthread_once(&init_guard, &cpuinfo_x86_linux_init); + #elif defined(_WIN32) || defined(__CYGWIN__) + InitOnceExecuteOnce(&init_guard, &cpuinfo_x86_windows_init, NULL, NULL); +@@ -35,7 +35,7 @@ bool CPUINFO_ABI cpuinfo_initialize(void) { + cpuinfo_log_error("operating system is not supported in cpuinfo"); + #endif #elif CPUINFO_ARCH_ARM || CPUINFO_ARCH_ARM64 -- #if defined(__linux__) -+ #if defined(__linux__) || defined(__HAIKU__) - pthread_once(&init_guard, &cpuinfo_arm_linux_init); - #elif defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE - pthread_once(&init_guard, &cpuinfo_arm_mach_init); +- #if defined(__linux__) ++ #if defined(__linux__) || defined(__HAIKU__) + pthread_once(&init_guard, &cpuinfo_arm_linux_init); + #elif defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE + pthread_once(&init_guard, &cpuinfo_arm_mach_init); -- -2.30.0 +2.30.2 diff --git a/media-libs/svt-av1/svt_av1-0.8.6.recipe b/media-libs/svt-av1/svt_av1-0.9.0.recipe similarity index 87% rename from media-libs/svt-av1/svt_av1-0.8.6.recipe rename to media-libs/svt-av1/svt_av1-0.9.0.recipe index 52cd6fb3b..cc3274af5 100644 --- a/media-libs/svt-av1/svt_av1-0.8.6.recipe +++ b/media-libs/svt-av1/svt_av1-0.9.0.recipe @@ -9,7 +9,7 @@ COPYRIGHT="2019, Alliance for Open Media" LICENSE="BSD (2-clause)" REVISION="1" SOURCE_URI="https://github.com/AOMediaCodec/SVT-AV1/archive/v$portVersion.tar.gz" -CHECKSUM_SHA256="951ffc240ceecd94c6cd94e53c81217c4333219a868cbf477a9eedaf0ed1c388" +CHECKSUM_SHA256="0bc21e302d559290a563482ddec0c9a1370de33453453bdaade6890f1f7163f7" SOURCE_DIR="SVT-AV1-$portVersion" PATCHES="svt_av1-$portVersion.patchset" @@ -30,7 +30,7 @@ PROVIDES=" svt_av1$secondaryArchSuffix = $portVersion cmd:SvtAv1DecApp$commandSuffix cmd:SvtAv1EncApp$commandSuffix - lib:libSvtAv1Dec$secondaryArchSuffix = $libVersionCompat + lib:libSvtAv1Dec$secondaryArchSuffix = 0.8.7 compat >= 0 lib:libSvtAv1Enc$secondaryArchSuffix = $libVersionCompat " REQUIRES=" @@ -39,7 +39,7 @@ REQUIRES=" PROVIDES_devel=" svt_av1${secondaryArchSuffix}_devel = $portVersion - devel:libSvtAv1Dec$secondaryArchSuffix = $libVersionCompat + devel:libSvtAv1Dec$secondaryArchSuffix = 0.8.7 compat >= 0 devel:libSvtAv1Enc$secondaryArchSuffix = $libVersionCompat " REQUIRES_devel=" @@ -57,7 +57,7 @@ BUILD_PREREQUIRES=" " defineDebugInfoPackage svt_av1$secondaryArchSuffix \ - "$libDir"/libSvtAv1Dec.so.$libVersion \ + "$libDir"/libSvtAv1Dec.so.0.8.7 \ "$libDir"/libSvtAv1Enc.so.$libVersion BUILD() @@ -65,6 +65,7 @@ BUILD() cmake -B build -G Ninja \ -DBUILD_SHARED_LIBS=ON \ -DNATIVE=OFF \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ $cmakeDirArgs ninja -C build $jobArgs }