Source Mage code commit list

[Treeve Jelbert <scm AT sourcemage.org>]

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

 video/ffmpeg/DETAILS            |    2 -
 video/ffmpeg/HISTORY            |    3 ++
 video/mlt/HISTORY               |    3 ++
 video/mlt/PRE_BUILD             |    3 ++
 video/mlt/patches/qt-5.15.patch |   45 
++++++++++++++++++++++++++++++++++++++++
 vulkan/vulkan-headers/DETAILS   |    4 +--
 vulkan/vulkan-headers/HISTORY   |    3 ++
 7 files changed, 60 insertions(+), 3 deletions(-)

New commits:
commit 89a8569f659cf1f4bb2dcacafd0c868bac854d1d
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    mlt - fix build with qt-5.15

commit 33fa085921a872e1d7d69bc7f78d77f07fe14f63
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    ffmpeg: => 4.3

commit ce558d76932b35d1fb24dc901fc18e1582d2fd52
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    vulkan-headers: => 1.2.144

diff --git a/video/ffmpeg/DETAILS b/video/ffmpeg/DETAILS
index 09fb1c7..227f343 100755
--- a/video/ffmpeg/DETAILS
+++ b/video/ffmpeg/DETAILS
@@ -1,6 +1,6 @@
            SPELL=ffmpeg
 if [[ $FFMPEG_RELEASE == stable ]]; then
-         VERSION=4.2.3
+         VERSION=4.3
   SECURITY_PATCH=20
 else
          VERSION=0.7.16
diff --git a/video/ffmpeg/HISTORY b/video/ffmpeg/HISTORY
index c31a42b..d9ae993 100644
--- a/video/ffmpeg/HISTORY
+++ b/video/ffmpeg/HISTORY
@@ -1,3 +1,6 @@
+2020-06-18 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 4.3
+
 2020-05-21 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: version 4.2.3
 
diff --git a/video/mlt/HISTORY b/video/mlt/HISTORY
index 748bb37..80b37b5 100644
--- a/video/mlt/HISTORY
+++ b/video/mlt/HISTORY
@@ -1,3 +1,6 @@
+2020-06-18 Treeve Jelbert <treeve AT sourcemage.org>
+       * PRE_BUILD qt-5.15.patch: added
+
 2020-03-15 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 6.20.0
        * BUILD: remove obsolete logic
diff --git a/video/mlt/PRE_BUILD b/video/mlt/PRE_BUILD
new file mode 100755
index 0000000..922c0ab
--- /dev/null
+++ b/video/mlt/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build    &&
+cd $SOURCE_DIRECTORY &&
+apply_patch_dir patches
diff --git a/video/mlt/patches/qt-5.15.patch b/video/mlt/patches/qt-5.15.patch
new file mode 100644
index 0000000..e4e226a
--- /dev/null
+++ b/video/mlt/patches/qt-5.15.patch
@@ -0,0 +1,45 @@
+commit f58b44d73442986eeffec7431e59b7d19d214c1b
+Author: Heiko Becker <heirecka AT 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>
diff --git a/vulkan/vulkan-headers/DETAILS b/vulkan/vulkan-headers/DETAILS
index 739c5fd..3b4c21c 100755
--- a/vulkan/vulkan-headers/DETAILS
+++ b/vulkan/vulkan-headers/DETAILS
@@ -1,7 +1,7 @@
            SPELL=vulkan-headers
           SPELLX=Vulkan-Headers
-         VERSION=1.2.142
-     
SOURCE_HASH=sha512:f131b23cb270bfcd2cb0e69f21bfcbdbfa816692eabb371b2649315dd4309279e5a52fd9700e4291ff0985d25e49b253396ee2d4607e2cd90b96a693e97057e7
+         VERSION=1.2.144
+     
SOURCE_HASH=sha512:19df01bc441024cca638ca090c796c6f864825cd02fd4b946d9944b0cda283feaab02c95a98074e5369a2de0589502f5574478d3e313031c4bf2582c219b0685
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
        WEB_SITE=https://github.com/KhronosGroup/$SPELLX
diff --git a/vulkan/vulkan-headers/HISTORY b/vulkan/vulkan-headers/HISTORY
index 6ab3f56..87875d1 100644
--- a/vulkan/vulkan-headers/HISTORY
+++ b/vulkan/vulkan-headers/HISTORY
@@ -1,3 +1,6 @@
+2020-06-17 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 1.2.144
+
 2020-06-02 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 1.2.142