From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1F2F6138334 for ; Sun, 16 Dec 2018 19:30:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0C303E0CCE; Sun, 16 Dec 2018 19:30:38 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C7F70E0CCC for ; Sun, 16 Dec 2018 19:30:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9A168335C38 for ; Sun, 16 Dec 2018 19:30:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CDFF14F8 for ; Sun, 16 Dec 2018 19:30:31 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1544988555.499996f93cc2348710d2f8a90b35423dedf5fa5d.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/phonon/files/, media-libs/phonon/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/phonon/files/phonon-4.10.1-pulseaudio-qt-5.12.patch media-libs/phonon/phonon-4.10.1-r1.ebuild media-libs/phonon/phonon-9999.ebuild X-VCS-Directories: media-libs/phonon/ media-libs/phonon/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 499996f93cc2348710d2f8a90b35423dedf5fa5d X-VCS-Branch: master Date: Sun, 16 Dec 2018 19:30:31 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 5ae5eed2-46c9-4748-892e-439079620422 X-Archives-Hash: 3de1679d8c1053f7043f17e6463143b5 commit: 499996f93cc2348710d2f8a90b35423dedf5fa5d Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Dec 16 19:13:20 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Dec 16 19:29:15 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=499996f9 media-libs/phonon: Fix PulseAudio support with Qt 5.12, EAPI-7 bump Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/phonon-4.10.1-pulseaudio-qt-5.12.patch | 28 ++++++++++++++++++++++ ...{phonon-9999.ebuild => phonon-4.10.1-r1.ebuild} | 9 ++++--- media-libs/phonon/phonon-9999.ebuild | 7 +++--- 3 files changed, 38 insertions(+), 6 deletions(-) diff --git a/media-libs/phonon/files/phonon-4.10.1-pulseaudio-qt-5.12.patch b/media-libs/phonon/files/phonon-4.10.1-pulseaudio-qt-5.12.patch new file mode 100644 index 00000000000..4b1dc5b6fbc --- /dev/null +++ b/media-libs/phonon/files/phonon-4.10.1-pulseaudio-qt-5.12.patch @@ -0,0 +1,28 @@ +From eef6dae58a19da4c6af90a0b7cce6378e527683d Mon Sep 17 00:00:00 2001 +From: Antonio Rojas +Date: Mon, 10 Dec 2018 21:10:13 +0100 +Subject: Fix PulseAudio support with Qt 5.12 + +QAbstractEventDispatcher::instance()->metaObject()->className() now returns "QXcbGlibEventDispatcher", so the glib event loop test fails + +Differential Revision: https://phabricator.kde.org/D17486 +--- + phonon/pulsesupport.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/phonon/pulsesupport.cpp b/phonon/pulsesupport.cpp +index b7009b1..d324084 100644 +--- a/phonon/pulsesupport.cpp ++++ b/phonon/pulsesupport.cpp +@@ -840,7 +840,8 @@ PulseSupport::PulseSupport() + } + + // We require a glib event loop +- if (!QByteArray(QAbstractEventDispatcher::instance()->metaObject()->className()).contains("EventDispatcherGlib")) { ++ if (!QByteArray(QAbstractEventDispatcher::instance()->metaObject()->className()).contains("EventDispatcherGlib") && ++ !QByteArray(QAbstractEventDispatcher::instance()->metaObject()->className()).contains("GlibEventDispatcher")) { + qWarning("WARNING: Disabling PulseAudio integration for lack of GLib event loop."); + return; + } +-- +cgit v1.1 diff --git a/media-libs/phonon/phonon-9999.ebuild b/media-libs/phonon/phonon-4.10.1-r1.ebuild similarity index 90% copy from media-libs/phonon/phonon-9999.ebuild copy to media-libs/phonon/phonon-4.10.1-r1.ebuild index 478b0d3bb95..011e7d0ba88 100644 --- a/media-libs/phonon/phonon-9999.ebuild +++ b/media-libs/phonon/phonon-4.10.1-r1.ebuild @@ -1,7 +1,7 @@ -# 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 if [[ ${PV} != *9999* ]]; then SRC_URI="mirror://kde/stable/phonon/${PV}/${P}.tar.xz" @@ -32,7 +32,8 @@ RDEPEND=" >=media-sound/pulseaudio-0.9.21[glib] ) " -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" kde-frameworks/extra-cmake-modules:5 virtual/pkgconfig " @@ -41,6 +42,8 @@ PDEPEND=" vlc? ( >=media-libs/phonon-vlc-0.9.0[qt5(+)] ) " +PATCHES=( "${FILESDIR}/${P}-pulseaudio-qt-5.12.patch" ) + src_configure() { local mycmakeargs=( -DPHONON_BUILD_PHONON4QT5=ON diff --git a/media-libs/phonon/phonon-9999.ebuild b/media-libs/phonon/phonon-9999.ebuild index 478b0d3bb95..abf73992ab1 100644 --- a/media-libs/phonon/phonon-9999.ebuild +++ b/media-libs/phonon/phonon-9999.ebuild @@ -1,7 +1,7 @@ -# 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 if [[ ${PV} != *9999* ]]; then SRC_URI="mirror://kde/stable/phonon/${PV}/${P}.tar.xz" @@ -32,7 +32,8 @@ RDEPEND=" >=media-sound/pulseaudio-0.9.21[glib] ) " -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" kde-frameworks/extra-cmake-modules:5 virtual/pkgconfig "