diff options
Diffstat (limited to 'media-libs/mlt/files')
| -rw-r--r-- | media-libs/mlt/files/mlt-6.10.0-swig-underlinking.patch (renamed from media-libs/mlt/files/mlt-6.2.0-ruby-link.patch) | 14 | ||||
| -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 |
7 files changed, 4 insertions, 336 deletions
diff --git a/media-libs/mlt/files/mlt-6.2.0-ruby-link.patch b/media-libs/mlt/files/mlt-6.10.0-swig-underlinking.patch index 35341b4c..e84e98c1 100644 --- a/media-libs/mlt/files/mlt-6.2.0-ruby-link.patch +++ b/media-libs/mlt/files/mlt-6.10.0-swig-underlinking.patch @@ -1,18 +1,12 @@ -The build system tries to link to installed system libraries first, which -fails because the ABI has changed... - +diff --git a/src/swig/ruby/build b/src/swig/ruby/build +index 2d0cc0d..1a8aee7 100755 --- 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" ) +@@ -8,6 +8,6 @@ system( "ln -sf ../mlt.i" ) 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++" ++$LDFLAGS = $LDFLAGS.to_s + " -L../../mlt++ -lmlt++ -L../../framework -lmlt" 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 2f486939..00000000 --- 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 d992ee32..00000000 --- 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 e9aaa25c..00000000 --- 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 0a3732da..00000000 --- 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 c00e8d05..00000000 --- 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 5f98f12b..00000000 --- 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 ] |