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

[Davide Pesavento]

commit:     ea04ace482dc579e72e7aa74ecb412390fe19911
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 16 11:25:15 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Aug 16 11:25:15 2014 +0000
URL:        
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=ea04ace4

[dev-qt/qtmultimedia:5] Workaround opengl headers inclusion issue.

See bug 518542 for details.

Package-Manager: portage-2.2.12

---
 dev-qt/qtmultimedia/qtmultimedia-5.3.1.ebuild    | 2 ++
 dev-qt/qtmultimedia/qtmultimedia-5.3.9999.ebuild | 2 ++
 dev-qt/qtmultimedia/qtmultimedia-5.4.9999.ebuild | 2 ++
 dev-qt/qtmultimedia/qtmultimedia-5.9999.ebuild   | 2 ++
 4 files changed, 8 insertions(+)

diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.3.1.ebuild 
b/dev-qt/qtmultimedia/qtmultimedia-5.3.1.ebuild
index 3676f07..d1e424f 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.3.1.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.3.1.ebuild
@@ -17,6 +17,7 @@ fi
 IUSE="alsa +gstreamer openal opengl +pulseaudio qml widgets"
 REQUIRED_USE="?? ( alsa pulseaudio )"
 
+# "widgets? ( qtgui[opengl=] )" because of bug 518542 comment 2
 RDEPEND="
        >=dev-qt/qtcore-${PV}:5[debug=]
        >=dev-qt/qtgui-${PV}:5[debug=]
@@ -33,6 +34,7 @@ RDEPEND="
                openal? ( media-libs/openal )
        )
        widgets? (
+               >=dev-qt/qtgui-${PV}:5[debug=,opengl=]
                >=dev-qt/qtwidgets-${PV}:5[debug=]
                opengl? ( >=dev-qt/qtopengl-${PV}:5[debug=] )
        )

diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.3.9999.ebuild 
b/dev-qt/qtmultimedia/qtmultimedia-5.3.9999.ebuild
index 3676f07..d1e424f 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.3.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.3.9999.ebuild
@@ -17,6 +17,7 @@ fi
 IUSE="alsa +gstreamer openal opengl +pulseaudio qml widgets"
 REQUIRED_USE="?? ( alsa pulseaudio )"
 
+# "widgets? ( qtgui[opengl=] )" because of bug 518542 comment 2
 RDEPEND="
        >=dev-qt/qtcore-${PV}:5[debug=]
        >=dev-qt/qtgui-${PV}:5[debug=]
@@ -33,6 +34,7 @@ RDEPEND="
                openal? ( media-libs/openal )
        )
        widgets? (
+               >=dev-qt/qtgui-${PV}:5[debug=,opengl=]
                >=dev-qt/qtwidgets-${PV}:5[debug=]
                opengl? ( >=dev-qt/qtopengl-${PV}:5[debug=] )
        )

diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.4.9999.ebuild 
b/dev-qt/qtmultimedia/qtmultimedia-5.4.9999.ebuild
index 3676f07..d1e424f 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.4.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.4.9999.ebuild
@@ -17,6 +17,7 @@ fi
 IUSE="alsa +gstreamer openal opengl +pulseaudio qml widgets"
 REQUIRED_USE="?? ( alsa pulseaudio )"
 
+# "widgets? ( qtgui[opengl=] )" because of bug 518542 comment 2
 RDEPEND="
        >=dev-qt/qtcore-${PV}:5[debug=]
        >=dev-qt/qtgui-${PV}:5[debug=]
@@ -33,6 +34,7 @@ RDEPEND="
                openal? ( media-libs/openal )
        )
        widgets? (
+               >=dev-qt/qtgui-${PV}:5[debug=,opengl=]
                >=dev-qt/qtwidgets-${PV}:5[debug=]
                opengl? ( >=dev-qt/qtopengl-${PV}:5[debug=] )
        )

diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.9999.ebuild 
b/dev-qt/qtmultimedia/qtmultimedia-5.9999.ebuild
index 3676f07..d1e424f 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.9999.ebuild
@@ -17,6 +17,7 @@ fi
 IUSE="alsa +gstreamer openal opengl +pulseaudio qml widgets"
 REQUIRED_USE="?? ( alsa pulseaudio )"
 
+# "widgets? ( qtgui[opengl=] )" because of bug 518542 comment 2
 RDEPEND="
        >=dev-qt/qtcore-${PV}:5[debug=]
        >=dev-qt/qtgui-${PV}:5[debug=]
@@ -33,6 +34,7 @@ RDEPEND="
                openal? ( media-libs/openal )
        )
        widgets? (
+               >=dev-qt/qtgui-${PV}:5[debug=,opengl=]
                >=dev-qt/qtwidgets-${PV}:5[debug=]
                opengl? ( >=dev-qt/qtopengl-${PV}:5[debug=] )
        )