diff options
| author | Patrick J Volkerding <volkerdi@slackware.com> | 2019-04-21 18:45:54 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2019-04-22 08:59:43 +0200 |
| commit | 1c4f74fa29203ad62ca85d4ce48fb08c85068b31 (patch) | |
| tree | b2cec83e0f0d241e49dbe29c4cb3d2a43a4ea890 /source/l/qt-gstreamer | |
| parent | 96cf3289b02a3c1b0e5c8d757a3d1f2dfaa044a4 (diff) | |
| download | current-1c4f74fa29203ad62ca85d4ce48fb08c85068b31.tar.gz | |
Sun Apr 21 18:45:54 UTC 201920190421184554
a/bash-5.0.007-x86_64-1.txz: Upgraded.
d/parallel-20190422-noarch-1.txz: Upgraded.
n/NetworkManager-1.18.1-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/l/qt-gstreamer')
| -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 |
2 files changed, 17 insertions, 0 deletions
diff --git a/source/l/qt-gstreamer/qt-gstreamer.SlackBuild b/source/l/qt-gstreamer/qt-gstreamer.SlackBuild index 62e44c4f..6adc9bc2 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 00000000..d97ace63 --- /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) |