aboutsummaryrefslogtreecommitdiffstats
path: root/multimedia
diff options
context:
space:
mode:
authorTobias C. Berner <tcberner@FreeBSD.org>2018-01-07 17:27:11 +0800
committerTobias C. Berner <tcberner@FreeBSD.org>2018-01-07 17:27:11 +0800
commitaae6917aecddc882fc95ab120a96725b089bb35f (patch)
tree9c1b7231d3e5f400be61d926a0d79b6fa0847b5c /multimedia
parentfbd85f2acc8214a63246a0432e6b67a9edd6a48d (diff)
downloadfreebsd-ports-gnome-aae6917aecddc882fc95ab120a96725b089bb35f.tar.gz
freebsd-ports-gnome-aae6917aecddc882fc95ab120a96725b089bb35f.tar.zst
freebsd-ports-gnome-aae6917aecddc882fc95ab120a96725b089bb35f.zip
multimedia/gstreamer-qt4, fix build with clang6
PR: 224945
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/gstreamer-qt4/Makefile2
-rw-r--r--multimedia/gstreamer-qt4/files/patch-elements_gstqtvideosink_gstqtvideosinkbase.cpp15
-rw-r--r--multimedia/gstreamer-qt4/files/patch-elements_gstqtvideosink_qtvideosinkdelegate.cpp15
-rw-r--r--multimedia/gstreamer-qt4/files/patch-elements_gstqtvideosink_qwidgetvideosinkdelegate.cpp15
4 files changed, 46 insertions, 1 deletions
diff --git a/multimedia/gstreamer-qt4/Makefile b/multimedia/gstreamer-qt4/Makefile
index fdb105c8a93f..b56c5daf75ef 100644
--- a/multimedia/gstreamer-qt4/Makefile
+++ b/multimedia/gstreamer-qt4/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gstreamer
PORTVERSION= 0.10.3
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= multimedia
MASTER_SITES= http://gstreamer.freedesktop.org/src/qt-${PORTNAME}/
PKGNAMESUFFIX= -qt4
diff --git a/multimedia/gstreamer-qt4/files/patch-elements_gstqtvideosink_gstqtvideosinkbase.cpp b/multimedia/gstreamer-qt4/files/patch-elements_gstqtvideosink_gstqtvideosinkbase.cpp
new file mode 100644
index 000000000000..28481b6a8a4f
--- /dev/null
+++ b/multimedia/gstreamer-qt4/files/patch-elements_gstqtvideosink_gstqtvideosinkbase.cpp
@@ -0,0 +1,15 @@
+invalid suffix on literal; C++11 requires a space between literal and identifier
+[-Wreserved-user-defined-literal]
+ GST_TRACE_OBJECT(sink, "Posting new buffer (%"GST_PTR_FORMAT") for rendering. "
+
+--- elements/gstqtvideosink/gstqtvideosinkbase.cpp.orig 2018-01-07 08:43:35 UTC
++++ elements/gstqtvideosink/gstqtvideosinkbase.cpp
+@@ -217,7 +217,7 @@ GstFlowReturn GstQtVideoSinkBase::show_frame(GstVideoS
+ {
+ GstQtVideoSinkBase *sink = GST_QT_VIDEO_SINK_BASE(video_sink);
+
+- GST_TRACE_OBJECT(sink, "Posting new buffer (%"GST_PTR_FORMAT") for rendering. "
++ GST_TRACE_OBJECT(sink, "Posting new buffer (%" GST_PTR_FORMAT ") for rendering. "
+ "Format dirty: %d", buffer, (int)sink->formatDirty);
+
+ QCoreApplication::postEvent(sink->delegate,
diff --git a/multimedia/gstreamer-qt4/files/patch-elements_gstqtvideosink_qtvideosinkdelegate.cpp b/multimedia/gstreamer-qt4/files/patch-elements_gstqtvideosink_qtvideosinkdelegate.cpp
new file mode 100644
index 000000000000..0df7a97d74ca
--- /dev/null
+++ b/multimedia/gstreamer-qt4/files/patch-elements_gstqtvideosink_qtvideosinkdelegate.cpp
@@ -0,0 +1,15 @@
+invalid suffix on literal; C++11 requires a space between literal and identifier
+[-Wreserved-user-defined-literal]
+ GST_TRACE_OBJECT(m_sink, "Received buffer %"GST_PTR_FORMAT, bufEvent->buffer);
+
+--- elements/gstqtvideosink/qtvideosinkdelegate.cpp.orig 2018-01-07 08:41:02 UTC
++++ elements/gstqtvideosink/qtvideosinkdelegate.cpp
+@@ -376,7 +376,7 @@ bool QtVideoSinkDelegate::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 (m_buffer) {
+ //free the previous buffer
diff --git a/multimedia/gstreamer-qt4/files/patch-elements_gstqtvideosink_qwidgetvideosinkdelegate.cpp b/multimedia/gstreamer-qt4/files/patch-elements_gstqtvideosink_qwidgetvideosinkdelegate.cpp
new file mode 100644
index 000000000000..fd3371d9fb42
--- /dev/null
+++ b/multimedia/gstreamer-qt4/files/patch-elements_gstqtvideosink_qwidgetvideosinkdelegate.cpp
@@ -0,0 +1,15 @@
+error: invalid suffix on literal; C++11 requires a space between literal and identifier
+[-Wreserved-user-defined-literal]
+ GST_LOG_OBJECT(m_sink, "Setting \"widget\" property to %"GST_PTR_FORMAT, widget);
+
+--- elements/gstqtvideosink/qwidgetvideosinkdelegate.cpp.orig 2018-01-07 08:41:23 UTC
++++ elements/gstqtvideosink/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);