commit: d32d62587aff47036611dd30872b7526bcad9638 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat Jan 6 14:56:48 2024 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Jan 7 14:32:33 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d32d6258
media-libs/mlt: drop 7.20.0-r1 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> media-libs/mlt/Manifest | 1 - .../mlt/files/mlt-7.20.0-qtblend-crash.patch | 43 ------ .../mlt/files/mlt-7.20.0-rotoscoping-crash.patch | 22 --- media-libs/mlt/mlt-7.20.0-r1.ebuild | 165 --------------------- 4 files changed, 231 deletions(-) diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest index 01200d508f40..8bbc295acb8c 100644 --- a/media-libs/mlt/Manifest +++ b/media-libs/mlt/Manifest @@ -1,2 +1 @@ -DIST mlt-7.20.0.tar.gz 1636493 BLAKE2B e056676825b50f0f575954e63cdfa409bb6cecc0b6b1358e99a1575469434f0a817f7ae934cbfa9bad681a6e004c238d2bb0c49d1e2b8a75724fe5040fc6771c SHA512 66bd108257aae8bd2bd76166eff09296f91fb89bc3deda164278c2a19688eb47cc78095563ef140433cb2ccb0d35d7ffc142fe157fe28e0fbdd92d9c0119be3d DIST mlt-7.22.0.tar.gz 1659954 BLAKE2B ab3dff26446a048e79d5f11942b05fa557ec91a813b14bd46492fe66c46a2e6685f3835ff647b69e6b6ebe137a345fc7eb17c8e88bdfd3bdb81e41eeca910aaa SHA512 84763e1cb8495be9476637d2474aa492906b904990905f9283faffff75829553cf87b097166fe6d382acc043422e6da45014ca4ba281c7fc68f10ebe3cec4fee 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 aad8f0e9e45c..000000000000 --- 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 <[email protected]> -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 124e1102b6d2..000000000000 --- 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 <[email protected]> -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-r1.ebuild b/media-libs/mlt/mlt-7.20.0-r1.ebuild deleted file mode 100644 index e2c50d4bb0c0..000000000000 --- a/media-libs/mlt/mlt-7.20.0-r1.ebuild +++ /dev/null @@ -1,165 +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 gtk jack libsamplerate opencv opengl python qt5 rtaudio rubberband sdl test vdpau vidstab xine xml" - -REQUIRED_USE="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 - ) - 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 - ) - 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 qt5) - -DMOD_RTAUDIO=$(usex rtaudio) - -DMOD_RUBBERBAND=$(usex rubberband) - -DMOD_VIDSTAB=$(usex vidstab) - -DMOD_XINE=$(usex xine) - -DMOD_XML=$(usex xml) - -DMOD_SOX=OFF - ) - - # 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 - -DPython3_EXECUTABLE="${PYTHON}" - ) - 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 -}
