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

[Michael Palimaka]

commit:     4b6a9320ee8f2caa0e34b6783a4b99c21b082f0c
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 23 04:30:55 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Jul 23 04:31:20 2017 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=4b6a9320

dev-qt/qtmultimedia: Qt 5.9 updates

Also remove gstreamer:0.10 support, as it's vulnerable and the maintainers
are looking to last rite it.

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 dev-qt/qtmultimedia/qtmultimedia-5.9.1.ebuild    | 25 +++++++-----------------
 dev-qt/qtmultimedia/qtmultimedia-5.9.9999.ebuild | 25 +++++++-----------------
 dev-qt/qtmultimedia/qtmultimedia-5.9999.ebuild   | 25 +++++++-----------------
 3 files changed, 21 insertions(+), 54 deletions(-)

diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.9.1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.9.1.ebuild
index f28d3192..d0626551 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.9.1.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.9.1.ebuild
@@ -10,8 +10,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
 fi
 
-IUSE="alsa gles2 gstreamer gstreamer010 openal pulseaudio qml widgets"
-REQUIRED_USE="?? ( gstreamer gstreamer010 )"
+IUSE="alsa gles2 gstreamer openal pulseaudio qml widgets"
 
 RDEPEND="
 	~dev-qt/qtcore-${PV}
@@ -24,12 +23,6 @@ RDEPEND="
 		media-libs/gst-plugins-bad:1.0
 		media-libs/gst-plugins-base:1.0
 	)
-	gstreamer010? (
-		dev-libs/glib:2
-		media-libs/gstreamer:0.10
-		media-libs/gst-plugins-bad:0.10
-		media-libs/gst-plugins-base:0.10
-	)
 	pulseaudio? ( media-sound/pulseaudio )
 	qml? (
 		~dev-qt/qtdeclarative-${PV}
@@ -46,14 +39,8 @@ DEPEND="${RDEPEND}
 "
 
 src_prepare() {
-	# do not rely on qtbase configuration
-	sed -i -e 's/contains(QT_CONFIG, \(alsa\|pulseaudio\))://' \
-		qtmultimedia.pro || die
-
-	qt_use_compile_test alsa
-	qt_use_compile_test gstreamer
-	qt_use_compile_test openal
-	qt_use_compile_test pulseaudio
+	qt_use_disable_config openal openal \
+		src/imports/imports.pro
 
 	qt_use_disable_mod qml quick \
 		src/src.pro \
@@ -69,8 +56,10 @@ src_prepare() {
 
 src_configure() {
 	local myqmakeargs=(
-		$(usex gstreamer 'GST_VERSION=1.0' '')
-		$(usex gstreamer010 'GST_VERSION=0.10' '')
+		--
+		$(qt_use alsa)
+		$(qt_use gstreamer)
+		$(qt_use pulseaudio)
 	)
 	qt5-build_src_configure
 }

diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.9.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.9.9999.ebuild
index f28d3192..d0626551 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.9.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.9.9999.ebuild
@@ -10,8 +10,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
 fi
 
-IUSE="alsa gles2 gstreamer gstreamer010 openal pulseaudio qml widgets"
-REQUIRED_USE="?? ( gstreamer gstreamer010 )"
+IUSE="alsa gles2 gstreamer openal pulseaudio qml widgets"
 
 RDEPEND="
 	~dev-qt/qtcore-${PV}
@@ -24,12 +23,6 @@ RDEPEND="
 		media-libs/gst-plugins-bad:1.0
 		media-libs/gst-plugins-base:1.0
 	)
-	gstreamer010? (
-		dev-libs/glib:2
-		media-libs/gstreamer:0.10
-		media-libs/gst-plugins-bad:0.10
-		media-libs/gst-plugins-base:0.10
-	)
 	pulseaudio? ( media-sound/pulseaudio )
 	qml? (
 		~dev-qt/qtdeclarative-${PV}
@@ -46,14 +39,8 @@ DEPEND="${RDEPEND}
 "
 
 src_prepare() {
-	# do not rely on qtbase configuration
-	sed -i -e 's/contains(QT_CONFIG, \(alsa\|pulseaudio\))://' \
-		qtmultimedia.pro || die
-
-	qt_use_compile_test alsa
-	qt_use_compile_test gstreamer
-	qt_use_compile_test openal
-	qt_use_compile_test pulseaudio
+	qt_use_disable_config openal openal \
+		src/imports/imports.pro
 
 	qt_use_disable_mod qml quick \
 		src/src.pro \
@@ -69,8 +56,10 @@ src_prepare() {
 
 src_configure() {
 	local myqmakeargs=(
-		$(usex gstreamer 'GST_VERSION=1.0' '')
-		$(usex gstreamer010 'GST_VERSION=0.10' '')
+		--
+		$(qt_use alsa)
+		$(qt_use gstreamer)
+		$(qt_use pulseaudio)
 	)
 	qt5-build_src_configure
 }

diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.9999.ebuild
index f28d3192..d0626551 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.9999.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.9999.ebuild
@@ -10,8 +10,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
 fi
 
-IUSE="alsa gles2 gstreamer gstreamer010 openal pulseaudio qml widgets"
-REQUIRED_USE="?? ( gstreamer gstreamer010 )"
+IUSE="alsa gles2 gstreamer openal pulseaudio qml widgets"
 
 RDEPEND="
 	~dev-qt/qtcore-${PV}
@@ -24,12 +23,6 @@ RDEPEND="
 		media-libs/gst-plugins-bad:1.0
 		media-libs/gst-plugins-base:1.0
 	)
-	gstreamer010? (
-		dev-libs/glib:2
-		media-libs/gstreamer:0.10
-		media-libs/gst-plugins-bad:0.10
-		media-libs/gst-plugins-base:0.10
-	)
 	pulseaudio? ( media-sound/pulseaudio )
 	qml? (
 		~dev-qt/qtdeclarative-${PV}
@@ -46,14 +39,8 @@ DEPEND="${RDEPEND}
 "
 
 src_prepare() {
-	# do not rely on qtbase configuration
-	sed -i -e 's/contains(QT_CONFIG, \(alsa\|pulseaudio\))://' \
-		qtmultimedia.pro || die
-
-	qt_use_compile_test alsa
-	qt_use_compile_test gstreamer
-	qt_use_compile_test openal
-	qt_use_compile_test pulseaudio
+	qt_use_disable_config openal openal \
+		src/imports/imports.pro
 
 	qt_use_disable_mod qml quick \
 		src/src.pro \
@@ -69,8 +56,10 @@ src_prepare() {
 
 src_configure() {
 	local myqmakeargs=(
-		$(usex gstreamer 'GST_VERSION=1.0' '')
-		$(usex gstreamer010 'GST_VERSION=0.10' '')
+		--
+		$(qt_use alsa)
+		$(qt_use gstreamer)
+		$(qt_use pulseaudio)
 	)
 	qt5-build_src_configure
 }