diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-11-03 16:06:58 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-11-03 16:06:58 +0000 |
commit | bd4aeefe33e63f613512604e47bfca7b2187697d (patch) | |
tree | adb35b5a9a00ee7ea591ab0c987f70167c23b597 /media-libs/qt-gstreamer/files | |
parent | 48ece6662cbd443015f5a57ae6d8cbdbd69ef37c (diff) |
gentoo resync : 03.11.2019
Diffstat (limited to 'media-libs/qt-gstreamer/files')
-rw-r--r-- | media-libs/qt-gstreamer/files/qt-gstreamer-1.2.0-clang-38.patch | 67 | ||||
-rw-r--r-- | media-libs/qt-gstreamer/files/qt-gstreamer-1.2.0-gstreamer16.patch | 25 |
2 files changed, 92 insertions, 0 deletions
diff --git a/media-libs/qt-gstreamer/files/qt-gstreamer-1.2.0-clang-38.patch b/media-libs/qt-gstreamer/files/qt-gstreamer-1.2.0-clang-38.patch new file mode 100644 index 000000000000..977a09d7f6ce --- /dev/null +++ b/media-libs/qt-gstreamer/files/qt-gstreamer-1.2.0-clang-38.patch @@ -0,0 +1,67 @@ +From fc159e5c4c8ffeabdc7319514c6bb19c9c9e1d3b Mon Sep 17 00:00:00 2001 +From: Aleix Pol <aleixpol@kde.org> +Date: Mon, 13 Jun 2016 10:36:34 +0200 +Subject: [PATCH] Fix build with Clang 3.8 + +error: invalid suffix on literal; C++11 requires a space between literal and identifier + +https://bugzilla.gnome.org/show_bug.cgi?id=767578 +--- + elements/gstqtvideosink/delegates/basedelegate.cpp | 2 +- + elements/gstqtvideosink/delegates/qwidgetvideosinkdelegate.cpp | 2 +- + elements/gstqtvideosink/gstqtquick2videosink.cpp | 2 +- + elements/gstqtvideosink/gstqtvideosinkbase.cpp | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/elements/gstqtvideosink/delegates/basedelegate.cpp b/elements/gstqtvideosink/delegates/basedelegate.cpp +index 7dde59c..65f364c 100644 +--- a/elements/gstqtvideosink/delegates/basedelegate.cpp ++++ b/elements/gstqtvideosink/delegates/basedelegate.cpp +@@ -155,7 +155,7 @@ bool BaseDelegate::event(QEvent *event) + BufferEvent *bufEvent = dynamic_cast<BufferEvent*>(event); + Q_ASSERT(bufEvent); + +- GST_TRACE_OBJECT(m_sink, "Received buffer %"GST_PTR_FORMAT, bufEvent->buffer); ++ GST_TRACE_OBJECT(m_sink, "Received buffer %" GST_PTR_FORMAT, bufEvent->buffer); + + if (isActive()) { + gst_buffer_replace (&m_buffer, bufEvent->buffer); +diff --git a/elements/gstqtvideosink/delegates/qwidgetvideosinkdelegate.cpp b/elements/gstqtvideosink/delegates/qwidgetvideosinkdelegate.cpp +index 8f23dc2..c42513f 100644 +--- a/elements/gstqtvideosink/delegates/qwidgetvideosinkdelegate.cpp ++++ b/elements/gstqtvideosink/delegates/qwidgetvideosinkdelegate.cpp +@@ -36,7 +36,7 @@ QWidget *QWidgetVideoSinkDelegate::widget() const + + void QWidgetVideoSinkDelegate::setWidget(QWidget *widget) + { +- GST_LOG_OBJECT(m_sink, "Setting \"widget\" property to %"GST_PTR_FORMAT, widget); ++ GST_LOG_OBJECT(m_sink, "Setting \"widget\" property to %" GST_PTR_FORMAT, widget); + + if (m_widget) { + m_widget.data()->removeEventFilter(this); +diff --git a/elements/gstqtvideosink/gstqtquick2videosink.cpp b/elements/gstqtvideosink/gstqtquick2videosink.cpp +index 7889fbf..bedc074 100644 +--- a/elements/gstqtvideosink/gstqtquick2videosink.cpp ++++ b/elements/gstqtvideosink/gstqtquick2videosink.cpp +@@ -248,7 +248,7 @@ gst_qt_quick2_video_sink_show_frame(GstVideoSink *sink, GstBuffer *buffer) + { + GstQtQuick2VideoSink *self = GST_QT_QUICK2_VIDEO_SINK (sink); + +- GST_TRACE_OBJECT(self, "Posting new buffer (%"GST_PTR_FORMAT") for rendering.", buffer); ++ GST_TRACE_OBJECT(self, "Posting new buffer (%" GST_PTR_FORMAT ") for rendering.", buffer); + + QCoreApplication::postEvent(self->priv->delegate, new BaseDelegate::BufferEvent(buffer)); + +diff --git a/elements/gstqtvideosink/gstqtvideosinkbase.cpp b/elements/gstqtvideosink/gstqtvideosinkbase.cpp +index 118d0a2..a707e02 100644 +--- a/elements/gstqtvideosink/gstqtvideosinkbase.cpp ++++ b/elements/gstqtvideosink/gstqtvideosinkbase.cpp +@@ -207,7 +207,7 @@ GstFlowReturn GstQtVideoSinkBase::show_frame(GstVideoSink *video_sink, GstBuffer + { + GstQtVideoSinkBase *sink = GST_QT_VIDEO_SINK_BASE(video_sink); + +- GST_TRACE_OBJECT(sink, "Posting new buffer (%"GST_PTR_FORMAT") for rendering.", buffer); ++ GST_TRACE_OBJECT(sink, "Posting new buffer (%" GST_PTR_FORMAT ") for rendering.", buffer); + + QCoreApplication::postEvent(sink->delegate, new BaseDelegate::BufferEvent(buffer)); + diff --git a/media-libs/qt-gstreamer/files/qt-gstreamer-1.2.0-gstreamer16.patch b/media-libs/qt-gstreamer/files/qt-gstreamer-1.2.0-gstreamer16.patch new file mode 100644 index 000000000000..6bb24048f6c1 --- /dev/null +++ b/media-libs/qt-gstreamer/files/qt-gstreamer-1.2.0-gstreamer16.patch @@ -0,0 +1,25 @@ +From 6e4fb2f3fcfb453c5522c66457ac5ed8c3b1b05c Mon Sep 17 00:00:00 2001 +From: George Kiagiadakis <george.kiagiadakis@collabora.com> +Date: Sat, 7 Sep 2019 10:49:38 +0300 +Subject: [PATCH] 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) |