diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-01-12 16:58:08 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-01-12 16:58:08 +0000 |
| commit | c8a77dfe4d3d307c1d5dd2650b7297447d8b609d (patch) | |
| tree | 9ea78393bc3ecd6ab4de449383d4e97e5f3648ae /media-libs/phonon | |
| parent | 2891d29af8907ce881662f4a02844926d7a293c7 (diff) | |
gentoo resync : 12.01.2019
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.2.ebuild (renamed from media-libs/phonon/phonon-4.10.1-r1.ebuild) | 4 |
3 files changed, 3 insertions, 33 deletions
diff --git a/media-libs/phonon/Manifest b/media-libs/phonon/Manifest index 353a4c0df702..590052fc7001 100644 --- a/media-libs/phonon/Manifest +++ b/media-libs/phonon/Manifest @@ -1,6 +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 +DIST phonon-4.10.2.tar.xz 322176 BLAKE2B a73fa78e732ba56745e0791559a1ab195e9a5d867d368935ebc779cc1705a405dfd8302f6b5d92678098da8b6fdb52ec4cc2d553c361c3fefc738d502e3c38b6 SHA512 205c2f41691ed37a2b24aa5e900f7720ba024d2046ea4bf0a9b9c46235ffd72dfb4010287ccf753b13e395f84c2a202cbb76454806de3519faf52c3ac7001c4e EBUILD phonon-4.10.1.ebuild 1316 BLAKE2B 4f5bc7ee24bc83bd5a015a95a39b33fd04d5dfd4fc005b9066f66a811e7ebac9cd2342ca8404bb581f78e66f4a4419845ca7462d1cb77a1c163ba45a5fa87d49 SHA512 a74bd9738dc1d27e9d58dce0088fe1c0c6696d0d19a17ac31a38a41c4966a16def6a5f84be108e70c37ecca233fa11d86010ec67f41ec69ff1c255e72b7e61cc +EBUILD phonon-4.10.2.ebuild 1326 BLAKE2B 80fbd37bddc8762071ada165dce4736a6588d06ed1f1191858076bad55dca1d527a85f530edfcc206f6b7b5b9d937494b65b1c7916604102b11af4700104483e SHA512 65dba06b0217f8fdca06802b50faf359d9edf35bf6dc8b65abcfc506d826e89836878aa18293070721d753482fd3c770264a5b072c91b9b1c0bcc6bf781fcfaf 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 deleted file mode 100644 index 4b1dc5b6fbc4..000000000000 --- a/media-libs/phonon/files/phonon-4.10.1-pulseaudio-qt-5.12.patch +++ /dev/null @@ -1,28 +0,0 @@ -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.2.ebuild index 011e7d0ba881..264801e2557e 100644 --- a/media-libs/phonon/phonon-4.10.1-r1.ebuild +++ b/media-libs/phonon/phonon-4.10.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -42,8 +42,6 @@ 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 |