DIST mlt-6.10.0.tar.gz 1384632 BLAKE2B 4bbcf95409df1ea1828d2b34e6d6663cf83f5672641034f775d029037505051c5490c46c69e104811aaf776794be2df95913d094319f4a2dbba0c42117abe15e SHA512 6f374f20f1dc851792c1075537cf7e977038fb557b2bd5d5816c1fc69d471947c8469c914cf662766f3b503ae819881bf2b4e1673e0f7a84309e0fb671a9de1b
-DIST mlt-6.4.1.tar.gz 1344030 BLAKE2B 835561eac31a44d292c5915567338eb43110b3474778327af282403b43e3e89eaec407e5920f81a774c03968b4c08a496b0ef6c3e6d0970c17353613e7f4d051 SHA512 b082274e2184a0496f496517ddbcae33bab44cd1f50c1708942b7a24e5861ba97cae9fa21ec41ea21d662cbf56e2e2e66caa707a100077ef6e13aa7140f7a9fb
-DIST mlt-6.6.0.tar.gz 1365768 BLAKE2B e2e6919d603560dac3d809740a3be2989a3b52a4e933fa67927c5c26796a5c9b35da1aedb54caa4c87133dc682d5f41455900594ebdfd6ec1516ff02d477d58f SHA512 06e553d2deb36deddd9e0f2269ee0529bf768e73d2160ee16a4cd36ed3fba5be145165f0b21278623afece046351264269509ff05f24fbbb2f163be1f4d48845
+++ /dev/null
-The build system tries to link to installed system libraries first, which
-fails because the ABI has changed...
-
---- a/src/swig/ruby/build
-+++ b/src/swig/ruby/build
-@@ -5,9 +5,11 @@
- exit 0
- end
- system( "ln -sf ../mlt.i" )
-+system( "ln -sf ../../framework/libmlt.so" )
-+system( "ln -sf ../../mlt++/libmlt++.so" )
- system( "swig -c++ -ruby -I../../mlt++ -I../.. mlt.i" )
- $CFLAGS = $CFLAGS.to_s + " -I../.. " + (ENV.has_key?('CXXFLAGS')? ENV['CXXFLAGS'] : '')
- $CXXFLAGS = $CXXFLAGS.to_s + " -I../.. " + (ENV.has_key?('CXXFLAGS')? ENV['CXXFLAGS'] : '')
--$LDFLAGS = $LDFLAGS.to_s + " -L../../mlt++ -lmlt++"
-+$LIBS += " -lmlt++ -lmlt -lstdc++"
- create_makefile('mlt')
- system( "make V=1" )
+++ /dev/null
-From 2125e3955a0d0be61571cf43b674f74b4b93c6f8 Mon Sep 17 00:00:00 2001
-From: Dan Dennedy <dan@dennedy.org>
-Date: Sat, 26 Aug 2017 18:31:47 -0700
-Subject: [PATCH] Fix #248 xlocale.h was removed in glibc 2.26.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Reported by schnitzeltony on Andreas Müller.
-Patch by Dave Plater.
----
- src/framework/mlt_property.h | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/src/framework/mlt_property.h b/src/framework/mlt_property.h
-index 404d513f..043f530b 100644
---- a/src/framework/mlt_property.h
-+++ b/src/framework/mlt_property.h
-@@ -3,7 +3,7 @@
- * \brief Property class declaration
- * \see mlt_property_s
- *
-- * Copyright (C) 2003-2014 Meltytech, LLC
-+ * Copyright (C) 2003-2017 Meltytech, LLC
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
-@@ -31,7 +31,11 @@
- #endif
-
- #if defined(__GLIBC__) || defined(__APPLE__) || (__FreeBSD_version >= 900506)
--#include <xlocale.h>
-+# if GLIBC_MINOR >= 26 && !defined(APPLE)
-+# include <locale.h>
-+# else
-+# include <xlocale.h>
-+# endif
- #else
- typedef char* locale_t;
- #endif
+++ /dev/null
-From fbf6a5187776f2f392cf258935ff49e4c0e87024 Mon Sep 17 00:00:00 2001
-From: Dan Dennedy <dan@dennedy.org>
-Date: Wed, 30 Aug 2017 09:08:16 -0700
-Subject: [PATCH] Fix glib test macros to include locale.h.
-
----
- src/framework/mlt_property.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/framework/mlt_property.h b/src/framework/mlt_property.h
-index 043f530b..3ecebd67 100644
---- a/src/framework/mlt_property.h
-+++ b/src/framework/mlt_property.h
-@@ -31,7 +31,7 @@
- #endif
-
- #if defined(__GLIBC__) || defined(__APPLE__) || (__FreeBSD_version >= 900506)
--# if GLIBC_MINOR >= 26 && !defined(APPLE)
-+# if __GLIBC_MINOR__ >= 26 && !defined(__APPLE__)
- # include <locale.h>
- # else
- # include <xlocale.h>
+++ /dev/null
-From fad1df2bc8efc2881867e510443547fddf5d620b Mon Sep 17 00:00:00 2001
-From: Brian Matherly <code@brianmatherly.com>
-Date: Sun, 19 Feb 2017 23:35:17 -0600
-Subject: [PATCH 1/2] Use external libebur128 if detected.
-
----
- src/modules/plus/Makefile | 7 +++++--
- src/modules/plus/configure | 11 +++++++++++
- 2 files changed, 16 insertions(+), 2 deletions(-)
-
-diff --git a/src/modules/plus/Makefile b/src/modules/plus/Makefile
-index 90067a56..351e7b76 100644
---- a/src/modules/plus/Makefile
-+++ b/src/modules/plus/Makefile
-@@ -22,14 +22,17 @@ OBJS = consumer_blipflash.o \
- filter_sepia.o \
- producer_blipflash.o \
- producer_count.o \
-- transition_affine.o \
-- ebur128/ebur128.o
-+ transition_affine.o
-
- ifdef USE_FFTW
- OBJS += filter_dance.o \
- filter_fft.o
- endif
-
-+ifdef USE_INTERNAL_LIBEBUR128
-+ OBJS += ebur128/ebur128.o
-+endif
-+
- SRCS := $(OBJS:.o=.c)
-
- all: $(TARGET)
-diff --git a/src/modules/plus/configure b/src/modules/plus/configure
-index fbd49807..e38464b4 100755
---- a/src/modules/plus/configure
-+++ b/src/modules/plus/configure
-@@ -16,5 +16,16 @@ then
- echo "- fftw not found: disable fft and dance filters"
- fi
-
-+ pkg-config libebur128
-+ if [ $? -eq 0 ]
-+ then
-+ echo "CFLAGS += $(pkg-config --cflags libebur128)" >> config.mak
-+ echo "LDFLAGS += $(pkg-config --libs libebur128)" >> config.mak
-+ else
-+ echo "- libebur128 not found: using internal libebur128"
-+ echo "USE_INTERNAL_LIBEBUR128=1" >> config.mak
-+ echo "CFLAGS += -DUSE_INTERNAL_LIBEBUR128" >> config.mak
-+ fi
-+
- exit 0
- fi
-
-From 9951883b895eb920b7f67ea67a0753d8dea21a9e Mon Sep 17 00:00:00 2001
-From: Brian Matherly <code@brianmatherly.com>
-Date: Mon, 20 Feb 2017 08:15:52 -0600
-Subject: [PATCH 2/2] Fix include directives for ebur128 filters.
-
----
- src/modules/plus/Makefile | 2 +-
- src/modules/plus/configure | 2 ++
- src/modules/plus/filter_dynamic_loudness.c | 2 +-
- src/modules/plus/filter_loudness.c | 2 +-
- src/modules/plus/filter_loudness_meter.c | 2 +-
- 5 files changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/src/modules/plus/Makefile b/src/modules/plus/Makefile
-index 351e7b76..366bca19 100644
---- a/src/modules/plus/Makefile
-+++ b/src/modules/plus/Makefile
-@@ -1,4 +1,4 @@
--CFLAGS += -I../.. -Iebur128/queue
-+CFLAGS += -I../..
-
- LDFLAGS += -L../../framework -lmlt -lm -lpthread
-
-diff --git a/src/modules/plus/configure b/src/modules/plus/configure
-index e38464b4..59662ca0 100755
---- a/src/modules/plus/configure
-+++ b/src/modules/plus/configure
-@@ -19,12 +19,14 @@ then
- pkg-config libebur128
- if [ $? -eq 0 ]
- then
-+ echo "- libebur128 found: using external libebur128"
- echo "CFLAGS += $(pkg-config --cflags libebur128)" >> config.mak
- echo "LDFLAGS += $(pkg-config --libs libebur128)" >> config.mak
- else
- echo "- libebur128 not found: using internal libebur128"
- echo "USE_INTERNAL_LIBEBUR128=1" >> config.mak
- echo "CFLAGS += -DUSE_INTERNAL_LIBEBUR128" >> config.mak
-+ echo "CFLAGS += -Iebur128 -Iebur128/queue" >> config.mak
- fi
-
- exit 0
-diff --git a/src/modules/plus/filter_dynamic_loudness.c b/src/modules/plus/filter_dynamic_loudness.c
-index 07551f14..99c83051 100644
---- a/src/modules/plus/filter_dynamic_loudness.c
-+++ b/src/modules/plus/filter_dynamic_loudness.c
-@@ -22,7 +22,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <math.h>
--#include "ebur128/ebur128.h"
-+#include <ebur128.h>
-
- typedef struct
- {
-diff --git a/src/modules/plus/filter_loudness.c b/src/modules/plus/filter_loudness.c
-index 8b74b5c9..0614fecc 100644
---- a/src/modules/plus/filter_loudness.c
-+++ b/src/modules/plus/filter_loudness.c
-@@ -22,7 +22,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <math.h>
--#include "ebur128/ebur128.h"
-+#include <ebur128.h>
-
- #define MAX_RESULT_SIZE 512
-
-diff --git a/src/modules/plus/filter_loudness_meter.c b/src/modules/plus/filter_loudness_meter.c
-index 9926f945..6c81d19f 100644
---- a/src/modules/plus/filter_loudness_meter.c
-+++ b/src/modules/plus/filter_loudness_meter.c
-@@ -22,7 +22,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <math.h>
--#include "ebur128/ebur128.h"
-+#include <ebur128.h>
-
- typedef struct
- {
+++ /dev/null
-From 622ff3acf6256739bd547ade1ceca0e6df5022e6 Mon Sep 17 00:00:00 2001
-From: BoboopTeam <BoboopTeam@users.noreply.github.com>
-Date: Thu, 7 Sep 2017 22:14:48 +0200
-Subject: [PATCH] module: opencv: Remove deleted cv::Tracker::create()
-
-This static method is no longer present in OpenCV API, this workaround should fix compilation against OpenCV 3.3.0 and newer
----
- src/modules/opencv/filter_opencv_tracker.cpp | 10 +++++++---
- 1 file changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/src/modules/opencv/filter_opencv_tracker.cpp b/src/modules/opencv/filter_opencv_tracker.cpp
-index 48ffb56b..3cfc07d2 100644
---- a/src/modules/opencv/filter_opencv_tracker.cpp
-+++ b/src/modules/opencv/filter_opencv_tracker.cpp
-@@ -111,11 +111,15 @@ static void analyze( mlt_filter filter, cv::Mat cvFrame, private_data* data, int
- data->algo = mlt_properties_get( filter_properties, "algo" );
- if ( data->algo == NULL || !strcmp(data->algo, "" ) )
- {
-- data->tracker = cv::Tracker::create( "KCF" );
-+ data->tracker = cv::TrackerKCF::create();
-+ }
-+ else if (!strcmp(data->algo, "MIL" ))
-+ {
-+ data->tracker = cv::TrackerMIL::create();
- }
- else
-- {
-- data->tracker = cv::Tracker::create( data->algo );
-+ {
-+ data->tracker = cv::TrackerBoosting::create();
- }
-
- // Discard previous results
+++ /dev/null
-From d2a04ae77a6b2c82a2e12b9fb631beb8f825946d Mon Sep 17 00:00:00 2001
-From: Alberto Villa <avilla@FreeBSD.org>
-Date: Sat, 24 Dec 2016 05:07:54 +0100
-Subject: [PATCH] Move Qt OpenGL include(s) to Qt 4 specific code
-
-Only Qt 4 code references those files (QMutex and QWaitCondition are
-not OpenGL files, but still they're only useful in Qt 4 code).
----
- src/modules/qt/consumer_qglsl.cpp | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/src/modules/qt/consumer_qglsl.cpp b/src/modules/qt/consumer_qglsl.cpp
-index 74840602..ca0cf383 100644
---- a/src/modules/qt/consumer_qglsl.cpp
-+++ b/src/modules/qt/consumer_qglsl.cpp
-@@ -20,13 +20,14 @@
- #include "common.h"
- #include <framework/mlt.h>
- #include <QApplication>
--#include <QGLWidget>
--#include <QMutex>
--#include <QWaitCondition>
- #include <QtGlobal>
-
- #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-
-+#include <QGLWidget>
-+#include <QMutex>
-+#include <QWaitCondition>
-+
- class GLWidget : public QGLWidget
- {
- private:
+++ /dev/null
-From 6ba6cab570d824641f63c66b355ba28f0721811f Mon Sep 17 00:00:00 2001
-From: Alberto Villa <avilla@FreeBSD.org>
-Date: Sat, 24 Dec 2016 05:10:20 +0100
-Subject: [PATCH] Avoid looking for Qt5OpenGL module
-
-The OpenGL-related code needed by qimage was moved to Qt5Gui, which
-allows to safely remove the dependency on Qt 5 builds.
-
-Build tested on FreeBSD.
----
- src/modules/qt/configure | 20 +-------------------
- 1 file changed, 1 insertion(+), 19 deletions(-)
-
-diff --git a/src/modules/qt/configure b/src/modules/qt/configure
-index 24803baf..7475dc09 100755
---- a/src/modules/qt/configure
-+++ b/src/modules/qt/configure
-@@ -107,14 +107,6 @@ else
- then
- echo QTCXXFLAGS=-I$qt_includedir -I$qt_includedir/QtCore -I$qt_includedir/QtGui -I$qt_includedir/QtXml -I$qt_includedir/QtSvg -I$qt_includedir/QtWidgets >> config.mak
- echo QTLIBS=-Wl,-rpath-link,"$qt_libdir" -L"$qt_libdir" -lQt5Core -lQt5Gui -lQt5Xml -lQt5Svg -lQt5Widgets >> config.mak
-- if [ -f "$qt_libdir/libQt5OpenGL.so" ] || [ -f "$qt_libdir/libQt5OpenGL.a" ]
-- then
-- echo QTCXXFLAGS+=-I$qt_includedir/QtOpenGL >> config.mak
-- echo QTLIBS+=-lQt5OpenGL >> config.mak
-- else
-- echo "- Qt5OpenGL not found: disabling"
-- without_opengl=true
-- fi
- # Qt5 on OS X
- elif [ -d "$qt_libdir/QtWidgets.framework" ]
- then
-@@ -123,11 +115,10 @@ else
- -I$qt_includedir/QtGui -I$qt_libdir/QtGui.framework/Headers \
- -I$qt_includedir/QtXml -I$qt_libdir/QtXml.framework/Headers \
- -I$qt_includedir/QtSvg -I$qt_libdir/QtSvg.framework/Headers \
-- -I$qt_includedir/QtOpenGL -I$qt_libdir/QtOpenGL.framework/Headers \
- -I$qt_includedir/QtWidgets -I$qt_libdir/QtWidgets.framework/Headers \
- >> config.mak
- echo QTLIBS=-F"$qt_libdir" -framework QtCore -framework QtGui -framework \
-- QtXml -framework QtSvg -framework QtOpenGL -framework QtWidgets >> config.mak
-+ QtXml -framework QtSvg -framework QtWidgets >> config.mak
- # Qt4 on OS X
- elif [ -d "$qt_libdir/QtGui.framework" ]
- then
-@@ -151,15 +142,6 @@ else
- without_kde=true
- echo QTCXXFLAGS=$(pkg-config --cflags Qt5Core Qt5Gui Qt5Xml Qt5Svg Qt5Widgets) >> config.mak
- echo QTLIBS=$(pkg-config --libs Qt5Core Qt5Gui Qt5Xml Qt5Svg Qt5Widgets) >> config.mak
-- pkg-config --exists 'Qt5OpenGL'
-- if [ $? -eq 0 ]
-- then
-- echo QTCXXFLAGS+=$(pkg-config --cflags Qt5OpenGL) >> config.mak
-- echo QTLIBS+=$(pkg-config --libs Qt5OpenGL) >> config.mak
-- else
-- echo "- Qt5OpenGL not found: disabling"
-- without_opengl=true
-- fi
- else
- pkg-config --exists 'QtGui >= 4'
- if [ $? -eq 0 ]
+++ /dev/null
-From c7c2f271170892094a0cccdb517ca1b6061208d7 Mon Sep 17 00:00:00 2001
-From: Dan Dennedy <dan@dennedy.org>
-Date: Mon, 12 Mar 2018 15:20:29 -0700
-Subject: [PATCH] Fix #284 GIF encoding not working.
-
-This also fixes DPX.
----
- presets/consumer/avformat/GIF | 1 -
- src/modules/avformat/consumer_avformat.c | 2 +-
- 2 files changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/presets/consumer/avformat/GIF b/presets/consumer/avformat/GIF
-index f6a0cd41a..da7361851 100644
---- a/presets/consumer/avformat/GIF
-+++ b/presets/consumer/avformat/GIF
-@@ -7,4 +7,3 @@ bf=0
-
- meta.preset.extension=gif
- meta.preset.name=GIF Animation
--meta.preset.hidden=1
-diff --git a/src/modules/avformat/consumer_avformat.c b/src/modules/avformat/consumer_avformat.c
-index caac488e2..c3724d131 100644
---- a/src/modules/avformat/consumer_avformat.c
-+++ b/src/modules/avformat/consumer_avformat.c
-@@ -71,7 +71,7 @@
- #define AUDIO_ENCODE_BUFFER_SIZE (48000 * 2 * MAX_AUDIO_STREAMS)
- #define AUDIO_BUFFER_SIZE (1024 * 42)
- #define VIDEO_BUFFER_SIZE (8192 * 8192)
--#define IMAGE_ALIGN (1)
-+#define IMAGE_ALIGN (4)
-
- //
- // This structure should be extended and made globally available in mlt
+++ /dev/null
-From 95f7f7bc104ec35ed3c909e52d928313fd35a48c Mon Sep 17 00:00:00 2001
-From: Jean-Baptiste Mardelle <jb@kdenlive.org>
-Date: Mon, 19 Mar 2018 09:20:49 +0100
-Subject: [PATCH] Fix crash with kdenlivetile caused by wrong malloc size
-
----
- src/modules/qt/producer_kdenlivetitle.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/modules/qt/producer_kdenlivetitle.c b/src/modules/qt/producer_kdenlivetitle.c
-index 67508aa33..4dc5d9c6b 100644
---- a/src/modules/qt/producer_kdenlivetitle.c
-+++ b/src/modules/qt/producer_kdenlivetitle.c
-@@ -41,7 +41,7 @@ void read_xml(mlt_properties properties)
- goto error;
- rewind (f);
-
-- char *infile = (char*) mlt_pool_alloc(lSize);
-+ char *infile = (char*) mlt_pool_alloc(lSize + 1);
- if ( infile )
- {
- size = fread(infile,1,lSize,f);
+++ /dev/null
-From bd59735b4f97ae9dff864debdecc2318b0cb8f94 Mon Sep 17 00:00:00 2001
-From: Dan Dennedy <dan@dennedy.org>
-Date: Mon, 12 Feb 2018 12:21:19 -0800
-Subject: [PATCH] Fix compile error with libav.
-
----
- src/modules/avformat/producer_avformat.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/modules/avformat/producer_avformat.c b/src/modules/avformat/producer_avformat.c
-index 214c8b325..7de997cc2 100644
---- a/src/modules/avformat/producer_avformat.c
-+++ b/src/modules/avformat/producer_avformat.c
-@@ -1,6 +1,6 @@
- /*
- * producer_avformat.c -- avformat producer
-- * 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
-@@ -1266,7 +1266,7 @@ static int pick_av_pixel_format( int *pix_fmt )
- return 0;
- }
-
--#if LIBSWSCALE_VERSION_INT >= AV_VERSION_INT( 3, 1, 101 )
-+#if defined(FFUDIV) && LIBSWSCALE_VERSION_INT >= AV_VERSION_INT( 3, 1, 101 )
- struct sliced_pix_fmt_conv_t
- {
- int width, height, slice_w;
-@@ -1461,7 +1461,7 @@ static int convert_image( producer_avformat self, AVFrame *frame, uint8_t *buffe
- sws_freeContext( context );
- }
- else
--#if LIBSWSCALE_VERSION_INT >= AV_VERSION_INT( 3, 1, 101 )
-+#if defined(FFUDIV) && LIBSWSCALE_VERSION_INT >= AV_VERSION_INT( 3, 1, 101 )
- {
- int i, c;
- struct sliced_pix_fmt_conv_t ctx =
+++ /dev/null
-From 56e3affe1ff425d979ea9f2a5e086d769852c3fc Mon Sep 17 00:00:00 2001
-From: Dan Dennedy <dan@dennedy.org>
-Date: Fri, 16 Feb 2018 09:55:29 -0800
-Subject: [PATCH] Fix compile error with libav.
-
----
- src/modules/avformat/producer_avformat.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/modules/avformat/producer_avformat.c b/src/modules/avformat/producer_avformat.c
-index 7de997cc2..2fafd00e8 100644
---- a/src/modules/avformat/producer_avformat.c
-+++ b/src/modules/avformat/producer_avformat.c
-@@ -1266,7 +1266,7 @@ static int pick_av_pixel_format( int *pix_fmt )
- return 0;
- }
-
--#if defined(FFUDIV) && LIBSWSCALE_VERSION_INT >= AV_VERSION_INT( 3, 1, 101 )
-+#if defined(FFUDIV) && (LIBSWSCALE_VERSION_INT >= ((3<<16)+(1<<8)+101))
- struct sliced_pix_fmt_conv_t
- {
- int width, height, slice_w;
-@@ -1461,7 +1461,7 @@ static int convert_image( producer_avformat self, AVFrame *frame, uint8_t *buffe
- sws_freeContext( context );
- }
- else
--#if defined(FFUDIV) && LIBSWSCALE_VERSION_INT >= AV_VERSION_INT( 3, 1, 101 )
-+#if defined(FFUDIV) && (LIBSWSCALE_VERSION_INT >= ((3<<16)+(1<<8)+101))
- {
- int i, c;
- struct sliced_pix_fmt_conv_t ctx =
+++ /dev/null
-From 53181a4e4629e2cd22c6f5d16a459aa843f4bd65 Mon Sep 17 00:00:00 2001
-From: Dan Dennedy <dan@dennedy.org>
-Date: Fri, 23 Feb 2018 10:04:47 -0800
-Subject: [PATCH] Fix compile error with libav.
-
----
- src/modules/avformat/consumer_avformat.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/modules/avformat/consumer_avformat.c b/src/modules/avformat/consumer_avformat.c
-index 6deb76df5..ba5c900c7 100644
---- a/src/modules/avformat/consumer_avformat.c
-+++ b/src/modules/avformat/consumer_avformat.c
-@@ -1647,7 +1647,9 @@ 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;
-+#if LIBAVCODEC_VERSION_INT >= ((57<<16)+(96<<8)) && LIBAVCODEC_VERSION_MICRO >= 100
- enc_ctx->audio_avframe->channels = c->channels;
-+#endif
- } else {
- mlt_log_error( MLT_CONSUMER_SERVICE(consumer), "failed to allocate audio AVFrame\n" );
- mlt_events_fire( properties, "consumer-fatal-error", NULL );
+++ /dev/null
-From e013fd7c2f49b40a1b482d712d531329d538da88 Mon Sep 17 00:00:00 2001
-From: Brian Matherly <code@brianmatherly.com>
-Date: Wed, 31 Jan 2018 20:57:42 -0600
-Subject: [PATCH] Fix segmentation fault when using qimage png producer #296
-
----
- src/modules/qt/qimage_wrapper.cpp | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/src/modules/qt/qimage_wrapper.cpp b/src/modules/qt/qimage_wrapper.cpp
-index 436f65d15..99b4ebf8e 100644
---- a/src/modules/qt/qimage_wrapper.cpp
-+++ b/src/modules/qt/qimage_wrapper.cpp
-@@ -229,18 +229,19 @@ void refresh_image( producer_qimage self, mlt_frame frame, mlt_image_format form
- QString interps = mlt_properties_get( properties, "rescale.interp" );
- bool interp = ( interps != "nearest" ) && ( interps != "none" );
- QImage *qimage = static_cast<QImage*>( self->qimage );
-+ int has_alpha = qimage->hasAlphaChannel();
-+ QImage::Format qimageFormat = has_alpha ? QImage::Format_ARGB32 : QImage::Format_RGB32;
-
- // Note - the original qimage is already safe and ready for destruction
-- if ( qimage->depth() == 1 )
-+ if ( qimage->format() != qimageFormat )
- {
-- QImage temp = qimage->convertToFormat( QImage::Format_RGB32 );
-+ QImage temp = qimage->convertToFormat( qimageFormat );
- delete qimage;
- qimage = new QImage( temp );
- self->qimage = qimage;
- }
- QImage scaled = interp? qimage->scaled( QSize( width, height ) ) :
- qimage->scaled( QSize(width, height), Qt::IgnoreAspectRatio, Qt::SmoothTransformation );
-- int has_alpha = scaled.hasAlphaChannel();
-
- // Store width and height
- self->current_width = width;
+++ /dev/null
-From 7e0d478d161eacea015aa3d116e250e7c5f9f942 Mon Sep 17 00:00:00 2001
-From: Dan Dennedy <dan@dennedy.org>
-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 );
<flag name="python">Build SWIG bindings for Python</flag>
<flag name="rtaudio">Builds rtaudio consumer for native audio support on multiple platforms.</flag>
<flag name="ruby">Build SWIG bindings for Ruby</flag>
- <flag name="sdl2">Build <pkg>media-libs/libsdl2</pkg> module</flag>
<!--
<flag name="swfdec">Use <pkg>media-libs/swfdec</pkg> for reading .swf files (Macromedia Flash) instead of libavformat.</flag>
<flag name="java">Build SWIG bindings for Java</flag>
+++ /dev/null
-# 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 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: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
- )
- 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}"/${PN}-6.2.0-ruby-link.patch
- "${FILESDIR}"/${P}-libebur128-unbundle.patch
- "${FILESDIR}"/${P}-opencv-3.3.patch
- "${FILESDIR}"/${P}-glibc226-{1,2}.patch
- "${FILESDIR}"/${P}-qtopengl-{1,2}.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 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
-}
+++ /dev/null
-# 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 flag-o-matic 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} ) sdl2? ( sdl )"
-
-#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? (
- sdl2? (
- media-libs/libsdl2[X,opengl,video]
- media-libs/sdl2-image
- )
- !sdl2? (
- >=media-libs/libsdl-1.2.10[X,opengl,video]
- >=media-libs/sdl-image-1.2.4
- )
- )
- 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
- "${FILESDIR}"/${P}-libav-{1,2,3}.patch
- "${FILESDIR}"/${P}-png-segfault.patch
- "${FILESDIR}"/${P}-gif-encoding.patch
- "${FILESDIR}"/${P}-kdenlivetitle-crash.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 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 sdl ; then
- if use sdl2 ; then
- myconf+=( --enable-sdl2 --disable-sdl )
- else
- myconf+=( --enable-sdl --disable-sdl2 )
- fi
- else
- myconf+=( --disable-sdl --disable-sdl2 )
- 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
-}
projects / gentoo.git / commitdiff