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