Date: Tuesday, October 27, 2020 @ 08:32:21 Author: arojas Revision: 398844
Fix build with gstreamer 1.18 (FS#68429) Added: qt-gstreamer/trunk/qt-gstreamer-1.18.patch Modified: qt-gstreamer/trunk/PKGBUILD -------------------------+ PKGBUILD | 31 +++++++++++-------------------- qt-gstreamer-1.18.patch | 26 ++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 20 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-10-27 07:44:00 UTC (rev 398843) +++ PKGBUILD 2020-10-27 08:32:21 UTC (rev 398844) @@ -4,7 +4,7 @@ pkgname=qt-gstreamer pkgver=1.2.0 -pkgrel=3 +pkgrel=4 arch=(x86_64) pkgdesc="Qt bindings for GStreamer" url='https://gstreamer.freedesktop.org/modules/qt-gstreamer.html' @@ -11,39 +11,30 @@ license=(LGPL2.1) depends=(qt5-declarative gst-plugins-good) makedepends=(cmake boost doxygen python) -conflicts=(qt5-gstreamer) -provides=(qt5-gstreamer) -replaces=(qt5-gstreamer) source=("https://gstreamer.freedesktop.org/src/$pkgname/$pkgname-$pkgver.tar.xz"; gstreamer-1.6.patch - gstreamer-1.16.patch) + gstreamer-1.16.patch + qt-gstreamer-1.18.patch) sha256sums=('9f3b492b74cad9be918e4c4db96df48dab9c012f2ae5667f438b64a4d92e8fd4' 'adffd16ceb13a324858ff38b7bc01ea5129a439bda170e322598df4c7fa24637' - 'dfc2681ab1d157e08b838fb48f51d64fddf3b8ac25a4ec00051632db4f938668') + 'dfc2681ab1d157e08b838fb48f51d64fddf3b8ac25a4ec00051632db4f938668' + 'c62ddf19ef0079eed669585459d7031f69ddd18f7db2122c6e84f221ccb8afb5') prepare() { - mkdir -p build cd $pkgbase-$pkgver - -# Fix build with gstreamer 1.6 - patch -p1 -i ../gstreamer-1.6.patch - -# Fix build with gstreamer 1.16 - patch -p1 -i ../gstreamer-1.16.patch + patch -p1 -i ../gstreamer-1.6.patch # Fix build with gstreamer 1.6 + patch -p1 -i ../gstreamer-1.16.patch # Fix build with gstreamer 1.16 + patch -p1 -i ../qt-gstreamer-1.18.patch # Fix build with gstreamer 1.18 } build() { - cd build - cmake ../$pkgname-$pkgver \ + cmake -B build -S $pkgname-$pkgver \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_LIBDIR=lib \ -DQTGSTREAMER_EXAMPLES=OFF \ -DQT_VERSION=5 - make + cmake --build build } package() { - cd build - make DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" cmake --install build } Added: qt-gstreamer-1.18.patch =================================================================== --- qt-gstreamer-1.18.patch (rev 0) +++ qt-gstreamer-1.18.patch 2020-10-27 08:32:21 UTC (rev 398844) @@ -0,0 +1,26 @@ +diff --git a/src/QGst/event.cpp b/src/QGst/event.cpp +index 0530f0b..260a909 100644 +--- a/src/QGst/event.cpp ++++ b/src/QGst/event.cpp +@@ -125,7 +125,7 @@ Segment SegmentEvent::segment() const + //******************************************************** + TagEventPtr TagEvent::create(const TagList & taglist) + { +- GstEvent * e = gst_event_new_tag(gst_tag_list_copy(taglist)); ++ GstEvent * e = gst_event_new_tag(gst_tag_list_copy(&taglist)); + return TagEventPtr::wrap(e, false); + } + +diff --git a/src/QGst/message.cpp b/src/QGst/message.cpp +index ae845cc..1044b88 100644 +--- a/src/QGst/message.cpp ++++ b/src/QGst/message.cpp +@@ -157,7 +157,7 @@ QString InfoMessage::debugMessage() const + + TagMessagePtr TagMessage::create(const ObjectPtr & source, const TagList & taglist) + { +- GstMessage *m = gst_message_new_tag(source, gst_tag_list_copy(taglist)); ++ GstMessage *m = gst_message_new_tag(source, gst_tag_list_copy(&taglist)); + return TagMessagePtr::wrap(m, false); + } +
