| 1 |
commit: 125bc025b7e91c3f4b60f219416b62be04fcbf00 |
| 2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jul 13 17:23:10 2016 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jul 13 17:24:58 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=125bc025 |
| 7 |
|
| 8 |
media-libs/phonon: ensure zeitgeist is always disabled on a foreign ABI |
| 9 |
|
| 10 |
dev-libs/libqzeitgeist is not multilib-enabled, so if not explicitly disabled |
| 11 |
the native library may be detected during a foreign ABI build causing a build |
| 12 |
failure. |
| 13 |
|
| 14 |
Package-Manager: portage-2.3.0 |
| 15 |
|
| 16 |
media-libs/phonon/phonon-4.8.3-r1.ebuild | 4 ++-- |
| 17 |
media-libs/phonon/phonon-4.9.0.ebuild | 2 +- |
| 18 |
media-libs/phonon/phonon-9999.ebuild | 2 +- |
| 19 |
3 files changed, 4 insertions(+), 4 deletions(-) |
| 20 |
|
| 21 |
diff --git a/media-libs/phonon/phonon-4.8.3-r1.ebuild b/media-libs/phonon/phonon-4.8.3-r1.ebuild |
| 22 |
index c1b5b0e..6b06e7f 100644 |
| 23 |
--- a/media-libs/phonon/phonon-4.8.3-r1.ebuild |
| 24 |
+++ b/media-libs/phonon/phonon-4.8.3-r1.ebuild |
| 25 |
@@ -1,4 +1,4 @@ |
| 26 |
-# Copyright 1999-2015 Gentoo Foundation |
| 27 |
+# Copyright 1999-2016 Gentoo Foundation |
| 28 |
# Distributed under the terms of the GNU General Public License v2 |
| 29 |
# $Id$ |
| 30 |
|
| 31 |
@@ -73,7 +73,7 @@ multilib_src_configure() { |
| 32 |
$(cmake-utils_use designer PHONON_BUILD_DESIGNER_PLUGIN) |
| 33 |
$(cmake-utils_use_with pulseaudio GLIB2) |
| 34 |
$(cmake-utils_use_with pulseaudio PulseAudio) |
| 35 |
- $(multilib_is_native_abi && cmake-utils_use_with zeitgeist QZeitgeist) |
| 36 |
+ $(multilib_is_native_abi && echo -DWITH_QZeitgeist=$(usex zeitgeist) || echo -DWITH_QZeitgeist=OFF) |
| 37 |
-DQT_QMAKE_EXECUTABLE="$(${QT_MULTIBUILD_VARIANT}_get_bindir)"/qmake |
| 38 |
) |
| 39 |
if [[ ${QT_MULTIBUILD_VARIANT} = qt4 ]]; then |
| 40 |
|
| 41 |
diff --git a/media-libs/phonon/phonon-4.9.0.ebuild b/media-libs/phonon/phonon-4.9.0.ebuild |
| 42 |
index 8a2830c..ae53534 100644 |
| 43 |
--- a/media-libs/phonon/phonon-4.9.0.ebuild |
| 44 |
+++ b/media-libs/phonon/phonon-4.9.0.ebuild |
| 45 |
@@ -69,7 +69,7 @@ multilib_src_configure() { |
| 46 |
-DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE |
| 47 |
-DWITH_GLIB2=$(usex pulseaudio) |
| 48 |
-DWITH_PulseAudio=$(usex pulseaudio) |
| 49 |
- $(multilib_is_native_abi && echo -DWITH_QZeitgeist=$(usex zeitgeist)) |
| 50 |
+ $(multilib_is_native_abi && echo -DWITH_QZeitgeist=$(usex zeitgeist) || echo -DWITH_QZeitgeist=OFF) |
| 51 |
) |
| 52 |
|
| 53 |
if [[ ${QT_MULTIBUILD_VARIANT} = qt4 ]]; then |
| 54 |
|
| 55 |
diff --git a/media-libs/phonon/phonon-9999.ebuild b/media-libs/phonon/phonon-9999.ebuild |
| 56 |
index 8a2830c..ae53534 100644 |
| 57 |
--- a/media-libs/phonon/phonon-9999.ebuild |
| 58 |
+++ b/media-libs/phonon/phonon-9999.ebuild |
| 59 |
@@ -69,7 +69,7 @@ multilib_src_configure() { |
| 60 |
-DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE |
| 61 |
-DWITH_GLIB2=$(usex pulseaudio) |
| 62 |
-DWITH_PulseAudio=$(usex pulseaudio) |
| 63 |
- $(multilib_is_native_abi && echo -DWITH_QZeitgeist=$(usex zeitgeist)) |
| 64 |
+ $(multilib_is_native_abi && echo -DWITH_QZeitgeist=$(usex zeitgeist) || echo -DWITH_QZeitgeist=OFF) |
| 65 |
) |
| 66 |
|
| 67 |
if [[ ${QT_MULTIBUILD_VARIANT} = qt4 ]]; then |
Archives