public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/phonon-gstreamer/files/, media-libs/phonon-gstreamer/
Date: Sun, 16 Dec 2018 19:30:31 +0000 (UTC)	[thread overview]
Message-ID: <1544988556.469eb8e67ea448ca5f5a4b8e4da8674c83bbcdc7.asturm@gentoo> (raw)

commit:     469eb8e67ea448ca5f5a4b8e4da8674c83bbcdc7
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 16 19:23:09 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Dec 16 19:29:16 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=469eb8e6

media-libs/phonon-gstreamer: No paused state on 0 vol, EAPI-7 bump

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 ...non-gstreamer-4.9.0-no-paused-on-zero-vol.patch | 30 ++++++++++++++++++++++
 ...999.ebuild => phonon-gstreamer-4.9.0-r3.ebuild} | 14 +++++++---
 .../phonon-gstreamer/phonon-gstreamer-9999.ebuild  |  9 ++++---
 3 files changed, 45 insertions(+), 8 deletions(-)

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 00000000000..51887e99c8e
--- /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-9999.ebuild b/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r3.ebuild
similarity index 80%
copy from media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild
copy to media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r3.ebuild
index cd3c7c7b418..cc7a98acb8d 100644
--- a/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild
+++ b/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r3.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,10 +38,16 @@ RDEPEND="
 	virtual/opengl
 	network? ( media-plugins/gst-plugins-soup:1.0 )
 "
-DEPEND="${RDEPEND}
+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 cd3c7c7b418..0d59d267cf7 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
 "
 


             reply	other threads:[~2018-12-16 19:30 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-12-16 19:30 Andreas Sturmlechner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2022-11-11 23:17 [gentoo-commits] repo/gentoo:master commit in: media-libs/phonon-gstreamer/files/, media-libs/phonon-gstreamer/ Andreas Sturmlechner
2018-04-13 23:01 Andreas Sturmlechner
2016-07-24 17:21 Michael Palimaka
2015-10-27 15:45 Michael Palimaka

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1544988556.469eb8e67ea448ca5f5a4b8e4da8674c83bbcdc7.asturm@gentoo \
    --to=asturm@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox