From: "Davide Pesavento" <pesa@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtdemo/
Date: Thu, 25 Jul 2013 09:13:07 +0000 (UTC) [thread overview]
Message-ID: <1374743610.76db9f951057558d40a45f436f1b0ee054781c86.pesa@gentoo> (raw)
commit: 76db9f951057558d40a45f436f1b0ee054781c86
Author: Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Thu Jul 25 09:13:30 2013 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu Jul 25 09:13:30 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=76db9f95
[dev-qt/qtdemo] Fix bugs #477652 and #477862.
Package-Manager: portage-2.2.0_alpha188
---
dev-qt/qtdemo/metadata.xml | 1 +
dev-qt/qtdemo/qtdemo-4.8.9999.ebuild | 46 +++++++++++++++++++-----------------
2 files changed, 25 insertions(+), 22 deletions(-)
diff --git a/dev-qt/qtdemo/metadata.xml b/dev-qt/qtdemo/metadata.xml
index 5038698..feb2119 100644
--- a/dev-qt/qtdemo/metadata.xml
+++ b/dev-qt/qtdemo/metadata.xml
@@ -11,6 +11,7 @@
<flag name="multimedia">Build QtMultimedia examples and demos</flag>
<flag name="opengl">Build QtOpenGL examples and demos</flag>
<flag name="openvg">Build QtOpenVG examples and demos</flag>
+ <flag name="phonon">Build Phonon examples and demos</flag>
<flag name="qt3support">Build Qt3Support examples and demos</flag>
<flag name="webkit">Build QtWebKit examples and demos</flag>
<flag name="xmlpatterns">Build QtXmlPatterns examples and demos</flag>
diff --git a/dev-qt/qtdemo/qtdemo-4.8.9999.ebuild b/dev-qt/qtdemo/qtdemo-4.8.9999.ebuild
index 4085f64..2d892e5 100644
--- a/dev-qt/qtdemo/qtdemo-4.8.9999.ebuild
+++ b/dev-qt/qtdemo/qtdemo-4.8.9999.ebuild
@@ -13,29 +13,29 @@ if [[ ${QT4_BUILD_TYPE} == live ]]; then
else
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x64-macos"
fi
-IUSE="dbus declarative kde multimedia opengl openvg qt3support webkit xmlpatterns"
+IUSE="dbus declarative kde multimedia opengl openvg phonon qt3support webkit xmlpatterns"
DEPEND="
- ~dev-qt/qtcore-${PV}:4[aqua=,debug=,qt3support?]
- ~dev-qt/qtgui-${PV}:4[aqua=,debug=,qt3support?]
- ~dev-qt/qthelp-${PV}:4[aqua=,debug=]
- ~dev-qt/qtscript-${PV}:4[aqua=,debug=]
- ~dev-qt/qtsql-${PV}:4[aqua=,debug=,qt3support?]
- ~dev-qt/qtsvg-${PV}:4[aqua=,debug=]
- ~dev-qt/qttest-${PV}:4[aqua=,debug=]
- dbus? ( ~dev-qt/qtdbus-${PV}:4[aqua=,debug=] )
- declarative? ( ~dev-qt/qtdeclarative-${PV}:4[aqua=,debug=,webkit?] )
- kde? ( media-libs/phonon[aqua=] )
- !kde? ( || (
- ~dev-qt/qtphonon-${PV}:4[aqua=,debug=]
- media-libs/phonon[aqua=]
- ) )
- multimedia? ( ~dev-qt/qtmultimedia-${PV}:4[aqua=,debug=] )
- opengl? ( ~dev-qt/qtopengl-${PV}:4[aqua=,debug=,qt3support?] )
- openvg? ( ~dev-qt/qtopenvg-${PV}:4[aqua=,debug=,qt3support?] )
- qt3support? ( ~dev-qt/qt3support-${PV}:4[aqua=,debug=] )
- webkit? ( ~dev-qt/qtwebkit-${PV}:4[aqua=,debug=] )
- xmlpatterns? ( ~dev-qt/qtxmlpatterns-${PV}:4[aqua=,debug=] )
+ ~dev-qt/designer-${PV}[aqua=,debug=]
+ ~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support?]
+ ~dev-qt/qtgui-${PV}[aqua=,debug=,qt3support?]
+ ~dev-qt/qthelp-${PV}[aqua=,debug=]
+ ~dev-qt/qtscript-${PV}[aqua=,debug=]
+ ~dev-qt/qtsql-${PV}[aqua=,debug=,qt3support?]
+ ~dev-qt/qtsvg-${PV}[aqua=,debug=]
+ ~dev-qt/qttest-${PV}[aqua=,debug=]
+ dbus? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=] )
+ declarative? ( ~dev-qt/qtdeclarative-${PV}[aqua=,debug=,webkit?] )
+ multimedia? ( ~dev-qt/qtmultimedia-${PV}[aqua=,debug=] )
+ opengl? ( ~dev-qt/qtopengl-${PV}[aqua=,debug=,qt3support?] )
+ openvg? ( ~dev-qt/qtopenvg-${PV}[aqua=,debug=,qt3support?] )
+ phonon? (
+ kde? ( media-libs/phonon[aqua=] )
+ !kde? ( || ( ~dev-qt/qtphonon-${PV}[aqua=,debug=] media-libs/phonon[aqua=] ) )
+ )
+ qt3support? ( ~dev-qt/qt3support-${PV}[aqua=,debug=] )
+ webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=] )
+ xmlpatterns? ( ~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=] )
"
RDEPEND="${DEPEND}"
@@ -49,8 +49,8 @@ pkg_setup() {
examples"
QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
doc/src/images
- src
include
+ src
tools"
qt4-build_pkg_setup
@@ -66,6 +66,7 @@ src_prepare() {
'multimedia:spectrum'
'opengl:boxes|glhypnotizer'
'openvg'
+ 'phonon:mediaplayer'
'webkit:browser'
'xmlpatterns'
)
@@ -99,6 +100,7 @@ src_configure() {
$(qt_use multimedia)
$(qt_use opengl)
$(qt_use openvg)
+ $(qt_use phonon)
$(qt_use qt3support)
$(qt_use webkit)
$(qt_use xmlpatterns)"
next reply other threads:[~2013-07-25 9:13 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-25 9:13 Davide Pesavento [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-05-27 22:59 [gentoo-commits] proj/qt:master commit in: dev-qt/qtdemo/ Davide Pesavento
2014-07-08 19:33 Davide Pesavento
2014-12-31 13:06 Michael Palimaka
2015-06-06 23:48 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=1374743610.76db9f951057558d40a45f436f1b0ee054781c86.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