commit: a1bf4e9d98be833c07ac3193bcdd32bf92b25c34 Author: Pablo Cholaky <waltercool <AT> slash <DOT> cl> AuthorDate: Sun Sep 27 17:13:49 2015 +0000 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> CommitDate: Fri Oct 16 14:39:54 2015 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=a1bf4e9d
dev-qt/qtmultimedia: add gstreamer1.0 support dev-qt/qtmultimedia/metadata.xml | 2 ++ dev-qt/qtmultimedia/qtmultimedia-5.5.0.ebuild | 11 +++++++++-- dev-qt/qtmultimedia/qtmultimedia-5.5.9999.ebuild | 11 +++++++++-- dev-qt/qtmultimedia/qtmultimedia-5.6.9999.ebuild | 11 +++++++++-- dev-qt/qtmultimedia/qtmultimedia-5.9999.ebuild | 11 +++++++++-- 5 files changed, 38 insertions(+), 8 deletions(-) diff --git a/dev-qt/qtmultimedia/metadata.xml b/dev-qt/qtmultimedia/metadata.xml index b408e5c..92a1217 100644 --- a/dev-qt/qtmultimedia/metadata.xml +++ b/dev-qt/qtmultimedia/metadata.xml @@ -5,6 +5,8 @@ <use> <flag name="exceptions">Add support for exceptions - like catching them inside the event loop (recommended by upstream)</flag> + <flag name="gstreamer">Enable HTML5 audio/video support via <pkg>media-libs/gstreamer:1.0</pkg></flag> + <flag name="gstreamer010">Enable HTML5 audio/video support via <pkg>media-libs/gstreamer:0.10</pkg></flag> <flag name="qml">Build QML/QtQuick bindings and imports</flag> <flag name="widgets">Build the QtMultimediaWidgets module</flag> </use> diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.5.0.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.5.0.ebuild index cac4c48..dd56d86 100644 --- a/dev-qt/qtmultimedia/qtmultimedia-5.5.0.ebuild +++ b/dev-qt/qtmultimedia/qtmultimedia-5.5.0.ebuild @@ -11,7 +11,8 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86" fi -IUSE="alsa +gstreamer openal pulseaudio qml widgets" +IUSE="alsa gstreamer gstreamer010 openal pulseaudio qml widgets" +REQUIRED_USE="?? ( gstreamer gstreamer010 )" RDEPEND=" >=dev-qt/qtcore-${PV}:5 @@ -19,6 +20,11 @@ RDEPEND=" >=dev-qt/qtnetwork-${PV}:5 alsa? ( media-libs/alsa-lib ) gstreamer? ( + media-libs/gstreamer:1.0 + media-libs/gst-plugins-bad:1.0 + media-libs/gst-plugins-base:1.0 + ) + gstreamer010? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-bad:0.10 media-libs/gst-plugins-base:0.10 @@ -61,7 +67,8 @@ src_prepare() { src_configure() { local myqmakeargs=( - $(usex gstreamer 'GST_VERSION=0.10' '') + $(usex gstreamer 'GST_VERSION=1.0' '') + $(usex gstreamer010 'GST_VERSION=0.10' '') ) qt5-build_src_configure } diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.5.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.5.9999.ebuild index cac4c48..dd56d86 100644 --- a/dev-qt/qtmultimedia/qtmultimedia-5.5.9999.ebuild +++ b/dev-qt/qtmultimedia/qtmultimedia-5.5.9999.ebuild @@ -11,7 +11,8 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86" fi -IUSE="alsa +gstreamer openal pulseaudio qml widgets" +IUSE="alsa gstreamer gstreamer010 openal pulseaudio qml widgets" +REQUIRED_USE="?? ( gstreamer gstreamer010 )" RDEPEND=" >=dev-qt/qtcore-${PV}:5 @@ -19,6 +20,11 @@ RDEPEND=" >=dev-qt/qtnetwork-${PV}:5 alsa? ( media-libs/alsa-lib ) gstreamer? ( + media-libs/gstreamer:1.0 + media-libs/gst-plugins-bad:1.0 + media-libs/gst-plugins-base:1.0 + ) + gstreamer010? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-bad:0.10 media-libs/gst-plugins-base:0.10 @@ -61,7 +67,8 @@ src_prepare() { src_configure() { local myqmakeargs=( - $(usex gstreamer 'GST_VERSION=0.10' '') + $(usex gstreamer 'GST_VERSION=1.0' '') + $(usex gstreamer010 'GST_VERSION=0.10' '') ) qt5-build_src_configure } diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.6.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.6.9999.ebuild index cac4c48..dd56d86 100644 --- a/dev-qt/qtmultimedia/qtmultimedia-5.6.9999.ebuild +++ b/dev-qt/qtmultimedia/qtmultimedia-5.6.9999.ebuild @@ -11,7 +11,8 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86" fi -IUSE="alsa +gstreamer openal pulseaudio qml widgets" +IUSE="alsa gstreamer gstreamer010 openal pulseaudio qml widgets" +REQUIRED_USE="?? ( gstreamer gstreamer010 )" RDEPEND=" >=dev-qt/qtcore-${PV}:5 @@ -19,6 +20,11 @@ RDEPEND=" >=dev-qt/qtnetwork-${PV}:5 alsa? ( media-libs/alsa-lib ) gstreamer? ( + media-libs/gstreamer:1.0 + media-libs/gst-plugins-bad:1.0 + media-libs/gst-plugins-base:1.0 + ) + gstreamer010? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-bad:0.10 media-libs/gst-plugins-base:0.10 @@ -61,7 +67,8 @@ src_prepare() { src_configure() { local myqmakeargs=( - $(usex gstreamer 'GST_VERSION=0.10' '') + $(usex gstreamer 'GST_VERSION=1.0' '') + $(usex gstreamer010 'GST_VERSION=0.10' '') ) qt5-build_src_configure } diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.9999.ebuild index cac4c48..dd56d86 100644 --- a/dev-qt/qtmultimedia/qtmultimedia-5.9999.ebuild +++ b/dev-qt/qtmultimedia/qtmultimedia-5.9999.ebuild @@ -11,7 +11,8 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86" fi -IUSE="alsa +gstreamer openal pulseaudio qml widgets" +IUSE="alsa gstreamer gstreamer010 openal pulseaudio qml widgets" +REQUIRED_USE="?? ( gstreamer gstreamer010 )" RDEPEND=" >=dev-qt/qtcore-${PV}:5 @@ -19,6 +20,11 @@ RDEPEND=" >=dev-qt/qtnetwork-${PV}:5 alsa? ( media-libs/alsa-lib ) gstreamer? ( + media-libs/gstreamer:1.0 + media-libs/gst-plugins-bad:1.0 + media-libs/gst-plugins-base:1.0 + ) + gstreamer010? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-bad:0.10 media-libs/gst-plugins-base:0.10 @@ -61,7 +67,8 @@ src_prepare() { src_configure() { local myqmakeargs=( - $(usex gstreamer 'GST_VERSION=0.10' '') + $(usex gstreamer 'GST_VERSION=1.0' '') + $(usex gstreamer010 'GST_VERSION=0.10' '') ) qt5-build_src_configure }