* [gentoo-commits] repo/gentoo:master commit in: profiles/arch/sparc/, profiles/arch/hppa/, profiles/arch/alpha/, ...
@ 2022-03-16 22:35 Sam James
0 siblings, 0 replies; only message in thread
From: Sam James @ 2022-03-16 22:35 UTC (permalink / raw
To: gentoo-commits
commit: 6ad2b615f414edd77c02ee9ce9c942687b0aaf70
Author: Adel KARA SLIMANE <adel.ks <AT> zegrapher <DOT> com>
AuthorDate: Mon Mar 14 10:09:52 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Mar 16 22:33:30 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ad2b615
media-video/ffmpeg: enable vmaf use flag
To use Netflix' vmaf scoring algorithm
Signed-off-by: Adel KARA SLIMANE <adel.ks <AT> zegrapher.com>
Closes: https://github.com/gentoo/gentoo/pull/23412
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../{ffmpeg-4.4.1-r2.ebuild => ffmpeg-4.4.1-r3.ebuild} | 6 +++++-
.../ffmpeg/{ffmpeg-5.0.ebuild => ffmpeg-5.0-r1.ebuild} | 6 +++++-
media-video/ffmpeg/ffmpeg-9999.ebuild | 6 +++++-
media-video/ffmpeg/files/vmaf-models-default-path.patch | 13 +++++++++++++
media-video/ffmpeg/metadata.xml | 1 +
profiles/arch/alpha/package.use.mask | 4 ++++
profiles/arch/amd64/package.use.stable.mask | 4 ++++
profiles/arch/arm/package.use.mask | 4 ++++
profiles/arch/arm64/package.use.mask | 4 ++++
profiles/arch/hppa/package.use.mask | 4 ++++
profiles/arch/ia64/package.use.mask | 4 ++++
profiles/arch/m68k/package.use.mask | 4 ++++
profiles/arch/mips/package.use.mask | 4 ++++
profiles/arch/powerpc/package.use.mask | 4 ++++
profiles/arch/riscv/package.use.mask | 4 ++++
profiles/arch/s390/package.use.mask | 4 ++++
profiles/arch/sparc/package.use.mask | 4 ++++
profiles/arch/x86/package.use.mask | 4 ++++
18 files changed, 81 insertions(+), 3 deletions(-)
diff --git a/media-video/ffmpeg/ffmpeg-4.4.1-r2.ebuild b/media-video/ffmpeg/ffmpeg-4.4.1-r3.ebuild
similarity index 98%
rename from media-video/ffmpeg/ffmpeg-4.4.1-r2.ebuild
rename to media-video/ffmpeg/ffmpeg-4.4.1-r3.ebuild
index 0650f5458c0e..2c8dc26e3f13 100644
--- a/media-video/ffmpeg/ffmpeg-4.4.1-r2.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.4.1-r3.ebuild
@@ -84,7 +84,7 @@ FFMPEG_FLAG_MAP=(
vorbis:libvorbis vpx:libvpx zvbi:libzvbi
# libavfilter options
appkit
- bs2b:libbs2b chromaprint cuda:cuda-llvm flite:libflite frei0r
+ bs2b:libbs2b chromaprint cuda:cuda-llvm flite:libflite frei0r vmaf:libvmaf
fribidi:libfribidi fontconfig ladspa libass libtesseract lv2 truetype:libfreetype vidstab:libvidstab
rubberband:librubberband zeromq:libzmq zimg:libzimg
# libswresample options
@@ -255,6 +255,7 @@ RDEPEND="
nvenc? ( >=media-libs/nv-codec-headers-9.1.23.1[${MULTILIB_USEDEP}] )
vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
vidstab? ( >=media-libs/vidstab-1.1.0[${MULTILIB_USEDEP}] )
+ vmaf? ( media-libs/libvmaf[${MULTILIB_USEDEP}] )
vorbis? (
>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
@@ -338,6 +339,9 @@ src_prepare() {
if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
export revision=git-N-${FFMPEG_REVISION}
fi
+
+ eapply "${FILESDIR}/vmaf-models-default-path.patch"
+
default
echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die
}
diff --git a/media-video/ffmpeg/ffmpeg-5.0.ebuild b/media-video/ffmpeg/ffmpeg-5.0-r1.ebuild
similarity index 98%
rename from media-video/ffmpeg/ffmpeg-5.0.ebuild
rename to media-video/ffmpeg/ffmpeg-5.0-r1.ebuild
index b6c059f58997..a818aa4782dc 100644
--- a/media-video/ffmpeg/ffmpeg-5.0.ebuild
+++ b/media-video/ffmpeg/ffmpeg-5.0-r1.ebuild
@@ -84,7 +84,7 @@ FFMPEG_FLAG_MAP=(
vorbis:libvorbis vpx:libvpx zvbi:libzvbi
# libavfilter options
appkit
- bs2b:libbs2b chromaprint cuda:cuda-llvm flite:libflite frei0r
+ bs2b:libbs2b chromaprint cuda:cuda-llvm flite:libflite frei0r vmaf:libvmaf
fribidi:libfribidi fontconfig ladspa libass libtesseract lv2 truetype:libfreetype vidstab:libvidstab
rubberband:librubberband zeromq:libzmq zimg:libzimg
# libswresample options
@@ -255,6 +255,7 @@ RDEPEND="
nvenc? ( >=media-libs/nv-codec-headers-9.1.23.1[${MULTILIB_USEDEP}] )
vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
vidstab? ( >=media-libs/vidstab-1.1.0[${MULTILIB_USEDEP}] )
+ vmaf? ( media-libs/libvmaf[${MULTILIB_USEDEP}] )
vorbis? (
>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
@@ -337,6 +338,9 @@ src_prepare() {
if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
export revision=git-N-${FFMPEG_REVISION}
fi
+
+ eapply "${FILESDIR}/vmaf-models-default-path.patch"
+
default
echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die
}
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index f1ded0aea4a0..1f70d55ec169 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -84,7 +84,7 @@ FFMPEG_FLAG_MAP=(
vorbis:libvorbis vpx:libvpx zvbi:libzvbi
# libavfilter options
appkit
- bs2b:libbs2b chromaprint cuda:cuda-llvm flite:libflite frei0r
+ bs2b:libbs2b chromaprint cuda:cuda-llvm flite:libflite frei0r vmaf:libvmaf
fribidi:libfribidi fontconfig ladspa libass libtesseract lv2 truetype:libfreetype vidstab:libvidstab
rubberband:librubberband zeromq:libzmq zimg:libzimg
# libswresample options
@@ -255,6 +255,7 @@ RDEPEND="
nvenc? ( >=media-libs/nv-codec-headers-9.1.23.1[${MULTILIB_USEDEP}] )
vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
vidstab? ( >=media-libs/vidstab-1.1.0[${MULTILIB_USEDEP}] )
+ vmaf? ( media-libs/libvmaf[${MULTILIB_USEDEP}] )
vorbis? (
>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
@@ -337,6 +338,9 @@ src_prepare() {
if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
export revision=git-N-${FFMPEG_REVISION}
fi
+
+ eapply "${FILESDIR}/vmaf-models-default-path.patch"
+
default
echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die
}
diff --git a/media-video/ffmpeg/files/vmaf-models-default-path.patch b/media-video/ffmpeg/files/vmaf-models-default-path.patch
new file mode 100644
index 000000000000..a9777e94b7aa
--- /dev/null
+++ b/media-video/ffmpeg/files/vmaf-models-default-path.patch
@@ -0,0 +1,13 @@
+Put default path of models to /usr/share/vmaf/model
+
+--- a/libavfilter/vf_libvmaf.c
++++ b/libavfilter/vf_libvmaf.c
+@@ -72,7 +72,7 @@ typedef struct LIBVMAFContext {
+ #define FLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM
+
+ static const AVOption libvmaf_options[] = {
+- {"model_path", "Set the model to be used for computing vmaf.", OFFSET(model_path), AV_OPT_TYPE_STRING, {.str="/usr/local/share/model/vmaf_v0.6.1.pkl"}, 0, 1, FLAGS},
++ {"model_path", "Set the model to be used for computing vmaf.", OFFSET(model_path), AV_OPT_TYPE_STRING, {.str="/usr/share/vmaf/model/vmaf_v0.6.1.json"}, 0, 1, FLAGS},
+ {"log_path", "Set the file path to be used to store logs.", OFFSET(log_path), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 1, FLAGS},
+ {"log_fmt", "Set the format of the log (xml or json).", OFFSET(log_fmt), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 1, FLAGS},
+ {"enable_transform", "Enables transform for computing vmaf.", OFFSET(enable_transform), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, FLAGS},
diff --git a/media-video/ffmpeg/metadata.xml b/media-video/ffmpeg/metadata.xml
index 2f0738126047..c07905a8339b 100644
--- a/media-video/ffmpeg/metadata.xml
+++ b/media-video/ffmpeg/metadata.xml
@@ -57,6 +57,7 @@
<flag name="svt-av1">Enables AV1 encoding support via <pkg>media-libs/svt-av1</pkg>.</flag>
<flag name="twolame">Enables MP2 encoding via <pkg>media-sound/twolame</pkg> as an alternative to the internal encoder.</flag>
<flag name="vidstab">Enables video stabilization filter using vid.stab library (<pkg>media-libs/vidstab</pkg>).</flag>
+ <flag name="vmaf">Enables Netflix's perceptual video quality assessment filter using the library (<pkg>media-libs/libvmaf</pkg>).</flag>
<flag name="vpx">Enables VP8 and VP9 codec support using libvpx: Decoding does not require this to be enabled but libvpx can also be used for decoding; encoding requires this useflag to be enabled though.</flag>
<flag name="vulkan">Enables support for the vulkan API for GPU offload.</flag>
<flag name="x265">Enables HEVC encoding with <pkg>media-libs/x265</pkg>.</flag>
diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask
index 3d8e666a5da0..d372b01a7581 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -1,6 +1,10 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
+# Adel Kara Slimane <adel.ks@zegrapher.com> (2022-03-14)
+# Untested useflag on other arches, needs keywording
+media-video/ffmpeg vmaf
+
# Adel Kara Slimane <adel.ks@zegrapher.com> (2022-02-17)
# Mask AMF keyword on non-amd64 arches
# It is unusable, for now, in other arches
diff --git a/profiles/arch/amd64/package.use.stable.mask b/profiles/arch/amd64/package.use.stable.mask
index 9be61d38434a..b73ea069d9a0 100644
--- a/profiles/arch/amd64/package.use.stable.mask
+++ b/profiles/arch/amd64/package.use.stable.mask
@@ -17,6 +17,10 @@
#--- END OF EXAMPLES ---
+# Adel Kara Slimane <adel.ks@zegrapher.com> (2022-03-14)
+# needs stabilizing
+media-video/ffmpeg vmaf
+
# Adel Kara Slimane <adel.ks@zegrapher.com> (2022-02-17)
# needs stabilizing
media-video/ffmpeg amf
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index 42bec012b442..78ced3f3b812 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -1,6 +1,10 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
+# Adel Kara Slimane <adel.ks@zegrapher.com> (2022-03-14)
+# Untested useflag on other arches, needs keywording
+media-video/ffmpeg vmaf
+
# Andreas Sturmlechner <asturm@gentoo.org> (2022-03-13)
# Not yet keyworded. Bug #835037
kde-frameworks/kfilemetadata mobi
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index 43a168e32dce..8b7b5eb5a77d 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -1,6 +1,10 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
+# Adel Kara Slimane <adel.ks@zegrapher.com> (2022-03-14)
+# Untested useflag on other arches, needs keywording
+media-video/ffmpeg vmaf
+
# Sam James <sam@gentoo.org> (2022-02-26)
# Supports 64-bit NEON
>=media-libs/libjpeg-turbo-2.1.3 -cpu_flags_arm_neon
diff --git a/profiles/arch/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask
index 676070429d9c..0249cc604189 100644
--- a/profiles/arch/hppa/package.use.mask
+++ b/profiles/arch/hppa/package.use.mask
@@ -4,6 +4,10 @@
# NOTE: When masking a USE flag due to missing keywords, please file a keyword
# request bug for the hppa arch.
+# Adel Kara Slimane <adel.ks@zegrapher.com> (2022-03-14)
+# Untested useflag on other arches, needs keywording
+media-video/ffmpeg vmaf
+
# Sam James <sam@gentoo.org> (2022-03-06)
# Unkeyworded dependencies
net-mail/cyrus-imapd http
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index f0e75e9cd9e8..21675618442e 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -1,6 +1,10 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
+# Adel Kara Slimane <adel.ks@zegrapher.com> (2022-03-14)
+# Untested useflag on other arches, needs keywording
+media-video/ffmpeg vmaf
+
# Sam James <sam@gentoo.org> (2022-03-06)
# Unkeyworded dependencies
net-mail/cyrus-imapd http
diff --git a/profiles/arch/m68k/package.use.mask b/profiles/arch/m68k/package.use.mask
index 6a163838c340..4944ff27f139 100644
--- a/profiles/arch/m68k/package.use.mask
+++ b/profiles/arch/m68k/package.use.mask
@@ -1,6 +1,10 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
+# Adel Kara Slimane <adel.ks@zegrapher.com> (2022-03-14)
+# Untested useflag on other arches, needs keywording
+media-video/ffmpeg vmaf
+
# Adel Kara Slimane <adel.ks@zegrapher.com> (2022-01-11)
# Mask AMF keyword on non-amd64 arches
# It is unusable, for now, in other arches
diff --git a/profiles/arch/mips/package.use.mask b/profiles/arch/mips/package.use.mask
index 6dae04813fb1..bc6c5cb3127f 100644
--- a/profiles/arch/mips/package.use.mask
+++ b/profiles/arch/mips/package.use.mask
@@ -1,6 +1,10 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
+# Adel Kara Slimane <adel.ks@zegrapher.com> (2022-03-14)
+# Untested useflag on other arches, needs keywording
+media-video/ffmpeg vmaf
+
# James Le Cuirot <chewi@gentoo.org> (2022-02-24)
# These GRUB platforms are only for MIPS.
sys-boot/grub -grub_platforms_loongson -grub_platforms_qemu-mips
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index b21c72c893ab..9b81c363f5b3 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -1,6 +1,10 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
+# Adel Kara Slimane <adel.ks@zegrapher.com> (2022-03-14)
+# Untested useflag on other arches, needs keywording
+media-video/ffmpeg vmaf
+
# Adel Kara Slimane <adel.ks@zegrapher.com> (2021-12-11)
# Mask AMF keyword on non-amd64 arches
# It is unusable, for now, in other arches
diff --git a/profiles/arch/riscv/package.use.mask b/profiles/arch/riscv/package.use.mask
index 9f7d5a307eab..b34b1d80f7be 100644
--- a/profiles/arch/riscv/package.use.mask
+++ b/profiles/arch/riscv/package.use.mask
@@ -1,6 +1,10 @@
# Copyright 2019-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
+# Adel Kara Slimane <adel.ks@zegrapher.com> (2022-03-14)
+# Untested useflag on other arches, needs keywording
+media-video/ffmpeg vmaf
+
# Alex Fan <alex.fan.q@gmail.com> (2022-02-28)
# dev-libs/vc is a dummy implementation on this arch
# krita fails to build with it
diff --git a/profiles/arch/s390/package.use.mask b/profiles/arch/s390/package.use.mask
index e92a5a5fa6d1..5117a01c2908 100644
--- a/profiles/arch/s390/package.use.mask
+++ b/profiles/arch/s390/package.use.mask
@@ -1,6 +1,10 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
+# Adel Kara Slimane <adel.ks@zegrapher.com> (2022-03-14)
+# Untested useflag on other arches, needs keywording
+media-video/ffmpeg vmaf
+
# Adel Kara Slimane <adel.ks@zegrapher.com> (2021-12-11)
# Mask AMF keyword on non-amd64 arches
# It is unusable, for now, in other arches
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index 5c3dd765e5b9..019950a35230 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -1,6 +1,10 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
+# Adel Kara Slimane <adel.ks@zegrapher.com> (2022-03-14)
+# Untested useflag on other arches, needs keywording
+media-video/ffmpeg vmaf
+
# Sam James <sam@gentoo.org> (2022-03-06)
# Unkeyworded dependencies
net-mail/cyrus-imapd http
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index 4b44ff6a681a..c9f5459e720f 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -1,6 +1,10 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
+# Adel Kara Slimane <adel.ks@zegrapher.com> (2022-03-14)
+# Untested useflag on other arches, needs keywording
+media-video/ffmpeg vmaf
+
# Sam James <sam@gentoo.org> (2022-03-10)
# dev-util/hip and its rocm dependencies not keyworded here
sci-physics/lammps hip
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2022-03-16 22:35 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-03-16 22:35 [gentoo-commits] repo/gentoo:master commit in: profiles/arch/sparc/, profiles/arch/hppa/, profiles/arch/alpha/, Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox