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

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,  5 Aug 2014 00:08:11 +0000 (UTC)	[thread overview]
Message-ID: <1407197246.ed3fbad2098ffcfededfc6b1bf69fc2005285704.pesa@gentoo> (raw)

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
+}

WARNING: multiple messages have this Message-ID (diff)

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:17 +0000 (UTC)	[thread overview]
Message-ID: <1407197246.ed3fbad2098ffcfededfc6b1bf69fc2005285704.pesa@gentoo> (raw)
Message-ID: <20140819010717.zbT5ru6SU4mINiMUVYDde9uTUuU5NtLr30inDZ4tJoI@z> (raw)

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://sources.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
+}

next             reply	other threads:[~2014-08-05  0:08 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-08-05  0:08 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-16 11:26 Davide Pesavento
2014-08-19  1:07 ` Davide Pesavento
2014-07-12 17:00 Davide Pesavento
2014-05-27 22:59 Davide Pesavento

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:b4f8d68 dfblob:a31be04 dfblob:a36c3ac dfblob:3676f07
dfblob:a36c3ac dfblob:3676f07 dfblob:a36c3ac dfblob:3676f07
dfblob:b4f8d68 dfblob:a31be04 dfblob:a36c3ac dfblob:3676f07
dfblob:a36c3ac dfblob:3676f07 dfblob:a36c3ac dfblob:3676f07 )
 OR (
bs:"[gentoo-commits] proj/qt:master commit in: dev-qt/qtmultimedia/" )
	(help)

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=1407197246.ed3fbad2098ffcfededfc6b1bf69fc2005285704.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