Gentoo Archives: gentoo-commits

From: "Anthony G. Basile" <blueness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/musl:master commit in: media-libs/mesa/
Date: Mon, 03 Dec 2018 05:08:19
Message-Id: 1543813644.258b506a4da896cc011e52995c6168bcf214ae9c.blueness@gentoo
1 commit: 258b506a4da896cc011e52995c6168bcf214ae9c
2 Author: g3ngr33n <gengreen <AT> tutanota <DOT> com>
3 AuthorDate: Mon Dec 3 01:24:48 2018 +0000
4 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
5 CommitDate: Mon Dec 3 05:07:24 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=258b506a
7
8 media-libs/mesa: openmax support removed
9
10 Package-Manager: Portage-2.3.51, Repoman-2.3.11
11 Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
12
13 media-libs/mesa/mesa-18.1.6-r1.ebuild | 31 ++-----------------------------
14 media-libs/mesa/mesa-18.1.6.ebuild | 31 ++-----------------------------
15 media-libs/mesa/mesa-18.1.9-r1.ebuild | 29 +----------------------------
16 media-libs/mesa/mesa-18.1.9.ebuild | 31 ++-----------------------------
17 media-libs/mesa/metadata.xml | 1 -
18 5 files changed, 7 insertions(+), 116 deletions(-)
19
20 diff --git a/media-libs/mesa/mesa-18.1.6-r1.ebuild b/media-libs/mesa/mesa-18.1.6-r1.ebuild
21 index 134fcaf..8e43662 100644
22 --- a/media-libs/mesa/mesa-18.1.6-r1.ebuild
23 +++ b/media-libs/mesa/mesa-18.1.6-r1.ebuild
24 @@ -1,4 +1,4 @@
25 -# Copyright 1999-2018 Gentoo Foundation
26 +# Copyright 1999-2018 Gentoo Authors
27 # Distributed under the terms of the GNU General Public License v2
28
29 EAPI=6
30 @@ -40,14 +40,13 @@ done
31
32 IUSE="${IUSE_VIDEO_CARDS}
33 bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 unwind
34 - +llvm +nptl opencl osmesa pax_kernel openmax pic selinux vaapi valgrind
35 + +llvm +nptl opencl osmesa pax_kernel pic selinux vaapi valgrind
36 vdpau vulkan wayland xvmc xa"
37
38 REQUIRED_USE="
39 d3d9? ( dri3 gallium )
40 llvm? ( gallium )
41 opencl? ( gallium llvm || ( video_cards_r600 video_cards_radeonsi ) )
42 - openmax? ( gallium )
43 gles1? ( egl )
44 gles2? ( egl )
45 vaapi? ( gallium )
46 @@ -105,10 +104,6 @@ RDEPEND="
47 dev-libs/libclc
48 virtual/libelf:0=[${MULTILIB_USEDEP}]
49 )
50 - openmax? (
51 - >=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}]
52 - x11-misc/xdg-utils
53 - )
54 vaapi? (
55 >=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
56 video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 )
57 @@ -317,7 +312,6 @@ multilib_src_configure() {
58 myconf+="
59 $(use_enable d3d9 nine)
60 $(use_enable llvm)
61 - $(use_enable openmax omx-bellagio)
62 $(use_enable vaapi va)
63 $(use_enable vdpau)
64 $(use_enable xa)
65 @@ -431,12 +425,6 @@ multilib_src_install() {
66 fi
67 eend $?
68 fi
69 -
70 - if use openmax; then
71 - echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share/mesa/xdg\"" > "${T}/99mesaxdgomx"
72 - doenvd "${T}"/99mesaxdgomx
73 - keepdir /usr/share/mesa/xdg
74 - fi
75 }
76
77 multilib_src_install_all() {
78 @@ -469,15 +457,6 @@ pkg_postinst() {
79 eselect opencl set --use-old ${PN}
80 fi
81
82 - # run omxregister-bellagio to make the OpenMAX drivers known system-wide
83 - if use openmax; then
84 - ebegin "Registering OpenMAX drivers"
85 - BELLAGIO_SEARCH_PATH="${EPREFIX}/usr/$(get_libdir)/libomxil-bellagio0" \
86 - OMX_BELLAGIO_REGISTRY=${EPREFIX}/usr/share/mesa/xdg/.omxregister \
87 - omxregister-bellagio
88 - eend $?
89 - fi
90 -
91 # warn about patent encumbered texture-float
92 if use !bindist; then
93 elog "USE=\"bindist\" was not set. Potentially patent encumbered code was"
94 @@ -486,12 +465,6 @@ pkg_postinst() {
95 fi
96 }
97
98 -pkg_prerm() {
99 - if use openmax; then
100 - rm "${EPREFIX}"/usr/share/mesa/xdg/.omxregister
101 - fi
102 -}
103 -
104 # $1 - VIDEO_CARDS flag
105 # other args - names of DRI drivers to enable
106 # TODO: avoid code duplication for a more elegant implementation
107
108 diff --git a/media-libs/mesa/mesa-18.1.6.ebuild b/media-libs/mesa/mesa-18.1.6.ebuild
109 index d922b30..3145d0d 100644
110 --- a/media-libs/mesa/mesa-18.1.6.ebuild
111 +++ b/media-libs/mesa/mesa-18.1.6.ebuild
112 @@ -1,4 +1,4 @@
113 -# Copyright 1999-2018 Gentoo Foundation
114 +# Copyright 1999-2018 Gentoo Authors
115 # Distributed under the terms of the GNU General Public License v2
116
117 EAPI=6
118 @@ -40,14 +40,13 @@ done
119
120 IUSE="${IUSE_VIDEO_CARDS}
121 bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 unwind
122 - +llvm +nptl opencl osmesa pax_kernel openmax pic selinux vaapi valgrind
123 + +llvm +nptl opencl osmesa pax_kernel pic selinux vaapi valgrind
124 vdpau vulkan wayland xvmc xa"
125
126 REQUIRED_USE="
127 d3d9? ( dri3 gallium )
128 llvm? ( gallium )
129 opencl? ( gallium llvm || ( video_cards_r600 video_cards_radeonsi ) )
130 - openmax? ( gallium )
131 gles1? ( egl )
132 gles2? ( egl )
133 vaapi? ( gallium )
134 @@ -105,10 +104,6 @@ RDEPEND="
135 dev-libs/libclc
136 virtual/libelf:0=[${MULTILIB_USEDEP}]
137 )
138 - openmax? (
139 - >=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}]
140 - x11-misc/xdg-utils
141 - )
142 vaapi? (
143 >=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
144 video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 )
145 @@ -316,7 +311,6 @@ multilib_src_configure() {
146 myconf+="
147 $(use_enable d3d9 nine)
148 $(use_enable llvm)
149 - $(use_enable openmax omx-bellagio)
150 $(use_enable vaapi va)
151 $(use_enable vdpau)
152 $(use_enable xa)
153 @@ -430,12 +424,6 @@ multilib_src_install() {
154 fi
155 eend $?
156 fi
157 -
158 - if use openmax; then
159 - echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share/mesa/xdg\"" > "${T}/99mesaxdgomx"
160 - doenvd "${T}"/99mesaxdgomx
161 - keepdir /usr/share/mesa/xdg
162 - fi
163 }
164
165 multilib_src_install_all() {
166 @@ -468,15 +456,6 @@ pkg_postinst() {
167 eselect opencl set --use-old ${PN}
168 fi
169
170 - # run omxregister-bellagio to make the OpenMAX drivers known system-wide
171 - if use openmax; then
172 - ebegin "Registering OpenMAX drivers"
173 - BELLAGIO_SEARCH_PATH="${EPREFIX}/usr/$(get_libdir)/libomxil-bellagio0" \
174 - OMX_BELLAGIO_REGISTRY=${EPREFIX}/usr/share/mesa/xdg/.omxregister \
175 - omxregister-bellagio
176 - eend $?
177 - fi
178 -
179 # warn about patent encumbered texture-float
180 if use !bindist; then
181 elog "USE=\"bindist\" was not set. Potentially patent encumbered code was"
182 @@ -485,12 +464,6 @@ pkg_postinst() {
183 fi
184 }
185
186 -pkg_prerm() {
187 - if use openmax; then
188 - rm "${EPREFIX}"/usr/share/mesa/xdg/.omxregister
189 - fi
190 -}
191 -
192 # $1 - VIDEO_CARDS flag
193 # other args - names of DRI drivers to enable
194 # TODO: avoid code duplication for a more elegant implementation
195
196 diff --git a/media-libs/mesa/mesa-18.1.9-r1.ebuild b/media-libs/mesa/mesa-18.1.9-r1.ebuild
197 index 97dd357..ca6486f 100644
198 --- a/media-libs/mesa/mesa-18.1.9-r1.ebuild
199 +++ b/media-libs/mesa/mesa-18.1.9-r1.ebuild
200 @@ -40,14 +40,13 @@ done
201
202 IUSE="${IUSE_VIDEO_CARDS}
203 bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 unwind
204 - +llvm +nptl opencl osmesa pax_kernel openmax pic selinux vaapi valgrind
205 + +llvm +nptl opencl osmesa pax_kernel pic selinux vaapi valgrind
206 vdpau vulkan wayland xvmc xa"
207
208 REQUIRED_USE="
209 d3d9? ( dri3 gallium )
210 llvm? ( gallium )
211 opencl? ( gallium llvm || ( video_cards_r600 video_cards_radeonsi ) )
212 - openmax? ( gallium )
213 gles1? ( egl )
214 gles2? ( egl )
215 vaapi? ( gallium )
216 @@ -105,10 +104,6 @@ RDEPEND="
217 dev-libs/libclc
218 virtual/libelf:0=[${MULTILIB_USEDEP}]
219 )
220 - openmax? (
221 - >=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}]
222 - x11-misc/xdg-utils
223 - )
224 vaapi? (
225 >=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
226 video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 )
227 @@ -317,7 +312,6 @@ multilib_src_configure() {
228 myconf+="
229 $(use_enable d3d9 nine)
230 $(use_enable llvm)
231 - $(use_enable openmax omx-bellagio)
232 $(use_enable vaapi va)
233 $(use_enable vdpau)
234 $(use_enable xa)
235 @@ -431,12 +425,6 @@ multilib_src_install() {
236 fi
237 eend $?
238 fi
239 -
240 - if use openmax; then
241 - echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share/mesa/xdg\"" > "${T}/99mesaxdgomx"
242 - doenvd "${T}"/99mesaxdgomx
243 - keepdir /usr/share/mesa/xdg
244 - fi
245 }
246
247 multilib_src_install_all() {
248 @@ -469,15 +457,6 @@ pkg_postinst() {
249 eselect opencl set --use-old ${PN}
250 fi
251
252 - # run omxregister-bellagio to make the OpenMAX drivers known system-wide
253 - if use openmax; then
254 - ebegin "Registering OpenMAX drivers"
255 - BELLAGIO_SEARCH_PATH="${EPREFIX}/usr/$(get_libdir)/libomxil-bellagio0" \
256 - OMX_BELLAGIO_REGISTRY=${EPREFIX}/usr/share/mesa/xdg/.omxregister \
257 - omxregister-bellagio
258 - eend $?
259 - fi
260 -
261 # warn about patent encumbered texture-float
262 if use !bindist; then
263 elog "USE=\"bindist\" was not set. Potentially patent encumbered code was"
264 @@ -486,12 +465,6 @@ pkg_postinst() {
265 fi
266 }
267
268 -pkg_prerm() {
269 - if use openmax; then
270 - rm "${EPREFIX}"/usr/share/mesa/xdg/.omxregister
271 - fi
272 -}
273 -
274 # $1 - VIDEO_CARDS flag
275 # other args - names of DRI drivers to enable
276 # TODO: avoid code duplication for a more elegant implementation
277
278 diff --git a/media-libs/mesa/mesa-18.1.9.ebuild b/media-libs/mesa/mesa-18.1.9.ebuild
279 index cdc5915..e61e3fd 100644
280 --- a/media-libs/mesa/mesa-18.1.9.ebuild
281 +++ b/media-libs/mesa/mesa-18.1.9.ebuild
282 @@ -1,4 +1,4 @@
283 -# Copyright 1999-2018 Gentoo Foundation
284 +# Copyright 1999-2018 Gentoo Authors
285 # Distributed under the terms of the GNU General Public License v2
286
287 EAPI=6
288 @@ -40,14 +40,13 @@ done
289
290 IUSE="${IUSE_VIDEO_CARDS}
291 bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 unwind
292 - +llvm +nptl opencl osmesa pax_kernel openmax pic selinux vaapi valgrind
293 + +llvm +nptl opencl osmesa pax_kernel pic selinux vaapi valgrind
294 vdpau vulkan wayland xvmc xa"
295
296 REQUIRED_USE="
297 d3d9? ( dri3 gallium )
298 llvm? ( gallium )
299 opencl? ( gallium llvm || ( video_cards_r600 video_cards_radeonsi ) )
300 - openmax? ( gallium )
301 gles1? ( egl )
302 gles2? ( egl )
303 vaapi? ( gallium )
304 @@ -105,10 +104,6 @@ RDEPEND="
305 dev-libs/libclc
306 virtual/libelf:0=[${MULTILIB_USEDEP}]
307 )
308 - openmax? (
309 - >=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}]
310 - x11-misc/xdg-utils
311 - )
312 vaapi? (
313 >=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
314 video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 )
315 @@ -316,7 +311,6 @@ multilib_src_configure() {
316 myconf+="
317 $(use_enable d3d9 nine)
318 $(use_enable llvm)
319 - $(use_enable openmax omx-bellagio)
320 $(use_enable vaapi va)
321 $(use_enable vdpau)
322 $(use_enable xa)
323 @@ -430,12 +424,6 @@ multilib_src_install() {
324 fi
325 eend $?
326 fi
327 -
328 - if use openmax; then
329 - echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share/mesa/xdg\"" > "${T}/99mesaxdgomx"
330 - doenvd "${T}"/99mesaxdgomx
331 - keepdir /usr/share/mesa/xdg
332 - fi
333 }
334
335 multilib_src_install_all() {
336 @@ -468,15 +456,6 @@ pkg_postinst() {
337 eselect opencl set --use-old ${PN}
338 fi
339
340 - # run omxregister-bellagio to make the OpenMAX drivers known system-wide
341 - if use openmax; then
342 - ebegin "Registering OpenMAX drivers"
343 - BELLAGIO_SEARCH_PATH="${EPREFIX}/usr/$(get_libdir)/libomxil-bellagio0" \
344 - OMX_BELLAGIO_REGISTRY=${EPREFIX}/usr/share/mesa/xdg/.omxregister \
345 - omxregister-bellagio
346 - eend $?
347 - fi
348 -
349 # warn about patent encumbered texture-float
350 if use !bindist; then
351 elog "USE=\"bindist\" was not set. Potentially patent encumbered code was"
352 @@ -485,12 +464,6 @@ pkg_postinst() {
353 fi
354 }
355
356 -pkg_prerm() {
357 - if use openmax; then
358 - rm "${EPREFIX}"/usr/share/mesa/xdg/.omxregister
359 - fi
360 -}
361 -
362 # $1 - VIDEO_CARDS flag
363 # other args - names of DRI drivers to enable
364 # TODO: avoid code duplication for a more elegant implementation
365
366 diff --git a/media-libs/mesa/metadata.xml b/media-libs/mesa/metadata.xml
367 index 8e1144c..f978f99 100644
368 --- a/media-libs/mesa/metadata.xml
369 +++ b/media-libs/mesa/metadata.xml
370 @@ -17,7 +17,6 @@
371 <flag name="gles2">Enable GLESv2 support.</flag>
372 <flag name="llvm">Enable LLVM backend for Gallium3D.</flag>
373 <flag name="opencl">Enable the Clover Gallium OpenCL state tracker.</flag>
374 - <flag name="openmax">Enable OpenMAX video decode/encode acceleration for Gallium3D.</flag>
375 <flag name="osmesa">Build the Mesa library for off-screen rendering.</flag>
376 <flag name="pax_kernel">Enable if the user plans to run the package under a pax enabled hardened kernel</flag>
377 <flag name="pic">disable optimized assembly code that is not PIC friendly</flag>