diff options
Diffstat (limited to 'media-libs/phonon')
| -rw-r--r-- | media-libs/phonon/Manifest | 4 | ||||
| -rw-r--r-- | media-libs/phonon/files/phonon-4.10.1-pulseaudio-qt-5.12.patch | 28 | ||||
| -rw-r--r-- | media-libs/phonon/phonon-4.10.1-r1.ebuild | 58 | ||||
| -rw-r--r-- | media-libs/phonon/phonon-9999.ebuild | 7 |
4 files changed, 93 insertions, 4 deletions
diff --git a/media-libs/phonon/Manifest b/media-libs/phonon/Manifest index 401accc6c3d1..353a4c0df702 100644 --- a/media-libs/phonon/Manifest +++ b/media-libs/phonon/Manifest @@ -1,4 +1,6 @@ +AUX phonon-4.10.1-pulseaudio-qt-5.12.patch 1222 BLAKE2B 4f3fbc357921da2fcc7257631c0fa52d6f60687717c83a3869275dbe1a28b72377262d150c30482cab8567d254bb4170632130cabb70ec659e18f45aa0b62c6b SHA512 9755301595adb720d8b28b74b1623894c8d5852b172c18ee9119534200e1db1b86039838af9405ab0081b88ae1188043132bb5c4b66a781ed7d036d11b2db9d7 DIST phonon-4.10.1.tar.xz 322100 BLAKE2B 0040bcc82e68a52cb8056c29b5008daddfd8b985f95113e17f1c18d1b5bf1f81222a34ae45b2ee5bd3bc0f104614551638642a85e1770fc218cbe7e2209b5a0e SHA512 a1cc0960c587d09a2fb0f43ae82147df133c34cba7bf01f5720b4b27aca4dda1d83444e89e40fb2f25828d152f89ccfff56d2d4649007c57b7df9eca8c64c007 +EBUILD phonon-4.10.1-r1.ebuild 1383 BLAKE2B a8914a3623d1f2dd35ce183afba370e34e9b39b6bfbbfa5be7ab8743969b789d9126d337dce81abb5da126f7a3e81ed13af3c817665b06344ab258fa2be74c64 SHA512 f8f9030f134d36d9d13410191ef0ecf86006a019019eda6bd6f21e155f26f9c3ac6d2df018c142725104ea04b3a13d21e2db817c911519c28b25d7aec25fbdd7 EBUILD phonon-4.10.1.ebuild 1316 BLAKE2B 4f5bc7ee24bc83bd5a015a95a39b33fd04d5dfd4fc005b9066f66a811e7ebac9cd2342ca8404bb581f78e66f4a4419845ca7462d1cb77a1c163ba45a5fa87d49 SHA512 a74bd9738dc1d27e9d58dce0088fe1c0c6696d0d19a17ac31a38a41c4966a16def6a5f84be108e70c37ecca233fa11d86010ec67f41ec69ff1c255e72b7e61cc -EBUILD phonon-9999.ebuild 1318 BLAKE2B f81d0fa3e4d96d19c0ca73f69c70929d0f3f8ef5ed6d0056c5c77b7de3ba4770e8b0f5260ee761374b3bd92091af015364d8d3651c322603e580c4a309b58809 SHA512 ec473a05b87f24fa10b52097f4a3dec0d890ab368a92b4bbcf176a8b80242776a37bc999b23c6f16da123e76c9df1b8a61e21d90e579718ad48e550c8cf457f8 +EBUILD phonon-9999.ebuild 1326 BLAKE2B 7c6d2b1dc638e0caaa10c788fcb50a56f2aabbcdf1ce4107713b5aac3b89efdbb49fdaebbd18f8c6e6728751db0387bba79f3df91dbee99d503308d83d97bf97 SHA512 88475f68ad0c6ebee1cea8783990d1bd3d269ac4834495094773dca906bb094e37c37abeb64b300584baa6049d273e73954f7e2009d36c2257e67736807275b0 MISC metadata.xml 394 BLAKE2B e551fa12fcce92bd237d1cdb3fcbd496768e012004ace1e08a89f1e0e5f5c997d5b9d1488afce03925337d28a9c431994ce23244ffcb46f7138cde951dc26662 SHA512 963308198d2057bc2869eb21b644c59211f3c4bb04a46de3cca04dc85cdcf67b113555870149b971c8c43a0c64fb88cd141ccf20740f6428d1573485844574a6 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 000000000000..4b1dc5b6fbc4 --- /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 <arojas@archlinux.org> +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-4.10.1-r1.ebuild b/media-libs/phonon/phonon-4.10.1-r1.ebuild new file mode 100644 index 000000000000..011e7d0ba881 --- /dev/null +++ b/media-libs/phonon/phonon-4.10.1-r1.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +if [[ ${PV} != *9999* ]]; then + SRC_URI="mirror://kde/stable/phonon/${PV}/${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 qmake-utils + +DESCRIPTION="KDE multimedia API" +HOMEPAGE="https://phonon.kde.org/" + +LICENSE="|| ( LGPL-2.1 LGPL-3 )" +SLOT="0" +IUSE="debug designer gstreamer pulseaudio +vlc" + +RDEPEND=" + !!dev-qt/qtphonon:4 + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + designer? ( dev-qt/designer:5 ) + pulseaudio? ( + dev-libs/glib:2 + >=media-sound/pulseaudio-0.9.21[glib] + ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + kde-frameworks/extra-cmake-modules:5 + virtual/pkgconfig +" +PDEPEND=" + gstreamer? ( >=media-libs/phonon-gstreamer-4.9.0[qt5(+)] ) + 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 + -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE + -DPHONON_BUILD_DESIGNER_PLUGIN=$(usex designer) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Declarative=ON + -DWITH_GLIB2=$(usex pulseaudio) + -DWITH_PulseAudio=$(usex pulseaudio) + -DQT_QMAKE_EXECUTABLE="$(qt5_get_bindir)"/qmake + ) + cmake-utils_src_configure +} diff --git a/media-libs/phonon/phonon-9999.ebuild b/media-libs/phonon/phonon-9999.ebuild index 478b0d3bb95d..abf73992ab1f 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 " |