Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtmultimedia/
Date: Sat, 02 Sep 2017 14:10:39
Message-Id: 1504361354.0177fe5fe8373963abbd1dfaa4156101bbce0646.asturm@gentoo
1 commit: 0177fe5fe8373963abbd1dfaa4156101bbce0646
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sat Sep 2 14:06:16 2017 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sat Sep 2 14:09:14 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0177fe5f
7
8 dev-qt/qtmultimedia: Drop deprecated USE=gstreamer010
9
10 Gentoo-bug: 629142
11 Package-Manager: Portage-2.3.8, Repoman-2.3.3
12
13 dev-qt/qtmultimedia/metadata.xml | 1 -
14 dev-qt/qtmultimedia/qtmultimedia-5.6.2.ebuild | 10 +---------
15 dev-qt/qtmultimedia/qtmultimedia-5.7.1.ebuild | 10 +---------
16 3 files changed, 2 insertions(+), 19 deletions(-)
17
18 diff --git a/dev-qt/qtmultimedia/metadata.xml b/dev-qt/qtmultimedia/metadata.xml
19 index 847e28a4516..c6f5fc3b126 100644
20 --- a/dev-qt/qtmultimedia/metadata.xml
21 +++ b/dev-qt/qtmultimedia/metadata.xml
22 @@ -10,7 +10,6 @@
23 inside the event loop (recommended by upstream)</flag>
24 <flag name="gles2">Use GLES 2.0 or later instead of full OpenGL</flag>
25 <flag name="gstreamer">Enable audio support via <pkg>media-libs/gstreamer</pkg> using SLOT 1.0</flag>
26 - <flag name="gstreamer010">Enable audio support via <pkg>media-libs/gstreamer</pkg> using SLOT 0.10</flag>
27 <flag name="qml">Build QML/QtQuick bindings and imports</flag>
28 <flag name="widgets">Build the QtMultimediaWidgets module</flag>
29 </use>
30
31 diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.6.2.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.6.2.ebuild
32 index 8b1a874d05b..bcd2410201e 100644
33 --- a/dev-qt/qtmultimedia/qtmultimedia-5.6.2.ebuild
34 +++ b/dev-qt/qtmultimedia/qtmultimedia-5.6.2.ebuild
35 @@ -10,8 +10,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
36 KEYWORDS="amd64 arm hppa ~ppc ppc64 x86"
37 fi
38
39 -IUSE="alsa gles2 gstreamer gstreamer010 openal pulseaudio qml widgets"
40 -REQUIRED_USE="?? ( gstreamer gstreamer010 )"
41 +IUSE="alsa gles2 gstreamer openal pulseaudio qml widgets"
42
43 RDEPEND="
44 ~dev-qt/qtcore-${PV}
45 @@ -24,12 +23,6 @@ RDEPEND="
46 media-libs/gst-plugins-bad:1.0
47 media-libs/gst-plugins-base:1.0
48 )
49 - gstreamer010? (
50 - dev-libs/glib:2
51 - media-libs/gstreamer:0.10
52 - media-libs/gst-plugins-bad:0.10
53 - media-libs/gst-plugins-base:0.10
54 - )
55 pulseaudio? ( media-sound/pulseaudio )
56 qml? (
57 ~dev-qt/qtdeclarative-${PV}
58 @@ -70,7 +63,6 @@ src_prepare() {
59 src_configure() {
60 local myqmakeargs=(
61 $(usex gstreamer 'GST_VERSION=1.0' '')
62 - $(usex gstreamer010 'GST_VERSION=0.10' '')
63 )
64 qt5-build_src_configure
65 }
66
67 diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.7.1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.7.1.ebuild
68 index e9f999ac9f8..255a5e8a152 100644
69 --- a/dev-qt/qtmultimedia/qtmultimedia-5.7.1.ebuild
70 +++ b/dev-qt/qtmultimedia/qtmultimedia-5.7.1.ebuild
71 @@ -10,8 +10,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
72 KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86"
73 fi
74
75 -IUSE="alsa gles2 gstreamer gstreamer010 openal pulseaudio qml widgets"
76 -REQUIRED_USE="?? ( gstreamer gstreamer010 )"
77 +IUSE="alsa gles2 gstreamer openal pulseaudio qml widgets"
78
79 RDEPEND="
80 ~dev-qt/qtcore-${PV}
81 @@ -24,12 +23,6 @@ RDEPEND="
82 media-libs/gst-plugins-bad:1.0
83 media-libs/gst-plugins-base:1.0
84 )
85 - gstreamer010? (
86 - dev-libs/glib:2
87 - media-libs/gstreamer:0.10
88 - media-libs/gst-plugins-bad:0.10
89 - media-libs/gst-plugins-base:0.10
90 - )
91 pulseaudio? ( media-sound/pulseaudio )
92 qml? (
93 ~dev-qt/qtdeclarative-${PV}
94 @@ -70,7 +63,6 @@ src_prepare() {
95 src_configure() {
96 local myqmakeargs=(
97 $(usex gstreamer 'GST_VERSION=1.0' '')
98 - $(usex gstreamer010 'GST_VERSION=0.10' '')
99 )
100 qt5-build_src_configure
101 }