gentoo auto-resync : 04:10:2023 - 17:51:59

4 files changed, 74 insertions, 1 deletions

diff --git a/media-libs/svt-hevc/Manifest b/media-libs/svt-hevc/Manifest
index aad82598e1d7..5a6d08b7fc20 100644
--- a/media-libs/svt-hevc/Manifest
+++ b/media-libs/svt-hevc/Manifest
@@ -1,4 +1,6 @@
+AUX svt-hevc-1.5.1-dont-clobber-fortify_source.patch 796 BLAKE2B 442890c94ab0bf6448f153c23cf19a6a330a89126b70e7e2d9634a01fae687ac5e45bdd1e23beff42983e0749c2103df68c203738558188e7a65fbea78be40cc SHA512 78fa039d7e8195d179e68016a6489f441429001841dc2bde7fc9ab4e78f769ba331a87dbd848cd9cadedf11b0f67077280ffffd83e6a94b98552ed3fd5019214
 DIST svt-hevc-1.5.1.tar.gz 1220295 BLAKE2B e70dc07f74746cb69561818b642d8ce5efd9e731b3376889556ddea0f647f8deaa4edf7a4993d86a5b1100db37d02f928d53eeaa594b7d5c582b92c30761e470 SHA512 f5b9d9a090cb04ada0a3f310522f00b619ae628b8474fe7e1c7f562a017b5a9d0c8c58ab9a35b43cb19f2568fbc59e0395dcd517b7983924b175393ad2ba4299
+EBUILD svt-hevc-1.5.1-r1.ebuild 722 BLAKE2B 89543bc747dd60295e48eb3bd5d2e8831c03a53bf6cdb637b9cb9b011c0714358f9698e79d8406a4fbbe892e39894e8870c3ea18376b46f96a9b04be7cca08cc SHA512 9c0f0aebb13ae80eea0eff5c0e202ecd7c8f102400d9d59b1ad75717f5f82e2a2f964661808a11bbc0df4c2f381717b6153215e12894d0fb5ce8b742a5f9c61a
 EBUILD svt-hevc-1.5.1.ebuild 648 BLAKE2B 02673e1c6187f6c88dfe5469d82657c3b0fcd1c63151464ebbe9ea14a7cf3e642203faeac14f7228fe890f58fc0388d38b4243d55ca33115928d33a90988ca37 SHA512 7f38654a9e6847d819df103d93eb344528455da41258905158c78e8a5d04791ab2ec24eed523b9a294720b8a43d3e58a61b5738b4eea3d768832cf8f77056598
-EBUILD svt-hevc-9999.ebuild 648 BLAKE2B 02673e1c6187f6c88dfe5469d82657c3b0fcd1c63151464ebbe9ea14a7cf3e642203faeac14f7228fe890f58fc0388d38b4243d55ca33115928d33a90988ca37 SHA512 7f38654a9e6847d819df103d93eb344528455da41258905158c78e8a5d04791ab2ec24eed523b9a294720b8a43d3e58a61b5738b4eea3d768832cf8f77056598
+EBUILD svt-hevc-9999.ebuild 722 BLAKE2B 89543bc747dd60295e48eb3bd5d2e8831c03a53bf6cdb637b9cb9b011c0714358f9698e79d8406a4fbbe892e39894e8870c3ea18376b46f96a9b04be7cca08cc SHA512 9c0f0aebb13ae80eea0eff5c0e202ecd7c8f102400d9d59b1ad75717f5f82e2a2f964661808a11bbc0df4c2f381717b6153215e12894d0fb5ce8b742a5f9c61a
 MISC metadata.xml 624 BLAKE2B 11842f1f6fe5a26ca9b8448c380082eb8a77a5a7ebc105b7d8d6a69644aa43075c64301a92563df1cd78a44711e3d7a54eaec08013efbad9641efa30edf5a754 SHA512 155b8a1daecb9cbc6e9399907ccd2016d89d8ee3aee8d4ceedeb5350531733b0997672190c1a87782312d3ea2b10a8760dfac1996a6345b4d55ee077247df693
diff --git a/media-libs/svt-hevc/files/svt-hevc-1.5.1-dont-clobber-fortify_source.patch b/media-libs/svt-hevc/files/svt-hevc-1.5.1-dont-clobber-fortify_source.patch
new file mode 100644
index 000000000000..1cc2974b393c
--- /dev/null
+++ b/media-libs/svt-hevc/files/svt-hevc-1.5.1-dont-clobber-fortify_source.patch
@@ -0,0 +1,35 @@
+Don't clobber our toolchain defaults.
+
+https://bugs.gentoo.org/895260
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -100,7 +100,6 @@ set(flags_to_test
+     -Wformat-security
+     -fPIE
+     -fPIC
+-    -D_FORTIFY_SOURCE=2
+     /GS
+     /sdl)
+ if(MSVC)
+--- a/gstreamer-plugin/CMakeLists.txt
++++ b/gstreamer-plugin/CMakeLists.txt
+@@ -25,8 +25,7 @@ set(flags_to_test
+     -fstack-protector-strong
+     -fPIE
+     -fPIC
+-    -flto
+-    -D_FORTIFY_SOURCE=2)
++    -flto)
+ if(NOT MSVC)
+     list(INSERT flags_to_test 0 -Wall)
+ else()
+--- a/gstreamer-plugin/meson.build
++++ b/gstreamer-plugin/meson.build
+@@ -22,7 +22,6 @@ svthevcenc_dep = dependency('SvtHevcEnc')
+ cc = meson.get_compiler('c')
+ cc_flags = [
+     '-O2',
+-    '-D_FORTIFY_SOURCE=2',
+     '-Wformat',
+     '-Wformat-security',
+     '-fPIE',
diff --git a/media-libs/svt-hevc/svt-hevc-1.5.1-r1.ebuild b/media-libs/svt-hevc/svt-hevc-1.5.1-r1.ebuild
new file mode 100644
index 000000000000..07281bb8299b
--- /dev/null
+++ b/media-libs/svt-hevc/svt-hevc-1.5.1-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic cmake
+
+DESCRIPTION="Scalable Video Technology for HEVC (SVT-HEVC Encoder)"
+HOMEPAGE="https://github.com/OpenVisualCloud/SVT-HEVC"
+
+if [ ${PV} = "9999" ]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/OpenVisualCloud/SVT-HEVC.git"
+else
+	SRC_URI="https://github.com/OpenVisualCloud/SVT-HEVC/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/SVT-HEVC-${PV}"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+
+BDEPEND="dev-lang/nasm"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.1-dont-clobber-fortify_source.patch
+)
+
+src_prepare() {
+	append-ldflags -Wl,-z,noexecstack
+	cmake_src_prepare
+}
diff --git a/media-libs/svt-hevc/svt-hevc-9999.ebuild b/media-libs/svt-hevc/svt-hevc-9999.ebuild
index 5729a3499a49..07281bb8299b 100644
--- a/media-libs/svt-hevc/svt-hevc-9999.ebuild
+++ b/media-libs/svt-hevc/svt-hevc-9999.ebuild
@@ -22,6 +22,10 @@ SLOT="0"
 
 BDEPEND="dev-lang/nasm"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.1-dont-clobber-fortify_source.patch
+)
+
 src_prepare() {
 	append-ldflags -Wl,-z,noexecstack
 	cmake_src_prepare