From 4380f93bf13fb48af2220991eb3dc770d6a2a5dac6e97dd3a96402f836ad30e3 Mon Sep 17 00:00:00 2001 From: yoong jin Date: Fri, 17 Jan 2025 13:25:53 +0100 Subject: [PATCH 01/10] Update SVT-AV1.spec --- SVT-AV1.spec | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/SVT-AV1.spec b/SVT-AV1.spec index cce1c79..e083288 100644 --- a/SVT-AV1.spec +++ b/SVT-AV1.spec @@ -30,6 +30,7 @@ BuildRequires: gcc-c++ >= 5.4.0 BuildRequires: help2man BuildRequires: pkg-config BuildRequires: yasm >= 1.2.0 +BuildRequires: cpuinfo-devel ExclusiveArch: aarch64 riscv64 x86_64 %description @@ -63,8 +64,23 @@ This package contains the header files for svt-av1. %prep %autosetup -p1 -n %name-v%version +#mitigate name collisions +mv third_party/safestringlib/LICENSE third_party/safestringlib/LICENSE.safestringlib +mv third_party/fastfeat/LICENSE third_party/fastfeat/LICENSE.fastfeat + +#sanitize third_party +rm -rf third_party/cpuinfo +rm -rf third_party/aom* +rm -rf third_party/googletest + + %build -%cmake -DNATIVE=OFF +%cmake \ + -DNATIVE=OFF \ + -DUSE_EXTERNAL_CPUINFO=ON \ + -DSVT_AV1_LTO=ON \ + -DENABLE_AVX512=ON \ + -DSVT_AV1_PGO=ON \ %cmake_build %install -- 2.45.2 From 56d63566a80fb6dcc4421594c9862880bbdd92515fc473b3be09d1e9a016297b Mon Sep 17 00:00:00 2001 From: yoong jin Date: Fri, 17 Jan 2025 13:30:39 +0100 Subject: [PATCH 02/10] Update SVT-AV1.changes --- SVT-AV1.changes | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/SVT-AV1.changes b/SVT-AV1.changes index 6e70a6f..49d92bf 100644 --- a/SVT-AV1.changes +++ b/SVT-AV1.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Jan 17 12:27:35 UTC 2025 - Yoong Jin + +- Added optimzation flags to Cmake +- Santitized thired party folder + * Deleted bechmarking folders + * Renamed conflicting license files + * Switced to system libcpuinfo + ------------------------------------------------------------------- Tue Oct 29 22:11:44 UTC 2024 - Jan Engelhardt -- 2.45.2 From d153c2acf551fb3829c1dc3cdb6fbe245e5a9cffec2cb4a1eb3a4c1bb17c915a Mon Sep 17 00:00:00 2001 From: yoong jin Date: Fri, 17 Jan 2025 13:31:55 +0100 Subject: [PATCH 03/10] Update SVT-AV1.spec --- SVT-AV1.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SVT-AV1.spec b/SVT-AV1.spec index e083288..256d885 100644 --- a/SVT-AV1.spec +++ b/SVT-AV1.spec @@ -100,7 +100,7 @@ cp -a Docs README.md "$b/" %ldconfig_scriptlets -n libSvtAv1Enc2 %files -n libSvtAv1Enc2 -%license LICENSE.md PATENTS.md +%license LICENSE.md PATENTS.md third_party/fastfeat/LICENSE.fastfeat third_party/safestringlib/LICENSE.safestringlib %_libdir/libSvtAv1Enc.so.* %files -- 2.45.2 From bc86823c2a2ab922489ff8bae1ad322b3c2bd509af28823b910b1f2290f14ba2 Mon Sep 17 00:00:00 2001 From: yoong jin Date: Fri, 17 Jan 2025 13:43:26 +0100 Subject: [PATCH 04/10] Update SVT-AV1.spec --- SVT-AV1.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/SVT-AV1.spec b/SVT-AV1.spec index 256d885..591c2bb 100644 --- a/SVT-AV1.spec +++ b/SVT-AV1.spec @@ -31,8 +31,11 @@ BuildRequires: help2man BuildRequires: pkg-config BuildRequires: yasm >= 1.2.0 BuildRequires: cpuinfo-devel +Provides: bundled(fastfeat) +Provides: bundled(safestringlib) ExclusiveArch: aarch64 riscv64 x86_64 + %description The Scalable Video Technology for AV1 (SVT-AV1 Encoder and Decoder) is an AV1-compliant encoder/decoder library core. The SVT-AV1 encoder development is -- 2.45.2 From a7aa2067aa8974b08f6e4234362ec651a78f6a2a547944b7458c9ee0882f3b88 Mon Sep 17 00:00:00 2001 From: yoong jin Date: Fri, 17 Jan 2025 13:55:10 +0100 Subject: [PATCH 05/10] Update SVT-AV1.spec --- SVT-AV1.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SVT-AV1.spec b/SVT-AV1.spec index 591c2bb..3a3e992 100644 --- a/SVT-AV1.spec +++ b/SVT-AV1.spec @@ -83,7 +83,7 @@ rm -rf third_party/googletest -DUSE_EXTERNAL_CPUINFO=ON \ -DSVT_AV1_LTO=ON \ -DENABLE_AVX512=ON \ - -DSVT_AV1_PGO=ON \ + -DSVT_AV1_PGO=ON %cmake_build %install -- 2.45.2 From 905048a2511cba4de6e5b40a2c645357b8bca2ce6310f00384251b344b7f3c0f Mon Sep 17 00:00:00 2001 From: yoong jin Date: Fri, 17 Jan 2025 14:14:42 +0100 Subject: [PATCH 06/10] Update SVT-AV1.spec --- SVT-AV1.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/SVT-AV1.spec b/SVT-AV1.spec index 3a3e992..ffd8493 100644 --- a/SVT-AV1.spec +++ b/SVT-AV1.spec @@ -83,7 +83,8 @@ rm -rf third_party/googletest -DUSE_EXTERNAL_CPUINFO=ON \ -DSVT_AV1_LTO=ON \ -DENABLE_AVX512=ON \ - -DSVT_AV1_PGO=ON + -DSVT_AV1_PGO=ON \ + -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=OFF %cmake_build %install -- 2.45.2 From ef0ec361ac998e8089089884cf4de82807d2af488acbf6dc03eb240a7e5e6197 Mon Sep 17 00:00:00 2001 From: yoong jin Date: Fri, 17 Jan 2025 14:20:26 +0100 Subject: [PATCH 07/10] Update SVT-AV1.spec --- SVT-AV1.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/SVT-AV1.spec b/SVT-AV1.spec index ffd8493..e63c07f 100644 --- a/SVT-AV1.spec +++ b/SVT-AV1.spec @@ -84,7 +84,10 @@ rm -rf third_party/googletest -DSVT_AV1_LTO=ON \ -DENABLE_AVX512=ON \ -DSVT_AV1_PGO=ON \ - -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=OFF + -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=OFF \ + -Dcpuinfo_DIR="" \ + -DCMAKE_DISABLE_FIND_PACKAGE_cpuinfo=TRUE + # cpuinfo cmake is broken, force fallback to pkg-config %cmake_build %install -- 2.45.2 From 848503e4c98b45db5d9168d6e409d92ac99036f37bf1987f985bf796a59a46aa Mon Sep 17 00:00:00 2001 From: yoong jin Date: Fri, 17 Jan 2025 14:22:21 +0100 Subject: [PATCH 08/10] Update SVT-AV1.spec --- SVT-AV1.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/SVT-AV1.spec b/SVT-AV1.spec index e63c07f..f930164 100644 --- a/SVT-AV1.spec +++ b/SVT-AV1.spec @@ -85,8 +85,7 @@ rm -rf third_party/googletest -DENABLE_AVX512=ON \ -DSVT_AV1_PGO=ON \ -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=OFF \ - -Dcpuinfo_DIR="" \ - -DCMAKE_DISABLE_FIND_PACKAGE_cpuinfo=TRUE + -Dcpuinfo_DIR="" # cpuinfo cmake is broken, force fallback to pkg-config %cmake_build -- 2.45.2 From f52fc6a4a8d2c120fd608929be3b8ac93e60284d5fbae0c5fc599de19c6d1cb0 Mon Sep 17 00:00:00 2001 From: yoong jin Date: Fri, 17 Jan 2025 14:28:04 +0100 Subject: [PATCH 09/10] Update SVT-AV1.spec --- SVT-AV1.spec | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/SVT-AV1.spec b/SVT-AV1.spec index f930164..95e2c85 100644 --- a/SVT-AV1.spec +++ b/SVT-AV1.spec @@ -30,7 +30,8 @@ BuildRequires: gcc-c++ >= 5.4.0 BuildRequires: help2man BuildRequires: pkg-config BuildRequires: yasm >= 1.2.0 -BuildRequires: cpuinfo-devel +# broken package +# BuildRequires: cpuinfo-devel Provides: bundled(fastfeat) Provides: bundled(safestringlib) ExclusiveArch: aarch64 riscv64 x86_64 @@ -80,12 +81,10 @@ rm -rf third_party/googletest %build %cmake \ -DNATIVE=OFF \ - -DUSE_EXTERNAL_CPUINFO=ON \ -DSVT_AV1_LTO=ON \ -DENABLE_AVX512=ON \ - -DSVT_AV1_PGO=ON \ - -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=OFF \ - -Dcpuinfo_DIR="" + -DSVT_AV1_PGO=ON + # -DUSE_EXTERNAL_CPUINFO=ON \ # cpuinfo cmake is broken, force fallback to pkg-config %cmake_build -- 2.45.2 From 7a9fddce63ee1fa665a5fd018b48c8922a80d3a52339d8bca7c0236fa62f8b56 Mon Sep 17 00:00:00 2001 From: yoong jin Date: Fri, 17 Jan 2025 14:30:14 +0100 Subject: [PATCH 10/10] Update SVT-AV1.spec --- SVT-AV1.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SVT-AV1.spec b/SVT-AV1.spec index 95e2c85..b0ff69b 100644 --- a/SVT-AV1.spec +++ b/SVT-AV1.spec @@ -73,7 +73,7 @@ mv third_party/safestringlib/LICENSE third_party/safestringlib/LICENSE.safestrin mv third_party/fastfeat/LICENSE third_party/fastfeat/LICENSE.fastfeat #sanitize third_party -rm -rf third_party/cpuinfo +# rm -rf third_party/cpuinfo rm -rf third_party/aom* rm -rf third_party/googletest -- 2.45.2