commit: 1700c3fd712b4bf742cb7340d807d6aa28b23691 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Wed Oct 4 14:44:15 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Oct 4 15:10:44 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1700c3fd
media-libs/svt-hevc: don't redefine _FORTIFY_SOURCE Closes: https://bugs.gentoo.org/895260 Signed-off-by: Sam James <sam <AT> gentoo.org> ...vt-hevc-1.5.1-dont-clobber-fortify_source.patch | 35 ++++++++++++++++++++++ ...t-hevc-9999.ebuild => svt-hevc-1.5.1-r1.ebuild} | 4 +++ media-libs/svt-hevc/svt-hevc-9999.ebuild | 4 +++ 3 files changed, 43 insertions(+) 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-9999.ebuild b/media-libs/svt-hevc/svt-hevc-1.5.1-r1.ebuild similarity index 89% copy from media-libs/svt-hevc/svt-hevc-9999.ebuild copy to media-libs/svt-hevc/svt-hevc-1.5.1-r1.ebuild index 5729a3499a49..07281bb8299b 100644 --- a/media-libs/svt-hevc/svt-hevc-9999.ebuild +++ b/media-libs/svt-hevc/svt-hevc-1.5.1-r1.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 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
