Control: tags -1 patch

On Mon, Dec 21, 2020 at 10:03:53PM +0100, Paul Gevers wrote:
> On Sun, 6 Oct 2019 23:12:00 +0200 Helmut Grohne <hel...@subdivi.de> wrote:
> > qt-gstreamer fails to build from source in unstable on amd64. A build in
> > sbuild ends with:
> 
> The reproducibility rebuilds [1] show this happening on all their
> architectures. The bullseye freeze is drawing near. Can this bug please
> be looked into soon?

Arch has 2 patches (in attach) to fix the build with newer versions of
gstreamer. I confirmed that they make the build succeed.

https://github.com/archlinux/svntogit-packages/commits/packages/qt-gstreamer/trunk

Cheers,

Ivo
>From 6e4fb2f3fcfb453c5522c66457ac5ed8c3b1b05c Mon Sep 17 00:00:00 2001
From: George Kiagiadakis <george.kiagiada...@collabora.com>
Date: Sat, 7 Sep 2019 10:49:38 +0300
Subject: QGst/caps: compilation fix from
 https://bugs.kde.org/show_bug.cgi?id=406676#c2

Because the macro version of gst_caps_copy() confuses the C++ compiler
---
 src/QGst/caps.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/QGst/caps.cpp b/src/QGst/caps.cpp
index 3824d82..a15b701 100644
--- a/src/QGst/caps.cpp
+++ b/src/QGst/caps.cpp
@@ -54,7 +54,8 @@ QString Caps::toString() const
 
 void Caps::append(const CapsPtr & caps2)
 {
-    gst_caps_append(object<GstCaps>(), gst_caps_copy(caps2));
+    const GstCaps * caps2ptr = caps2;
+    gst_caps_append(object<GstCaps>(), gst_caps_copy(caps2ptr));
 }
 
 CapsPtr Caps::merge(CapsPtr & caps2)
-- 
cgit v1.2.1

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);
 }
 

Reply via email to