From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 0681713877A for ; Tue, 5 Aug 2014 00:08:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D6442E08B8; Tue, 5 Aug 2014 00:08:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5CAFDE08B8 for ; Tue, 5 Aug 2014 00:08:14 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3BF0B34013B for ; Tue, 5 Aug 2014 00:08:13 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id CA62B1881B for ; Tue, 5 Aug 2014 00:08:11 +0000 (UTC) From: "Davide Pesavento" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Davide Pesavento" Message-ID: <1407197246.ed3fbad2098ffcfededfc6b1bf69fc2005285704.pesa@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtmultimedia/ X-VCS-Repository: proj/qt X-VCS-Files: dev-qt/qtmultimedia/metadata.xml dev-qt/qtmultimedia/qtmultimedia-5.3.1.ebuild dev-qt/qtmultimedia/qtmultimedia-5.3.9999.ebuild dev-qt/qtmultimedia/qtmultimedia-5.9999.ebuild X-VCS-Directories: dev-qt/qtmultimedia/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: ed3fbad2098ffcfededfc6b1bf69fc2005285704 X-VCS-Branch: master Date: Tue, 5 Aug 2014 00:08:11 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: c798c38c-b61e-45f2-9733-b96014d90ec7 X-Archives-Hash: 9aef3308ee52953e0b9ea358e80c1e16 commit: ed3fbad2098ffcfededfc6b1bf69fc2005285704 Author: Davide Pesavento gentoo org> AuthorDate: Tue Aug 5 00:07:26 2014 +0000 Commit: Davide Pesavento gentoo 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 @@ Add support for exceptions - like catching them inside the event loop (recommended by Nokia) - Build QML/QtQuick bindings + Build QML/QtQuick bindings and imports + Build the QtMultimediaWidgets module https://bugreports.qt-project.org/ 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 +} From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id A601613877A for ; Tue, 19 Aug 2014 01:07:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5D6F5E09A5; Tue, 19 Aug 2014 01:07:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 879A1E09A7 for ; Tue, 19 Aug 2014 01:07:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7D125340076 for ; Tue, 19 Aug 2014 01:07:18 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2A9D03913 for ; Tue, 19 Aug 2014 01:07:17 +0000 (UTC) From: "Davide Pesavento" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Davide Pesavento" Message-ID: <1407197246.ed3fbad2098ffcfededfc6b1bf69fc2005285704.pesa@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtmultimedia/ X-VCS-Repository: proj/qt X-VCS-Files: dev-qt/qtmultimedia/metadata.xml dev-qt/qtmultimedia/qtmultimedia-5.3.1.ebuild dev-qt/qtmultimedia/qtmultimedia-5.3.9999.ebuild dev-qt/qtmultimedia/qtmultimedia-5.9999.ebuild X-VCS-Directories: dev-qt/qtmultimedia/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: ed3fbad2098ffcfededfc6b1bf69fc2005285704 X-VCS-Branch: master Date: Tue, 19 Aug 2014 01:07:17 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: fa7b0f49-cf7c-41ad-9758-a68d4f05913a X-Archives-Hash: 3bbd791e217bbbe6ed2bf411d56aa3cc Message-ID: <20140819010717.zbT5ru6SU4mINiMUVYDde9uTUuU5NtLr30inDZ4tJoI@z> commit: ed3fbad2098ffcfededfc6b1bf69fc2005285704 Author: Davide Pesavento gentoo org> AuthorDate: Tue Aug 5 00:07:26 2014 +0000 Commit: Davide Pesavento gentoo 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 @@ Add support for exceptions - like catching them inside the event loop (recommended by Nokia) - Build QML/QtQuick bindings + Build QML/QtQuick bindings and imports + Build the QtMultimediaWidgets module https://bugreports.qt-project.org/ 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 +}