media-libs/mlt: Bump to v7.24

Signed-off-by: Sven Eden <sven.eden@prydeworx.com>

5 files changed, 3 insertions, 247 deletions

diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest
index 6a4583a..2816e31 100644
--- a/media-libs/mlt/Manifest
+++ b/media-libs/mlt/Manifest
@@ -3,8 +3,6 @@ AUX mlt-6.22.1-no_lua_bdepend.patch 153 BLAKE2B 3ea31c570e7bef81bda0905549baedee
 AUX mlt-7.0.1-cmake-symlink.patch 569 BLAKE2B 06f7c8e7ec78206bb1344bab98f1d9ec816b16c458300964fe31ff30f8f2cc64d8f25a795773fd64db7249b031a164c350b55b6326c4d07d73ffd27f8786a911 SHA512 6deb458c3a89f800b4770460330c1e545c22d3a7304f0713b7ae214145d1413a3061c7c026ab2f6fc44801d1d7505352f03c0da7034e817b684e0ebb25d9a94f
 AUX mlt-7.20.0-qtblend-crash.patch 1893 BLAKE2B d9f71edccd072a225671edeb87da2a4739a08d877594bd40beddbd3d2a91c4e203b6d2cadd0d4ab5f5ff379081782fe2b52566b314f60f36fed616c5e3277bd5 SHA512 aad0695972491be06886ea7d50c2b72bd21e3d2a6f720de1dbbd12a11d26709ccafe444dc1a0db86ac532e82c85009520638243af731d58ea91caedb3193b4b6
 AUX mlt-7.20.0-rotoscoping-crash.patch 1039 BLAKE2B 4acd280d7a90e5e75a75e37e95cc5562d7bfc8cb15a493c223ea1193815054f26f1630f993e0b8b738963103b2bea1719976e1d795112d4518ed847fa7d62430 SHA512 f5bafa246d12ba472a614078fb5e092e59b63fc546a680568ae1e25e9469a21d2dcfd7c9b02aefc094b657bd82ef7b7e3e50bb0220be733a12ff251f4bf541e4
-DIST mlt-7.20.0.tar.gz 1636493 BLAKE2B e056676825b50f0f575954e63cdfa409bb6cecc0b6b1358e99a1575469434f0a817f7ae934cbfa9bad681a6e004c238d2bb0c49d1e2b8a75724fe5040fc6771c SHA512 66bd108257aae8bd2bd76166eff09296f91fb89bc3deda164278c2a19688eb47cc78095563ef140433cb2ccb0d35d7ffc142fe157fe28e0fbdd92d9c0119be3d
-DIST mlt-7.22.0.tar.gz 1659954 BLAKE2B ab3dff26446a048e79d5f11942b05fa557ec91a813b14bd46492fe66c46a2e6685f3835ff647b69e6b6ebe137a345fc7eb17c8e88bdfd3bdb81e41eeca910aaa SHA512 84763e1cb8495be9476637d2474aa492906b904990905f9283faffff75829553cf87b097166fe6d382acc043422e6da45014ca4ba281c7fc68f10ebe3cec4fee
-EBUILD mlt-7.20.0-r101.ebuild 4087 BLAKE2B ae19fcd3208d4ddb0a6015aa507051d05667021b262c56bf0cd454f5ae4d03c479ea732230e23e4ed59b062fca8ad8216cb68239bb2c50524c08dbc9a5bd3c8b SHA512 fb8368c9aabe0d5fc07fbda4e1df7829e1863aecd4e011b53d9899cf99d34ee16e8be45688be36b986477a50908bee9c692219ba9cd8e7194dfd486100a0780c
-EBUILD mlt-7.22.0-r101.ebuild 4051 BLAKE2B 773212bb4a4504af6cd1bde90f81505a4bfd75cec442cb0cafccfabb91363b4279db376548aa8dafff9af2c4053dc7fe10e915ae8f9f275a2fdeb63d57e2bc7d SHA512 e0041ad93521604da9d04b2b0d61fab2f7f373631794f0e84884b3fe4828e6eeb82f775521eeca26691ae4324c951aa96eedb48172cb73ab16cf23f1305a268b
+DIST mlt-7.24.0.tar.gz 1662552 BLAKE2B f6e83b3c3fd9e3bf64366a6f6165b1839003b0fd058e1368e0648e011eff6da1a9af9fa7652aff032bc4ed4465be4648b5f1ae25fc102397aa9ae2d19981643a SHA512 a9e7fd5dc04152e523456bad244416b4fdeb5961ee7cadb816dd1393277d1d801200db595dcd28e520d76e6b2caca17e65c39b0256beb7c42a58ef241b85471d
+EBUILD mlt-7.24.0-r101.ebuild 4024 BLAKE2B b9901bc6145255b78e24a18efad7916463e66eafd9d9feb68e6ba7bed6cfacc8baf7d74c03873087cfdcb855f3a1ba5990722939fe8ed30969c0238ba55c242a SHA512 251e48f47339fb1730c816623cbc5eb8120e8281f9c8bdfa475b47f99c48d18942774adccbe1e76671a5a5f5ef7b792a5a8d0d090b83adbd26f6de94041eb9a3
 MISC metadata.xml 1512 BLAKE2B f4fa55b53a172a02258d8753474d2e536a918cad5a3d00d6405a74284aa0ff27cce5fb2f89d03656ec9d164a5e1e229b08c64923d5dfc0778f387242b73a7e46 SHA512 85025f11e0cd74831d5b6cd290d4721bb43799086c76f03ed36a27bf26181ff563dc58a3cd6e506182a2fa7114eeb92014c33633bccecf7d5509439681c454be
diff --git a/media-libs/mlt/files/mlt-7.20.0-qtblend-crash.patch b/media-libs/mlt/files/mlt-7.20.0-qtblend-crash.patch
deleted file mode 100644
index aad8f0e..0000000
--- a/media-libs/mlt/files/mlt-7.20.0-qtblend-crash.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 09f55bf3d1fdcac06c5d297bb27cb4f3e7f85021 Mon Sep 17 00:00:00 2001
-From: Jean-Baptiste Mardelle <jb@kdenlive.org>
-Date: Thu, 5 Oct 2023 08:45:16 +0200
-Subject: [PATCH] Ensure qtblend doesn't request an image of 0 width or height
- (crashes many filters)
-
----
- src/modules/qt/filter_qtblend.cpp     | 6 +++---
- src/modules/qt/transition_qtblend.cpp | 3 +++
- 2 files changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/src/modules/qt/filter_qtblend.cpp b/src/modules/qt/filter_qtblend.cpp
-index d54f7ccad..32d752d60 100644
---- a/src/modules/qt/filter_qtblend.cpp
-+++ b/src/modules/qt/filter_qtblend.cpp
-@@ -103,10 +103,10 @@ static int filter_get_image(mlt_frame frame,
-                    || rect.h != *height;
- 
-         if (mlt_properties_get_int(properties, "distort") == 0) {
--            b_height = qMin((int) rect.h, b_height);
--            b_width = b_height * b_dar / b_ar / consumer_ar;
-+            b_height = qMax(1, qMin((int) rect.h, b_height));
-+            b_width = qMax(1, int(b_height * b_dar / b_ar / consumer_ar));
-         } else {
--            b_width *= b_ar / consumer_ar;
-+            b_width = qMax(1, int(b_width * b_ar / consumer_ar));
-         }
-         if (!hasAlpha && (b_width < *width || b_height < *height)) {
-             hasAlpha = true;
-diff --git a/src/modules/qt/transition_qtblend.cpp b/src/modules/qt/transition_qtblend.cpp
-index 9dbc795aa..0b41b3ff8 100644
---- a/src/modules/qt/transition_qtblend.cpp
-+++ b/src/modules/qt/transition_qtblend.cpp
-@@ -121,6 +121,9 @@ static int get_image(mlt_frame a_frame,
-             // we will process operations on top frame, so also process b_frame
-             forceAlpha = true;
-         }
-+        // Ensure we don't request an image with a 0 width or height
-+        b_width = qMax(1, b_width);
-+        b_height = qMax(1, b_height);
-     } else {
-         b_height = *height;
-         b_width = *width;
diff --git a/media-libs/mlt/files/mlt-7.20.0-rotoscoping-crash.patch b/media-libs/mlt/files/mlt-7.20.0-rotoscoping-crash.patch
deleted file mode 100644
index 124e110..0000000
--- a/media-libs/mlt/files/mlt-7.20.0-rotoscoping-crash.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 482f1fb0179587575b3071f622df51a95895068a Mon Sep 17 00:00:00 2001
-From: Jean-Baptiste Mardelle <jb@kdenlive.org>
-Date: Wed, 4 Oct 2023 22:26:13 +0200
-Subject: [PATCH] Fix rotoscoping filter crash on image with height = 0
-
----
- src/modules/plusgpl/filter_rotoscoping.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/modules/plusgpl/filter_rotoscoping.c b/src/modules/plusgpl/filter_rotoscoping.c
-index 35e3931f0..782c39422 100644
---- a/src/modules/plusgpl/filter_rotoscoping.c
-+++ b/src/modules/plusgpl/filter_rotoscoping.c
-@@ -337,7 +337,7 @@ static int filter_get_image(mlt_frame frame,
-     int offsetx = 0;
-     int offsety = 0;
-     // Compare aspect ratio
--    if (100 * *width / *height != 100 * normalized_width / normalized_height) {
-+    if (*height > 0 && 100 * *width / *height != 100 * normalized_width / normalized_height) {
-         // Source has a different aspect ratio, apply scaling
-         double xfactor = normalized_width / *width;
-         double yfactor = normalized_height / *height;
diff --git a/media-libs/mlt/mlt-7.20.0-r101.ebuild b/media-libs/mlt/mlt-7.20.0-r101.ebuild
deleted file mode 100644
index bd9aaa4..0000000
--- a/media-libs/mlt/mlt-7.20.0-r101.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..12} )
-inherit python-single-r1 cmake
-
-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/7"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug ffmpeg frei0r glaxnimate gtk jack libsamplerate opencv opengl python qt5 qt6 rtaudio rubberband sdl sox test vdpau vidstab xine xml"
-
-REQUIRED_USE="
-	?? ( qt5 qt6 )
-	glaxnimate? ( || ( qt5 qt6 ) )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-# Needs unpackaged 'kwalify'
-RESTRICT="test"
-
-# rtaudio will use OSS on non linux OSes
-# Qt already needs FFTW/PLUS so let's just always have it on to ensure
-# MLT is useful: bug #603168.
-DEPEND="
-	>=media-libs/libebur128-1.2.2:=
-	sci-libs/fftw:3.0=
-	ffmpeg? ( media-video/ffmpeg:0=[vdpau?] )
-	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 )
-	opencv? ( >=media-libs/opencv-4.5.1:=[contrib] )
-	opengl? (
-		media-libs/libglvnd
-		media-video/movit
-	)
-	python? ( ${PYTHON_DEPS} )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtxml:5
-		media-libs/libexif
-		x11-libs/libX11
-	)
-	qt6? (
-		dev-qt/qt5compat:6
-		dev-qt/qtbase:6[gui,widgets,xml]
-		dev-qt/qtsvg:6
-		media-libs/libexif
-		x11-libs/libX11
-	)
-	rtaudio? (
-		>=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
-	)
-	sox? ( media-sound/sox )
-	vidstab? ( media-libs/vidstab )
-	xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 )
-	xml? ( >=dev-libs/libxml2-2.5 )
-"
-#	java? ( >=virtual/jre-1.8:* )
-#	perl? ( dev-lang/perl )
-#	php? ( dev-lang/php )
-#	ruby? ( ${RUBY_DEPS} )
-#	sox? ( media-sound/sox )
-#	tcl? ( dev-lang/tcl:0= )
-RDEPEND="${DEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	python? ( >=dev-lang/swig-2.0 )
-"
-
-DOCS=( AUTHORS NEWS README.md )
-
-PATCHES=(
-	# downstream
-	"${FILESDIR}"/${PN}-6.10.0-swig-underlinking.patch
-	"${FILESDIR}"/${PN}-6.22.1-no_lua_bdepend.patch
-	"${FILESDIR}"/${PN}-7.0.1-cmake-symlink.patch
-	# upstream (>=7.21.0)
-	"${FILESDIR}"/${P}-{rotoscoping,qtblend}-crash.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Respect CFLAGS LDFLAGS when building shared libraries. Bug #308873
-	if use python; then
-		sed -i "/mlt.so/s/ -lmlt++ /& ${CFLAGS} ${LDFLAGS} /" src/swig/python/build || die
-		python_fix_shebang src/swig/python
-	fi
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=ON
-		-DCLANG_FORMAT=OFF
-		-DGPL=ON
-		-DGPL3=ON
-		-DBUILD_TESTING=$(usex test)
-		-DMOD_KDENLIVE=ON
-		-DMOD_SDL1=OFF
-		-DMOD_SDL2=$(usex sdl)
-		-DMOD_AVFORMAT=$(usex ffmpeg)
-		-DMOD_PLUS=ON
-		-DMOD_FREI0R=$(usex frei0r)
-		-DMOD_GDK=$(usex gtk)
-		-DMOD_JACKRACK=$(usex jack)
-		-DMOD_RESAMPLE=$(usex libsamplerate)
-		-DMOD_OPENCV=$(usex opencv)
-		-DMOD_MOVIT=$(usex opengl)
-		-DMOD_QT=$(usex qt5)
-		-DMOD_GLAXNIMATE=$(usex glaxnimate $(usex qt5) OFF)
-		-DMOD_QT6=$(usex qt6)
-		-DMOD_GLAXNIMATE_QT6=$(usex glaxnimate $(usex qt6) OFF)
-		-DMOD_RTAUDIO=$(usex rtaudio)
-		-DMOD_RUBBERBAND=$(usex rubberband)
-		-DMOD_VIDSTAB=$(usex vidstab)
-		-DMOD_XINE=$(usex xine)
-		-DMOD_XML=$(usex xml)
-		-DMOD_SOX=$(usex sox)
-	)
-
-	# TODO: rework upstream CMake to allow controlling MMX/SSE/SSE2
-	# TODO: add swig language bindings?
-	# see also https://www.mltframework.org/twiki/bin/view/MLT/ExtremeMakeover
-
-	if use python; then
-		mycmakeargs+=( -DSWIG_PYTHON=ON )
-	fi
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	insinto /usr/share/${PN}
-	doins -r demo
-
-	#
-	# Install SWIG bindings
-	#
-
-	docinto swig
-
-	if use python; then
-		dodoc "${S}"/src/swig/python/play.py
-		python_optimize
-	fi
-}
diff --git a/media-libs/mlt/mlt-7.22.0-r101.ebuild b/media-libs/mlt/mlt-7.24.0-r101.ebuild
index 38c9e2f..4ee68cf 100644
--- a/media-libs/mlt/mlt-7.22.0-r101.ebuild
+++ b/media-libs/mlt/mlt-7.24.0-r101.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -83,7 +83,6 @@ DEPEND="
 #	perl? ( dev-lang/perl )
 #	php? ( dev-lang/php )
 #	ruby? ( ${RUBY_DEPS} )
-#	sox? ( media-sound/sox )
 #	tcl? ( dev-lang/tcl:0= )
 RDEPEND="${DEPEND}"
 BDEPEND="