gentoo resync : 08.01.2021

4 files changed, 15 insertions, 251 deletions

diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest
index 47b775358ea6..1649570cebae 100644
--- a/media-libs/mlt/Manifest
+++ b/media-libs/mlt/Manifest
@@ -4,6 +4,5 @@ AUX mlt-6.22.1-no_lua_bdepend.patch 153 BLAKE2B 3ea31c570e7bef81bda0905549baedee
 DIST mlt-6.22.1.tar.gz 1343746 BLAKE2B 3178f9af8ee2695df3343d333d03a5e87a22d226915a19c90dd78bbe66684984d37549ef53e6583152b5f44267d0e908e6f887f18fb02289cc31e8c8b1520ddb SHA512 c620b68d35c90eab650c70768a4ae631dec83ece6dd3fd8e09f9300d837d8e0f3da1b098786188f9c1216800f848dd5db7c9e5fa03e816fba3fbcf3c63324c74
 DIST mlt-6.24.0.tar.gz 1351427 BLAKE2B ea645f0fc6822c0fe3012ac4833062dcddff9859e35fc41aacd929c2dc0c80b49bb83b7714d234e0bcad9a4e300534e8637b1e6927c99cb84e9ce2959e619a7b SHA512 c9533191aad7be894152e305a4ce3f8c1dbd652ea887774866c74aed4794eae90bd15b0b9a070e6fc22f2979e210af6ca1a2c937adcc3b0be5d39ba900df6229
 EBUILD mlt-6.22.1-r1.ebuild 4814 BLAKE2B 7750e214aa0052178da1defe96742d7a67092c45d01a565ab0d049e625ca7d31fe9c8a5be7cc985d00565cd407937f6c8754380f618c1a14aba75a0b61cde912 SHA512 2d2a6e0d0e126a281b3ad07b9ae6df2feb8958e9e548bab4b83c5b8e5ddd477362369b61479381eae631432671f0513e145c0f42eb23fbd747c67d8a4ee27ab4
-EBUILD mlt-6.22.1-r100.ebuild 5411 BLAKE2B 1e2d57368378f4be08bc460f1a6ae40c03b5ca4dab0204f9047fc92da5faea7697ec8b5ae4d9b61eaacfdf3a5ffc6264074078497b643df11bdbd98d9bf15038 SHA512 b7accc9d4c753c94aa579815985fecb54eebcff50bdde2ac05df3b73dfbc02899ebba253a0b8e6a0745e3b798bfe860ea65d4e0975504ee12cf9060c24355a7b
-EBUILD mlt-6.24.0.ebuild 5342 BLAKE2B 2cd7777b287ca59bd1c790350088f932588bb88e6bf77fc03214587b088d2931d370b176694c7fc898e3aaf6db5153bd4c010c4422670d403fbafb5607e542ea SHA512 32c77d93f58523e9e4d0dac84a3a2ee85f124efa6373ae2da89187b4198dc793e1e0f0f7532b13e0b6aeab3f02d49b395a73b718d8a8889ceabed0698ffb1439
-MISC metadata.xml 1539 BLAKE2B ce738031471a08f5d3969af421d214c79b8c8581daa3a40cd6bc0d04d5884d7c5c64551e18f3262ca0539663d63ea1a35e85e57bd5861816eea5c295c2430517 SHA512 2b9b1cdc067811cee0bb3a242fe3985217e223d8d2defeae9161fb187e50934e765c03d6899f121ad4a6fa86fcbdd01392ae875b65331efe2ab64f0c4f1ced61
+EBUILD mlt-6.24.0-r1.ebuild 5323 BLAKE2B fe6e06c8b47aaea654668fc835b3bc95981ff948ccbeaf6569bf68f876db1f1e4b0bb91c1fe9e886fe2447a1800c001c340441a86cfe6e188f10340cc6727842 SHA512 9d4772005fb5a0e7bbd497243939a15d9d298ea4d2d9700564edacebd99ad614d9d34d128b7e3666ae1c606f7fb0d2099ea00e2f890c49c83e2f53e7ea305ecd
+MISC metadata.xml 1673 BLAKE2B ab376b18df6085a95490cfe541fd0cd0af07b0d221aa693132d8f5ae4ec67e468df2e823943edc871c97ad15848a43acaf92c9fb341f07c9fdfcf504896ac23d SHA512 ddfc34505aa0ed7b32b2e6af160929e45aa508b5aad3e42178976836b784f10d6de8c820bb40e0f1be3e62d5723fe93459fdd53579aa65dc996bca4a14dc6c7a
diff --git a/media-libs/mlt/metadata.xml b/media-libs/mlt/metadata.xml
index dae5f6d74dd8..0a18c2e2c883 100644
--- a/media-libs/mlt/metadata.xml
+++ b/media-libs/mlt/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
 	<maintainer type="project">
 		<email>media-video@gentoo.org</email>
+		<name>Gentoo Video Project</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>kde@gentoo.org</email>
@@ -16,8 +17,9 @@
 		<flag name="melt">Build the melt commandline tool</flag>
 		<flag name="opencv">Build motion tracking module using <pkg>media-libs/opencv</pkg></flag>
 		<flag name="python">Build SWIG bindings for Python</flag>
-		<flag name="rtaudio">Builds rtaudio consumer for native audio support on multiple platforms.</flag>
-		<flag name="vidstab">Enabled video stabilization with <pkg>media-libs/vidstab</pkg>.</flag>
+		<flag name="rtaudio">Builds rtaudio consumer for native audio support on multiple platforms</flag>
+		<flag name="rubberband">Enable audio pitch-shifting using <pkg>media-libs/rubberband</pkg></flag>
+		<flag name="vidstab">Enabled video stabilization with <pkg>media-libs/vidstab</pkg></flag>
 		<!--
 		<flag name="swfdec">Use <pkg>media-libs/swfdec</pkg> for reading .swf files (Macromedia Flash) instead of libavformat.</flag>
 		<flag name="java">Build SWIG bindings for Java</flag>
diff --git a/media-libs/mlt/mlt-6.22.1-r100.ebuild b/media-libs/mlt/mlt-6.22.1-r100.ebuild
deleted file mode 100644
index 1645da008141..000000000000
--- a/media-libs/mlt/mlt-6.22.1-r100.ebuild
+++ /dev/null
@@ -1,235 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..4} luajit )
-PYTHON_COMPAT=( python3_{6,7,8,9} )
-
-inherit lua python-single-r1 qmake-utils toolchain-funcs
-
-DESCRIPTION="Open source multimedia framework for television broadcasting"
-HOMEPAGE="https://www.mltframework.org/"
-SRC_URI="https://github.com/mltframework/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="compressed-lumas cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 debug ffmpeg
-fftw frei0r gtk jack kdenlive kernel_linux libsamplerate lua melt opencv opengl python
-qt5 rtaudio sdl vdpau vidstab xine xml"
-# java perl php tcl
-
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-SWIG_DEPEND=">=dev-lang/swig-2.0"
-#	java? ( ${SWIG_DEPEND} >=virtual/jdk-1.5 )
-#	perl? ( ${SWIG_DEPEND} )
-#	php? ( ${SWIG_DEPEND} )
-#	tcl? ( ${SWIG_DEPEND} )
-#	ruby? ( ${SWIG_DEPEND} )
-BDEPEND="
-	virtual/pkgconfig
-	compressed-lumas? ( virtual/imagemagick-tools[png] )
-	lua? ( ${SWIG_DEPEND} virtual/pkgconfig )
-	python? ( ${SWIG_DEPEND} )
-"
-#rtaudio will use OSS on non linux OSes
-DEPEND="
-	>=media-libs/libebur128-1.2.2:=
-	ffmpeg? ( media-video/ffmpeg:0=[vdpau?,-flite] )
-	fftw? ( sci-libs/fftw:3.0= )
-	frei0r? ( media-plugins/frei0r-plugins )
-	gtk? (
-		media-libs/libexif
-		x11-libs/pango
-	)
-	jack? (
-		>=dev-libs/libxml2-2.5
-		media-libs/ladspa-sdk
-		virtual/jack
-	)
-	libsamplerate? ( >=media-libs/libsamplerate-0.1.2 )
-	lua? ( ${LUA_DEPS} )
-	opencv? ( >=media-libs/opencv-3.2.0:= )
-	opengl? ( media-video/movit )
-	python? ( ${PYTHON_DEPS} )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtxml:5
-		media-libs/libexif
-		x11-libs/libX11
-	)
-	rtaudio? (
-		>=media-libs/rtaudio-4.1.2
-		kernel_linux? ( media-libs/alsa-lib )
-	)
-	sdl? (
-		media-libs/libsdl2[X,opengl,video]
-		media-libs/sdl2-image
-	)
-	vidstab? ( media-libs/vidstab )
-	xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 )
-	xml? ( >=dev-libs/libxml2-2.5 )"
-#	java? ( >=virtual/jre-1.5 )
-#	perl? ( dev-lang/perl )
-#	php? ( dev-lang/php )
-#	ruby? ( ${RUBY_DEPS} )
-#	sox? ( media-sound/sox )
-#	tcl? ( dev-lang/tcl:0= )
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS NEWS README docs/{framework,melt,mlt{++,-xml}}.txt )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.10.0-swig-underlinking.patch
-	"${FILESDIR}"/${PN}-6.22.1-no_lua_bdepend.patch
-	"${FILESDIR}"/${P}-fix-regression-w-multiple-affine-filters.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# respect CFLAGS LDFLAGS when building shared libraries. Bug #308873
-	for x in python lua; do
-		sed -i "/mlt.so/s/ -lmlt++ /& ${CFLAGS} ${LDFLAGS} /" src/swig/$x/build || die
-	done
-
-	use python && python_fix_shebang src/swig/python
-}
-
-src_configure() {
-	tc-export CC CXX
-
-	local myconf=(
-		--enable-gpl
-		--enable-gpl3
-		--enable-motion-est
-		--target-arch=$(tc-arch)
-		--disable-gtk2
-		--disable-kde
-		--disable-sdl
-		--disable-swfdec
-		$(use_enable debug)
-		$(use_enable cpu_flags_x86_sse sse)
-		$(use_enable cpu_flags_x86_sse2 sse2)
-		$(use_enable ffmpeg avformat)
-		$(use_enable fftw plus)
-		$(use_enable frei0r)
-		$(use_enable gtk gdk)
-		$(use_enable jack jackrack)
-		$(use_enable kdenlive)
-		$(use_enable libsamplerate resample)
-		$(use_enable melt)
-		$(use_enable opencv)
-		$(use_enable opengl)
-		$(use_enable qt5 qt)
-		$(use_enable rtaudio)
-		$(use_enable sdl sdl2)
-		$(use_enable vidstab vid.stab )
-		$(use_enable xine)
-		$(use_enable xml)
-		--disable-sox
-	)
-		#$(use_enable sox) FIXME
-
-	use compressed-lumas && myconf+=( --luma-compress )
-	use ffmpeg && myconf+=( --avformat-swscale )
-	use vdpau && myconf+=( --avformat-vdpau )
-
-	if use qt5 ; then
-		myconf+=(
-			--qt-includedir=$(qt5_get_headerdir)
-			--qt-libdir=$(qt5_get_libdir)
-		)
-	fi
-
-	if use amd64 || use x86 ; then
-		myconf+=( $(use_enable cpu_flags_x86_mmx mmx) )
-	else
-		myconf+=( --disable-mmx )
-	fi
-
-	if ! use melt ; then
-		sed -i -e "s;src/melt;;" Makefile || die
-	fi
-
-	# TODO: add swig language bindings
-	# see also https://www.mltframework.org/twiki/bin/view/MLT/ExtremeMakeover
-
-	local swig_lang=()
-	# not done: java perl php ruby tcl
-	# handled separately: lua
-	for i in python; do
-		use $i && swig_lang+=( $i )
-	done
-	[[ -z "${swig_lang}" ]] && swig_lang=( none )
-
-	econf "${myconf[@]}" --swig-languages="${swig_lang[*]}"
-
-	sed -i -e s/^OPT/#OPT/ config.mak || die
-}
-
-src_compile() {
-	default
-
-	if use lua; then
-		# Only copy sources now to avoid unnecessary rebuilds
-		lua_copy_sources
-
-		lua_compile() {
-			pushd "${BUILD_DIR}"/src/swig/lua > /dev/null || die
-
-			sed -i -e "s| mlt_wrap.cxx| $(lua_get_CFLAGS) mlt_wrap.cxx|" build || die
-			./build
-
-			popd > /dev/null || die
-		}
-		lua_foreach_impl lua_compile
-	fi
-}
-
-src_install() {
-	default
-
-	insinto /usr/share/${PN}
-	doins -r demo
-
-	#
-	# Install SWIG bindings
-	#
-
-	docinto swig
-
-	if use lua; then
-		lua_install() {
-			pushd "${BUILD_DIR}"/src/swig/lua > /dev/null || die
-
-			exeinto "$(lua_get_cmod_dir)"
-			doexe mlt.so
-
-			popd > /dev/null || die
-		}
-		lua_foreach_impl lua_install
-
-		dodoc "${S}"/src/swig/lua/play.lua
-	fi
-
-	if use python; then
-		cd "${S}"/src/swig/python || die
-		python_domodule mlt.py _mlt.so
-		chmod +x "${D}$(python_get_sitedir)/_mlt.so" || die
-		dodoc play.py
-		python_optimize
-	fi
-
-	# not done: java perl php ruby tcl
-}
diff --git a/media-libs/mlt/mlt-6.24.0.ebuild b/media-libs/mlt/mlt-6.24.0-r1.ebuild
index d9701907cf5a..1f6ac4939d80 100644
--- a/media-libs/mlt/mlt-6.24.0.ebuild
+++ b/media-libs/mlt/mlt-6.24.0-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 LUA_COMPAT=( lua5-{1..4} luajit )
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 inherit lua python-single-r1 qmake-utils toolchain-funcs
 
 DESCRIPTION="Open source multimedia framework for television broadcasting"
@@ -14,9 +14,9 @@ SRC_URI="https://github.com/mltframework/${PN}/releases/download/v${PV}/${P}.tar
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="compressed-lumas cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 debug ffmpeg
-fftw frei0r gtk jack kdenlive kernel_linux libsamplerate lua melt opencv opengl python
-qt5 rtaudio sdl vdpau vidstab xine xml"
+IUSE="compressed-lumas cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 debug
+ffmpeg fftw frei0r gtk jack kernel_linux libsamplerate lua opencv opengl python
+qt5 rtaudio rubberband sdl vdpau vidstab xine xml"
 # java perl php tcl
 
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
@@ -67,6 +67,7 @@ DEPEND="
 		>=media-libs/rtaudio-4.1.2
 		kernel_linux? ( media-libs/alsa-lib )
 	)
+	rubberband? ( media-libs/rubberband )
 	sdl? (
 		media-libs/libsdl2[X,opengl,video]
 		media-libs/sdl2-image
@@ -110,6 +111,8 @@ src_configure() {
 	local myconf=(
 		--enable-gpl
 		--enable-gpl3
+		--enable-kdenlive
+		--enable-melt
 		--enable-motion-est
 		--target-arch=$(tc-arch)
 		--disable-gtk2
@@ -124,13 +127,12 @@ src_configure() {
 		$(use_enable frei0r)
 		$(use_enable gtk gdk)
 		$(use_enable jack jackrack)
-		$(use_enable kdenlive)
 		$(use_enable libsamplerate resample)
-		$(use_enable melt)
 		$(use_enable opencv)
 		$(use_enable opengl)
 		$(use_enable qt5 qt)
 		$(use_enable rtaudio)
+		$(use_enable rubberband)
 		$(use_enable sdl sdl2)
 		$(use_enable vidstab vid.stab)
 		$(use_enable xine)
@@ -156,10 +158,6 @@ src_configure() {
 		myconf+=( --disable-mmx )
 	fi
 
-	if ! use melt ; then
-		sed -i -e "s;src/melt;;" Makefile || die
-	fi
-
 	# TODO: add swig language bindings
 	# see also https://www.mltframework.org/twiki/bin/view/MLT/ExtremeMakeover