diff options
Diffstat (limited to '')
| -rw-r--r-- | source/l/FTBFSlog | 4 | ||||
| -rwxr-xr-x | source/l/qt-gstreamer/qt-gstreamer.SlackBuild | 5 | ||||
| -rw-r--r-- | source/l/qt-gstreamer/qt-gstreamer.gstreamer-1.16.x.diff | 12 |
3 files changed, 21 insertions, 0 deletions
diff --git a/source/l/FTBFSlog b/source/l/FTBFSlog index 0b04c0ced..f87be4ac6 100644 --- a/source/l/FTBFSlog +++ b/source/l/FTBFSlog @@ -1,3 +1,7 @@ +Mon Apr 22 01:42:38 UTC 2019 + qt-gstreamer: Fix for gstreamer-1.16.x API change. + Thanks to nobodino. ++--------------------------+ Mon Mar 4 23:07:37 UTC 2019 qt: tested and found to compile with newly patched gcc. Thanks to nobodino. diff --git a/source/l/qt-gstreamer/qt-gstreamer.SlackBuild b/source/l/qt-gstreamer/qt-gstreamer.SlackBuild index 62e44c4f5..6adc9bc2b 100755 --- a/source/l/qt-gstreamer/qt-gstreamer.SlackBuild +++ b/source/l/qt-gstreamer/qt-gstreamer.SlackBuild @@ -82,6 +82,11 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Fix build with gstreamer-1.16.x. This is rather pointless since qt-gstreamer +# is considered dead (in -current only artikulate uses it, and in Plasma 5 +# nothing does), but we'll queue a fix for the FTBFS anyway: +zcat $CWD/qt-gstreamer.gstreamer-1.16.x.diff.gz | patch -p1 --verbose || exit 1 + mkdir -p build cd build cmake \ diff --git a/source/l/qt-gstreamer/qt-gstreamer.gstreamer-1.16.x.diff b/source/l/qt-gstreamer/qt-gstreamer.gstreamer-1.16.x.diff new file mode 100644 index 000000000..d97ace63d --- /dev/null +++ b/source/l/qt-gstreamer/qt-gstreamer.gstreamer-1.16.x.diff @@ -0,0 +1,12 @@ +--- ./src/QGst/caps.cpp.orig 2014-07-08 13:38:36.000000000 -0500 ++++ ./src/QGst/caps.cpp 2019-04-21 20:39:17.810000919 -0500 +@@ -54,7 +54,8 @@ + + void Caps::append(const CapsPtr & caps2) + { +- gst_caps_append(object<GstCaps>(), gst_caps_copy(caps2)); ++ GstCaps *caps3 = caps2; ++ gst_caps_append(object<GstCaps>(), gst_caps_copy(caps3)); + } + + CapsPtr Caps::merge(CapsPtr & caps2) |