[gentoo-commits] proj/qt:master commit in: dev-qt/qtmultimedia/

[Davide Pesavento]

commit:     f211f3f8abd2a544586da907f22a881e39bb214f
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 13 02:11:51 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Jul 13 02:11:51 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=f211f3f8

[dev-qt/qtmultimedia] Make alsa and pulseaudio USE flags actually work.

Also stop enabling opengl by default.

Package-Manager: portage-2.2.20

 dev-qt/qtmultimedia/qtmultimedia-5.5.0.ebuild    | 11 ++++++++---
 dev-qt/qtmultimedia/qtmultimedia-5.5.9999.ebuild | 11 ++++++++---
 dev-qt/qtmultimedia/qtmultimedia-5.9999.ebuild   | 11 ++++++++---
 3 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.5.0.ebuild 
b/dev-qt/qtmultimedia/qtmultimedia-5.5.0.ebuild
index 88cb621..2362b52 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.5.0.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.5.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
        KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
 fi
 
-IUSE="alsa +gstreamer openal +opengl pulseaudio qml widgets"
+IUSE="alsa +gstreamer openal opengl pulseaudio qml widgets"
 
 RDEPEND="
        >=dev-qt/qtcore-${PV}:5
@@ -34,10 +34,14 @@ RDEPEND="
        )
 "
 DEPEND="${RDEPEND}
-       x11-proto/videoproto
+       gstreamer? ( x11-proto/videoproto )
 "
 
 src_prepare() {
+       # do not rely on qtbase configuration
+       sed -i -e 's/contains(QT_CONFIG, \(alsa\|pulseaudio\))://' \
+               qtmultimedia.pro || die
+
        qt_use_compile_test alsa
        qt_use_compile_test gstreamer
        qt_use_compile_test openal
@@ -47,7 +51,8 @@ src_prepare() {
                src/multimediawidgets/multimediawidgets.pro
 
        qt_use_disable_mod qml quick \
-               src/src.pro
+               src/src.pro \
+               src/plugins/plugins.pro
 
        qt_use_disable_mod widgets widgets \
                src/src.pro \

diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.5.9999.ebuild 
b/dev-qt/qtmultimedia/qtmultimedia-5.5.9999.ebuild
index 88cb621..2362b52 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.5.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.5.9999.ebuild
@@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
        KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
 fi
 
-IUSE="alsa +gstreamer openal +opengl pulseaudio qml widgets"
+IUSE="alsa +gstreamer openal opengl pulseaudio qml widgets"
 
 RDEPEND="
        >=dev-qt/qtcore-${PV}:5
@@ -34,10 +34,14 @@ RDEPEND="
        )
 "
 DEPEND="${RDEPEND}
-       x11-proto/videoproto
+       gstreamer? ( x11-proto/videoproto )
 "
 
 src_prepare() {
+       # do not rely on qtbase configuration
+       sed -i -e 's/contains(QT_CONFIG, \(alsa\|pulseaudio\))://' \
+               qtmultimedia.pro || die
+
        qt_use_compile_test alsa
        qt_use_compile_test gstreamer
        qt_use_compile_test openal
@@ -47,7 +51,8 @@ src_prepare() {
                src/multimediawidgets/multimediawidgets.pro
 
        qt_use_disable_mod qml quick \
-               src/src.pro
+               src/src.pro \
+               src/plugins/plugins.pro
 
        qt_use_disable_mod widgets widgets \
                src/src.pro \

diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.9999.ebuild 
b/dev-qt/qtmultimedia/qtmultimedia-5.9999.ebuild
index 88cb621..2362b52 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.9999.ebuild
@@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
        KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
 fi
 
-IUSE="alsa +gstreamer openal +opengl pulseaudio qml widgets"
+IUSE="alsa +gstreamer openal opengl pulseaudio qml widgets"
 
 RDEPEND="
        >=dev-qt/qtcore-${PV}:5
@@ -34,10 +34,14 @@ RDEPEND="
        )
 "
 DEPEND="${RDEPEND}
-       x11-proto/videoproto
+       gstreamer? ( x11-proto/videoproto )
 "
 
 src_prepare() {
+       # do not rely on qtbase configuration
+       sed -i -e 's/contains(QT_CONFIG, \(alsa\|pulseaudio\))://' \
+               qtmultimedia.pro || die
+
        qt_use_compile_test alsa
        qt_use_compile_test gstreamer
        qt_use_compile_test openal
@@ -47,7 +51,8 @@ src_prepare() {
                src/multimediawidgets/multimediawidgets.pro
 
        qt_use_disable_mod qml quick \
-               src/src.pro
+               src/src.pro \
+               src/plugins/plugins.pro
 
        qt_use_disable_mod widgets widgets \
                src/src.pro \