From 0d0eacfce1fcb70f582ec7879cde3fef6fbe144d Mon Sep 17 00:00:00 2001 From: RPM Fusion Release Engineering Date: Wed, 13 Nov 2019 13:27:51 +0100 Subject: [PATCH 01/15] Initial setup of the repo --- .gitignore | 0 sources | 0 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 .gitignore create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/sources b/sources new file mode 100644 index 0000000..e69de29 From 5f65c6f1f858027a764029f61477910a8679aedf Mon Sep 17 00:00:00 2001 From: Vasiliy Glazov Date: Wed, 13 Nov 2019 16:03:49 +0300 Subject: [PATCH 02/15] Initial commit. --- .gitignore | 1 + ...b632ede3c47945e42289672c08013bc6a56f.patch | 55 +++++++++++ sources | 1 + svt-hevc.spec | 97 +++++++++++++++++++ 4 files changed, 154 insertions(+) create mode 100644 d313b632ede3c47945e42289672c08013bc6a56f.patch create mode 100644 svt-hevc.spec diff --git a/.gitignore b/.gitignore index e69de29..dfb6aee 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/SVT-HEVC-1.4.1.tar.gz diff --git a/d313b632ede3c47945e42289672c08013bc6a56f.patch b/d313b632ede3c47945e42289672c08013bc6a56f.patch new file mode 100644 index 0000000..2fbec2e --- /dev/null +++ b/d313b632ede3c47945e42289672c08013bc6a56f.patch @@ -0,0 +1,55 @@ +From d313b632ede3c47945e42289672c08013bc6a56f Mon Sep 17 00:00:00 2001 +From: Austin Hu +Date: Thu, 19 Sep 2019 06:28:28 +0800 +Subject: [PATCH] Don't compile the binaries as executable stack. + +Signed-off-by: Austin Hu +--- + Source/Lib/ASM_SSE2/x64Macro.asm | 14 ++++++++++++++ + Source/Lib/ASM_SSE2/x64inc.asm | 14 ++++++++++++++ + 2 files changed, 28 insertions(+) + +diff --git a/Source/Lib/ASM_SSE2/x64Macro.asm b/Source/Lib/ASM_SSE2/x64Macro.asm +index eaeeac61..7dcb9038 100644 +--- a/Source/Lib/ASM_SSE2/x64Macro.asm ++++ b/Source/Lib/ASM_SSE2/x64Macro.asm +@@ -28,3 +28,17 @@ + punpckl%1 xmm%8, xmm%9 ; 67 66 65 64 63 62 61 60 73 63 72 62 71 61 70 60 75 65 55 45 74 64 54 44 76 66 56 46 36 26 16 06 + punpckh%1 xmm%13, xmm%9 ; 77 76 75 74 73 72 71 70 77 67 76 66 75 65 74 64 77 67 57 47 76 66 56 46 77 67 57 47 37 27 17 07 + %endmacro ++ ++%define FORMAT_ELF 0 ++%ifidn __OUTPUT_FORMAT__,elf ++ %define FORMAT_ELF 1 ++%elifidn __OUTPUT_FORMAT__,elf32 ++ %define FORMAT_ELF 1 ++%elifidn __OUTPUT_FORMAT__,elf64 ++ %define FORMAT_ELF 1 ++%endif ++ ++; This is needed for ELF, otherwise the GNU linker assumes the stack is executable by default. ++%if FORMAT_ELF ++ [SECTION .note.GNU-stack noalloc noexec nowrite progbits] ++%endif +diff --git a/Source/Lib/ASM_SSE2/x64inc.asm b/Source/Lib/ASM_SSE2/x64inc.asm +index 4440b060..a884545b 100644 +--- a/Source/Lib/ASM_SSE2/x64inc.asm ++++ b/Source/Lib/ASM_SSE2/x64inc.asm +@@ -323,3 +323,17 @@ bits 64 + %endif + %endmacro + %define NEED_EMMS 1 ++ ++%define FORMAT_ELF 0 ++%ifidn __OUTPUT_FORMAT__,elf ++ %define FORMAT_ELF 1 ++%elifidn __OUTPUT_FORMAT__,elf32 ++ %define FORMAT_ELF 1 ++%elifidn __OUTPUT_FORMAT__,elf64 ++ %define FORMAT_ELF 1 ++%endif ++ ++; This is needed for ELF, otherwise the GNU linker assumes the stack is executable by default. ++%if FORMAT_ELF ++ [SECTION .note.GNU-stack noalloc noexec nowrite progbits] ++%endif diff --git a/sources b/sources index e69de29..ce172f9 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +SHA512 (SVT-HEVC-1.4.1.tar.gz) = 0a41068e7ecbb7d7ec2bd709bfb8b8da3028dbdc7c5c52d1e5bc689722c61fc359312c55ab1b043c9a0d7e8957fce43075f6ec1b24363b0551e4b17c12b5a30f diff --git a/svt-hevc.spec b/svt-hevc.spec new file mode 100644 index 0000000..364ca43 --- /dev/null +++ b/svt-hevc.spec @@ -0,0 +1,97 @@ +Name: svt-hevc +Version: 1.4.1 +Release: 1%{?dist} +Summary: Scalable Video Technology for HEVC Encoder + +License: BSD-2-Clause-Patent +URL: https://github.com/OpenVisualCloud/SVT-HEVC +Source0: %url/archive/v%{version}/SVT-HEVC-%{version}.tar.gz +# https://github.com/OpenVisualCloud/SVT-HEVC/issues/364 +Patch0: d313b632ede3c47945e42289672c08013bc6a56f.patch + +BuildRequires: gcc +BuildRequires: cmake +BuildRequires: yasm +BuildRequires: meson +BuildRequires: gstreamer1-devel +BuildRequires: gstreamer1-plugins-base-devel + +Requires: %{name}-libs%{?_isa} = %{version}-%{release} + +ExclusiveArch: x86_64 + +%description +The Scalable Video Technology for HEVC Encoder (SVT-HEVC Encoder) is an +HEVC-compliant encoder library core that achieves excellent density-quality +tradeoffs, and is highly optimized for Intel® Xeon™ Scalable Processor and +Xeon™ D processors. + +%package libs +Summary: Libraries for svt-hevc + +%description libs +Libraries for development svt-hevc. + +%package devel +Summary: Include files and mandatory libraries for development svt-hevc +Requires: %{name}-libs%{?_isa} = %{version}-%{release} + +%description devel +Include files and mandatory libraries for development svt-hevc. + +%package -n gstreamer1-%{name} +Summary: GStreamer 1.0 %{name}-based plug-in +Requires: gstreamer1-plugins-base%{?_isa} + +%description -n gstreamer1-%{name} +This package provides %{name}-based GStreamer plug-in. + +%prep +%autosetup -p1 -n SVT-HEVC-%{version} +# Remove unneeded flags +sed -i 's|-O3)|)|' CMakeLists.txt +# Patch build gstreamer plugin +sed -e "s|install: true,|install: true, include_directories : '../Source/API', link_args : '-lSvtHevcEnc',|" \ +-e "/svthevcenc_dep =/d" -e 's|, svthevcenc_dep||' -e "s|svthevcenc_dep.found()|true|" -i gstreamer-plugin/meson.build + + +%build +mkdir -p %{_target_platform} +pushd %{_target_platform} + %cmake -G Ninja \ + .. +popd +%ninja_build -C %{_target_platform} + +pushd gstreamer-plugin + export LIBRARY_PATH="$PWD/../Bin/Release:$LIBRARY_PATH" + %meson + %meson_build +popd + + +%install +%ninja_install -C %{_target_platform} +pushd gstreamer-plugin + %meson_install +popd + +%files +%{_bindir}/SvtHevcEncApp + +%files libs +%license LICENSE.md +%doc README.md Docs/svt-hevc_encoder_user_guide.md +%{_libdir}/libSvtHevcEnc.so.1* + +%files devel +%{_includedir}/%{name} +%{_libdir}/libSvtHevcEnc.so +%{_libdir}/pkgconfig/*.pc + +%files -n gstreamer1-%{name} +%{_libdir}/gstreamer-1.0/libgstsvthevcenc.so + +%changelog +* Tue Sep 17 2019 Vasiliy Glazov - 1.4.1-1 +- Initial release From 22819ea7f6df52fcb7f58940fa4b8585bd399101 Mon Sep 17 00:00:00 2001 From: Vasiliy Glazov Date: Thu, 14 Nov 2019 09:51:32 +0300 Subject: [PATCH 03/15] Correct build gstreamer plugin. --- svt-hevc.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/svt-hevc.spec b/svt-hevc.spec index 364ca43..eb13db2 100644 --- a/svt-hevc.spec +++ b/svt-hevc.spec @@ -1,6 +1,6 @@ Name: svt-hevc Version: 1.4.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Scalable Video Technology for HEVC Encoder License: BSD-2-Clause-Patent @@ -51,7 +51,7 @@ This package provides %{name}-based GStreamer plug-in. # Remove unneeded flags sed -i 's|-O3)|)|' CMakeLists.txt # Patch build gstreamer plugin -sed -e "s|install: true,|install: true, include_directories : '../Source/API', link_args : '-lSvtHevcEnc',|" \ +sed -e "s|install: true,|install: true, include_directories : include_directories('../Source/API'), link_args : '-lSvtHevcEnc',|" \ -e "/svthevcenc_dep =/d" -e 's|, svthevcenc_dep||' -e "s|svthevcenc_dep.found()|true|" -i gstreamer-plugin/meson.build @@ -93,5 +93,8 @@ popd %{_libdir}/gstreamer-1.0/libgstsvthevcenc.so %changelog +* Tue Sep 17 2019 Vasiliy Glazov - 1.4.1-2 +- Correct build gstreamer plugin + * Tue Sep 17 2019 Vasiliy Glazov - 1.4.1-1 - Initial release From 723429497a99707d22d86ef16303d015eb1ab163 Mon Sep 17 00:00:00 2001 From: Vasiliy Glazov Date: Mon, 30 Dec 2019 11:19:38 +0300 Subject: [PATCH 04/15] Update to 1.4.3. --- .gitignore | 1 + ...b632ede3c47945e42289672c08013bc6a56f.patch | 55 ------------------- sources | 2 +- svt-hevc-build.patch | 34 ++++++++++++ svt-hevc.spec | 16 +++--- 5 files changed, 43 insertions(+), 65 deletions(-) delete mode 100644 d313b632ede3c47945e42289672c08013bc6a56f.patch create mode 100644 svt-hevc-build.patch diff --git a/.gitignore b/.gitignore index dfb6aee..b9b4b92 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /SVT-HEVC-1.4.1.tar.gz +/SVT-HEVC-1.4.3.tar.gz diff --git a/d313b632ede3c47945e42289672c08013bc6a56f.patch b/d313b632ede3c47945e42289672c08013bc6a56f.patch deleted file mode 100644 index 2fbec2e..0000000 --- a/d313b632ede3c47945e42289672c08013bc6a56f.patch +++ /dev/null @@ -1,55 +0,0 @@ -From d313b632ede3c47945e42289672c08013bc6a56f Mon Sep 17 00:00:00 2001 -From: Austin Hu -Date: Thu, 19 Sep 2019 06:28:28 +0800 -Subject: [PATCH] Don't compile the binaries as executable stack. - -Signed-off-by: Austin Hu ---- - Source/Lib/ASM_SSE2/x64Macro.asm | 14 ++++++++++++++ - Source/Lib/ASM_SSE2/x64inc.asm | 14 ++++++++++++++ - 2 files changed, 28 insertions(+) - -diff --git a/Source/Lib/ASM_SSE2/x64Macro.asm b/Source/Lib/ASM_SSE2/x64Macro.asm -index eaeeac61..7dcb9038 100644 ---- a/Source/Lib/ASM_SSE2/x64Macro.asm -+++ b/Source/Lib/ASM_SSE2/x64Macro.asm -@@ -28,3 +28,17 @@ - punpckl%1 xmm%8, xmm%9 ; 67 66 65 64 63 62 61 60 73 63 72 62 71 61 70 60 75 65 55 45 74 64 54 44 76 66 56 46 36 26 16 06 - punpckh%1 xmm%13, xmm%9 ; 77 76 75 74 73 72 71 70 77 67 76 66 75 65 74 64 77 67 57 47 76 66 56 46 77 67 57 47 37 27 17 07 - %endmacro -+ -+%define FORMAT_ELF 0 -+%ifidn __OUTPUT_FORMAT__,elf -+ %define FORMAT_ELF 1 -+%elifidn __OUTPUT_FORMAT__,elf32 -+ %define FORMAT_ELF 1 -+%elifidn __OUTPUT_FORMAT__,elf64 -+ %define FORMAT_ELF 1 -+%endif -+ -+; This is needed for ELF, otherwise the GNU linker assumes the stack is executable by default. -+%if FORMAT_ELF -+ [SECTION .note.GNU-stack noalloc noexec nowrite progbits] -+%endif -diff --git a/Source/Lib/ASM_SSE2/x64inc.asm b/Source/Lib/ASM_SSE2/x64inc.asm -index 4440b060..a884545b 100644 ---- a/Source/Lib/ASM_SSE2/x64inc.asm -+++ b/Source/Lib/ASM_SSE2/x64inc.asm -@@ -323,3 +323,17 @@ bits 64 - %endif - %endmacro - %define NEED_EMMS 1 -+ -+%define FORMAT_ELF 0 -+%ifidn __OUTPUT_FORMAT__,elf -+ %define FORMAT_ELF 1 -+%elifidn __OUTPUT_FORMAT__,elf32 -+ %define FORMAT_ELF 1 -+%elifidn __OUTPUT_FORMAT__,elf64 -+ %define FORMAT_ELF 1 -+%endif -+ -+; This is needed for ELF, otherwise the GNU linker assumes the stack is executable by default. -+%if FORMAT_ELF -+ [SECTION .note.GNU-stack noalloc noexec nowrite progbits] -+%endif diff --git a/sources b/sources index ce172f9..800c627 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (SVT-HEVC-1.4.1.tar.gz) = 0a41068e7ecbb7d7ec2bd709bfb8b8da3028dbdc7c5c52d1e5bc689722c61fc359312c55ab1b043c9a0d7e8957fce43075f6ec1b24363b0551e4b17c12b5a30f +SHA512 (SVT-HEVC-1.4.3.tar.gz) = 93ab43c05b1dc7154f08d848e3ac2dd1ec5ee278abbb022718e8c8601efa4a25179144dbf0c9950da4c27052a53604d37edec471fce46b309e3c84eb99dd88c4 diff --git a/svt-hevc-build.patch b/svt-hevc-build.patch new file mode 100644 index 0000000..a972876 --- /dev/null +++ b/svt-hevc-build.patch @@ -0,0 +1,34 @@ +diff -uNdr SVT-HEVC-1.4.3_orig/CMakeLists.txt SVT-HEVC-1.4.3/CMakeLists.txt +--- SVT-HEVC-1.4.3_orig/CMakeLists.txt 2019-12-14 23:28:40.000000000 +0300 ++++ SVT-HEVC-1.4.3/CMakeLists.txt 2019-12-30 11:09:01.437899907 +0300 +@@ -119,8 +119,7 @@ + endif() + endif() + set(release_flags_to_test +- -O2 +- -O3) ++ -O2) + set(debug_flags_to_test + -O0) + +diff -uNdr SVT-HEVC-1.4.3_orig/gstreamer-plugin/meson.build SVT-HEVC-1.4.3/gstreamer-plugin/meson.build +--- SVT-HEVC-1.4.3_orig/gstreamer-plugin/meson.build 2019-12-14 23:28:40.000000000 +0300 ++++ SVT-HEVC-1.4.3/gstreamer-plugin/meson.build 2019-12-30 11:09:01.446899587 +0300 +@@ -17,7 +17,6 @@ + plugins_install_dir = '@0@/gstreamer-1.0'.format(get_option('libdir')) + + # common meson configuration +-svthevcenc_dep = dependency('SvtHevcEnc') + + cc = meson.get_compiler('c') + cc_flags = [ +@@ -47,7 +46,7 @@ + + gstSvtHevcEnc = library('gstsvthevcenc', + 'gstsvthevcenc.c', +- dependencies: [gstbase_dep, gstpbutils_dep , gstvideo_dep, svthevcenc_dep], +- install: true, ++ dependencies: [gstbase_dep, gstpbutils_dep , gstvideo_dep], ++ install: true, include_directories : include_directories('../Source/API'), link_args : '-lSvtHevcEnc', + install_dir: plugins_install_dir + ) diff --git a/svt-hevc.spec b/svt-hevc.spec index eb13db2..948e763 100644 --- a/svt-hevc.spec +++ b/svt-hevc.spec @@ -1,13 +1,13 @@ Name: svt-hevc -Version: 1.4.1 -Release: 2%{?dist} +Version: 1.4.3 +Release: 1%{?dist} Summary: Scalable Video Technology for HEVC Encoder License: BSD-2-Clause-Patent URL: https://github.com/OpenVisualCloud/SVT-HEVC Source0: %url/archive/v%{version}/SVT-HEVC-%{version}.tar.gz -# https://github.com/OpenVisualCloud/SVT-HEVC/issues/364 -Patch0: d313b632ede3c47945e42289672c08013bc6a56f.patch +# Correct build flags and gstreamer plugin +Patch0: svt-hevc-build.patch BuildRequires: gcc BuildRequires: cmake @@ -48,11 +48,6 @@ This package provides %{name}-based GStreamer plug-in. %prep %autosetup -p1 -n SVT-HEVC-%{version} -# Remove unneeded flags -sed -i 's|-O3)|)|' CMakeLists.txt -# Patch build gstreamer plugin -sed -e "s|install: true,|install: true, include_directories : include_directories('../Source/API'), link_args : '-lSvtHevcEnc',|" \ --e "/svthevcenc_dep =/d" -e 's|, svthevcenc_dep||' -e "s|svthevcenc_dep.found()|true|" -i gstreamer-plugin/meson.build %build @@ -93,6 +88,9 @@ popd %{_libdir}/gstreamer-1.0/libgstsvthevcenc.so %changelog +* Mon Dec 30 2019 Vasiliy Glazov - 1.4.3-1 +- Update to 1.4.3 + * Tue Sep 17 2019 Vasiliy Glazov - 1.4.1-2 - Correct build gstreamer plugin From 3e29072ab57403c412eaed1c5fea6e7fa2a3c7f6 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Wed, 5 Feb 2020 08:36:56 +0000 Subject: [PATCH 05/15] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: leigh123linux --- svt-hevc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/svt-hevc.spec b/svt-hevc.spec index 948e763..dbe6432 100644 --- a/svt-hevc.spec +++ b/svt-hevc.spec @@ -1,6 +1,6 @@ Name: svt-hevc Version: 1.4.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Scalable Video Technology for HEVC Encoder License: BSD-2-Clause-Patent @@ -88,6 +88,9 @@ popd %{_libdir}/gstreamer-1.0/libgstsvthevcenc.so %changelog +* Wed Feb 05 2020 RPM Fusion Release Engineering - 1.4.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Mon Dec 30 2019 Vasiliy Glazov - 1.4.3-1 - Update to 1.4.3 From 1a895f793bd8fc80dc3344b5b07768951c805c24 Mon Sep 17 00:00:00 2001 From: vascom Date: Tue, 4 Aug 2020 06:36:45 +0300 Subject: [PATCH 06/15] Update to 1.5.0. --- .gitignore | 1 + sources | 2 +- svt-hevc.spec | 13 ++++++------- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index b9b4b92..25e96d6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /SVT-HEVC-1.4.1.tar.gz /SVT-HEVC-1.4.3.tar.gz +/SVT-HEVC-1.5.0.tar.gz diff --git a/sources b/sources index 800c627..8256465 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (SVT-HEVC-1.4.3.tar.gz) = 93ab43c05b1dc7154f08d848e3ac2dd1ec5ee278abbb022718e8c8601efa4a25179144dbf0c9950da4c27052a53604d37edec471fce46b309e3c84eb99dd88c4 +SHA512 (SVT-HEVC-1.5.0.tar.gz) = e24c48b05c09f348ff39515b8eaa9723d012157ec395520d21adf5654f4e56082a8d46a9ba8c38ee536e78b59cf48d2eb93fadb6e8416a27541003a08593580c diff --git a/svt-hevc.spec b/svt-hevc.spec index dbe6432..1bb20c8 100644 --- a/svt-hevc.spec +++ b/svt-hevc.spec @@ -1,6 +1,6 @@ Name: svt-hevc -Version: 1.4.3 -Release: 2%{?dist} +Version: 1.5.0 +Release: 1%{?dist} Summary: Scalable Video Technology for HEVC Encoder License: BSD-2-Clause-Patent @@ -51,11 +51,7 @@ This package provides %{name}-based GStreamer plug-in. %build -mkdir -p %{_target_platform} -pushd %{_target_platform} - %cmake -G Ninja \ - .. -popd +%cmake -G Ninja %ninja_build -C %{_target_platform} pushd gstreamer-plugin @@ -88,6 +84,9 @@ popd %{_libdir}/gstreamer-1.0/libgstsvthevcenc.so %changelog +* Tue Aug 04 2020 Vasiliy Glazov - 1.5.0-1 +- Update to 1.5.0 + * Wed Feb 05 2020 RPM Fusion Release Engineering - 1.4.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 08688262f1fa9d274a75be6eaddf57684e76b391 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Tue, 4 Aug 2020 09:26:16 +0100 Subject: [PATCH 07/15] Fix cmake --- svt-hevc.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/svt-hevc.spec b/svt-hevc.spec index 1bb20c8..86ca028 100644 --- a/svt-hevc.spec +++ b/svt-hevc.spec @@ -1,3 +1,5 @@ +%undefine __cmake_in_source_build + Name: svt-hevc Version: 1.5.0 Release: 1%{?dist} @@ -51,7 +53,11 @@ This package provides %{name}-based GStreamer plug-in. %build -%cmake -G Ninja +%cmake -G Ninja \ +%if 0%{?rhel} && 0%{?rhel} > 7 + -B %{_target_platform} -S . +%endif + %ninja_build -C %{_target_platform} pushd gstreamer-plugin From 9414cfcb5d9c3c6a3cecbb105fbd5f827d1df320 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Tue, 18 Aug 2020 22:36:20 +0100 Subject: [PATCH 08/15] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Leigh Scott --- svt-hevc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/svt-hevc.spec b/svt-hevc.spec index 86ca028..2133629 100644 --- a/svt-hevc.spec +++ b/svt-hevc.spec @@ -2,7 +2,7 @@ Name: svt-hevc Version: 1.5.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Scalable Video Technology for HEVC Encoder License: BSD-2-Clause-Patent @@ -90,6 +90,9 @@ popd %{_libdir}/gstreamer-1.0/libgstsvthevcenc.so %changelog +* Tue Aug 18 2020 RPM Fusion Release Engineering - 1.5.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Aug 04 2020 Vasiliy Glazov - 1.5.0-1 - Update to 1.5.0 From 68de037d53ad54ce877121926c950db1c0b4179f Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Thu, 4 Feb 2021 08:22:36 +0000 Subject: [PATCH 09/15] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Leigh Scott --- svt-hevc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/svt-hevc.spec b/svt-hevc.spec index 2133629..4dc384c 100644 --- a/svt-hevc.spec +++ b/svt-hevc.spec @@ -2,7 +2,7 @@ Name: svt-hevc Version: 1.5.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Scalable Video Technology for HEVC Encoder License: BSD-2-Clause-Patent @@ -90,6 +90,9 @@ popd %{_libdir}/gstreamer-1.0/libgstsvthevcenc.so %changelog +* Thu Feb 04 2021 RPM Fusion Release Engineering - 1.5.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Aug 18 2020 RPM Fusion Release Engineering - 1.5.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From e432195a3c4c466417da05a016b878e2e79f0839 Mon Sep 17 00:00:00 2001 From: vascom Date: Sun, 7 Feb 2021 11:10:55 +0300 Subject: [PATCH 10/15] Fix build with GCC 11. Remove gstreamer plugin since it is now in gstreamer1-plugins-bad-freeworld package. --- cmake.patch | 27 +++++++++++++++++++++++++++ svt-hevc-build.patch | 34 ---------------------------------- svt-hevc.spec | 31 +++++++------------------------ 3 files changed, 34 insertions(+), 58 deletions(-) create mode 100644 cmake.patch delete mode 100644 svt-hevc-build.patch diff --git a/cmake.patch b/cmake.patch new file mode 100644 index 0000000..7f619f6 --- /dev/null +++ b/cmake.patch @@ -0,0 +1,27 @@ +diff -uNdr SVT-HEVC-1.5.0_old/CMakeLists.txt SVT-HEVC-1.5.0_new/CMakeLists.txt +--- SVT-HEVC-1.5.0_old/CMakeLists.txt 2020-08-04 00:57:25.000000000 +0300 ++++ SVT-HEVC-1.5.0_new/CMakeLists.txt 2021-02-07 10:58:15.333859295 +0300 +@@ -100,11 +100,9 @@ + -Wformat-security + -fPIE + -fPIC +- -D_FORTIFY_SOURCE=2 +- /GS +- /sdl) ++ -D_FORTIFY_SOURCE=2) + if(MSVC) +- list(APPEND flags_to_test /MP) ++ list(APPEND flags_to_test /MP /GS /sdl) + else() + option(NATIVE "Build for native performance (march=native)") + list(INSERT flags_to_test 0 -Wall) +@@ -119,8 +117,7 @@ + endif() + endif() + set(release_flags_to_test +- -O2 +- -O3) ++ -O2) + set(debug_flags_to_test + -O0) + diff --git a/svt-hevc-build.patch b/svt-hevc-build.patch deleted file mode 100644 index a972876..0000000 --- a/svt-hevc-build.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -uNdr SVT-HEVC-1.4.3_orig/CMakeLists.txt SVT-HEVC-1.4.3/CMakeLists.txt ---- SVT-HEVC-1.4.3_orig/CMakeLists.txt 2019-12-14 23:28:40.000000000 +0300 -+++ SVT-HEVC-1.4.3/CMakeLists.txt 2019-12-30 11:09:01.437899907 +0300 -@@ -119,8 +119,7 @@ - endif() - endif() - set(release_flags_to_test -- -O2 -- -O3) -+ -O2) - set(debug_flags_to_test - -O0) - -diff -uNdr SVT-HEVC-1.4.3_orig/gstreamer-plugin/meson.build SVT-HEVC-1.4.3/gstreamer-plugin/meson.build ---- SVT-HEVC-1.4.3_orig/gstreamer-plugin/meson.build 2019-12-14 23:28:40.000000000 +0300 -+++ SVT-HEVC-1.4.3/gstreamer-plugin/meson.build 2019-12-30 11:09:01.446899587 +0300 -@@ -17,7 +17,6 @@ - plugins_install_dir = '@0@/gstreamer-1.0'.format(get_option('libdir')) - - # common meson configuration --svthevcenc_dep = dependency('SvtHevcEnc') - - cc = meson.get_compiler('c') - cc_flags = [ -@@ -47,7 +46,7 @@ - - gstSvtHevcEnc = library('gstsvthevcenc', - 'gstsvthevcenc.c', -- dependencies: [gstbase_dep, gstpbutils_dep , gstvideo_dep, svthevcenc_dep], -- install: true, -+ dependencies: [gstbase_dep, gstpbutils_dep , gstvideo_dep], -+ install: true, include_directories : include_directories('../Source/API'), link_args : '-lSvtHevcEnc', - install_dir: plugins_install_dir - ) diff --git a/svt-hevc.spec b/svt-hevc.spec index 4dc384c..31483f6 100644 --- a/svt-hevc.spec +++ b/svt-hevc.spec @@ -2,21 +2,19 @@ Name: svt-hevc Version: 1.5.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Scalable Video Technology for HEVC Encoder License: BSD-2-Clause-Patent URL: https://github.com/OpenVisualCloud/SVT-HEVC Source0: %url/archive/v%{version}/SVT-HEVC-%{version}.tar.gz -# Correct build flags and gstreamer plugin -Patch0: svt-hevc-build.patch +# Correct build flags +Patch0: cmake.patch BuildRequires: gcc BuildRequires: cmake BuildRequires: yasm BuildRequires: meson -BuildRequires: gstreamer1-devel -BuildRequires: gstreamer1-plugins-base-devel Requires: %{name}-libs%{?_isa} = %{version}-%{release} @@ -41,13 +39,6 @@ Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description devel Include files and mandatory libraries for development svt-hevc. -%package -n gstreamer1-%{name} -Summary: GStreamer 1.0 %{name}-based plug-in -Requires: gstreamer1-plugins-base%{?_isa} - -%description -n gstreamer1-%{name} -This package provides %{name}-based GStreamer plug-in. - %prep %autosetup -p1 -n SVT-HEVC-%{version} @@ -60,18 +51,9 @@ This package provides %{name}-based GStreamer plug-in. %ninja_build -C %{_target_platform} -pushd gstreamer-plugin - export LIBRARY_PATH="$PWD/../Bin/Release:$LIBRARY_PATH" - %meson - %meson_build -popd - %install %ninja_install -C %{_target_platform} -pushd gstreamer-plugin - %meson_install -popd %files %{_bindir}/SvtHevcEncApp @@ -86,10 +68,11 @@ popd %{_libdir}/libSvtHevcEnc.so %{_libdir}/pkgconfig/*.pc -%files -n gstreamer1-%{name} -%{_libdir}/gstreamer-1.0/libgstsvthevcenc.so - %changelog +* Sun Feb 07 2021 Vasiliy Glazov - 1.5.0-4 +- Fix build for GCC 11 +- Remove gstreamer plugin + * Thu Feb 04 2021 RPM Fusion Release Engineering - 1.5.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 64aaab2cb74e680b7b32b0a27fcf61ffcadb80af Mon Sep 17 00:00:00 2001 From: Vasiliy Glazov Date: Tue, 18 May 2021 17:34:04 +0300 Subject: [PATCH 11/15] Update to 1.5.1. --- .gitignore | 1 + sources | 2 +- svt-hevc.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 25e96d6..0af6582 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /SVT-HEVC-1.4.1.tar.gz /SVT-HEVC-1.4.3.tar.gz /SVT-HEVC-1.5.0.tar.gz +/SVT-HEVC-1.5.1.tar.gz diff --git a/sources b/sources index 8256465..ee1fecd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (SVT-HEVC-1.5.0.tar.gz) = e24c48b05c09f348ff39515b8eaa9723d012157ec395520d21adf5654f4e56082a8d46a9ba8c38ee536e78b59cf48d2eb93fadb6e8416a27541003a08593580c +SHA512 (SVT-HEVC-1.5.1.tar.gz) = b1dfcb7ba028de3604e595d2ec95bf2e666b01b9e5f9ee67a7dc9257633061d4c7ed8e2f5da9e2a05f38f8927f1e7201b87f68119953980bbe16987cb68a89ea diff --git a/svt-hevc.spec b/svt-hevc.spec index 31483f6..d50e46f 100644 --- a/svt-hevc.spec +++ b/svt-hevc.spec @@ -1,8 +1,8 @@ %undefine __cmake_in_source_build Name: svt-hevc -Version: 1.5.0 -Release: 4%{?dist} +Version: 1.5.1 +Release: 1%{?dist} Summary: Scalable Video Technology for HEVC Encoder License: BSD-2-Clause-Patent @@ -69,6 +69,9 @@ Include files and mandatory libraries for development svt-hevc. %{_libdir}/pkgconfig/*.pc %changelog +* Tue May 18 2021 Vasiliy Glazov - 1.5.1-1 +- Update to 1.5.1 + * Sun Feb 07 2021 Vasiliy Glazov - 1.5.0-4 - Fix build for GCC 11 - Remove gstreamer plugin From 07ae8b70ee24c5aa6b3903b64d62a8b280828d25 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Tue, 3 Aug 2021 16:32:08 +0100 Subject: [PATCH 12/15] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Leigh Scott --- svt-hevc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/svt-hevc.spec b/svt-hevc.spec index d50e46f..23b33e2 100644 --- a/svt-hevc.spec +++ b/svt-hevc.spec @@ -2,7 +2,7 @@ Name: svt-hevc Version: 1.5.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Scalable Video Technology for HEVC Encoder License: BSD-2-Clause-Patent @@ -69,6 +69,9 @@ Include files and mandatory libraries for development svt-hevc. %{_libdir}/pkgconfig/*.pc %changelog +* Tue Aug 03 2021 RPM Fusion Release Engineering - 1.5.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue May 18 2021 Vasiliy Glazov - 1.5.1-1 - Update to 1.5.1 From c1802f66c4dd60733196d76cd426ef23bea9aa57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Wed, 9 Feb 2022 21:13:55 +0000 Subject: [PATCH 13/15] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Sérgio M. Basto --- svt-hevc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/svt-hevc.spec b/svt-hevc.spec index 23b33e2..d57cb68 100644 --- a/svt-hevc.spec +++ b/svt-hevc.spec @@ -2,7 +2,7 @@ Name: svt-hevc Version: 1.5.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Scalable Video Technology for HEVC Encoder License: BSD-2-Clause-Patent @@ -69,6 +69,9 @@ Include files and mandatory libraries for development svt-hevc. %{_libdir}/pkgconfig/*.pc %changelog +* Wed Feb 09 2022 RPM Fusion Release Engineering - 1.5.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Tue Aug 03 2021 RPM Fusion Release Engineering - 1.5.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 27a949c662518b6055430568dcb92a1fee1cbfa0 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Wed, 9 Feb 2022 23:12:18 +0000 Subject: [PATCH 14/15] Fix build --- svt-hevc.spec | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/svt-hevc.spec b/svt-hevc.spec index d57cb68..d124255 100644 --- a/svt-hevc.spec +++ b/svt-hevc.spec @@ -1,5 +1,3 @@ -%undefine __cmake_in_source_build - Name: svt-hevc Version: 1.5.1 Release: 3%{?dist} @@ -44,16 +42,13 @@ Include files and mandatory libraries for development svt-hevc. %build -%cmake -G Ninja \ -%if 0%{?rhel} && 0%{?rhel} > 7 - -B %{_target_platform} -S . -%endif +%cmake -G Ninja -%ninja_build -C %{_target_platform} +%cmake_build %install -%ninja_install -C %{_target_platform} +%cmake_install %files %{_bindir}/SvtHevcEncApp From 1631296bcf29054e9e753354ae9063b611b8bc13 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Tue, 31 Oct 2023 00:23:41 +0300 Subject: [PATCH 15/15] Remove unnecessary files --- sources | 1 - 1 file changed, 1 deletion(-) delete mode 100644 sources diff --git a/sources b/sources deleted file mode 100644 index ee1fecd..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (SVT-HEVC-1.5.1.tar.gz) = b1dfcb7ba028de3604e595d2ec95bf2e666b01b9e5f9ee67a7dc9257633061d4c7ed8e2f5da9e2a05f38f8927f1e7201b87f68119953980bbe16987cb68a89ea