public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Davide Pesavento" <pesa@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtmultimedia/
Date: Tue, 19 Aug 2014 01:07:18 +0000 (UTC)	[thread overview]
Message-ID: <1408188315.ea04ace482dc579e72e7aa74ecb412390fe19911.pesa@gentoo> (raw)
Message-ID: <20140819010718.g75ZsaZ7QfftSXnDB23xjjYB_B_fVIek6Cl3g6rV2Rw@z> (raw)

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://sources.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=] )
 	)


             reply	other threads:[~2014-08-19  1:26 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-08-16 11:26 Davide Pesavento [this message]
2014-08-19  1:07 ` [gentoo-commits] proj/qt:master commit in: dev-qt/qtmultimedia/ Davide Pesavento
  -- strict thread matches above, loose matches on Subject: below --
2023-05-28 17:53 Jimi Huotari
2023-05-28 13:10 Jimi Huotari
2022-11-05 16:39 Andreas Sturmlechner
2022-09-24 21:24 Andreas Sturmlechner
2022-09-24 17:03 Andreas Sturmlechner
2022-09-08  9:29 Andreas Sturmlechner
2022-07-17  7:13 Andreas Sturmlechner
2022-06-20 18:03 Jimi Huotari
2021-09-22  7:19 Andreas Sturmlechner
2020-04-03 20:03 Andreas Sturmlechner
2019-03-11  6:45 Michael Palimaka
2018-04-24 19:17 Jimi Huotari
2018-02-06 13:54 Michael Palimaka
2017-07-23  4:31 Michael Palimaka
2016-07-31 19:29 Michael Palimaka
2016-07-13 17:56 Davide Pesavento
2016-04-23 17:20 Michael Palimaka
2016-04-10 12:22 Davide Pesavento
2016-04-10 12:10 Davide Pesavento
2015-11-19 16:00 Michael Palimaka
2015-10-17 14:08 Michael Palimaka
2015-10-16 18:21 Michael Palimaka
2015-10-16 16:12 Michael Palimaka
2015-10-16 14:40 Michael Palimaka
2015-10-09 16:05 Michael Palimaka
2015-08-04 21:40 Davide Pesavento
2015-07-19 14:06 Michael Palimaka
2015-07-13  2:14 Davide Pesavento
2014-10-11  2:59 Davide Pesavento
2014-10-11  2:43 Davide Pesavento
2014-08-19  1:07 Davide Pesavento
2014-08-17 12:04 ` Davide Pesavento
2014-08-05  0:08 Davide Pesavento
2014-08-19  1:07 ` Davide Pesavento
2014-07-12 17:00 Davide Pesavento
2014-05-27 22:59 Davide Pesavento

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=1408188315.ea04ace482dc579e72e7aa74ecb412390fe19911.pesa@gentoo \
    --to=pesa@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