summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
authorTreeve Jelbert2020-08-17 17:56:10 +0200
committerTreeve Jelbert2020-08-17 17:58:24 +0200
commitd2f6ce114b6c623f6b8c401982eccfff25cb07ad (patch)
tree744f719939149c4c0b68e9e47c45f1d9b4ea635c /video
parenta1eee78014131daaadd3a59dc7cddccd1fed1879 (diff)
mlt: => 6.22.1
Diffstat (limited to 'video')
-rwxr-xr-xvideo/mlt/DEPENDS4
-rwxr-xr-xvideo/mlt/DETAILS4
-rw-r--r--video/mlt/HISTORY5
-rw-r--r--video/mlt/patches/qt-5.15.patch45
4 files changed, 9 insertions, 49 deletions
diff --git a/video/mlt/DEPENDS b/video/mlt/DEPENDS
index 0b78ac3c00..3811e49572 100755
--- a/video/mlt/DEPENDS
+++ b/video/mlt/DEPENDS
@@ -72,5 +72,5 @@ optional_depends python \
"" \
"Python language bindings" &&
-optional_depends pulseaudio '--enable-rtaudio' '--disable-rtaudio' 'RT Audio support'
-
+optional_depends pulseaudio '--enable-rtaudio' '--disable-rtaudio' 'RT Audio support' &&
+optional_depends OPENCV '--enable-opencv' '--disable-opencv' 'OpenCV support'
diff --git a/video/mlt/DETAILS b/video/mlt/DETAILS
index dfb32fee61..89c4808ca9 100755
--- a/video/mlt/DETAILS
+++ b/video/mlt/DETAILS
@@ -8,8 +8,8 @@ if [[ $MLT_BRANCH == scm ]];then
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-git
FORCE_DOWNLOAD=on
else
- VERSION=6.20.0
- SOURCE_HASH=sha512:939e837fb07ff0eace308987d83913e979f82c6eb156b40fde784f3f2b031b5f6896ac96dcde1627925cbb6fc76725f3fc4e5b2d0616fae11263648bcdbe82e3
+ VERSION=6.22.1
+ SOURCE_HASH=sha512:c620b68d35c90eab650c70768a4ae631dec83ece6dd3fd8e09f9300d837d8e0f3da1b098786188f9c1216800f848dd5db7c9e5fa03e816fba3fbcf3c63324c74
SOURCE=$SPELL-v$VERSION.tar.gz
SOURCE_URL[0]=https://github.com/mltframework/mlt/archive/v$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/video/mlt/HISTORY b/video/mlt/HISTORY
index 80b37b55c9..34d3d86834 100644
--- a/video/mlt/HISTORY
+++ b/video/mlt/HISTORY
@@ -1,3 +1,8 @@
+2020-08-17 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: version 6.22.1
+ * DEPENDS: add OPENCV
+ * PRE_BUILD patches/*: deleted
+
2020-06-18 Treeve Jelbert <treeve@sourcemage.org>
* PRE_BUILD qt-5.15.patch: added
diff --git a/video/mlt/patches/qt-5.15.patch b/video/mlt/patches/qt-5.15.patch
deleted file mode 100644
index e4e226a3e0..0000000000
--- a/video/mlt/patches/qt-5.15.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-commit f58b44d73442986eeffec7431e59b7d19d214c1b
-Author: Heiko Becker <heirecka@exherbo.org>
-Date: Tue Mar 24 21:17:05 2020 +0100
-
- Fix build with Qt 5.15.0
-
- QPainterPath is no longer included via qtransform.h (since
- 5.15.0-beta2, 50d2acdc93b4de2ba56eb67787e2bdcb21dd4bea in qtbase.git).
-
-diff --git a/src/modules/qt/filter_qtext.cpp b/src/modules/qt/filter_qtext.cpp
-index c3de1fad..c3e10f1a 100644
---- a/src/modules/qt/filter_qtext.cpp
-+++ b/src/modules/qt/filter_qtext.cpp
-@@ -21,6 +21,7 @@
- #include <framework/mlt.h>
- #include <framework/mlt_log.h>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QString>
-
- static QRectF get_text_path( QPainterPath* qpath, mlt_properties filter_properties, const char* text, double scale )
-diff --git a/src/modules/qt/graph.cpp b/src/modules/qt/graph.cpp
-index 6d4d669c..7e91bb12 100644
---- a/src/modules/qt/graph.cpp
-+++ b/src/modules/qt/graph.cpp
-@@ -18,6 +18,7 @@
- */
-
- #include "graph.h"
-+#include <QPainterPath>
- #include <QVector>
- #include <math.h>
-
-diff --git a/src/modules/qt/producer_qtext.cpp b/src/modules/qt/producer_qtext.cpp
-index 603c2b78..ff95a8e2 100644
---- a/src/modules/qt/producer_qtext.cpp
-+++ b/src/modules/qt/producer_qtext.cpp
-@@ -26,6 +26,7 @@
- #include <QImage>
- #include <QColor>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QFont>
- #include <QString>
- #include <QTextCodec>