gentoo resync : 24.12.2018

4 files changed, 92 insertions, 5 deletions

diff --git a/media-libs/phonon-gstreamer/Manifest b/media-libs/phonon-gstreamer/Manifest
index 9b2d4c5d1902..995591957b77 100644
--- a/media-libs/phonon-gstreamer/Manifest
+++ b/media-libs/phonon-gstreamer/Manifest
@@ -1,5 +1,7 @@
+AUX phonon-gstreamer-4.9.0-no-paused-on-zero-vol.patch 998 BLAKE2B 6f659a6a6aad157ad708934a165f17ca4766dec3baf3cdd03e5b10b41201751f17008b43b6183df9afeba7303603fc9c1fcc413bb16a2e97cd571196ce2e6905 SHA512 c97a88e86ef3f56fdcdb12d3256afce34381ec1072ebbeda7c427db7a9c000feecab5f84a44d9a86fd099b26cda6a8a50a0a4c20139167e4e8b96c96368feddb
 AUX phonon-gstreamer-4.9.0-qt-5.11.patch 2144 BLAKE2B a11065fab61037e11f54ab2b3a41f55231ac2175372077b302b033bbf7483030e763e50e8dce00886394ce94feb205b75d3bf5f4ea4b0c11f3e0c0fba42f14f3 SHA512 b13fe80bf493d33ef942babf084f823e9d6314f489496007dd43e9c0efba4c8e354067cba5ccae53806156d631a8bbf115b84e654052086aeb1d5d32f15b6f08
 DIST phonon-backend-gstreamer-4.9.0.tar.xz 75960 BLAKE2B 676810dc99f3734a6932bfe355a37df1334c3460eba9a6d96e039442ce2729b61db61798c1f7207aef68a30f79355703c80e6aeb1a2ca7156f22e9fd7e07027b SHA512 9c13d37c6c7070c2bd8fcc562f743ac2f55289bc7cc82147ef0ae990e5d380d541cc1d9ce61e6ad1549ed1935d41faafaeeb0cd5463e4c656ea8fee636ff4dfe
 EBUILD phonon-gstreamer-4.9.0-r2.ebuild 1112 BLAKE2B d89617cbae84c6cfc8aada90399857bb9da793b1eb5e9521c0dbc2bd98c1510b5e1c9a34a013180070898713290b343ed7dffd697a608df7b3a513321882bffc SHA512 d57323dda5dd554e8ac0b6fae3bb3fad57b255b3d4f396eb70765a8088b509f0f34ddf10b3723fb048feb7aa0c1eddc4463e37513ffcd0268e8cf31adfb33599
-EBUILD phonon-gstreamer-9999.ebuild 1056 BLAKE2B aa1afd5ade889a59c5ec4218fe9cba15f50d863483e5b379077c5a832e35a9c57eecf9eddb307e04ccc5bf6882ef72f845749b54407fa57cdfb79bb230882e71 SHA512 17a27ab64a08f7be157a59106e3f8871b631533164d517130c37448fa6d2d26eb2ceb2056cd31c35cc4af15bbe821d0c2792e89ffe86a3d832aa4b10862d9efc
+EBUILD phonon-gstreamer-4.9.0-r3.ebuild 1171 BLAKE2B 1a8b437bfc5d212095c9512ef4f4fed781272ff71e223276ee59ec0939a8cb09ddb79e16f5673808556f28ff0d4967339085c61a344c3bfc77135e819431fa24 SHA512 18804f0bd1a29e70254eca50599ec809eb30baaf49e6563e2251cf1c49bee3ed6258f970290e1f476d9a1803c692a35cd9c775b98d3522e1149e775e7fc79279
+EBUILD phonon-gstreamer-9999.ebuild 1076 BLAKE2B cc052d97bd49ea217e9cd98c7dd716f34e21088ac9f76c0a1816198a70a3431bec3c9e78de843523e23fa23e5eb947734b38b5958bf99393d54ad05fbe0d43db SHA512 a591c829bbbaa09bddb724956605fcb65528113769837d0232a87feb057a4f15825c7b7a0fdad7e65fd457a756c96ad372aa0ec0baf54b12d7e800c3d25ecb4d
 MISC metadata.xml 339 BLAKE2B 2e6fd710b9791c7dd1f8836dac9209a84608dcb54d5ebef458acef6651c03eb55d8733d23df0a6cd0dbe470f00d43e0413b3d18b432f8a38a765af458e5662fc SHA512 c481721ab8e7762b2b951501cc99f7e2d2263ffd682dce3731fb415b677b74f7fbfe7770e9d2b1b1ce496c10254b84bb7489ff971593dac90c151a9ff1623e9a
diff --git a/media-libs/phonon-gstreamer/files/phonon-gstreamer-4.9.0-no-paused-on-zero-vol.patch b/media-libs/phonon-gstreamer/files/phonon-gstreamer-4.9.0-no-paused-on-zero-vol.patch
new file mode 100644
index 000000000000..51887e99c8e1
--- /dev/null
+++ b/media-libs/phonon-gstreamer/files/phonon-gstreamer-4.9.0-no-paused-on-zero-vol.patch
@@ -0,0 +1,30 @@
+From fca0714fd37b2276eb663f649b6b9871a3973fa4 Mon Sep 17 00:00:00 2001
+From: Anthony Fieroni <bvbfan@abv.bg>
+Date: Mon, 10 Dec 2018 16:19:51 +0200
+Subject: Do not trigger paused state on 0 percentage
+
+Differential Revision: https://phabricator.kde.org/D14241
+
+Signed-off-by: Anthony Fieroni <bvbfan@abv.bg>
+---
+ gstreamer/pipeline.cpp | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/gstreamer/pipeline.cpp b/gstreamer/pipeline.cpp
+index 7025418..0d0b253 100644
+--- a/gstreamer/pipeline.cpp
++++ b/gstreamer/pipeline.cpp
+@@ -325,6 +325,11 @@ gboolean Pipeline::cb_buffering(GstBus *bus, GstMessage *gstMessage, gpointer da
+     gint percent = 0;
+     gst_message_parse_buffering(gstMessage, &percent);
+ 
++    // we should not trigger paused state or gstreamer will starts buffering again
++    if (percent == 0) {
++        return true;
++    }
++
+     debug() << Q_FUNC_INFO << "Buffering :" << percent;
+ 
+     // Instead of playing when the pipeline is still streaming, we pause
+-- 
+cgit v1.1
diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r3.ebuild b/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r3.ebuild
new file mode 100644
index 000000000000..cc7a98acb8dd
--- /dev/null
+++ b/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="phonon-backend-gstreamer"
+MY_P=${MY_PN}-${PV}
+
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/${MY_P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+else
+	EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
+	inherit git-r3
+fi
+
+inherit cmake-utils
+
+DESCRIPTION="Phonon GStreamer backend"
+HOMEPAGE="https://phonon.kde.org/"
+
+LICENSE="LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"
+SLOT="0"
+IUSE="alsa debug +network"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/libxml2:2
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtopengl:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0
+	>=media-libs/phonon-4.10.0
+	media-plugins/gst-plugins-meta:1.0[alsa?,ogg,vorbis]
+	virtual/opengl
+	network? ( media-plugins/gst-plugins-soup:1.0 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-qt-5.11.patch"
+	"${FILESDIR}/${P}-no-paused-on-zero-vol.patch"
+)
+
+src_configure() {
+	local mycmakeargs=( -DPHONON_BUILD_PHONON4QT5=ON )
+	cmake-utils_src_configure
+}
diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild b/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild
index cd3c7c7b418c..0d59d267cf77 100644
--- a/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild
+++ b/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 MY_PN="phonon-backend-gstreamer"
 MY_P=${MY_PN}-${PV}
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/${MY_P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-fbsd"
 else
 	EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
 	inherit git-r3
@@ -38,7 +38,8 @@ RDEPEND="
 	virtual/opengl
 	network? ( media-plugins/gst-plugins-soup:1.0 )
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
 "