commit: b71ef8102b95d349d8f57c8cf392483deac449c5 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat Apr 24 21:39:33 2021 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat Apr 24 21:40:12 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b71ef810
media-libs/mlt: Fix ogg crash, set min media-libs/opencv to 4.5.1 Closes: https://bugs.gentoo.org/783030 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../mlt-6.26.1-fix-crash-w-ogg-album-art.patch | 50 +++++ media-libs/mlt/mlt-6.26.1-r1.ebuild | 232 +++++++++++++++++++++ 2 files changed, 282 insertions(+) diff --git a/media-libs/mlt/files/mlt-6.26.1-fix-crash-w-ogg-album-art.patch b/media-libs/mlt/files/mlt-6.26.1-fix-crash-w-ogg-album-art.patch new file mode 100644 index 00000000000..4ad7ff5de41 --- /dev/null +++ b/media-libs/mlt/files/mlt-6.26.1-fix-crash-w-ogg-album-art.patch @@ -0,0 +1,50 @@ +From 7063e88e09977282470c4f2f93e56e05f21b7c2b Mon Sep 17 00:00:00 2001 +From: Dan Dennedy <[email protected]> +Date: Fri, 16 Apr 2021 11:15:37 -0700 +Subject: [PATCH] fix #704 by properly identifying cover art + +(cherry picked from commit 6b0829df726aa9a840b8b34e923e9faf17a3a5ca) +--- + src/modules/avformat/producer_avformat.c | 15 ++++----------- + 1 file changed, 4 insertions(+), 11 deletions(-) + +diff --git a/src/modules/avformat/producer_avformat.c b/src/modules/avformat/producer_avformat.c +index 049452f9d..e079e6f70 100644 +--- a/src/modules/avformat/producer_avformat.c ++++ b/src/modules/avformat/producer_avformat.c +@@ -398,10 +398,7 @@ static mlt_properties find_default_streams( producer_avformat self ) + if ( first_video_index < 0 ) + first_video_index = i; + // Only set the video stream if not album art +- if (self->video_index < 0 && +- (codec_params->codec_id != AV_CODEC_ID_MJPEG || +- codec_context->time_base.num != 1 || +- codec_context->time_base.den != 90000)) { ++ if (self->video_index < 0 && !(context->streams[i]->disposition & AV_DISPOSITION_ATTACHED_PIC)) { + self->video_index = i; + } + mlt_properties_set( meta_media, key, "video" ); +@@ -1682,11 +1679,7 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form + codec_params = stream->codecpar; + + // Always use the image cache for album art. +- int is_album_art = ((codec_context->codec_id == AV_CODEC_ID_MJPEG +- || codec_context->codec_id == AV_CODEC_ID_GIF +- || codec_context->codec_id == AV_CODEC_ID_PNG) +- && mlt_properties_get_int(properties, "meta.media.frame_rate_num") == 90000 +- && mlt_properties_get_int(properties, "meta.media.frame_rate_den") == 1); ++ int is_album_art = stream->disposition & AV_DISPOSITION_ATTACHED_PIC; + if (is_album_art) + position = 0; + +@@ -2296,8 +2289,8 @@ static int video_codec_init( producer_avformat self, int index, mlt_properties p + mlt_properties_set_int( properties, "meta.media.frame_rate_num", frame_rate.num ); + mlt_properties_set_int( properties, "meta.media.frame_rate_den", frame_rate.den ); + +- // MP3 album art is a single JPEG at 90000 fps, which is not seekable. +- if ( codec->id == AV_CODEC_ID_MJPEG && frame_rate.num == 90000 && frame_rate.den == 1 ) ++ // Cover art is a single image at 90000 fps, which is not seekable. ++ if (stream->disposition & AV_DISPOSITION_ATTACHED_PIC) + self->video_seekable = 0; + + // Set the YUV colorspace from override or detect diff --git a/media-libs/mlt/mlt-6.26.1-r1.ebuild b/media-libs/mlt/mlt-6.26.1-r1.ebuild new file mode 100644 index 00000000000..b04aa302aa9 --- /dev/null +++ b/media-libs/mlt/mlt-6.26.1-r1.ebuild @@ -0,0 +1,232 @@ +# 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_{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 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} ) + 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-4.5.1:= ) + 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 ) + ) + 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.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-crash-w-ogg-album-art.patch # git master +) + +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-kdenlive + --enable-melt + --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 libsamplerate resample) + $(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) + $(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 + + # 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 +}
