From 375b755176375759724d1c2b4dccbf24fa1ba1ac Mon Sep 17 00:00:00 2001 From: extrowerk <5569059+extrowerk@users.noreply.github.com> Date: Mon, 25 Apr 2022 09:33:02 +0200 Subject: [PATCH] SVT-AV1: bump (#6843) --- ...Alliance for Open Media Patent License 1.0 | 32 +++++++++++++++++++ ...-0.9.0.patchset => svt_av1-1.0.0.patchset} | 26 ++------------- ..._av1-0.9.0.recipe => svt_av1-1.0.0.recipe} | 7 ++-- 3 files changed, 39 insertions(+), 26 deletions(-) create mode 100644 media-libs/svt-av1/licenses/Alliance for Open Media Patent License 1.0 rename media-libs/svt-av1/patches/{svt_av1-0.9.0.patchset => svt_av1-1.0.0.patchset} (76%) rename media-libs/svt-av1/{svt_av1-0.9.0.recipe => svt_av1-1.0.0.recipe} (91%) diff --git a/media-libs/svt-av1/licenses/Alliance for Open Media Patent License 1.0 b/media-libs/svt-av1/licenses/Alliance for Open Media Patent License 1.0 new file mode 100644 index 000000000..aff96d15e --- /dev/null +++ b/media-libs/svt-av1/licenses/Alliance for Open Media Patent License 1.0 @@ -0,0 +1,32 @@ +BSD 3-Clause Clear License +The Clear BSD License + +Copyright (c) 2021, Alliance for Open Media + +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted (subject to the limitations in the disclaimer below) +provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the distribution. + +3. Neither the name of the Alliance for Open Media nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE GRANTED BY THIS LICENSE. +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY +EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL +THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT +OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/media-libs/svt-av1/patches/svt_av1-0.9.0.patchset b/media-libs/svt-av1/patches/svt_av1-1.0.0.patchset similarity index 76% rename from media-libs/svt-av1/patches/svt_av1-0.9.0.patchset rename to media-libs/svt-av1/patches/svt_av1-1.0.0.patchset index 5968aef4e..88322b606 100644 --- a/media-libs/svt-av1/patches/svt_av1-0.9.0.patchset +++ b/media-libs/svt-av1/patches/svt_av1-1.0.0.patchset @@ -5,10 +5,10 @@ Subject: Haiku patch diff --git a/CMakeLists.txt b/CMakeLists.txt -index d320f27..88108cb 100644 +index 588391d..ee1766e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -320,7 +320,7 @@ else() +@@ -319,7 +319,7 @@ else() endif() if(MINGW) check_both_flags_add(-mxsave -fno-asynchronous-unwind-tables) @@ -17,26 +17,6 @@ index d320f27..88108cb 100644 check_both_flags_add(-fstack-protector-strong) check_both_flags_add(PREPEND -fno-stack-clash-protection) endif() -diff --git a/Source/Lib/Common/Codec/EbThreads.c b/Source/Lib/Common/Codec/EbThreads.c -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) - #if !defined(EB_THREAD_SANITIZER_ENABLED) && !DISABLE_REALTIME - pthread_attr_t attr; - pthread_attr_init(&attr); -+#if !defined(__HAIKU__) - pthread_attr_setschedpolicy(&attr, SCHED_FIFO); - pthread_attr_setinheritsched(&attr, PTHREAD_EXPLICIT_SCHED); - - struct sched_param param = {.sched_priority = 99}; - pthread_attr_setschedparam(&attr, ¶m); -+#else -+ pthread_attr_setstacksize(&attr, 256 * PAGESIZE); -+#endif - - 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 4f32f9c..3a3116c 100644 --- a/third_party/cpuinfo/CMakeLists.txt @@ -82,5 +62,5 @@ index e183d2e..2b6979c 100644 #elif defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE pthread_once(&init_guard, &cpuinfo_arm_mach_init); -- -2.30.2 +2.35.1 diff --git a/media-libs/svt-av1/svt_av1-0.9.0.recipe b/media-libs/svt-av1/svt_av1-1.0.0.recipe similarity index 91% rename from media-libs/svt-av1/svt_av1-0.9.0.recipe rename to media-libs/svt-av1/svt_av1-1.0.0.recipe index cc3274af5..4588680ad 100644 --- a/media-libs/svt-av1/svt_av1-0.9.0.recipe +++ b/media-libs/svt-av1/svt_av1-1.0.0.recipe @@ -5,11 +5,12 @@ Decoder) is an AV1-compliant encoder/decoder library core. The SVT-AV1 encoder\ both VOD and Live encoding / transcoding video applications. The SVT-AV1 \ decoder implementation is targeting future codec research activities." HOMEPAGE="https://github.com/AOMediaCodec/SVT-AV1" -COPYRIGHT="2019, Alliance for Open Media" -LICENSE="BSD (2-clause)" +COPYRIGHT="2019,2021 Alliance for Open Media" +LICENSE="BSD (3-clause) + Alliance for Open Media Patent License 1.0" REVISION="1" SOURCE_URI="https://github.com/AOMediaCodec/SVT-AV1/archive/v$portVersion.tar.gz" -CHECKSUM_SHA256="0bc21e302d559290a563482ddec0c9a1370de33453453bdaade6890f1f7163f7" +CHECKSUM_SHA256="34bc7fa4daf9c0431c70b0e4818046dbec93d33a2d45926d1df2274c47b8c8a8" SOURCE_DIR="SVT-AV1-$portVersion" PATCHES="svt_av1-$portVersion.patchset"