gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-11-10 06:57:08 -08:00
Code Issues Projects Releases Wiki Activity

media-libs/phonon: ensure zeitgeist is always disabled on a foreign ABI

Browse Source 
dev-libs/libqzeitgeist is not multilib-enabled, so if not explicitly disabled
the native library may be detected during a foreign ABI build causing a build
failure.

Package-Manager: portage-2.3.0
This commit is contained in:
Michael Palimaka
2016-07-14 03:24:58 +10:00
parent 0f822518c9
commit 125bc025b7
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
media-libs/phonon/phonon-4.8.3-r1.ebuild
+2 -2
View File
@@ -1,4 +1,4 @@
# Copyright 1999-2015 Gentoo Foundation
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -73,7 +73,7 @@ multilib_src_configure() {
$(cmake-utils_use designer PHONON_BUILD_DESIGNER_PLUGIN)
$(cmake-utils_use_with pulseaudio GLIB2)
$(cmake-utils_use_with pulseaudio PulseAudio)
$(multilib_is_native_abi && cmake-utils_use_with zeitgeist QZeitgeist)
$(multilib_is_native_abi && echo -DWITH_QZeitgeist=$(usex zeitgeist) || echo -DWITH_QZeitgeist=OFF)
-DQT_QMAKE_EXECUTABLE="$(${QT_MULTIBUILD_VARIANT}_get_bindir)"/qmake
)
if [[ ${QT_MULTIBUILD_VARIANT} = qt4 ]]; then
media-libs/phonon/phonon-4.9.0.ebuild
+1 -1
View File
@@ -69,7 +69,7 @@ multilib_src_configure() {
-DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE
-DWITH_GLIB2=$(usex pulseaudio)
-DWITH_PulseAudio=$(usex pulseaudio)
$(multilib_is_native_abi && echo -DWITH_QZeitgeist=$(usex zeitgeist))
$(multilib_is_native_abi && echo -DWITH_QZeitgeist=$(usex zeitgeist) || echo -DWITH_QZeitgeist=OFF)
)
if [[ ${QT_MULTIBUILD_VARIANT} = qt4 ]]; then
media-libs/phonon/phonon-9999.ebuild
+1 -1
View File
@@ -69,7 +69,7 @@ multilib_src_configure() {
-DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE
-DWITH_GLIB2=$(usex pulseaudio)
-DWITH_PulseAudio=$(usex pulseaudio)
$(multilib_is_native_abi && echo -DWITH_QZeitgeist=$(usex zeitgeist))
$(multilib_is_native_abi && echo -DWITH_QZeitgeist=$(usex zeitgeist) || echo -DWITH_QZeitgeist=OFF)
)
if [[ ${QT_MULTIBUILD_VARIANT} = qt4 ]]; then