gentoo auto-resync : 06:10:2023 - 17:57:58

3 files changed, 75 insertions, 4 deletions

diff --git a/media-libs/libvmaf/Manifest b/media-libs/libvmaf/Manifest
index 7d86104087a7..3b20d1618769 100644
--- a/media-libs/libvmaf/Manifest
+++ b/media-libs/libvmaf/Manifest
@@ -1,3 +1,4 @@
-DIST libvmaf-2.3.0.tar.gz 18373659 BLAKE2B a08f18cabf99bf421c61c1fa60b946ee62027f06d5ec2a1b78c7d14ef7541a850b83216eed815f586711365ac2e31bdc6b5be811ae4fd6882717bf030d9ffc0f SHA512 10f0af2b1e868d9780a2766c6c06451ea79f4a8cd8f6c546473382587011f9a7c8c5bf80952021980ede62e2188bcb388337c8903a906d50c739be7cdbb8f61b
-EBUILD libvmaf-2.3.0-r2.ebuild 1328 BLAKE2B 23d5b5dd5d729807f0be1c28731f70f6392cc9ec7381d2e81f87945af356a4a7251ada8b7165c37b94b921fd606a8ba95ffbed06ca604027b6f7efa95875af37 SHA512 fa62b7ee32196986e9257831c1eea6241d2801ca3e3604a245fe92533d7294b731ddea7ff56b1ce5c0943e8c6428a7624890392e40070634f43c73ac9520e73d
+DIST libvmaf-2.3.1.tar.gz 18388094 BLAKE2B df5af307382eeb215a5f47ea7f78d8d6d8087f238c3f68c2614c0588415dc948cadce5ce2da9b37f6e05a1c695e5437cfb9ca3917fc8346bab6312f0859e90a2 SHA512 4854247bba4b323d08fa9ef4a082a08ed9ab1763dffbe0a1af2b594205e908f47dfb919d03a32e0bce77a40e33e4b2a2594e5d1e8e081379640d6abf279a129b
+EBUILD libvmaf-2.3.1.ebuild 1353 BLAKE2B 06c161d294e8b1ac73e0a669a6ac60f6aaebad54477e68c41380b2ce4feed4649b3011ce512a29642807d328033d9d2c3d49447fab3a86382ff98704c47273f7 SHA512 cb03e4c4d01d83f479691ca5db32b44f2c450e865662d0507996a9b0846bb92cc038f643873c8ada3328ea5ea0ce7cc1e87c20103d397579c9b6da8c32bc0ba8
+EBUILD libvmaf-9999.ebuild 1423 BLAKE2B c0d2931e440404f49dc02bebb9995e4a8167c39fcaa02861a906611a60797940e2cb4e182f118436820d47b2e8d1d0b3d891a8684fee8ac61cb6a40aab8349f7 SHA512 7057aa700b4d8508946bba7a8e273adcffe85ad7d8c514cb61b02defc71930909212a66b45f33bff25d48321eae2fbe841b637181c4f4f69db725193459b9dc1
 MISC metadata.xml 857 BLAKE2B 418ddef5fe12e5d06e978bedb739e26e119939d056c03761a3493851a69c7bfd110fe7cb31505fa3bd52104ec11045b05eae84fd2f5558007779b7bf776ef16a SHA512 52fd19cf32b9b24ae427ff9a1254ac0b514de79df6e7a47f638c304bbaab799294a29d9e7e8467c2fdb1ab0a208e3704f95c8a276fde9ad176c38e2786a962b3
diff --git a/media-libs/libvmaf/libvmaf-2.3.0-r2.ebuild b/media-libs/libvmaf/libvmaf-2.3.1.ebuild
index 4b8559100337..751393e00c9f 100644
--- a/media-libs/libvmaf/libvmaf-2.3.0-r2.ebuild
+++ b/media-libs/libvmaf/libvmaf-2.3.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit meson-multilib
+inherit meson-multilib flag-o-matic
 
 DESCRIPTION="C libary for Netflix's Perceptual video quality assessment"
 HOMEPAGE="https://github.com/Netflix/vmaf"
@@ -48,6 +48,7 @@ multilib_src_configure() {
 	)
 
 	EMESON_SOURCE="${S}/libvmaf"
+	filter-lto
 	meson_src_configure
 }
 
diff --git a/media-libs/libvmaf/libvmaf-9999.ebuild b/media-libs/libvmaf/libvmaf-9999.ebuild
new file mode 100644
index 000000000000..a5fc3721b828
--- /dev/null
+++ b/media-libs/libvmaf/libvmaf-9999.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson-multilib flag-o-matic
+
+DESCRIPTION="C libary for Netflix's Perceptual video quality assessment"
+HOMEPAGE="https://github.com/Netflix/vmaf"
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Netflix/vmaf.git"
+else
+	SRC_URI="
+		https://github.com/Netflix/vmaf/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	"
+	KEYWORDS="~amd64 ~loong ~riscv ~x86"
+fi
+
+LICENSE="BSD-2-with-patent"
+SLOT="0"
+IUSE="+embed-models test"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	dev-lang/nasm
+	embed-models? ( app-editors/vim-core )
+"
+
+RDEPEND="${BDEPEND}"
+
+if [[ ${PV} == "9999" ]]; then
+	S="${WORKDIR}/libvmaf-${PV}"
+else
+	S="${WORKDIR}/vmaf-${PV}"
+fi
+
+src_prepare() {
+	default
+
+	# Workaround for https://bugs.gentoo.org/837221
+	# The paths in the tests are hard coded to look for the model folder as "../../model"
+	sed -i "s|\"../../model|\"../vmaf-${PV}/model|g" "${S}"/libvmaf/test/* || die
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		$(meson_use embed-models built_in_models)
+		$(meson_use test enable_tests)
+	)
+
+	EMESON_SOURCE="${S}/libvmaf"
+	filter-lto
+	meson_src_configure
+}
+
+multilib_src_install() {
+	meson_src_install
+	find "${D}" -name '*.la' -delete -o -name '*.a' -delete || die
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	insinto "/usr/share/vmaf"
+	doins -r "${S}/model"
+}