gentoo auto-resync : 31:05:2023 - 09:23:01

4 files changed, 90 insertions, 1 deletions

diff --git a/media-libs/svt-av1/Manifest b/media-libs/svt-av1/Manifest
index 2da5fec12af3..e3b8d9cc90f5 100644
--- a/media-libs/svt-av1/Manifest
+++ b/media-libs/svt-av1/Manifest
@@ -1,6 +1,9 @@
+AUX svt-av1-1.5.0-fortify-no-override.patch 1064 BLAKE2B 0038d2f4554df3caf46cafd5afd70c7e9f38ad06433b317644883702697289f6ef2d739f0878c7b919643599602bfca87cdb5c63eee57c3ade81642d5fbbc4d6 SHA512 b6ca1931790300cef2459a455719d4604f5d219dd1eeceef2cc083e79778b1b270890ead05d3159d95059d4c8b16d6c3a04c56fc04ce089249280854728b71f8
 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
 EBUILD svt-av1-1.1.0.ebuild 1230 BLAKE2B c052068cc58e86e6f8147b5fdadf06633dcfe6fcb4dd020783e151be6dec1f59a8e1f0fce7ce7164cf0980973dcd579b0aadbd5a063dd1b26d4db5cd427a54d6 SHA512 3be02f20fe8ad0b4990d669bea9a9e266f65c529a41dfbf833e5477fcd6534f7a515ced45612862fe8213acd577eea30699e0c84bb9e5ba60e78c743785a4bef
 EBUILD svt-av1-1.4.1.ebuild 1358 BLAKE2B b58b73d7d99c12584a3bcfcff93a9101d27f61636f774d62762c4185224fe423feb4bf847387eab3098d1fe13a7d6bdbe4fd3b89ccdd0b5020248f67f8513f59 SHA512 bd643b174db7d05379c582cf02d8ce4b80194960a00fcbb85a13638f28663f7edb36caab31d0937962d006f57e5394b3dc9a373efe8c970095899a425d025155
-EBUILD svt-av1-9999.ebuild 1358 BLAKE2B b58b73d7d99c12584a3bcfcff93a9101d27f61636f774d62762c4185224fe423feb4bf847387eab3098d1fe13a7d6bdbe4fd3b89ccdd0b5020248f67f8513f59 SHA512 bd643b174db7d05379c582cf02d8ce4b80194960a00fcbb85a13638f28663f7edb36caab31d0937962d006f57e5394b3dc9a373efe8c970095899a425d025155
+EBUILD svt-av1-1.5.0.ebuild 1424 BLAKE2B 0dbc82ef36f8de6d4a1c37dce1a1a2580e3ae1cea759b17a72ae9b2b5bb0be017e2b06b11e4a370e64d0871fb6cb57aad4a88e00de0fc2e5e7a1b9eb324e089a SHA512 f1f66fc5989b29226ff251cb8ea42b773429e697d42972a31a13ddcc33cae295220fab9966a6113dc2d7017e0f74a3d5c4d4a96428cf50a392f2c734e90ec7fb
+EBUILD svt-av1-9999.ebuild 1424 BLAKE2B 0dbc82ef36f8de6d4a1c37dce1a1a2580e3ae1cea759b17a72ae9b2b5bb0be017e2b06b11e4a370e64d0871fb6cb57aad4a88e00de0fc2e5e7a1b9eb324e089a SHA512 f1f66fc5989b29226ff251cb8ea42b773429e697d42972a31a13ddcc33cae295220fab9966a6113dc2d7017e0f74a3d5c4d4a96428cf50a392f2c734e90ec7fb
 MISC metadata.xml 561 BLAKE2B 1effb05644507ea39fe071f9de1fe4c1a4feb30f9bc429985cf464aea9f9bc1f525e0c6f5e75da47d373f0acd60394a2bcec3b71e68bc3ab031334f95717d3b8 SHA512 1042fb94a9c0b93c007843585e0ea075d187cdd6b77bb8eb94d5fcfaa7d083a98916aedcbfccd1fa3da3307ef8bbe7d623efa7e39ccc9714d23973497bec7a89
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-1.5.0.ebuild b/media-libs/svt-av1/svt-av1-1.5.0.ebuild
new file mode 100644
index 000000000000..01c83e30f392
--- /dev/null
+++ b/media-libs/svt-av1/svt-av1-1.5.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib flag-o-matic
+
+DESCRIPTION="Scalable Video Technology for AV1 (SVT-AV1 Encoder and Decoder)"
+HOMEPAGE="https://gitlab.com/AOMediaCodec/SVT-AV1"
+
+if [[ ${PV} = 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/AOMediaCodec/SVT-AV1.git"
+else
+	SRC_URI="https://gitlab.com/AOMediaCodec/SVT-AV1/-/archive/v${PV}/SVT-AV1-v${PV}.tar.bz2"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	S="${WORKDIR}/SVT-AV1-v${PV}"
+fi
+
+# Also see "Alliance for Open Media Patent License 1.0"
+LICENSE="BSD-2 Apache-2.0 BSD ISC LGPL-2.1+ MIT"
+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
+
+	local mycmakeargs=(
+		# Tests require linking against https://github.com/Cidana-Developers/aom/tree/av1-normative ?
+		# undefined reference to `ifd_inspect'
+		# https://github.com/Cidana-Developers/aom/commit/cfc5c9e95bcb48a5a41ca7908b44df34ea1313c0
+		# .. and https://gitlab.com/AOMediaCodec/SVT-AV1/-/blob/master/.gitlab/workflows/linux/.gitlab-ci.yml implies it's all quite manual?
+		-DBUILD_TESTING=OFF
+		-DCMAKE_OUTPUT_DIRECTORY="${BUILD_DIR}"
+	)
+
+	[[ ${ABI} != amd64 ]] && mycmakeargs+=( -DCOMPILE_C_ONLY=ON )
+
+	cmake_src_configure
+}
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