commit: 5f298acb0c9958b158914fd9ce4fce8692a16f23 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Wed May 31 06:25:09 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed May 31 06:56:26 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f298acb
media-libs/svt-av1: add 1.5.0 Closes: https://bugs.gentoo.org/890280 Signed-off-by: Sam James <sam <AT> gentoo.org> media-libs/svt-av1/Manifest | 1 + .../files/svt-av1-1.5.0-fortify-no-override.patch | 37 ++++++++++++++++++++++ .../{svt-av1-9999.ebuild => svt-av1-1.5.0.ebuild} | 4 +++ media-libs/svt-av1/svt-av1-9999.ebuild | 4 +++ 4 files changed, 46 insertions(+) diff --git a/media-libs/svt-av1/Manifest b/media-libs/svt-av1/Manifest index 4e790f1a3ed4..8dcec676d2f6 100644 --- a/media-libs/svt-av1/Manifest +++ b/media-libs/svt-av1/Manifest @@ -1,2 +1,3 @@ DIST SVT-AV1-v1.4.1.tar.bz2 9440077 BLAKE2B ed79d566afaa22fdfb1925bf6a75e8e55abdec1f76333a0cfedc92f9ca524b36b622b5c40af5d4846a51a3cd9aa951eb617bf6007513d83b7f172c4f9bb0de27 SHA512 8297ef131ff8e7e6cbb0d19d2ba98904455d2953cde3fb0cbae714d050980a558e4cbed911968b5075d7aca758ca939a5091b68df557903387e3f22ac4bda1a1 +DIST SVT-AV1-v1.5.0.tar.bz2 9490521 BLAKE2B 6f54c1706ed65b8248bc434411cfdea5869765c42682100f5aa6b72d08626bd896f6a9a8067ac8af3c89c72bd324e74942b0f424ff33cc2f6ff54d9204ef7581 SHA512 d5aa7679aeaa1e19f21906a36a7214c72cdaee77e1b5c1946ded43f8381ec2d705e671130589207b65b920a4fcaa9ca1d0037f88ef8d2303125d7f7aa54e3a2e DIST svt-av1-1.1.0.tar.gz 9882945 BLAKE2B 2673fdbe17b36607e581cc540ca181672d16b3fbc0dd9c1a8b100ebea6b7a6872d6fa55976cb19c1c8afd50c5c09b67fbec1bcc892007ccd41e7f7ad68027d83 SHA512 87d661183de33554d228c2fa72deb9a945f2550083eb25688b4dc0676be384373a6a52af235066d85ce963ffbc7751c8afb46a2bc1c09e00f81ea0db5a232522 diff --git a/media-libs/svt-av1/files/svt-av1-1.5.0-fortify-no-override.patch b/media-libs/svt-av1/files/svt-av1-1.5.0-fortify-no-override.patch new file mode 100644 index 000000000000..d0db0f0d3afc --- /dev/null +++ b/media-libs/svt-av1/files/svt-av1-1.5.0-fortify-no-override.patch @@ -0,0 +1,37 @@ +Don't override our toolchain defaults, which may be F_S=3 on some profiles, and +F_S=2 otherwise. +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -325,10 +325,6 @@ else() + check_both_flags_add(-mno-avx) + endif() + +-if(CMAKE_C_FLAGS MATCHES "-O" AND NOT CMAKE_C_FLAGS MATCHES "-O0" AND NOT MINGW) +- add_definitions(-D_FORTIFY_SOURCE=2) +-endif() +- + if(CMAKE_ASM_NASM_OBJECT_FORMAT MATCHES "win") + set(CMAKE_ASM_NASM_FLAGS_DEBUG "${CMAKE_ASM_NASM_FLAGS_DEBUG} -gcv8") + elseif(CMAKE_ASM_NASM_COMPILER MATCHES "nasm") +--- a/gstreamer-plugin/CMakeLists.txt ++++ b/gstreamer-plugin/CMakeLists.txt +@@ -30,8 +30,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 +@@ -20,7 +20,6 @@ svtav1enc_dep = dependency('SvtAv1Enc') + cc = meson.get_compiler('c') + cc_flags = [ + '-O2', +- '-D_FORTIFY_SOURCE=2', + '-Wformat', + '-Wformat-security', + '-fPIE', diff --git a/media-libs/svt-av1/svt-av1-9999.ebuild b/media-libs/svt-av1/svt-av1-1.5.0.ebuild similarity index 95% copy from media-libs/svt-av1/svt-av1-9999.ebuild copy to media-libs/svt-av1/svt-av1-1.5.0.ebuild index 03e68027a60a..01c83e30f392 100644 --- a/media-libs/svt-av1/svt-av1-9999.ebuild +++ b/media-libs/svt-av1/svt-av1-1.5.0.ebuild @@ -23,6 +23,10 @@ SLOT="0" BDEPEND="amd64? ( dev-lang/yasm )" +PATCHES=( + "${FILESDIR}"/${PN}-1.5.0-fortify-no-override.patch +) + multilib_src_configure() { append-ldflags -Wl,-z,noexecstack diff --git a/media-libs/svt-av1/svt-av1-9999.ebuild b/media-libs/svt-av1/svt-av1-9999.ebuild index 03e68027a60a..01c83e30f392 100644 --- a/media-libs/svt-av1/svt-av1-9999.ebuild +++ b/media-libs/svt-av1/svt-av1-9999.ebuild @@ -23,6 +23,10 @@ SLOT="0" BDEPEND="amd64? ( dev-lang/yasm )" +PATCHES=( + "${FILESDIR}"/${PN}-1.5.0-fortify-no-override.patch +) + multilib_src_configure() { append-ldflags -Wl,-z,noexecstack
