gentoo resync : 03.11.2019

4 files changed, 103 insertions, 11 deletions

diff --git a/media-libs/qt-gstreamer/Manifest b/media-libs/qt-gstreamer/Manifest
index 002d37722a33..e14fa78b0a80 100644
--- a/media-libs/qt-gstreamer/Manifest
+++ b/media-libs/qt-gstreamer/Manifest
@@ -1,6 +1,8 @@
 AUX qt-gstreamer-1.2.0-boost157.patch 5474 BLAKE2B 72827e5a70e9d204271450f3cdfbe4b400c748e4b0722301de6de3c62cd0ef8ac68e2986732238cf0e5767fb398b73c7c3acd904d7a3aa3e24305012dddc354d SHA512 81f0ff93cf66635283114c35c1e8b0299c9f0f29b2d5c0cbf4e493b0e1895069a813aa898d7a2c1d2110661feffc512f8c91fef1e4e63a83d1d0e807c77b0c28
+AUX qt-gstreamer-1.2.0-clang-38.patch 3455 BLAKE2B ff525007a8c04605cf21e0c14259367b53aa74af761183a22b0103f986b4721c91c2cd3b0570b3582395f3741d0cea44e95fef7a9790adac0f2b225d19be3ff0 SHA512 9678fb9e9502c055be9f0875d4d33bf7c8d852228009ad1ef5b85b41b009eb43fc3b946b3ffaaaf1b79a90e6e20c4940f46946655f07d533214ef76473cd7dc1
 AUX qt-gstreamer-1.2.0-gstreamer15.patch 1494 BLAKE2B 1be10fb02d4a68406b17ccc758bb1bc79ad85fbde217de7ac12dd5c306326e68cddcdda82b55eebb24c6befb929008c85150b99d7bc6040e7b91984260287d3e SHA512 999ccdd8d9772887e5d302a43e14c2400519306332facc1e4a1c4a65d941ca278a473c84816e4a5358f08df2b42675e7ec9285e1616f77f755562942acaaa4a3
+AUX qt-gstreamer-1.2.0-gstreamer16.patch 853 BLAKE2B c25bd3018d1c20b601e9490a665014795114931158ef5cecb9ed3c27e9704483ab5a16fa89058d2cf87b7a63b0ec4644379861991bdb659b840494af1be7091d SHA512 118d8e3c4253f458206615b9b70dff839e492c4628275dfa2dd49705d1ca85dee16a2878d7af84ee8709c88b89d78b41afab65ea72786bce07d446142bbd4128
 AUX qt-gstreamer-1.2.0-qt-5.11b3.patch 1834 BLAKE2B 9869694e31a546d1c31bc965c7e0f44de28f5566076cee8d1bb36f274f42757256d5c77e4bf7be23e12260d235eb72868252a5b920a293adc71520bd91c70e3c SHA512 235418641f23e5bbbceef53f561bdfd3b06b5d247c8d81cfb5b72388f494142458bb0171e5b146f8be9613d22a5c286eec6730414d7cbd35b62744dcfc87e667
 DIST qt-gstreamer-1.2.0.tar.xz 313632 BLAKE2B e41fd7073e223a06b0115025dcfcd637f4803f953b4fe175f5b05713bd5282c7fa12039d5a5b4c98eff5a181bbb7cd4140a0f1de32a8aadeef5d7217b339eadf SHA512 ae58c72765d590b84fa8709b45934ac464d7e00dba862783a2c4fe9d41afd09c6e5f95523cdf465fcfd2c6fa705335071b101912c42cd6c1fd15ae207b0864c7
-EBUILD qt-gstreamer-1.2.0-r4.ebuild 1198 BLAKE2B 8e92d575a36881192af8570977e8b2f1fa7b626bb25f81c2e6633b908378e6de48e7efbe3722849345d8fb89727695aa21f4a0a8db3417f9e937246b32fd0c06 SHA512 d755cb4883768ae9e6ad4b7ee0638ae9b41b436d8d35bb7f47b72ad8687ec3616776173c4c7174e52f717166a58e82e2b1e7700a47b56cd333662a67cc2aec13
+EBUILD qt-gstreamer-1.2.0-r4.ebuild 1135 BLAKE2B 158fb805fd8339a456f4b978d9e55ff86adc3ba496da0265543e63fc0bcf672a3118fe4466816c0ef4d4d23035f0c4cfcce4e2efd2b825b7419757b1a7a4252e SHA512 670dbd2d811fd2f6361fb7a89814d0c15fb46285d73fb7866ec5825905c7e2c62116dfe517afb0c504835558fa1ed09075fbc6d9d2b409d68435375732a81c9a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
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)
diff --git a/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r4.ebuild b/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r4.ebuild
index 72741f9402e7..4adb838f82d5 100644
--- a/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r4.ebuild
+++ b/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r4.ebuild
@@ -3,22 +3,20 @@
 
 EAPI=7
 
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="https://gstreamer.freedesktop.org/src/qt-gstreamer/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
-else
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/gstreamer/qt-gstreamer.git"
-	inherit git-r3
-fi
 inherit cmake-utils
 
 DESCRIPTION="C++ bindings for GStreamer with a Qt-style API"
 HOMEPAGE="https://gstreamer.freedesktop.org/modules/qt-gstreamer.html"
+SRC_URI="https://gstreamer.freedesktop.org/src/qt-gstreamer/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
 IUSE="test"
 
+BDEPEND="
+	dev-util/glib-utils
+"
 RDEPEND="
 	dev-libs/boost:=
 	dev-libs/glib:2
@@ -30,16 +28,16 @@ RDEPEND="
 	media-libs/gstreamer:1.0
 	media-libs/gst-plugins-base:1.0
 "
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
+DEPEND="${RDEPEND}
 	test? ( dev-qt/qttest:5 )
 "
 
 PATCHES=(
 	"${FILESDIR}/${P}-gstreamer15.patch"
+	"${FILESDIR}/${P}-gstreamer16.patch"
 	"${FILESDIR}/${P}-boost157.patch"
 	"${FILESDIR}/${P}-qt-5.11b3.patch"
+	"${FILESDIR}/${P}-clang-38.patch"
 )
 
 # bug 497880