diff options
Diffstat (limited to 'media-libs/mlt/files')
-rw-r--r-- | media-libs/mlt/files/mlt-6.2.0-ruby-link.patch | 18 | ||||
-rw-r--r-- | media-libs/mlt/files/mlt-6.4.1-glibc226-1.patch | 40 | ||||
-rw-r--r-- | media-libs/mlt/files/mlt-6.4.1-glibc226-2.patch | 22 | ||||
-rw-r--r-- | media-libs/mlt/files/mlt-6.4.1-libebur128-unbundle.patch | 137 | ||||
-rw-r--r-- | media-libs/mlt/files/mlt-6.4.1-opencv-3.3.patch | 33 | ||||
-rw-r--r-- | media-libs/mlt/files/mlt-6.4.1-qtopengl-1.patch | 33 | ||||
-rw-r--r-- | media-libs/mlt/files/mlt-6.4.1-qtopengl-2.patch | 61 | ||||
-rw-r--r-- | media-libs/mlt/files/mlt-6.6.0-gif-encoding.patch | 33 | ||||
-rw-r--r-- | media-libs/mlt/files/mlt-6.6.0-kdenlivetitle-crash.patch | 22 | ||||
-rw-r--r-- | media-libs/mlt/files/mlt-6.6.0-libav-1.patch | 39 | ||||
-rw-r--r-- | media-libs/mlt/files/mlt-6.6.0-libav-2.patch | 31 | ||||
-rw-r--r-- | media-libs/mlt/files/mlt-6.6.0-libav-3.patch | 23 | ||||
-rw-r--r-- | media-libs/mlt/files/mlt-6.6.0-png-segfault.patch | 36 | ||||
-rw-r--r-- | media-libs/mlt/files/mlt-6.6.0-vorbis-ffmpeg-3.4.patch | 29 |
14 files changed, 0 insertions, 557 deletions
diff --git a/media-libs/mlt/files/mlt-6.2.0-ruby-link.patch b/media-libs/mlt/files/mlt-6.2.0-ruby-link.patch deleted file mode 100644 index 35341b4c2050..000000000000 --- a/media-libs/mlt/files/mlt-6.2.0-ruby-link.patch +++ /dev/null @@ -1,18 +0,0 @@ -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" ) diff --git a/media-libs/mlt/files/mlt-6.4.1-glibc226-1.patch b/media-libs/mlt/files/mlt-6.4.1-glibc226-1.patch deleted file mode 100644 index 2f486939d8f7..000000000000 --- a/media-libs/mlt/files/mlt-6.4.1-glibc226-1.patch +++ /dev/null @@ -1,40 +0,0 @@ -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 diff --git a/media-libs/mlt/files/mlt-6.4.1-glibc226-2.patch b/media-libs/mlt/files/mlt-6.4.1-glibc226-2.patch deleted file mode 100644 index d992ee32e06c..000000000000 --- a/media-libs/mlt/files/mlt-6.4.1-glibc226-2.patch +++ /dev/null @@ -1,22 +0,0 @@ -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> diff --git a/media-libs/mlt/files/mlt-6.4.1-libebur128-unbundle.patch b/media-libs/mlt/files/mlt-6.4.1-libebur128-unbundle.patch deleted file mode 100644 index e9aaa25cf324..000000000000 --- a/media-libs/mlt/files/mlt-6.4.1-libebur128-unbundle.patch +++ /dev/null @@ -1,137 +0,0 @@ -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 - { diff --git a/media-libs/mlt/files/mlt-6.4.1-opencv-3.3.patch b/media-libs/mlt/files/mlt-6.4.1-opencv-3.3.patch deleted file mode 100644 index 0a3732da2e30..000000000000 --- a/media-libs/mlt/files/mlt-6.4.1-opencv-3.3.patch +++ /dev/null @@ -1,33 +0,0 @@ -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 diff --git a/media-libs/mlt/files/mlt-6.4.1-qtopengl-1.patch b/media-libs/mlt/files/mlt-6.4.1-qtopengl-1.patch deleted file mode 100644 index c00e8d05615b..000000000000 --- a/media-libs/mlt/files/mlt-6.4.1-qtopengl-1.patch +++ /dev/null @@ -1,33 +0,0 @@ -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: diff --git a/media-libs/mlt/files/mlt-6.4.1-qtopengl-2.patch b/media-libs/mlt/files/mlt-6.4.1-qtopengl-2.patch deleted file mode 100644 index 5f98f12bbb1a..000000000000 --- a/media-libs/mlt/files/mlt-6.4.1-qtopengl-2.patch +++ /dev/null @@ -1,61 +0,0 @@ -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 ] diff --git a/media-libs/mlt/files/mlt-6.6.0-gif-encoding.patch b/media-libs/mlt/files/mlt-6.6.0-gif-encoding.patch deleted file mode 100644 index 4faecdc78792..000000000000 --- a/media-libs/mlt/files/mlt-6.6.0-gif-encoding.patch +++ /dev/null @@ -1,33 +0,0 @@ -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 diff --git a/media-libs/mlt/files/mlt-6.6.0-kdenlivetitle-crash.patch b/media-libs/mlt/files/mlt-6.6.0-kdenlivetitle-crash.patch deleted file mode 100644 index b65a63d87667..000000000000 --- a/media-libs/mlt/files/mlt-6.6.0-kdenlivetitle-crash.patch +++ /dev/null @@ -1,22 +0,0 @@ -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); diff --git a/media-libs/mlt/files/mlt-6.6.0-libav-1.patch b/media-libs/mlt/files/mlt-6.6.0-libav-1.patch deleted file mode 100644 index 6dc5a73c7fe2..000000000000 --- a/media-libs/mlt/files/mlt-6.6.0-libav-1.patch +++ /dev/null @@ -1,39 +0,0 @@ -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 = diff --git a/media-libs/mlt/files/mlt-6.6.0-libav-2.patch b/media-libs/mlt/files/mlt-6.6.0-libav-2.patch deleted file mode 100644 index d29cabec704a..000000000000 --- a/media-libs/mlt/files/mlt-6.6.0-libav-2.patch +++ /dev/null @@ -1,31 +0,0 @@ -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 = diff --git a/media-libs/mlt/files/mlt-6.6.0-libav-3.patch b/media-libs/mlt/files/mlt-6.6.0-libav-3.patch deleted file mode 100644 index fdbd5ef271f2..000000000000 --- a/media-libs/mlt/files/mlt-6.6.0-libav-3.patch +++ /dev/null @@ -1,23 +0,0 @@ -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 ); diff --git a/media-libs/mlt/files/mlt-6.6.0-png-segfault.patch b/media-libs/mlt/files/mlt-6.6.0-png-segfault.patch deleted file mode 100644 index c93458a8273b..000000000000 --- a/media-libs/mlt/files/mlt-6.6.0-png-segfault.patch +++ /dev/null @@ -1,36 +0,0 @@ -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; 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 deleted file mode 100644 index bdf6ea211d43..000000000000 --- a/media-libs/mlt/files/mlt-6.6.0-vorbis-ffmpeg-3.4.patch +++ /dev/null @@ -1,29 +0,0 @@ -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 ); |