[gentoo-commits] repo/gentoo:master commit in: media-libs/phonon/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Michael Palimaka" <kensington@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/phonon/
Date: Wed, 13 Jul 2016 17:25:09 +0000 (UTC)	[thread overview]
Message-ID: <1468430698.125bc025b7e91c3f4b60f219416b62be04fcbf00.kensington@gentoo> (raw)

commit:     125bc025b7e91c3f4b60f219416b62be04fcbf00
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 13 17:23:10 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Jul 13 17:24:58 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=125bc025

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

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

 media-libs/phonon/phonon-4.8.3-r1.ebuild | 4 ++--
 media-libs/phonon/phonon-4.9.0.ebuild    | 2 +-
 media-libs/phonon/phonon-9999.ebuild     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/media-libs/phonon/phonon-4.8.3-r1.ebuild b/media-libs/phonon/phonon-4.8.3-r1.ebuild
index c1b5b0e..6b06e7f 100644
--- a/media-libs/phonon/phonon-4.8.3-r1.ebuild
+++ b/media-libs/phonon/phonon-4.8.3-r1.ebuild
@@ -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

diff --git a/media-libs/phonon/phonon-4.9.0.ebuild b/media-libs/phonon/phonon-4.9.0.ebuild
index 8a2830c..ae53534 100644
--- a/media-libs/phonon/phonon-4.9.0.ebuild
+++ b/media-libs/phonon/phonon-4.9.0.ebuild
@@ -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

diff --git a/media-libs/phonon/phonon-9999.ebuild b/media-libs/phonon/phonon-9999.ebuild
index 8a2830c..ae53534 100644
--- a/media-libs/phonon/phonon-9999.ebuild
+++ b/media-libs/phonon/phonon-9999.ebuild
@@ -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

next             reply	other threads:[~2016-07-13 17:25 UTC|newest]

Thread overview: 73+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-07-13 17:25 Michael Palimaka [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-10-22 21:06 [gentoo-commits] repo/gentoo:master commit in: media-libs/phonon/ Andreas Sturmlechner
2025-03-16 23:20 Andreas Sturmlechner
2025-03-16 23:20 Andreas Sturmlechner
2024-07-26  3:39 Arthur Zamarin
2024-07-22 18:37 Arthur Zamarin
2024-07-01 20:47 Andreas Sturmlechner
2024-06-28 15:56 Sam James
2024-06-28 15:45 Sam James
2024-06-28 15:45 Sam James
2024-06-28 13:34 Andreas Sturmlechner
2024-04-25 20:43 Andreas Sturmlechner
2024-03-03 16:37 Andreas Sturmlechner
2024-02-02 12:44 Arthur Zamarin
2022-07-14 20:32 Andreas Sturmlechner
2019-12-03  5:04 Andreas Sturmlechner
2019-12-02 23:29 Aaron Bauman
2019-12-02 16:33 Mikle Kolyada
2019-12-02 16:12 Mikle Kolyada
2019-11-22 13:08 Andreas Sturmlechner
2019-11-22 13:08 Andreas Sturmlechner
2019-11-13 21:25 Andreas Sturmlechner
2019-09-26 13:58 Andreas Sturmlechner
2019-09-26 13:58 Andreas Sturmlechner
2019-08-27 19:59 Andreas Sturmlechner
2019-08-27 19:59 Andreas Sturmlechner
2019-08-27 19:59 Andreas Sturmlechner
2019-08-25  8:10 Andreas Sturmlechner
2019-08-22 14:16 Andreas Sturmlechner
2019-08-22 14:16 Andreas Sturmlechner
2019-08-08 22:00 Andreas Sturmlechner
2019-08-08 21:50 Andreas Sturmlechner
2019-07-20  7:43 Andreas Sturmlechner
2019-01-16 12:01 Andreas Sturmlechner
2019-01-15 22:10 Thomas Deutschmann
2019-01-14 14:33 Mikle Kolyada
2019-01-09 18:46 Andreas Sturmlechner
2018-05-25 23:58 Thomas Deutschmann
2018-05-24 14:31 Agostino Sarubbo
2018-04-27 23:05 Andreas Sturmlechner
2018-04-27 17:59 Johannes Huber
2018-03-13 19:51 Michał Górny
2018-02-24  9:48 Andreas Sturmlechner
2018-02-24  9:48 Andreas Sturmlechner
2017-12-19 14:41 Andreas Sturmlechner
2017-12-19  0:20 Andreas Sturmlechner
2017-12-19  0:20 Andreas Sturmlechner
2017-08-31 20:54 Andreas Sturmlechner
2017-08-26 19:19 Andreas Sturmlechner
2017-07-30 20:46 Andreas Sturmlechner
2017-06-24  9:11 Markus Meier
2017-06-23 11:44 Alexis Ballier
2017-06-13 12:31 Agostino Sarubbo
2017-06-04 10:42 Agostino Sarubbo
2017-06-03  7:54 Agostino Sarubbo
2017-06-02  0:38 Andreas Sturmlechner
2017-06-02  0:38 Andreas Sturmlechner
2017-01-24 17:15 Johannes Huber
2017-01-03 19:10 Johannes Huber
2016-12-29 16:23 Johannes Huber
2016-11-13 19:18 Markus Meier
2016-10-13  9:47 Agostino Sarubbo
2016-10-02  8:11 Jeroen Roovers
2016-09-27  9:09 Tobias Klausmann
2016-07-22 17:40 Michael Palimaka
2016-07-13 18:13 Michael Palimaka
2016-07-11  7:57 Johannes Huber
2016-05-31 17:21 Johannes Huber
2016-04-24 12:26 Johannes Huber
2016-04-21 17:15 Michael Palimaka
2016-04-21 17:15 Michael Palimaka
2016-04-21 17:15 Michael Palimaka
2016-04-21 17:15 Michael Palimaka

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:c1b5b0e dfblob:6b06e7f dfblob:8a2830c dfblob:ae53534
dfblob:8a2830c dfblob:ae53534 )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: media-libs/phonon/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1468430698.125bc025b7e91c3f4b60f219416b62be04fcbf00.kensington@gentoo \
    --to=kensington@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox