commit: ed3fbad2098ffcfededfc6b1bf69fc2005285704
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 5 00:07:26 2014 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Aug 5 00:07:26 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=ed3fbad2
[dev-qt/qtmultimedia:5] Fix automagic deps, add opengl and widgets USE flags.
Based on pull request #67 by xhochy. Fixes bug #517532.
Package-Manager: portage-2.2.11
---
dev-qt/qtmultimedia/metadata.xml | 3 +-
dev-qt/qtmultimedia/qtmultimedia-5.3.1.ebuild | 44 ++++++++++++++++++------
dev-qt/qtmultimedia/qtmultimedia-5.3.9999.ebuild | 44 ++++++++++++++++++------
dev-qt/qtmultimedia/qtmultimedia-5.9999.ebuild | 44 ++++++++++++++++++------
4 files changed, 104 insertions(+), 31 deletions(-)
diff --git a/dev-qt/qtmultimedia/metadata.xml b/dev-qt/qtmultimedia/metadata.xml
index b4f8d68..a31be04 100644
--- a/dev-qt/qtmultimedia/metadata.xml
+++ b/dev-qt/qtmultimedia/metadata.xml
@@ -5,7 +5,8 @@
<use>
<flag name="exceptions">Add support for exceptions - like
catching them
inside the event loop (recommended by Nokia)</flag>
- <flag name="qml">Build QML/QtQuick bindings</flag>
+ <flag name="qml">Build QML/QtQuick bindings and imports</flag>
+ <flag name="widgets">Build the QtMultimediaWidgets module</flag>
</use>
<upstream>
<bugs-to>https://bugreports.qt-project.org/</bugs-to>
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.3.1.ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5.3.1.ebuild
index a36c3ac..3676f07 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.3.1.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.3.1.ebuild
@@ -14,25 +14,49 @@ else
KEYWORDS="~amd64 ~x86"
fi
-# FIXME: probably lots of automagic deps
-# TODO: qt-widgets can be made optional
-# TODO: opengl, xv
+IUSE="alsa +gstreamer openal opengl +pulseaudio qml widgets"
+REQUIRED_USE="?? ( alsa pulseaudio )"
-IUSE="alsa gstreamer openal pulseaudio qml"
-
-DEPEND="
+RDEPEND="
>=dev-qt/qtcore-${PV}:5[debug=]
>=dev-qt/qtgui-${PV}:5[debug=]
>=dev-qt/qtnetwork-${PV}:5[debug=]
- >=dev-qt/qtwidgets-${PV}:5[debug=]
alsa? ( media-libs/alsa-lib )
gstreamer? (
media-libs/gstreamer:0.10
media-libs/gst-plugins-bad:0.10
media-libs/gst-plugins-base:0.10
)
- openal? ( media-libs/openal )
pulseaudio? ( media-sound/pulseaudio )
- qml? ( >=dev-qt/qtdeclarative-${PV}:5[debug=] )
+ qml? (
+ >=dev-qt/qtdeclarative-${PV}:5[debug=]
+ openal? ( media-libs/openal )
+ )
+ widgets? (
+ >=dev-qt/qtwidgets-${PV}:5[debug=]
+ opengl? ( >=dev-qt/qtopengl-${PV}:5[debug=] )
+ )
"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+ x11-proto/videoproto
+"
+
+src_prepare() {
+ qt_use_compile_test alsa
+ qt_use_compile_test gstreamer
+ qt_use_compile_test openal
+ qt_use_compile_test pulseaudio
+
+ qt_use_disable_mod opengl opengl \
+ src/multimediawidgets/multimediawidgets.pro
+
+ qt_use_disable_mod qml quick \
+ src/src.pro
+
+ qt_use_disable_mod widgets widgets \
+ src/src.pro \
+ src/gsttools/gsttools.pro \
+ src/plugins/gstreamer/common.pri
+
+ qt5-build_src_prepare
+}
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.3.9999.ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5.3.9999.ebuild
index a36c3ac..3676f07 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.3.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.3.9999.ebuild
@@ -14,25 +14,49 @@ else
KEYWORDS="~amd64 ~x86"
fi
-# FIXME: probably lots of automagic deps
-# TODO: qt-widgets can be made optional
-# TODO: opengl, xv
+IUSE="alsa +gstreamer openal opengl +pulseaudio qml widgets"
+REQUIRED_USE="?? ( alsa pulseaudio )"
-IUSE="alsa gstreamer openal pulseaudio qml"
-
-DEPEND="
+RDEPEND="
>=dev-qt/qtcore-${PV}:5[debug=]
>=dev-qt/qtgui-${PV}:5[debug=]
>=dev-qt/qtnetwork-${PV}:5[debug=]
- >=dev-qt/qtwidgets-${PV}:5[debug=]
alsa? ( media-libs/alsa-lib )
gstreamer? (
media-libs/gstreamer:0.10
media-libs/gst-plugins-bad:0.10
media-libs/gst-plugins-base:0.10
)
- openal? ( media-libs/openal )
pulseaudio? ( media-sound/pulseaudio )
- qml? ( >=dev-qt/qtdeclarative-${PV}:5[debug=] )
+ qml? (
+ >=dev-qt/qtdeclarative-${PV}:5[debug=]
+ openal? ( media-libs/openal )
+ )
+ widgets? (
+ >=dev-qt/qtwidgets-${PV}:5[debug=]
+ opengl? ( >=dev-qt/qtopengl-${PV}:5[debug=] )
+ )
"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+ x11-proto/videoproto
+"
+
+src_prepare() {
+ qt_use_compile_test alsa
+ qt_use_compile_test gstreamer
+ qt_use_compile_test openal
+ qt_use_compile_test pulseaudio
+
+ qt_use_disable_mod opengl opengl \
+ src/multimediawidgets/multimediawidgets.pro
+
+ qt_use_disable_mod qml quick \
+ src/src.pro
+
+ qt_use_disable_mod widgets widgets \
+ src/src.pro \
+ src/gsttools/gsttools.pro \
+ src/plugins/gstreamer/common.pri
+
+ qt5-build_src_prepare
+}
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.9999.ebuild
b/dev-qt/qtmultimedia/qtmultimedia-5.9999.ebuild
index a36c3ac..3676f07 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.9999.ebuild
@@ -14,25 +14,49 @@ else
KEYWORDS="~amd64 ~x86"
fi
-# FIXME: probably lots of automagic deps
-# TODO: qt-widgets can be made optional
-# TODO: opengl, xv
+IUSE="alsa +gstreamer openal opengl +pulseaudio qml widgets"
+REQUIRED_USE="?? ( alsa pulseaudio )"
-IUSE="alsa gstreamer openal pulseaudio qml"
-
-DEPEND="
+RDEPEND="
>=dev-qt/qtcore-${PV}:5[debug=]
>=dev-qt/qtgui-${PV}:5[debug=]
>=dev-qt/qtnetwork-${PV}:5[debug=]
- >=dev-qt/qtwidgets-${PV}:5[debug=]
alsa? ( media-libs/alsa-lib )
gstreamer? (
media-libs/gstreamer:0.10
media-libs/gst-plugins-bad:0.10
media-libs/gst-plugins-base:0.10
)
- openal? ( media-libs/openal )
pulseaudio? ( media-sound/pulseaudio )
- qml? ( >=dev-qt/qtdeclarative-${PV}:5[debug=] )
+ qml? (
+ >=dev-qt/qtdeclarative-${PV}:5[debug=]
+ openal? ( media-libs/openal )
+ )
+ widgets? (
+ >=dev-qt/qtwidgets-${PV}:5[debug=]
+ opengl? ( >=dev-qt/qtopengl-${PV}:5[debug=] )
+ )
"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+ x11-proto/videoproto
+"
+
+src_prepare() {
+ qt_use_compile_test alsa
+ qt_use_compile_test gstreamer
+ qt_use_compile_test openal
+ qt_use_compile_test pulseaudio
+
+ qt_use_disable_mod opengl opengl \
+ src/multimediawidgets/multimediawidgets.pro
+
+ qt_use_disable_mod qml quick \
+ src/src.pro
+
+ qt_use_disable_mod widgets widgets \
+ src/src.pro \
+ src/gsttools/gsttools.pro \
+ src/plugins/gstreamer/common.pri
+
+ qt5-build_src_prepare
+}
