mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-11-09 06:37:10 -08:00
media-libs/mlt: python3, use qmake-utils, various fixes
Add missing media-libs/libebur128 slot op Package-Manager: Portage-2.3.67, Repoman-2.3.16 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
This commit is contained in:
Andreas Sturmlechner
@@ -0,0 +1,56 @@
|
||||
From f0628d1fe7f61a267f1adad8824b9a2083e3376a Mon Sep 17 00:00:00 2001
|
||||
From: Dan Dennedy <dan@dennedy.org>
|
||||
Date: Fri, 31 May 2019 19:03:32 -0700
|
||||
Subject: [PATCH] Fix #453 bad aspect ratio computed resulting in black.
|
||||
|
||||
This occured when the s, width, or height properties are supplied with
|
||||
no "aspect."
|
||||
---
|
||||
src/modules/avformat/consumer_avformat.c | 34 +++++++++++++-----------
|
||||
1 file changed, 18 insertions(+), 16 deletions(-)
|
||||
|
||||
diff --git a/src/modules/avformat/consumer_avformat.c b/src/modules/avformat/consumer_avformat.c
|
||||
index 738f5a972..dd2719997 100644
|
||||
--- a/src/modules/avformat/consumer_avformat.c
|
||||
+++ b/src/modules/avformat/consumer_avformat.c
|
||||
@@ -271,22 +271,24 @@ mlt_consumer consumer_avformat_init( mlt_profile profile, char *arg )
|
||||
static void recompute_aspect_ratio( mlt_properties properties )
|
||||
{
|
||||
double ar = mlt_properties_get_double( properties, "aspect" );
|
||||
- AVRational rational = av_d2q( ar, 255 );
|
||||
- int width = mlt_properties_get_int( properties, "width" );
|
||||
- int height = mlt_properties_get_int( properties, "height" );
|
||||
-
|
||||
- // Update the profile and properties as well since this is an alias
|
||||
- // for mlt properties that correspond to profile settings
|
||||
- mlt_properties_set_int( properties, "display_aspect_num", rational.num );
|
||||
- mlt_properties_set_int( properties, "display_aspect_den", rational.den );
|
||||
-
|
||||
- // Now compute the sample aspect ratio
|
||||
- rational = av_d2q( ar * height / FFMAX(width, 1), 255 );
|
||||
-
|
||||
- // Update the profile and properties as well since this is an alias
|
||||
- // for mlt properties that correspond to profile settings
|
||||
- mlt_properties_set_int( properties, "sample_aspect_num", rational.num );
|
||||
- mlt_properties_set_int( properties, "sample_aspect_den", rational.den );
|
||||
+ if (ar > 0.0) {
|
||||
+ AVRational rational = av_d2q( ar, 255 );
|
||||
+ int width = mlt_properties_get_int( properties, "width" );
|
||||
+ int height = mlt_properties_get_int( properties, "height" );
|
||||
+
|
||||
+ // Update the profile and properties as well since this is an alias
|
||||
+ // for mlt properties that correspond to profile settings
|
||||
+ mlt_properties_set_int( properties, "display_aspect_num", rational.num );
|
||||
+ mlt_properties_set_int( properties, "display_aspect_den", rational.den );
|
||||
+
|
||||
+ // Now compute the sample aspect ratio
|
||||
+ rational = av_d2q( ar * height / FFMAX(width, 1), 255 );
|
||||
+
|
||||
+ // Update the profile and properties as well since this is an alias
|
||||
+ // for mlt properties that correspond to profile settings
|
||||
+ mlt_properties_set_int( properties, "sample_aspect_num", rational.num );
|
||||
+ mlt_properties_set_int( properties, "sample_aspect_den", rational.den );
|
||||
+ }
|
||||
}
|
||||
|
||||
static void color_trc_from_colorspace( mlt_properties properties )
|
||||
+22
@@ -0,0 +1,22 @@
|
||||
From 434dbcf62048cc1220c425c2adc77697b4d40ffb Mon Sep 17 00:00:00 2001
|
||||
From: Jean-Baptiste Mardelle <jb@kdenlive.org>
|
||||
Date: Mon, 10 Jun 2019 18:18:44 +0200
|
||||
Subject: [PATCH] Fix multi consumer doesn't correctly handle in point
|
||||
|
||||
---
|
||||
src/modules/core/consumer_multi.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/modules/core/consumer_multi.c b/src/modules/core/consumer_multi.c
|
||||
index 4bb16ddf5..d9b5fbc0f 100644
|
||||
--- a/src/modules/core/consumer_multi.c
|
||||
+++ b/src/modules/core/consumer_multi.c
|
||||
@@ -304,7 +304,7 @@ static void foreach_consumer_start( mlt_consumer consumer )
|
||||
if ( nested )
|
||||
{
|
||||
mlt_properties nested_props = MLT_CONSUMER_PROPERTIES(nested);
|
||||
- mlt_properties_set_position( nested_props, "_multi_position", 0 );
|
||||
+ mlt_properties_set_position( nested_props, "_multi_position", mlt_properties_get_position( properties, "in" ) );
|
||||
mlt_properties_set_data( nested_props, "_multi_audio", NULL, 0, NULL, NULL );
|
||||
mlt_properties_set_int( nested_props, "_multi_samples", 0 );
|
||||
mlt_consumer_start( nested );
|
||||
@@ -0,0 +1,31 @@
|
||||
From f6225b7f4cd5e9b6011ca79c3849dc9e286a7acb Mon Sep 17 00:00:00 2001
|
||||
From: Dan Dennedy <dan@dennedy.org>
|
||||
Date: Mon, 13 May 2019 11:44:13 -0700
|
||||
Subject: [PATCH] Fix crop filter not working with color producer.
|
||||
|
||||
Fixes https://github.com/mltframework/shotcut/issues/737
|
||||
---
|
||||
src/modules/core/producer_colour.c | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/modules/core/producer_colour.c b/src/modules/core/producer_colour.c
|
||||
index e1cfe5284..67d36dfb2 100644
|
||||
--- a/src/modules/core/producer_colour.c
|
||||
+++ b/src/modules/core/producer_colour.c
|
||||
@@ -1,6 +1,6 @@
|
||||
/*
|
||||
* producer_colour.c
|
||||
- * Copyright (C) 2003-2018 Meltytech, LLC
|
||||
+ * Copyright (C) 2003-2019 Meltytech, LLC
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
@@ -248,6 +248,8 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i
|
||||
mlt_properties_set_int( properties, "progressive", 1 );
|
||||
mlt_profile profile = mlt_service_profile( MLT_PRODUCER_SERVICE( producer ) );
|
||||
mlt_properties_set_double( properties, "aspect_ratio", mlt_profile_sar( profile ) );
|
||||
+ mlt_properties_set_int( properties, "meta.media.width", profile->width );
|
||||
+ mlt_properties_set_int( properties, "meta.media.height", profile->height );
|
||||
|
||||
// colour is an alias for resource
|
||||
if ( mlt_properties_get( producer_props, "colour" ) != NULL )
|
||||
@@ -0,0 +1,30 @@
|
||||
From 9b89b781b9d06181c8d486605ed4c2b3089d64d6 Mon Sep 17 00:00:00 2001
|
||||
From: alcinos <nicolas.carion@ens-lyon.fr>
|
||||
Date: Wed, 1 May 2019 23:50:41 +0200
|
||||
Subject: [PATCH] Fix race in mlt_consumer
|
||||
|
||||
---
|
||||
src/framework/mlt_consumer.c | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/framework/mlt_consumer.c b/src/framework/mlt_consumer.c
|
||||
index 491bc5e99..0e36bde3c 100644
|
||||
--- a/src/framework/mlt_consumer.c
|
||||
+++ b/src/framework/mlt_consumer.c
|
||||
@@ -31,6 +31,7 @@
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
#include <sys/time.h>
|
||||
+#include <stdatomic.h>
|
||||
|
||||
/** Define this if you want an automatic deinterlace (if necessary) when the
|
||||
* consumer's producer is not running at normal speed.
|
||||
@@ -65,7 +66,7 @@ typedef struct
|
||||
double fps;
|
||||
int channels;
|
||||
int frequency;
|
||||
- int speed;
|
||||
+ atomic_int speed;
|
||||
/* additional fields added for the parallel work queue */
|
||||
mlt_deque worker_threads;
|
||||
pthread_mutex_t done_mutex;
|
||||
@@ -0,0 +1,22 @@
|
||||
From ddf6983b4aaaf662944b84103dd4412aff45a428 Mon Sep 17 00:00:00 2001
|
||||
From: alcinos <nicolas.carion@ens-lyon.fr>
|
||||
Date: Fri, 10 May 2019 23:20:22 +0200
|
||||
Subject: [PATCH] Fix interpolation in rotoscoping filter
|
||||
|
||||
---
|
||||
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 0667929cd..70e3a093b 100644
|
||||
--- a/src/modules/plusgpl/filter_rotoscoping.c
|
||||
+++ b/src/modules/plusgpl/filter_rotoscoping.c
|
||||
@@ -572,7 +572,7 @@ static mlt_frame filter_process( mlt_filter filter, mlt_frame frame )
|
||||
int c2 = json2BCurves( keyframe, &p2 );
|
||||
|
||||
// range 0-1
|
||||
- double position = ( time - pos1 ) / (double)( pos2 - pos1 + 1 );
|
||||
+ double position = ( time - pos1 ) / (double)( pos2 - pos1 );
|
||||
|
||||
count = MIN( c1, c2 ); // additional points are ignored
|
||||
points = mlt_pool_alloc( count * sizeof( BPointF ) );
|
||||
@@ -0,0 +1,223 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
PYTHON_COMPAT=( python3_{6,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="ruby24"
|
||||
inherit python-single-r1 qmake-utils ruby-single 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 ~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 libav libsamplerate lua melt opencv opengl python
|
||||
qt5 rtaudio ruby sdl vdpau vidstab xine xml"
|
||||
# java perl php tcl
|
||||
|
||||
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} )
|
||||
BDEPEND="
|
||||
virtual/pkgconfig
|
||||
compressed-lumas? ( virtual/imagemagick-tools[png] )
|
||||
lua? ( ${SWIG_DEPEND} virtual/pkgconfig )
|
||||
python? ( ${SWIG_DEPEND} )
|
||||
ruby? ( ${SWIG_DEPEND} )"
|
||||
#rtaudio will use OSS on non linux OSes
|
||||
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-4.1.2
|
||||
kernel_linux? ( media-libs/alsa-lib )
|
||||
)
|
||||
ruby? ( ${RUBY_DEPS} )
|
||||
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 )
|
||||
# sox? ( media-sound/sox )
|
||||
# tcl? ( dev-lang/tcl:0= )
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
DOCS=( AUTHORS ChangeLog NEWS README docs/{framework,melt,mlt{++,-xml}}.txt )
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-6.10.0-swig-underlinking.patch
|
||||
"${FILESDIR}"/${P}-mlt_consumer-race-condition.patch
|
||||
"${FILESDIR}"/${P}-rotoscoping-interpolation.patch
|
||||
"${FILESDIR}"/${P}-crop-filter.patch
|
||||
"${FILESDIR}"/${P}-consumer_multi-does-not-correctly-handle-in-point.patch
|
||||
"${FILESDIR}"/${P}-bad-aspect-ratio-resulting-in-black.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 -e "s/env ruby/${USE_RUBY}/" src/swig/ruby/* || die
|
||||
|
||||
# fix python3 include dir
|
||||
sed -i -e 's/python{}.{}/python{}.{}m/' src/swig/python/build || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
tc-export CC CXX
|
||||
|
||||
local myconf=(
|
||||
--enable-gpl
|
||||
--enable-gpl3
|
||||
--enable-motion-est
|
||||
--target-arch=$(tc-arch)
|
||||
--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 gtk2)
|
||||
$(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=()
|
||||
# TODO: java perl php tcl
|
||||
for i in lua python ruby ; 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_install() {
|
||||
default
|
||||
|
||||
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
|
||||
}
|
||||
Reference in New Issue
Block a user