commit: 513c09f64248fd18d6dffcdeb0ed847d507fd205 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Jul 22 19:03:18 2018 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Jul 22 21:49:09 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=513c09f6
media-libs/mlt: Fix vorbis encoding with >=ffmpeg-3.4 Package-Manager: Portage-2.3.43, Repoman-2.3.10 .../mlt/files/mlt-6.6.0-vorbis-ffmpeg-3.4.patch | 29 +++ media-libs/mlt/mlt-6.6.0-r1.ebuild | 224 +++++++++++++++++++++ 2 files changed, 253 insertions(+) diff --git a/media-libs/mlt/files/mlt-6.6.0-vorbis-ffmpeg-3.4.patch b/media-libs/mlt/files/mlt-6.6.0-vorbis-ffmpeg-3.4.patch new file mode 100644 index 00000000000..bdf6ea211d4 --- /dev/null +++ b/media-libs/mlt/files/mlt-6.6.0-vorbis-ffmpeg-3.4.patch @@ -0,0 +1,29 @@ +From 7e0d478d161eacea015aa3d116e250e7c5f9f942 Mon Sep 17 00:00:00 2001 +From: Dan Dennedy <[email protected]> +Date: Wed, 7 Feb 2018 16:58:44 -0800 +Subject: [PATCH] Fix vorbis encoding with FFmpeg v3.4+ + +--- + src/modules/avformat/consumer_avformat.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/modules/avformat/consumer_avformat.c b/src/modules/avformat/consumer_avformat.c +index 434710049..6deb76df5 100644 +--- a/src/modules/avformat/consumer_avformat.c ++++ b/src/modules/avformat/consumer_avformat.c +@@ -1,6 +1,6 @@ + /* + * consumer_avformat.c -- an encoder based on avformat +- * Copyright (C) 2003-2017 Meltytech, LLC ++ * Copyright (C) 2003-2018 Meltytech, LLC + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public +@@ -1647,6 +1647,7 @@ static void *consumer_thread( void *arg ) + enc_ctx->audio_avframe->format = c->sample_fmt; + enc_ctx->audio_avframe->nb_samples = enc_ctx->audio_input_frame_size; + enc_ctx->audio_avframe->channel_layout = c->channel_layout; ++ enc_ctx->audio_avframe->channels = c->channels; + } else { + mlt_log_error( MLT_CONSUMER_SERVICE(consumer), "failed to allocate audio AVFrame\n" ); + mlt_events_fire( properties, "consumer-fatal-error", NULL ); diff --git a/media-libs/mlt/mlt-6.6.0-r1.ebuild b/media-libs/mlt/mlt-6.6.0-r1.ebuild new file mode 100644 index 00000000000..6fcd43e0423 --- /dev/null +++ b/media-libs/mlt/mlt-6.6.0-r1.ebuild @@ -0,0 +1,224 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 ) +# this ebuild currently only supports installing ruby bindings for a single ruby version +# so USE_RUBY must contain only a single value (the latest stable) as the ebuild calls +# /usr/bin/${USE_RUBY} directly +USE_RUBY="ruby23" +inherit eutils flag-o-matic multilib python-single-r1 ruby-single toolchain-funcs + +DESCRIPTION="Open source multimedia framework for television broadcasting" +HOMEPAGE="https://www.mltframework.org/"; +SRC_URI="https://github.com/mltframework/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~x86-fbsd ~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 libav libsamplerate lua melt opencv opengl python qt5 rtaudio ruby sdl sdl2 vdpau xine xml" +# java perl php tcl vidstab +IUSE="${IUSE} kernel_linux" + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +#rtaudio will use OSS on non linux OSes +COMMON_DEPEND=" + >=media-libs/libebur128-1.2.2 + ffmpeg? ( + libav? ( >=media-video/libav-12:0=[vdpau?] ) + !libav? ( media-video/ffmpeg:0=[vdpau?] ) + ) + fftw? ( sci-libs/fftw:3.0= ) + frei0r? ( media-plugins/frei0r-plugins ) + gtk? ( + media-libs/libexif + x11-libs/gtk+:2 + x11-libs/pango + ) + jack? ( + >=dev-libs/libxml2-2.5 + media-libs/ladspa-sdk + virtual/jack + ) + libsamplerate? ( >=media-libs/libsamplerate-0.1.2 ) + lua? ( >=dev-lang/lua-5.1.4-r4:= ) + 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 + kernel_linux? ( media-libs/alsa-lib ) + ) + ruby? ( ${RUBY_DEPS} ) + sdl? ( + >=media-libs/libsdl-1.2.10[X,opengl,video] + >=media-libs/sdl-image-1.2.4 + ) + sdl2? ( + media-libs/libsdl2[X,opengl,video] + media-libs/sdl2-image + ) + 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 ) +# sox? ( media-sound/sox ) +# tcl? ( dev-lang/tcl:0= ) +# vidstab? ( media-libs/libvidstab ) +SWIG_DEPEND=">=dev-lang/swig-2.0" +DEPEND="${COMMON_DEPEND} + virtual/pkgconfig + compressed-lumas? ( virtual/imagemagick-tools[png] ) + lua? ( ${SWIG_DEPEND} virtual/pkgconfig ) + python? ( ${SWIG_DEPEND} ) + ruby? ( ${SWIG_DEPEND} )" +# java? ( ${SWIG_DEPEND} >=virtual/jdk-1.5 ) +# perl? ( ${SWIG_DEPEND} ) +# php? ( ${SWIG_DEPEND} ) +# tcl? ( ${SWIG_DEPEND} ) +RDEPEND="${COMMON_DEPEND} + !media-libs/mlt++ +" + +DOCS=( AUTHORS ChangeLog NEWS README docs/{framework,melt,mlt{++,-xml}}.txt ) + +PATCHES=( "${FILESDIR}"/${P}-vorbis-ffmpeg-3.4.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 + sed -i "/^LDFLAGS/s: += :& ${LDFLAGS} :" src/swig/ruby/build || die + + sed -i -e "s/env ruby/${USE_RUBY}/" src/swig/ruby/* || die +} + +src_configure() { + tc-export CC CXX + + # bug 589848 + append-cxxflags -std=c++11 + + local myconf=( + --enable-gpl + --enable-gpl3 + --enable-motion-est + --target-arch=$(tc-arch) + --disable-kde + --disable-swfdec + $(use_enable debug) + $(use compressed-lumas && echo ' --luma-compress') + $(use_enable cpu_flags_x86_sse sse) + $(use_enable cpu_flags_x86_sse2 sse2) + $(use_enable gtk gtk2) + $(use_enable sdl) + $(use_enable sdl2) + $(use_enable jack jackrack) + $(use_enable ffmpeg avformat) + $(use ffmpeg && echo ' --avformat-swscale') + $(use_enable fftw plus) + $(use_enable frei0r) + $(use_enable melt) + $(use_enable opencv) + $(use_enable opengl) + $(use_enable libsamplerate resample) + $(use_enable rtaudio) + $(use vdpau && echo ' --avformat-vdpau') + $(use_enable xml) + $(use_enable xine) + $(use_enable kdenlive) + --disable-sox + ) + #$(use_enable sox) FIXME + + if use qt5 ; then + myconf+=( + --enable-qt + --qt-includedir=$(pkg-config Qt5Core --variable=includedir) + --qt-libdir=$(pkg-config Qt5Core --variable=libdir) + ) + else + myconf+=( --disable-qt ) + fi + + if use x86 || use amd64 ; 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 + # TODO: java perl php tcl + for i in lua python ruby ; do + use $i && swig_lang="${swig_lang} $i" + done + [[ -z "${swig_lang}" ]] && swig_lang="none" + + econf ${myconf[@]} --swig-languages="${swig_lang}" + + sed -i -e s/^OPT/#OPT/ "${S}/config.mak" || die +} + +src_install() { + emake DESTDIR="${D}" install + einstalldocs + + dodir /usr/share/${PN} + insinto /usr/share/${PN} + doins -r demo + + docinto swig + + # Install SWIG bindings + if use lua; then + cd "${S}"/src/swig/lua || die + exeinto $(pkg-config --variable INSTALL_CMOD lua) + doexe mlt.so + dodoc play.lua + fi + + if use python; then + cd "${S}"/src/swig/python || die + insinto $(python_get_sitedir) + doins mlt.py + exeinto $(python_get_sitedir) + doexe _mlt.so + dodoc play.py + python_optimize + fi + + if use ruby; then + cd "${S}"/src/swig/ruby || die + exeinto $("${EPREFIX}"/usr/bin/${USE_RUBY} -r rbconfig -e 'print RbConfig::CONFIG["sitearchdir"]') + doexe mlt.so + dodoc play.rb thumbs.rb + fi + # TODO: java perl php tcl +}
