summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-qt/qtdemo/ChangeLog6
-rw-r--r--dev-qt/qtdemo/qtdemo-4.8.5-r1.ebuild6
2 files changed, 8 insertions, 4 deletions
diff --git a/dev-qt/qtdemo/ChangeLog b/dev-qt/qtdemo/ChangeLog
index 90804557d0a3..5e8957d17bd6 100644
--- a/dev-qt/qtdemo/ChangeLog
+++ b/dev-qt/qtdemo/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-qt/qtdemo
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdemo/ChangeLog,v 1.9 2013/11/04 21:43:12 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdemo/ChangeLog,v 1.10 2013/12/28 02:06:13 pesa Exp $
+
+ 28 Dec 2013; Davide Pesavento <pesa@gentoo.org> qtdemo-4.8.5-r1.ebuild:
+ Don't fail if gstreamer is not installed, since other phonon backends may have
+ been selected. Fixes bug 490902. Do the same with QtMultimedia audio backend.
04 Nov 2013; Agostino Sarubbo <ago@gentoo.org> qtdemo-4.8.5-r1.ebuild:
Stable for ppc64, wrt bug #488536
diff --git a/dev-qt/qtdemo/qtdemo-4.8.5-r1.ebuild b/dev-qt/qtdemo/qtdemo-4.8.5-r1.ebuild
index 2d7e72174480..00dba52ca991 100644
--- a/dev-qt/qtdemo/qtdemo-4.8.5-r1.ebuild
+++ b/dev-qt/qtdemo/qtdemo-4.8.5-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdemo/qtdemo-4.8.5-r1.ebuild,v 1.5 2013/11/04 21:43:12 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdemo/qtdemo-4.8.5-r1.ebuild,v 1.6 2013/12/28 02:06:13 pesa Exp $
EAPI=4
@@ -97,10 +97,10 @@ src_configure() {
myconf+="
$(qt_use dbus)
$(qt_use declarative)
- $(qt_use multimedia)
+ $(qt_use multimedia) -no-audio-backend
$(qt_use opengl)
$(qt_use openvg)
- $(qt_use phonon)
+ $(qt_use phonon) -no-phonon-backend
$(qt_use qt3support)
$(qt_use webkit)
$(qt_use xmlpatterns)"