Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-plugins/gst-plugins-x/, media-plugins/vdr-xineliboutput/, ...
Date: Sat, 12 May 2018 00:33:06
Message-Id: 1526085154.5a5d59b0e82846b4fd789e76578347e0e2c64525.mattst88@gentoo
1 commit: 5a5d59b0e82846b4fd789e76578347e0e2c64525
2 Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
3 AuthorDate: Fri May 11 23:11:22 2018 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Sat May 12 00:32:34 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a5d59b0
7
8 media-plugins/*: Update dependencies (x11-proto/* -> x11-base/xorg-proto).
9
10 media-plugins/gst-plugins-x/gst-plugins-x-0.10.36-r1.ebuild | 5 ++---
11 .../gst-plugins-ximagesrc/gst-plugins-ximagesrc-0.10.31-r2.ebuild | 7 ++-----
12 .../gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.12.3.ebuild | 7 ++-----
13 .../gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.12.4.ebuild | 5 +----
14 .../gst-plugins-xvideo/gst-plugins-xvideo-0.10.36-r1.ebuild | 6 ++----
15 media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.1.0.ebuild | 4 ++--
16 media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0.ebuild | 4 ++--
17 .../vdr-xineliboutput/vdr-xineliboutput-2.0.0_pre20130821.ebuild | 4 ++--
18 .../vdr-xineliboutput/vdr-xineliboutput-2.0.0_pre20150220.ebuild | 4 ++--
19 media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild | 4 ++--
20 10 files changed, 19 insertions(+), 31 deletions(-)
21
22 diff --git a/media-plugins/gst-plugins-x/gst-plugins-x-0.10.36-r1.ebuild b/media-plugins/gst-plugins-x/gst-plugins-x-0.10.36-r1.ebuild
23 index 99e52cef5e3..bc72aa24507 100644
24 --- a/media-plugins/gst-plugins-x/gst-plugins-x-0.10.36-r1.ebuild
25 +++ b/media-plugins/gst-plugins-x/gst-plugins-x-0.10.36-r1.ebuild
26 @@ -1,4 +1,4 @@
27 -# Copyright 1999-2017 Gentoo Foundation
28 +# Copyright 1999-2018 Gentoo Foundation
29 # Distributed under the terms of the GNU General Public License v2
30
31 EAPI="5"
32 @@ -12,8 +12,7 @@ IUSE=""
33 RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
34 >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]"
35 DEPEND="${RDEPEND}
36 - >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
37 - >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]"
38 + x11-base/xorg-proto"
39
40 # xshm is a compile time option of ximage, which is in libXext
41 GST_PLUGINS_BUILD="x xshm"
42
43 diff --git a/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-0.10.31-r2.ebuild b/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-0.10.31-r2.ebuild
44 index 6e3450be613..1b1b38a13ef 100644
45 --- a/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-0.10.31-r2.ebuild
46 +++ b/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-0.10.31-r2.ebuild
47 @@ -1,4 +1,4 @@
48 -# Copyright 1999-2016 Gentoo Foundation
49 +# Copyright 1999-2018 Gentoo Foundation
50 # Distributed under the terms of the GNU General Public License v2
51
52 EAPI="5"
53 @@ -18,10 +18,7 @@ RDEPEND="
54 >=x11-libs/libSM-1.2.1-r1[${MULTILIB_USEDEP}]
55 "
56 DEPEND="${RDEPEND}
57 - >=x11-proto/damageproto-1.2.1-r1[${MULTILIB_USEDEP}]
58 - >=x11-proto/fixesproto-5.0-r1[${MULTILIB_USEDEP}]
59 - >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
60 - >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
61 + x11-base/xorg-proto
62 "
63
64 # xshm is a compile time option of ximage
65
66 diff --git a/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.12.3.ebuild b/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.12.3.ebuild
67 index 46d150ccc6a..e9a0f3958ff 100644
68 --- a/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.12.3.ebuild
69 +++ b/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.12.3.ebuild
70 @@ -1,4 +1,4 @@
71 -# Copyright 1999-2017 Gentoo Foundation
72 +# Copyright 1999-2018 Gentoo Foundation
73 # Distributed under the terms of the GNU General Public License v2
74
75 EAPI=6
76 @@ -18,10 +18,7 @@ RDEPEND="
77 >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
78 "
79 DEPEND="${RDEPEND}
80 - >=x11-proto/damageproto-1.2.1-r1[${MULTILIB_USEDEP}]
81 - >=x11-proto/fixesproto-5.0-r1[${MULTILIB_USEDEP}]
82 - >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
83 - >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
84 + x11-base/xorg-proto
85 "
86
87 # xshm is a compile time option of ximage
88
89 diff --git a/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.12.4.ebuild b/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.12.4.ebuild
90 index 572d5865e96..5beb37b776a 100644
91 --- a/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.12.4.ebuild
92 +++ b/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.12.4.ebuild
93 @@ -18,10 +18,7 @@ RDEPEND="
94 >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
95 "
96 DEPEND="${RDEPEND}
97 - >=x11-proto/damageproto-1.2.1-r1[${MULTILIB_USEDEP}]
98 - >=x11-proto/fixesproto-5.0-r1[${MULTILIB_USEDEP}]
99 - >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
100 - >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
101 + x11-base/xorg-proto
102 "
103
104 # xshm is a compile time option of ximage
105
106 diff --git a/media-plugins/gst-plugins-xvideo/gst-plugins-xvideo-0.10.36-r1.ebuild b/media-plugins/gst-plugins-xvideo/gst-plugins-xvideo-0.10.36-r1.ebuild
107 index e66e5e0c87f..56fece1ff40 100644
108 --- a/media-plugins/gst-plugins-xvideo/gst-plugins-xvideo-0.10.36-r1.ebuild
109 +++ b/media-plugins/gst-plugins-xvideo/gst-plugins-xvideo-0.10.36-r1.ebuild
110 @@ -1,4 +1,4 @@
111 -# Copyright 1999-2014 Gentoo Foundation
112 +# Copyright 1999-2018 Gentoo Foundation
113 # Distributed under the terms of the GNU General Public License v2
114
115 EAPI="5"
116 @@ -12,9 +12,7 @@ IUSE=""
117 RDEPEND=">=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
118 >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]"
119 DEPEND="${RDEPEND}
120 - >=x11-proto/videoproto-2.3.1-r1[${MULTILIB_USEDEP}]
121 - >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
122 - >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]"
123 + x11-base/xorg-proto"
124
125 # xshm is a compile time option of xvideo
126 # x is needed to build any X plugins, but we build/install only xv anyway
127
128 diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.1.0.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.1.0.ebuild
129 index 5eace810e33..22ecc06ccdd 100644
130 --- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.1.0.ebuild
131 +++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.1.0.ebuild
132 @@ -1,4 +1,4 @@
133 -# Copyright 1999-2015 Gentoo Foundation
134 +# Copyright 1999-2018 Gentoo Foundation
135 # Distributed under the terms of the GNU General Public License v2
136
137 EAPI=5
138 @@ -46,7 +46,7 @@ DEPEND="${COMMON_DEPEND}
139 nls? ( sys-devel/gettext )
140 xine? (
141 X? (
142 - x11-proto/xproto
143 + x11-base/xorg-proto
144 x11-libs/libXxf86vm
145 )
146 )"
147
148 diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0.ebuild
149 index 570df0c7c24..d594f721d33 100644
150 --- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0.ebuild
151 +++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0.ebuild
152 @@ -1,4 +1,4 @@
153 -# Copyright 1999-2017 Gentoo Foundation
154 +# Copyright 1999-2018 Gentoo Foundation
155 # Distributed under the terms of the GNU General Public License v2
156
157 EAPI=5
158 @@ -46,7 +46,7 @@ DEPEND="${COMMON_DEPEND}
159 nls? ( sys-devel/gettext )
160 xine? (
161 X? (
162 - x11-proto/xproto
163 + x11-base/xorg-proto
164 x11-libs/libXxf86vm
165 )
166 )"
167
168 diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_pre20130821.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_pre20130821.ebuild
169 index ba800d6eb61..6f3eb19458b 100644
170 --- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_pre20130821.ebuild
171 +++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_pre20130821.ebuild
172 @@ -1,4 +1,4 @@
173 -# Copyright 1999-2017 Gentoo Foundation
174 +# Copyright 1999-2018 Gentoo Foundation
175 # Distributed under the terms of the GNU General Public License v2
176
177 EAPI=5
178 @@ -48,7 +48,7 @@ DEPEND="${COMMON_DEPEND}
179 nls? ( sys-devel/gettext )
180 xine? (
181 X? (
182 - x11-proto/xproto
183 + x11-base/xorg-proto
184 x11-libs/libXxf86vm
185 )
186 )"
187
188 diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_pre20150220.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_pre20150220.ebuild
189 index 6f0aac3f5d5..d383380175c 100644
190 --- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_pre20150220.ebuild
191 +++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_pre20150220.ebuild
192 @@ -1,4 +1,4 @@
193 -# Copyright 1999-2017 Gentoo Foundation
194 +# Copyright 1999-2018 Gentoo Foundation
195 # Distributed under the terms of the GNU General Public License v2
196
197 EAPI=5
198 @@ -48,7 +48,7 @@ DEPEND="${COMMON_DEPEND}
199 nls? ( sys-devel/gettext )
200 xine? (
201 X? (
202 - x11-proto/xproto
203 + x11-base/xorg-proto
204 x11-libs/libXxf86vm
205 )
206 )"
207
208 diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild
209 index b3c8f7c0eda..bca8332076f 100644
210 --- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild
211 +++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild
212 @@ -1,4 +1,4 @@
213 -# Copyright 1999-2015 Gentoo Foundation
214 +# Copyright 1999-2018 Gentoo Foundation
215 # Distributed under the terms of the GNU General Public License v2
216
217 EAPI=5
218 @@ -49,7 +49,7 @@ DEPEND="${COMMON_DEPEND}
219 nls? ( sys-devel/gettext )
220 xine? (
221 X? (
222 - x11-proto/xproto
223 + x11-base/xorg-proto
224 x11-libs/libXxf86vm
225 )
226 )"