Gentoo Archives: gentoo-commits

From: "Manuel Rüger" <mrueg@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/mesa/
Date: Mon, 05 Sep 2016 16:35:35
Message-Id: 1473093317.aa85c53506894c222ff86b608ce38c52af61f90e.mrueg@gentoo
1 commit: aa85c53506894c222ff86b608ce38c52af61f90e
2 Author: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
3 AuthorDate: Mon Sep 5 16:34:58 2016 +0000
4 Commit: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
5 CommitDate: Mon Sep 5 16:35:17 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa85c535
7
8 media-libs/mesa: Remove old
9
10 Package-Manager: portage-2.3.0
11
12 media-libs/mesa/Manifest | 2 -
13 media-libs/mesa/mesa-11.1.3.ebuild | 453 ------------------------------------
14 media-libs/mesa/mesa-11.2.1.ebuild | 459 -------------------------------------
15 3 files changed, 914 deletions(-)
16
17 diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
18 index 721fe7c..0602675 100644
19 --- a/media-libs/mesa/Manifest
20 +++ b/media-libs/mesa/Manifest
21 @@ -2,9 +2,7 @@ DIST MesaLib-10.3.7.tar.bz2 7287153 SHA256 43c6ced15e237cbb21b3082d7c0b42777c50c
22 DIST MesaLib-7.10.3.tar.bz2 6056837 SHA256 1e701fc839b872677ddca9ed8784d754c9da1fbeda98173980e06aa7df0e85c0 SHA512 aa1f5f068b305fae5519e11cad2db9c6dc647d3122252bbcb210f13ac6ef1b667ae750344898bca7c5bfae94934db05eff915cb7417a59590e6d3ba230817aa8 WHIRLPOOL 5c2adda647936ed4163a4e4d5afad8344eb576712f9432f697aa0fc22ca17d7aaf0aeb6ad2d4e7e0825dc27cae570660332450778f8091e9b27aad2865c9b5fc
23 DIST mesa-11.0.6.tar.xz 7272972 SHA256 8340e64cdc91999840404c211496f3de38e7b4cb38db34e2f72f1642c5134760 SHA512 946a66803395ef0f4d3b328e981e03a87bb5173a523be5da1dd3363002fceacd8dcbfdbf9716e31bb4247b23cc5ef112b24bb4ef0709b514bc8160c6cbf1dbf3 WHIRLPOOL 19729acb5fbbcff3a99b4d7644750dff4a7a2d41c3f25f2e004938faf0c72abd33e97f5d23d2804f84b957824757b5f64f3a7f54a2dd8999b2a71eb9b1976e0b
24 DIST mesa-11.0.9.tar.xz 7282648 SHA256 a1262ff1c66a16ccf341186cf0e57b306b8589eb2cc5ce92ffb6788ab01d2b01 SHA512 8bf9c3bfe61f5d22182b9611d66051d83dfb302cc349921bc1d895acc8681b3e22e77cb360e2f12383fd928793b306f8f98998caa457dc04e3ff4e5561ea78f7 WHIRLPOOL a3477542b5ebfed9b69bd29e7f58a01b02c70d49399afb873744de08e776d712eaca3443f88dbdee25b1d3d35a4eb9dae75a3b9d7d6d652d41cded763836c59a
25 -DIST mesa-11.1.3.tar.xz 7566584 SHA256 51f6658a214d75e4d9f05207586d7ed56ebba75c6b10841176fb6675efa310ac SHA512 b9aae6a2d8f517c83fd16c5cb6b17ddf07156bc169a560a440de49e594f8c04e32c62c4522eddbd77827e51b7cd42754639655241c7dbf092d5abb1aab42b551 WHIRLPOOL dd1475a77a327de07ecabc91502d9250d30d53d89ad33c4c4b757c33868ef0c51858b97094f325366f7f36778902b065833d17482e5b2d8c4a4ce6c2c5adec68
26 DIST mesa-11.1.4.tar.xz 7570840 SHA256 0f781e9072655305f576efd4204d183bf99ac8cb8d9e0dd9fc2b4093230a0eba SHA512 ee83649eb30d0545e0ee950e8a23791c7e4faa01125e9d39fe9ab474cc2813bc7c813b35ce261e837e7c5189fdb3446f5413317ed8663fbdb1083e1d04944ebd WHIRLPOOL d36921620d401cacfb985d66172519b5abcbeb85b2cceac69170139193cd13fda565dffc13858d39e073ea89c4affb4e3960b6013a19247be4e05aa0750d3e55
27 -DIST mesa-11.2.1.tar.xz 7857308 SHA256 a65207e9ae5c5f1c29f863c6a2cc98a7ab99762a24b82a248337f0ea9cfce01b SHA512 e70df5f1a80c2904fd15db13c2a0d26eef3b3826cc77ccf79c50dc63e385a2123394c3c7f197882c8d35d8aa6cb9200a8fca705ccf3631000de89599c21891ac WHIRLPOOL 35d69c235717171d0628441fc10ab305ce21a302056aae97b453f3f5a33d8a691a983c7731872d1c45f4456c53192f9aa7f42b1b9016f1f4980ee358f1aeab9f
28 DIST mesa-11.2.2.tar.xz 7860932 SHA256 40e148812388ec7c6d7b6657d5a16e2e8dabba8b97ddfceea5197947647bdfb4 SHA512 fd1fcb1bc97e52784a4b3dedfd8c8ba95bc1b03a62b132d2e16154d076be7a6fabbca1bcba705a7916a1507d811d7f3e6c3488aa386d5e63891282fb1713ce52 WHIRLPOOL 96ecc968b2dad4d0574751565c8fbd383da7e30eb2b805f964d31c11633bfb9e27c461150bd436cb4400bde1c4f28f326f37a3f942b4d13b03ddf49e5ce4620e
29 DIST mesa-12.0.1.tar.xz 8571144 SHA256 bab24fb79f78c876073527f515ed871fc9c81d816f66c8a0b051d8d653896389 SHA512 11898336478d1f5bd3946d695b9599647c0b9084ad8890b4fa89daa922a217e5ca6d8b72f5801e362c3dd7723382f2daaa655b54f65a6d088ad8cfdb85f10023 WHIRLPOOL 9923990fc35142b8c877cbbfdfa7d362ae94c8c637360f28e348943dc6f380bdf5aee944c04da6337994f0f15790c8d1a55bea1f0b00afa780305e5862c78601
30 DIST mesa-12.0.2.tar.xz 8576848 SHA256 d957a5cc371dcd7ff2aa0d87492f263aece46f79352f4520039b58b1f32552cb SHA512 61fcbc3af16fff53f4877c5731c10fffa32a75c2eda9706d27ffdf00bd65a2c36b4ece165049b02c7269088f0755d93f6646ebc031d4b3fc838e316a5fcb2617 WHIRLPOOL 0563260c5a01357535bdf69baa3af9975a4ea84c428283b85d73bedb9c4ac622cd2d6946ac19b8d2923c973417353f059b6c1f65db04e032d3b27339d34bcff0
31
32 diff --git a/media-libs/mesa/mesa-11.1.3.ebuild b/media-libs/mesa/mesa-11.1.3.ebuild
33 deleted file mode 100644
34 index 93ba2c4..00000000
35 --- a/media-libs/mesa/mesa-11.1.3.ebuild
36 +++ /dev/null
37 @@ -1,453 +0,0 @@
38 -# Copyright 1999-2016 Gentoo Foundation
39 -# Distributed under the terms of the GNU General Public License v2
40 -# $Id$
41 -
42 -EAPI=5
43 -
44 -EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa"
45 -
46 -if [[ ${PV} = 9999 ]]; then
47 - GIT_ECLASS="git-r3"
48 - EXPERIMENTAL="true"
49 -fi
50 -
51 -PYTHON_COMPAT=( python2_7 )
52 -
53 -inherit autotools multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS}
54 -
55 -OPENGL_DIR="xorg-x11"
56 -
57 -MY_P="${P/_/-}"
58 -FOLDER="${PV/_rc*/}"
59 -
60 -DESCRIPTION="OpenGL-like graphic library for Linux"
61 -HOMEPAGE="http://mesa3d.sourceforge.net/"
62 -
63 -if [[ $PV == 9999 ]]; then
64 - SRC_URI=""
65 - KEYWORDS=""
66 -else
67 - SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${FOLDER}/${MY_P}.tar.xz"
68 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
69 -fi
70 -
71 -LICENSE="MIT"
72 -SLOT="0"
73 -RESTRICT="!bindist? ( bindist )"
74 -
75 -INTEL_CARDS="i915 i965 ilo intel"
76 -RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
77 -VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} freedreno nouveau vmware"
78 -for card in ${VIDEO_CARDS}; do
79 - IUSE_VIDEO_CARDS+=" video_cards_${card}"
80 -done
81 -
82 -IUSE="${IUSE_VIDEO_CARDS}
83 - bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm
84 - +nptl opencl osmesa pax_kernel openmax pic selinux +udev vaapi vdpau
85 - wayland xvmc xa kernel_FreeBSD"
86 -
87 -REQUIRED_USE="
88 - d3d9? ( dri3 gallium )
89 - llvm? ( gallium )
90 - opencl? ( gallium llvm )
91 - openmax? ( gallium )
92 - gles1? ( egl )
93 - gles2? ( egl )
94 - vaapi? ( gallium )
95 - vdpau? ( gallium )
96 - wayland? ( egl gbm )
97 - xa? ( gallium )
98 - video_cards_freedreno? ( gallium )
99 - video_cards_intel? ( classic )
100 - video_cards_i915? ( || ( classic gallium ) )
101 - video_cards_i965? ( classic )
102 - video_cards_ilo? ( gallium )
103 - video_cards_nouveau? ( || ( classic gallium ) )
104 - video_cards_radeon? ( || ( classic gallium )
105 - gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
106 - video_cards_r100? ( classic )
107 - video_cards_r200? ( classic )
108 - video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) )
109 - video_cards_r600? ( gallium )
110 - video_cards_radeonsi? ( gallium llvm )
111 - video_cards_vmware? ( gallium )
112 - ${PYTHON_REQUIRED_USE}
113 -"
114 -
115 -LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.64"
116 -# keep correct libdrm and dri2proto dep
117 -# keep blocks in rdepend for binpkg
118 -RDEPEND="
119 - !<x11-base/xorg-server-1.7
120 - !<=x11-proto/xf86driproto-2.0.3
121 - abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
122 - classic? ( app-eselect/eselect-mesa )
123 - gallium? ( app-eselect/eselect-mesa )
124 - >=app-eselect/eselect-opengl-1.3.0
125 - udev? ( kernel_linux? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] ) )
126 - >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
127 - >=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
128 - >=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
129 - >=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
130 - >=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
131 - >=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
132 - >=x11-libs/libxcb-1.9.3:=[${MULTILIB_USEDEP}]
133 - x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
134 - llvm? ( !kernel_FreeBSD? (
135 - video_cards_radeonsi? ( virtual/libelf:0=[${MULTILIB_USEDEP}] )
136 - !video_cards_r600? (
137 - video_cards_radeon? ( virtual/libelf:0=[${MULTILIB_USEDEP}] )
138 - ) )
139 - >=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}]
140 - <sys-devel/llvm-3.8
141 - )
142 - opencl? (
143 - app-eselect/eselect-opencl
144 - dev-libs/libclc
145 - !kernel_FreeBSD? ( virtual/libelf:0=[${MULTILIB_USEDEP}] )
146 - )
147 - openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}] )
148 - vaapi? ( >=x11-libs/libva-1.6.0:=[${MULTILIB_USEDEP}] )
149 - vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
150 - wayland? ( >=dev-libs/wayland-1.2.0:=[${MULTILIB_USEDEP}] )
151 - xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
152 - ${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vmware?,${MULTILIB_USEDEP}]
153 -"
154 -for card in ${INTEL_CARDS}; do
155 - RDEPEND="${RDEPEND}
156 - video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
157 - "
158 -done
159 -
160 -for card in ${RADEON_CARDS}; do
161 - RDEPEND="${RDEPEND}
162 - video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
163 - "
164 -done
165 -RDEPEND="${RDEPEND}
166 - video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
167 -"
168 -
169 -DEPEND="${RDEPEND}
170 - llvm? (
171 - video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] )
172 - )
173 - opencl? (
174 - >=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}]
175 - >=sys-devel/clang-3.4.2:=[${MULTILIB_USEDEP}]
176 - >=sys-devel/gcc-4.6
177 - )
178 - sys-devel/gettext
179 - virtual/pkgconfig
180 - >=x11-proto/dri2proto-2.8-r1:=[${MULTILIB_USEDEP}]
181 - dri3? (
182 - >=x11-proto/dri3proto-1.0:=[${MULTILIB_USEDEP}]
183 - >=x11-proto/presentproto-1.0:=[${MULTILIB_USEDEP}]
184 - )
185 - >=x11-proto/glproto-1.4.17-r1:=[${MULTILIB_USEDEP}]
186 - >=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]
187 - >=x11-proto/xf86driproto-2.1.1-r1:=[${MULTILIB_USEDEP}]
188 - >=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}]
189 -"
190 -[[ ${PV} == 9999 ]] && DEPEND+="
191 - sys-devel/bison
192 - sys-devel/flex
193 - ${PYTHON_DEPS}
194 - $(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
195 -"
196 -
197 -S="${WORKDIR}/${MY_P}"
198 -EGIT_CHECKOUT_DIR=${S}
199 -
200 -QA_WX_LOAD="
201 -x86? (
202 - !pic? (
203 - usr/lib*/libglapi.so.0.0.0
204 - usr/lib*/libGLESv1_CM.so.1.1.0
205 - usr/lib*/libGLESv2.so.2.0.0
206 - usr/lib*/libGL.so.1.2.0
207 - usr/lib*/libOSMesa.so.8.0.0
208 - )
209 -)"
210 -
211 -pkg_setup() {
212 - # warning message for bug 459306
213 - if use llvm && has_version sys-devel/llvm[!debug=]; then
214 - ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
215 - ewarn "detected! This can cause problems. For details, see bug 459306."
216 - fi
217 -
218 - python-any-r1_pkg_setup
219 -}
220 -
221 -src_prepare() {
222 - [[ ${PV} == 9999 ]] && eautoreconf
223 -}
224 -
225 -multilib_src_configure() {
226 - local myconf
227 -
228 - if use classic; then
229 - # Configurable DRI drivers
230 - driver_enable swrast
231 -
232 - # Intel code
233 - driver_enable video_cards_i915 i915
234 - driver_enable video_cards_i965 i965
235 - if ! use video_cards_i915 && \
236 - ! use video_cards_i965; then
237 - driver_enable video_cards_intel i915 i965
238 - fi
239 -
240 - # Nouveau code
241 - driver_enable video_cards_nouveau nouveau
242 -
243 - # ATI code
244 - driver_enable video_cards_r100 radeon
245 - driver_enable video_cards_r200 r200
246 - if ! use video_cards_r100 && \
247 - ! use video_cards_r200; then
248 - driver_enable video_cards_radeon radeon r200
249 - fi
250 - fi
251 -
252 - if use egl; then
253 - myconf+=" --with-egl-platforms=x11$(use wayland && echo ",wayland")$(use gbm && echo ",drm")"
254 - fi
255 -
256 - if use gallium; then
257 - myconf+="
258 - $(use_enable d3d9 nine)
259 - $(use_enable llvm gallium-llvm)
260 - $(use_enable openmax omx)
261 - $(use_enable vaapi va)
262 - $(use_enable vdpau)
263 - $(use_enable xa)
264 - $(use_enable xvmc)
265 - "
266 - use vaapi && myconf+=" --with-va-libdir=/usr/$(get_libdir)/va/drivers"
267 -
268 - gallium_enable swrast
269 - gallium_enable video_cards_vmware svga
270 - gallium_enable video_cards_nouveau nouveau
271 - gallium_enable video_cards_i915 i915
272 - gallium_enable video_cards_ilo ilo
273 - if ! use video_cards_i915 && \
274 - ! use video_cards_i965; then
275 - gallium_enable video_cards_intel i915
276 - fi
277 -
278 - gallium_enable video_cards_r300 r300
279 - gallium_enable video_cards_r600 r600
280 - gallium_enable video_cards_radeonsi radeonsi
281 - if ! use video_cards_r300 && \
282 - ! use video_cards_r600; then
283 - gallium_enable video_cards_radeon r300 r600
284 - fi
285 -
286 - gallium_enable video_cards_freedreno freedreno
287 - # opencl stuff
288 - if use opencl; then
289 - myconf+="
290 - $(use_enable opencl)
291 - --with-clang-libdir="${EPREFIX}/usr/lib"
292 - "
293 - fi
294 - fi
295 -
296 - # x86 hardened pax_kernel needs glx-read-only-text, bug 240956
297 - if [[ ${ABI} == x86 ]]; then
298 - myconf+=" $(use_enable pax_kernel glx-read-only-text)"
299 - fi
300 -
301 - # on abi_x86_32 hardened we need to have asm disable
302 - if [[ ${ABI} == x86* ]] && use pic; then
303 - myconf+=" --disable-asm"
304 - fi
305 -
306 - # build fails with BSD indent, bug #428112
307 - use userland_GNU || export INDENT=cat
308 -
309 - ECONF_SOURCE="${S}" \
310 - econf \
311 - --enable-dri \
312 - --enable-glx \
313 - --enable-shared-glapi \
314 - $(use_enable !bindist texture-float) \
315 - $(use_enable d3d9 nine) \
316 - $(use_enable debug) \
317 - $(use_enable dri3) \
318 - $(use_enable egl) \
319 - $(use_enable gbm) \
320 - $(use_enable gles1) \
321 - $(use_enable gles2) \
322 - $(use_enable nptl glx-tls) \
323 - $(use_enable osmesa) \
324 - $(use_enable !udev sysfs) \
325 - --enable-llvm-shared-libs \
326 - --with-dri-drivers=${DRI_DRIVERS} \
327 - --with-gallium-drivers=${GALLIUM_DRIVERS} \
328 - PYTHON2="${PYTHON}" \
329 - ${myconf}
330 -}
331 -
332 -multilib_src_install() {
333 - emake install DESTDIR="${D}"
334 -
335 - if use classic || use gallium; then
336 - ebegin "Moving DRI/Gallium drivers for dynamic switching"
337 - local gallium_drivers=( i915_dri.so i965_dri.so r300_dri.so r600_dri.so swrast_dri.so )
338 - keepdir /usr/$(get_libdir)/dri
339 - dodir /usr/$(get_libdir)/mesa
340 - for x in ${gallium_drivers[@]}; do
341 - if [ -f "$(get_libdir)/gallium/${x}" ]; then
342 - mv -f "${ED}/usr/$(get_libdir)/dri/${x}" "${ED}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \
343 - || die "Failed to move ${x}"
344 - fi
345 - done
346 - if use classic; then
347 - emake -C "${BUILD_DIR}/src/mesa/drivers/dri" DESTDIR="${D}" install
348 - fi
349 - for x in "${ED}"/usr/$(get_libdir)/dri/*.so; do
350 - if [ -f ${x} -o -L ${x} ]; then
351 - mv -f "${x}" "${x/dri/mesa}" \
352 - || die "Failed to move ${x}"
353 - fi
354 - done
355 - pushd "${ED}"/usr/$(get_libdir)/dri || die "pushd failed"
356 - ln -s ../mesa/*.so . || die "Creating symlink failed"
357 - # remove symlinks to drivers known to eselect
358 - for x in ${gallium_drivers[@]}; do
359 - if [ -f ${x} -o -L ${x} ]; then
360 - rm "${x}" || die "Failed to remove ${x}"
361 - fi
362 - done
363 - popd
364 - eend $?
365 - fi
366 - if use opencl; then
367 - ebegin "Moving Gallium/Clover OpenCL implementation for dynamic switching"
368 - local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa"
369 - dodir ${cl_dir}/{lib,include}
370 - if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then
371 - mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \
372 - "${ED}"${cl_dir}
373 - fi
374 - if [ -f "${ED}/usr/include/CL/opencl.h" ]; then
375 - mv -f "${ED}"/usr/include/CL \
376 - "${ED}"${cl_dir}/include
377 - fi
378 - eend $?
379 - fi
380 -
381 - if use openmax; then
382 - echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share/mesa/xdg\"" > "${T}/99mesaxdgomx"
383 - doenvd "${T}"/99mesaxdgomx
384 - keepdir /usr/share/mesa/xdg
385 - fi
386 -}
387 -
388 -multilib_src_install_all() {
389 - prune_libtool_files --all
390 - einstalldocs
391 -
392 - if use !bindist; then
393 - dodoc docs/patents.txt
394 - fi
395 -
396 - # Install config file for eselect mesa
397 - insinto /usr/share/mesa
398 - newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf
399 -}
400 -
401 -multilib_src_test() {
402 - if use llvm; then
403 - local llvm_tests='lp_test_arit lp_test_arit lp_test_blend lp_test_blend lp_test_conv lp_test_conv lp_test_format lp_test_format lp_test_printf lp_test_printf'
404 - pushd src/gallium/drivers/llvmpipe >/dev/null || die
405 - emake ${llvm_tests}
406 - pax-mark m ${llvm_tests}
407 - popd >/dev/null || die
408 - fi
409 - emake check
410 -}
411 -
412 -pkg_postinst() {
413 - # Switch to the xorg implementation.
414 - echo
415 - eselect opengl set --use-old ${OPENGL_DIR}
416 -
417 - # Select classic/gallium drivers
418 - if use classic || use gallium; then
419 - eselect mesa set --auto
420 - fi
421 -
422 - # Switch to mesa opencl
423 - if use opencl; then
424 - eselect opencl set --use-old ${PN}
425 - fi
426 -
427 - # run omxregister-bellagio to make the OpenMAX drivers known system-wide
428 - if use openmax; then
429 - ebegin "Registering OpenMAX drivers"
430 - BELLAGIO_SEARCH_PATH="${EPREFIX}/usr/$(get_libdir)/libomxil-bellagio0" \
431 - OMX_BELLAGIO_REGISTRY=${EPREFIX}/usr/share/mesa/xdg/.omxregister \
432 - omxregister-bellagio
433 - eend $?
434 - fi
435 -
436 - # warn about patent encumbered texture-float
437 - if use !bindist; then
438 - elog "USE=\"bindist\" was not set. Potentially patent encumbered code was"
439 - elog "enabled. Please see patents.txt for an explanation."
440 - fi
441 -
442 - if ! has_version media-libs/libtxc_dxtn; then
443 - elog "Note that in order to have full S3TC support, it is necessary to install"
444 - elog "media-libs/libtxc_dxtn as well. This may be necessary to get nice"
445 - elog "textures in some apps, and some others even require this to run."
446 - fi
447 -}
448 -
449 -pkg_prerm() {
450 - if use openmax; then
451 - rm "${EPREFIX}"/usr/share/mesa/xdg/.omxregister
452 - fi
453 -}
454 -
455 -# $1 - VIDEO_CARDS flag
456 -# other args - names of DRI drivers to enable
457 -# TODO: avoid code duplication for a more elegant implementation
458 -driver_enable() {
459 - case $# in
460 - # for enabling unconditionally
461 - 1)
462 - DRI_DRIVERS+=",$1"
463 - ;;
464 - *)
465 - if use $1; then
466 - shift
467 - for i in $@; do
468 - DRI_DRIVERS+=",${i}"
469 - done
470 - fi
471 - ;;
472 - esac
473 -}
474 -
475 -gallium_enable() {
476 - case $# in
477 - # for enabling unconditionally
478 - 1)
479 - GALLIUM_DRIVERS+=",$1"
480 - ;;
481 - *)
482 - if use $1; then
483 - shift
484 - for i in $@; do
485 - GALLIUM_DRIVERS+=",${i}"
486 - done
487 - fi
488 - ;;
489 - esac
490 -}
491
492 diff --git a/media-libs/mesa/mesa-11.2.1.ebuild b/media-libs/mesa/mesa-11.2.1.ebuild
493 deleted file mode 100644
494 index 570b78e..00000000
495 --- a/media-libs/mesa/mesa-11.2.1.ebuild
496 +++ /dev/null
497 @@ -1,459 +0,0 @@
498 -# Copyright 1999-2016 Gentoo Foundation
499 -# Distributed under the terms of the GNU General Public License v2
500 -# $Id$
501 -
502 -EAPI=5
503 -
504 -EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa"
505 -
506 -if [[ ${PV} = 9999 ]]; then
507 - GIT_ECLASS="git-r3"
508 - EXPERIMENTAL="true"
509 -fi
510 -
511 -PYTHON_COMPAT=( python2_7 )
512 -
513 -inherit autotools multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS}
514 -
515 -OPENGL_DIR="xorg-x11"
516 -
517 -MY_P="${P/_/-}"
518 -FOLDER="${PV/_rc*/}"
519 -
520 -DESCRIPTION="OpenGL-like graphic library for Linux"
521 -HOMEPAGE="http://mesa3d.sourceforge.net/"
522 -
523 -if [[ $PV == 9999 ]]; then
524 - SRC_URI=""
525 - KEYWORDS=""
526 -else
527 - SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${FOLDER}/${MY_P}.tar.xz"
528 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
529 -fi
530 -
531 -LICENSE="MIT"
532 -SLOT="0"
533 -RESTRICT="!bindist? ( bindist )"
534 -
535 -INTEL_CARDS="i915 i965 ilo intel"
536 -RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
537 -VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} freedreno nouveau vc4 vmware"
538 -for card in ${VIDEO_CARDS}; do
539 - IUSE_VIDEO_CARDS+=" video_cards_${card}"
540 -done
541 -
542 -IUSE="${IUSE_VIDEO_CARDS}
543 - bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm
544 - +nptl opencl osmesa pax_kernel openmax pic selinux +udev vaapi vdpau
545 - wayland xvmc xa kernel_FreeBSD"
546 -
547 -REQUIRED_USE="
548 - d3d9? ( dri3 gallium )
549 - llvm? ( gallium )
550 - opencl? ( gallium llvm )
551 - openmax? ( gallium )
552 - gles1? ( egl )
553 - gles2? ( egl )
554 - vaapi? ( gallium )
555 - vdpau? ( gallium )
556 - wayland? ( egl gbm )
557 - xa? ( gallium )
558 - video_cards_freedreno? ( gallium )
559 - video_cards_intel? ( classic )
560 - video_cards_i915? ( || ( classic gallium ) )
561 - video_cards_i965? ( classic )
562 - video_cards_ilo? ( gallium )
563 - video_cards_nouveau? ( || ( classic gallium ) )
564 - video_cards_radeon? ( || ( classic gallium )
565 - gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
566 - video_cards_r100? ( classic )
567 - video_cards_r200? ( classic )
568 - video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) )
569 - video_cards_r600? ( gallium )
570 - video_cards_radeonsi? ( gallium llvm )
571 - video_cards_vmware? ( gallium )
572 - ${PYTHON_REQUIRED_USE}
573 -"
574 -
575 -LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.67"
576 -# keep correct libdrm and dri2proto dep
577 -# keep blocks in rdepend for binpkg
578 -RDEPEND="
579 - !<x11-base/xorg-server-1.7
580 - !<=x11-proto/xf86driproto-2.0.3
581 - abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
582 - classic? ( app-eselect/eselect-mesa )
583 - gallium? ( app-eselect/eselect-mesa )
584 - >=app-eselect/eselect-opengl-1.3.0
585 - udev? ( kernel_linux? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] ) )
586 - >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
587 - >=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
588 - >=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
589 - >=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
590 - >=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
591 - >=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
592 - >=x11-libs/libxcb-1.9.3:=[${MULTILIB_USEDEP}]
593 - x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
594 - llvm? ( !kernel_FreeBSD? (
595 - video_cards_radeonsi? ( virtual/libelf:0=[${MULTILIB_USEDEP}] )
596 - !video_cards_r600? (
597 - video_cards_radeon? ( virtual/libelf:0=[${MULTILIB_USEDEP}] )
598 - ) )
599 - >=sys-devel/llvm-3.6.0:=[${MULTILIB_USEDEP}]
600 - )
601 - opencl? (
602 - app-eselect/eselect-opencl
603 - dev-libs/libclc
604 - !kernel_FreeBSD? ( virtual/libelf:0=[${MULTILIB_USEDEP}] )
605 - )
606 - openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}] )
607 - vaapi? ( >=x11-libs/libva-1.6.0:=[${MULTILIB_USEDEP}] )
608 - vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
609 - wayland? ( >=dev-libs/wayland-1.2.0:=[${MULTILIB_USEDEP}] )
610 - xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
611 - ${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vmware?,${MULTILIB_USEDEP}]
612 -"
613 -for card in ${INTEL_CARDS}; do
614 - RDEPEND="${RDEPEND}
615 - video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
616 - "
617 -done
618 -
619 -for card in ${RADEON_CARDS}; do
620 - RDEPEND="${RDEPEND}
621 - video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
622 - "
623 -done
624 -RDEPEND="${RDEPEND}
625 - video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
626 -"
627 -
628 -DEPEND="${RDEPEND}
629 - llvm? (
630 - video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] )
631 - )
632 - opencl? (
633 - >=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}]
634 - >=sys-devel/clang-3.4.2:=[${MULTILIB_USEDEP}]
635 - >=sys-devel/gcc-4.6
636 - )
637 - sys-devel/gettext
638 - virtual/pkgconfig
639 - >=x11-proto/dri2proto-2.8-r1:=[${MULTILIB_USEDEP}]
640 - dri3? (
641 - >=x11-proto/dri3proto-1.0:=[${MULTILIB_USEDEP}]
642 - >=x11-proto/presentproto-1.0:=[${MULTILIB_USEDEP}]
643 - )
644 - >=x11-proto/glproto-1.4.17-r1:=[${MULTILIB_USEDEP}]
645 - >=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]
646 - >=x11-proto/xf86driproto-2.1.1-r1:=[${MULTILIB_USEDEP}]
647 - >=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}]
648 -"
649 -[[ ${PV} == 9999 ]] && DEPEND+="
650 - sys-devel/bison
651 - sys-devel/flex
652 - ${PYTHON_DEPS}
653 - $(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
654 -"
655 -
656 -S="${WORKDIR}/${MY_P}"
657 -EGIT_CHECKOUT_DIR=${S}
658 -
659 -QA_WX_LOAD="
660 -x86? (
661 - !pic? (
662 - usr/lib*/libglapi.so.0.0.0
663 - usr/lib*/libGLESv1_CM.so.1.1.0
664 - usr/lib*/libGLESv2.so.2.0.0
665 - usr/lib*/libGL.so.1.2.0
666 - usr/lib*/libOSMesa.so.8.0.0
667 - )
668 -)"
669 -
670 -pkg_setup() {
671 - # warning message for bug 459306
672 - if use llvm && has_version sys-devel/llvm[!debug=]; then
673 - ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
674 - ewarn "detected! This can cause problems. For details, see bug 459306."
675 - fi
676 -
677 - python-any-r1_pkg_setup
678 -}
679 -
680 -src_prepare() {
681 - [[ ${PV} == 9999 ]] && eautoreconf
682 -}
683 -
684 -multilib_src_configure() {
685 - local myconf
686 -
687 - if use classic; then
688 - # Configurable DRI drivers
689 - driver_enable swrast
690 -
691 - # Intel code
692 - driver_enable video_cards_i915 i915
693 - driver_enable video_cards_i965 i965
694 - if ! use video_cards_i915 && \
695 - ! use video_cards_i965; then
696 - driver_enable video_cards_intel i915 i965
697 - fi
698 -
699 - # Nouveau code
700 - driver_enable video_cards_nouveau nouveau
701 -
702 - # ATI code
703 - driver_enable video_cards_r100 radeon
704 - driver_enable video_cards_r200 r200
705 - if ! use video_cards_r100 && \
706 - ! use video_cards_r200; then
707 - driver_enable video_cards_radeon radeon r200
708 - fi
709 - fi
710 -
711 - if use egl; then
712 - myconf+=" --with-egl-platforms=x11$(use wayland && echo ",wayland")$(use gbm && echo ",drm")"
713 - fi
714 -
715 - if use gallium; then
716 - myconf+="
717 - $(use_enable d3d9 nine)
718 - $(use_enable llvm gallium-llvm)
719 - $(use_enable openmax omx)
720 - $(use_enable vaapi va)
721 - $(use_enable vdpau)
722 - $(use_enable xa)
723 - $(use_enable xvmc)
724 - "
725 - use vaapi && myconf+=" --with-va-libdir=/usr/$(get_libdir)/va/drivers"
726 -
727 - gallium_enable swrast
728 - gallium_enable video_cards_vc4 vc4
729 - gallium_enable video_cards_vmware svga
730 - gallium_enable video_cards_nouveau nouveau
731 - gallium_enable video_cards_i915 i915
732 - gallium_enable video_cards_ilo ilo
733 - if ! use video_cards_i915 && \
734 - ! use video_cards_i965; then
735 - gallium_enable video_cards_intel i915
736 - fi
737 -
738 - gallium_enable video_cards_r300 r300
739 - gallium_enable video_cards_r600 r600
740 - gallium_enable video_cards_radeonsi radeonsi
741 - if ! use video_cards_r300 && \
742 - ! use video_cards_r600; then
743 - gallium_enable video_cards_radeon r300 r600
744 - fi
745 -
746 - gallium_enable video_cards_freedreno freedreno
747 - # opencl stuff
748 - if use opencl; then
749 - myconf+="
750 - $(use_enable opencl)
751 - --with-clang-libdir="${EPREFIX}/usr/lib"
752 - "
753 - fi
754 - fi
755 -
756 - # x86 hardened pax_kernel needs glx-rts, bug 240956
757 - if [[ ${ABI} == x86 ]]; then
758 - myconf+=" $(use_enable pax_kernel glx-read-only-text)"
759 - fi
760 -
761 - # on abi_x86_32 hardened we need to have asm disable
762 - if [[ ${ABI} == x86* ]] && use pic; then
763 - myconf+=" --disable-asm"
764 - fi
765 -
766 - if use gallium; then
767 - myconf+=" $(use_enable osmesa gallium-osmesa)"
768 - else
769 - myconf+=" $(use_enable osmesa)"
770 - fi
771 -
772 - # build fails with BSD indent, bug #428112
773 - use userland_GNU || export INDENT=cat
774 -
775 - ECONF_SOURCE="${S}" \
776 - econf \
777 - --enable-dri \
778 - --enable-glx \
779 - --enable-shared-glapi \
780 - --disable-shader-cache \
781 - $(use_enable !bindist texture-float) \
782 - $(use_enable d3d9 nine) \
783 - $(use_enable debug) \
784 - $(use_enable dri3) \
785 - $(use_enable egl) \
786 - $(use_enable gbm) \
787 - $(use_enable gles1) \
788 - $(use_enable gles2) \
789 - $(use_enable nptl glx-tls) \
790 - $(use_enable !udev sysfs) \
791 - --enable-llvm-shared-libs \
792 - --with-dri-drivers=${DRI_DRIVERS} \
793 - --with-gallium-drivers=${GALLIUM_DRIVERS} \
794 - PYTHON2="${PYTHON}" \
795 - ${myconf}
796 -}
797 -
798 -multilib_src_install() {
799 - emake install DESTDIR="${D}"
800 -
801 - if use classic || use gallium; then
802 - ebegin "Moving DRI/Gallium drivers for dynamic switching"
803 - local gallium_drivers=( i915_dri.so i965_dri.so r300_dri.so r600_dri.so swrast_dri.so )
804 - keepdir /usr/$(get_libdir)/dri
805 - dodir /usr/$(get_libdir)/mesa
806 - for x in ${gallium_drivers[@]}; do
807 - if [ -f "$(get_libdir)/gallium/${x}" ]; then
808 - mv -f "${ED}/usr/$(get_libdir)/dri/${x}" "${ED}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \
809 - || die "Failed to move ${x}"
810 - fi
811 - done
812 - if use classic; then
813 - emake -C "${BUILD_DIR}/src/mesa/drivers/dri" DESTDIR="${D}" install
814 - fi
815 - for x in "${ED}"/usr/$(get_libdir)/dri/*.so; do
816 - if [ -f ${x} -o -L ${x} ]; then
817 - mv -f "${x}" "${x/dri/mesa}" \
818 - || die "Failed to move ${x}"
819 - fi
820 - done
821 - pushd "${ED}"/usr/$(get_libdir)/dri || die "pushd failed"
822 - ln -s ../mesa/*.so . || die "Creating symlink failed"
823 - # remove symlinks to drivers known to eselect
824 - for x in ${gallium_drivers[@]}; do
825 - if [ -f ${x} -o -L ${x} ]; then
826 - rm "${x}" || die "Failed to remove ${x}"
827 - fi
828 - done
829 - popd
830 - eend $?
831 - fi
832 - if use opencl; then
833 - ebegin "Moving Gallium/Clover OpenCL implementation for dynamic switching"
834 - local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa"
835 - dodir ${cl_dir}/{lib,include}
836 - if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then
837 - mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \
838 - "${ED}"${cl_dir}
839 - fi
840 - if [ -f "${ED}/usr/include/CL/opencl.h" ]; then
841 - mv -f "${ED}"/usr/include/CL \
842 - "${ED}"${cl_dir}/include
843 - fi
844 - eend $?
845 - fi
846 -
847 - if use openmax; then
848 - echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share/mesa/xdg\"" > "${T}/99mesaxdgomx"
849 - doenvd "${T}"/99mesaxdgomx
850 - keepdir /usr/share/mesa/xdg
851 - fi
852 -}
853 -
854 -multilib_src_install_all() {
855 - prune_libtool_files --all
856 - einstalldocs
857 -
858 - if use !bindist; then
859 - dodoc docs/patents.txt
860 - fi
861 -
862 - # Install config file for eselect mesa
863 - insinto /usr/share/mesa
864 - newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf
865 -}
866 -
867 -multilib_src_test() {
868 - if use llvm; then
869 - local llvm_tests='lp_test_arit lp_test_arit lp_test_blend lp_test_blend lp_test_conv lp_test_conv lp_test_format lp_test_format lp_test_printf lp_test_printf'
870 - pushd src/gallium/drivers/llvmpipe >/dev/null || die
871 - emake ${llvm_tests}
872 - pax-mark m ${llvm_tests}
873 - popd >/dev/null || die
874 - fi
875 - emake check
876 -}
877 -
878 -pkg_postinst() {
879 - # Switch to the xorg implementation.
880 - echo
881 - eselect opengl set --use-old ${OPENGL_DIR}
882 -
883 - # Select classic/gallium drivers
884 - if use classic || use gallium; then
885 - eselect mesa set --auto
886 - fi
887 -
888 - # Switch to mesa opencl
889 - if use opencl; then
890 - eselect opencl set --use-old ${PN}
891 - fi
892 -
893 - # run omxregister-bellagio to make the OpenMAX drivers known system-wide
894 - if use openmax; then
895 - ebegin "Registering OpenMAX drivers"
896 - BELLAGIO_SEARCH_PATH="${EPREFIX}/usr/$(get_libdir)/libomxil-bellagio0" \
897 - OMX_BELLAGIO_REGISTRY=${EPREFIX}/usr/share/mesa/xdg/.omxregister \
898 - omxregister-bellagio
899 - eend $?
900 - fi
901 -
902 - # warn about patent encumbered texture-float
903 - if use !bindist; then
904 - elog "USE=\"bindist\" was not set. Potentially patent encumbered code was"
905 - elog "enabled. Please see patents.txt for an explanation."
906 - fi
907 -
908 - if ! has_version media-libs/libtxc_dxtn; then
909 - elog "Note that in order to have full S3TC support, it is necessary to install"
910 - elog "media-libs/libtxc_dxtn as well. This may be necessary to get nice"
911 - elog "textures in some apps, and some others even require this to run."
912 - fi
913 -}
914 -
915 -pkg_prerm() {
916 - if use openmax; then
917 - rm "${EPREFIX}"/usr/share/mesa/xdg/.omxregister
918 - fi
919 -}
920 -
921 -# $1 - VIDEO_CARDS flag
922 -# other args - names of DRI drivers to enable
923 -# TODO: avoid code duplication for a more elegant implementation
924 -driver_enable() {
925 - case $# in
926 - # for enabling unconditionally
927 - 1)
928 - DRI_DRIVERS+=",$1"
929 - ;;
930 - *)
931 - if use $1; then
932 - shift
933 - for i in $@; do
934 - DRI_DRIVERS+=",${i}"
935 - done
936 - fi
937 - ;;
938 - esac
939 -}
940 -
941 -gallium_enable() {
942 - case $# in
943 - # for enabling unconditionally
944 - 1)
945 - GALLIUM_DRIVERS+=",$1"
946 - ;;
947 - *)
948 - if use $1; then
949 - shift
950 - for i in $@; do
951 - GALLIUM_DRIVERS+=",${i}"
952 - done
953 - fi
954 - ;;
955 - esac
956 -}