1 |
commit: a6f8007128a12b7e88e50a5a04838a902f296e18 |
2 |
Author: Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jul 29 15:26:13 2013 +0000 |
4 |
Commit: Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de> |
5 |
CommitDate: Mon Jul 29 15:26:13 2013 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=a6f80071 |
7 |
|
8 |
media-libs/mesa: in g-x86 |
9 |
|
10 |
--- |
11 |
media-libs/mesa/files/eselect-mesa.conf.8.1 | 38 -- |
12 |
media-libs/mesa/files/glx_ro_text_segm.patch | 28 -- |
13 |
.../mesa-8.1-dont-require-llvm-for-r300.patch | 25 -- |
14 |
media-libs/mesa/mesa-9.1.5.ebuild | 419 --------------------- |
15 |
media-libs/mesa/metadata.xml | 1 - |
16 |
5 files changed, 511 deletions(-) |
17 |
|
18 |
diff --git a/media-libs/mesa/files/eselect-mesa.conf.8.1 b/media-libs/mesa/files/eselect-mesa.conf.8.1 |
19 |
deleted file mode 100644 |
20 |
index 63a21aa..0000000 |
21 |
--- a/media-libs/mesa/files/eselect-mesa.conf.8.1 |
22 |
+++ /dev/null |
23 |
@@ -1,38 +0,0 @@ |
24 |
-# mesa classic/gallium implementations in this release |
25 |
- |
26 |
-# Syntax description: |
27 |
-# * MESA_IMPLEMENTATIONS contains a space-delimited list of switchable |
28 |
-# classic/gallium implementations. |
29 |
-# * MESA_DRIVERS is an associative array, for each member "foo" of |
30 |
-# MESA_IMPLEMENTATIONS it contains the following elements: |
31 |
-# foo,description - Human-readable description of the driver |
32 |
-# foo,classicdriver - Filename of the classic driver |
33 |
-# foo,galliumdriver - Filename of the gallium driver |
34 |
-# foo,default - which of classic or gallium is chosen by default |
35 |
- |
36 |
-MESA_IMPLEMENTATIONS="i915 i965 r300 r600 sw" |
37 |
-declare -A MESA_DRIVERS || die "MESA_DRIVERS already in environment and not associative." |
38 |
- |
39 |
-MESA_DRIVERS[i915,description]="i915 (Intel 915, 945)" |
40 |
-MESA_DRIVERS[i915,classicdriver]="i915_dri.so" |
41 |
-MESA_DRIVERS[i915,galliumdriver]="i915g_dri.so" |
42 |
-MESA_DRIVERS[i915,default]="gallium" |
43 |
- |
44 |
-MESA_DRIVERS[i965,description]="i965 (Intel 965, G/Q3x, G/Q4x)" |
45 |
-MESA_DRIVERS[i965,classicdriver]="i965_dri.so" |
46 |
-MESA_DRIVERS[i965,default]="classic" |
47 |
- |
48 |
-MESA_DRIVERS[r300,description]="r300 (Radeon R300-R500)" |
49 |
-MESA_DRIVERS[r300,classicdriver]="r300_dri.so" |
50 |
-MESA_DRIVERS[r300,galliumdriver]="r300g_dri.so" |
51 |
-MESA_DRIVERS[r300,default]="gallium" |
52 |
- |
53 |
-MESA_DRIVERS[r600,description]="r600 (Radeon R600-R700, Evergreen, Northern Islands)" |
54 |
-MESA_DRIVERS[r600,classicdriver]="r600_dri.so" |
55 |
-MESA_DRIVERS[r600,galliumdriver]="r600g_dri.so" |
56 |
-MESA_DRIVERS[r600,default]="gallium" |
57 |
- |
58 |
-MESA_DRIVERS[sw,description]="sw (Software renderer)" |
59 |
-MESA_DRIVERS[sw,classicdriver]="swrast_dri.so" |
60 |
-MESA_DRIVERS[sw,galliumdriver]="swrastg_dri.so" |
61 |
-MESA_DRIVERS[sw,default]="gallium" |
62 |
|
63 |
diff --git a/media-libs/mesa/files/glx_ro_text_segm.patch b/media-libs/mesa/files/glx_ro_text_segm.patch |
64 |
deleted file mode 100644 |
65 |
index 495b7dc..0000000 |
66 |
--- a/media-libs/mesa/files/glx_ro_text_segm.patch |
67 |
+++ /dev/null |
68 |
@@ -1,28 +0,0 @@ |
69 |
-2011-02-09 Jeremy Huddleston <jeremyhu@×××××××××××.org |
70 |
- |
71 |
- #240956 |
72 |
- * configure.ac add support to enable readonly test segment on x86 |
73 |
- |
74 |
---- configure.ac.orig 2008-11-17 23:19:38.000000000 +0100 |
75 |
-+++ configure.ac 2008-11-17 23:20:17.000000000 +0100 |
76 |
-@@ -499,6 +499,20 @@ |
77 |
- enable_xcb=no |
78 |
- fi |
79 |
- |
80 |
-+ |
81 |
-+dnl readonly text segment on x86 hardened platforms |
82 |
-+AC_ARG_ENABLE([glx_rts], |
83 |
-+ [AS_HELP_STRING([--enable-glx-rts], |
84 |
-+ [on x86, use a readonly text segment for libGL @<:@default=disabled@:>@])], |
85 |
-+ [enable_glx_rts="$enableval"], |
86 |
-+ [enable_glx_rts=no]) |
87 |
-+if test "x$enable_glx_rts" = xyes; then |
88 |
-+ DEFINES="$DEFINES -DGLX_X86_READONLY_TEXT" |
89 |
-+else |
90 |
-+ enable_glx_rts=no |
91 |
-+fi |
92 |
-+ |
93 |
-+ |
94 |
- dnl |
95 |
- dnl libGL configuration per driver |
96 |
- dnl |
97 |
|
98 |
diff --git a/media-libs/mesa/files/mesa-8.1-dont-require-llvm-for-r300.patch b/media-libs/mesa/files/mesa-8.1-dont-require-llvm-for-r300.patch |
99 |
deleted file mode 100644 |
100 |
index 9fe7e32..0000000 |
101 |
--- a/media-libs/mesa/files/mesa-8.1-dont-require-llvm-for-r300.patch |
102 |
+++ /dev/null |
103 |
@@ -1,25 +0,0 @@ |
104 |
---- a/configure.ac 2012-05-12 11:50:09.786970584 +0200 |
105 |
-+++ b/configure.ac 2012-05-12 12:00:00.770582272 +0200 |
106 |
-@@ -1922,14 +1922,6 @@ |
107 |
- fi |
108 |
- } |
109 |
- |
110 |
--gallium_require_llvm() { |
111 |
-- if test "x$MESA_LLVM" = x0; then |
112 |
-- case "$host_cpu" in |
113 |
-- i*86|x86_64) AC_MSG_ERROR([LLVM is required to build $1 on x86 and x86_64]);; |
114 |
-- esac |
115 |
-- fi |
116 |
--} |
117 |
-- |
118 |
- gallium_require_drm_loader() { |
119 |
- if test "x$enable_gallium_loader" = xyes; then |
120 |
- PKG_CHECK_MODULES([LIBUDEV], [libudev], [], |
121 |
-@@ -1962,7 +1954,6 @@ |
122 |
- ;; |
123 |
- xr300) |
124 |
- PKG_CHECK_MODULES([RADEON], [libdrm_radeon >= $LIBDRM_RADEON_REQUIRED]) |
125 |
-- gallium_require_llvm "Gallium R300" |
126 |
- GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r300" |
127 |
- gallium_check_st "radeon/drm" "dri-r300" "xorg-r300" "" "xvmc-r300" "vdpau-r300" "va-r300" |
128 |
- ;; |
129 |
|
130 |
diff --git a/media-libs/mesa/mesa-9.1.5.ebuild b/media-libs/mesa/mesa-9.1.5.ebuild |
131 |
deleted file mode 100644 |
132 |
index fea75b1..0000000 |
133 |
--- a/media-libs/mesa/mesa-9.1.5.ebuild |
134 |
+++ /dev/null |
135 |
@@ -1,419 +0,0 @@ |
136 |
-# Copyright 1999-2013 Gentoo Foundation |
137 |
-# Distributed under the terms of the GNU General Public License v2 |
138 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-9.1.4.ebuild,v 1.1 2013/07/01 23:20:00 chithanh Exp $ |
139 |
- |
140 |
-EAPI=5 |
141 |
- |
142 |
-EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa" |
143 |
- |
144 |
-if [[ ${PV} = 9999* ]]; then |
145 |
- GIT_ECLASS="git-2" |
146 |
- EXPERIMENTAL="true" |
147 |
-fi |
148 |
- |
149 |
-PYTHON_COMPAT=( python{2_6,2_7} ) |
150 |
- |
151 |
-inherit base autotools multilib flag-o-matic python-single-r1 toolchain-funcs ${GIT_ECLASS} |
152 |
- |
153 |
-OPENGL_DIR="xorg-x11" |
154 |
- |
155 |
-MY_PN="${PN/m/M}" |
156 |
-MY_P="${MY_PN}-${PV/_rc/-rc}" |
157 |
-MY_SRC_P="${MY_PN}Lib-${PV/_rc/-rc}" |
158 |
- |
159 |
-FOLDER="${PV/_rc*/}" |
160 |
- |
161 |
-DESCRIPTION="OpenGL-like graphic library for Linux" |
162 |
-HOMEPAGE="http://mesa3d.sourceforge.net/" |
163 |
- |
164 |
-#SRC_PATCHES="mirror://gentoo/${PN}-9.1-gentoo-patches-05.tar.bz2" |
165 |
-if [[ $PV = 9999* ]]; then |
166 |
- SRC_URI="${SRC_PATCHES}" |
167 |
-else |
168 |
- SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${FOLDER}/${MY_SRC_P}.tar.bz2 |
169 |
- ${SRC_PATCHES}" |
170 |
-fi |
171 |
- |
172 |
-# The code is MIT/X11. |
173 |
-# GLES[2]/gl[2]{,ext,platform}.h are SGI-B-2.0 |
174 |
-LICENSE="MIT SGI-B-2.0" |
175 |
-SLOT="0" |
176 |
-KEYWORDS="~alpha ~amd64 ~arm ~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" |
177 |
- |
178 |
-INTEL_CARDS="i915 i965 intel" |
179 |
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi" |
180 |
-VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} nouveau vmware" |
181 |
-for card in ${VIDEO_CARDS}; do |
182 |
- IUSE_VIDEO_CARDS+=" video_cards_${card}" |
183 |
-done |
184 |
- |
185 |
-IUSE="${IUSE_VIDEO_CARDS} |
186 |
- bindist +classic debug +egl +gallium gbm gles1 gles2 +llvm +nptl |
187 |
- openvg osmesa pax_kernel pic r600-llvm-compiler selinux +shared-glapi vdpau |
188 |
- wayland xvmc xa xorg kernel_FreeBSD" |
189 |
- |
190 |
-REQUIRED_USE=" |
191 |
- llvm? ( gallium ) |
192 |
- openvg? ( egl gallium ) |
193 |
- gbm? ( shared-glapi ) |
194 |
- gles1? ( egl ) |
195 |
- gles2? ( egl ) |
196 |
- r600-llvm-compiler? ( gallium llvm || ( video_cards_r600 video_cards_radeon ) ) |
197 |
- wayland? ( egl ) |
198 |
- xa? ( gallium ) |
199 |
- xorg? ( gallium ) |
200 |
- video_cards_intel? ( || ( classic gallium ) ) |
201 |
- video_cards_i915? ( || ( classic gallium ) ) |
202 |
- video_cards_i965? ( classic ) |
203 |
- video_cards_nouveau? ( || ( classic gallium ) ) |
204 |
- video_cards_radeon? ( || ( classic gallium ) ) |
205 |
- video_cards_r100? ( classic ) |
206 |
- video_cards_r200? ( classic ) |
207 |
- video_cards_r300? ( gallium ) |
208 |
- video_cards_r600? ( gallium ) |
209 |
- video_cards_radeonsi? ( gallium llvm ) |
210 |
- video_cards_vmware? ( gallium ) |
211 |
-" |
212 |
- |
213 |
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.42" |
214 |
-# keep correct libdrm and dri2proto dep |
215 |
-# keep blocks in rdepend for binpkg |
216 |
-RDEPEND=" |
217 |
- !<x11-base/xorg-server-1.7 |
218 |
- !<=x11-proto/xf86driproto-2.0.3 |
219 |
- classic? ( app-admin/eselect-mesa ) |
220 |
- gallium? ( app-admin/eselect-mesa ) |
221 |
- >=app-admin/eselect-opengl-1.2.7 |
222 |
- dev-libs/expat |
223 |
- gbm? ( virtual/udev ) |
224 |
- >=x11-libs/libX11-1.3.99.901 |
225 |
- x11-libs/libXdamage |
226 |
- x11-libs/libXext |
227 |
- x11-libs/libXxf86vm |
228 |
- >=x11-libs/libxcb-1.8.1 |
229 |
- vdpau? ( >=x11-libs/libvdpau-0.4.1 ) |
230 |
- wayland? ( >=dev-libs/wayland-1.0.3 ) |
231 |
- xorg? ( |
232 |
- x11-base/xorg-server:=[-minimal] |
233 |
- x11-libs/libdrm[libkms] |
234 |
- ) |
235 |
- xvmc? ( >=x11-libs/libXvMC-1.0.6 ) |
236 |
- ${LIBDRM_DEPSTRING}[video_cards_nouveau?,video_cards_vmware?] |
237 |
-" |
238 |
-for card in ${INTEL_CARDS}; do |
239 |
- RDEPEND="${RDEPEND} |
240 |
- video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_intel] ) |
241 |
- " |
242 |
-done |
243 |
- |
244 |
-for card in ${RADEON_CARDS}; do |
245 |
- RDEPEND="${RDEPEND} |
246 |
- video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] ) |
247 |
- " |
248 |
-done |
249 |
- |
250 |
-DEPEND="${RDEPEND} |
251 |
- llvm? ( |
252 |
- >=sys-devel/llvm-2.9 |
253 |
- r600-llvm-compiler? ( sys-devel/llvm[video_cards_radeon] ) |
254 |
- video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] ) |
255 |
- ) |
256 |
- ${PYTHON_DEPS} |
257 |
- dev-libs/libxml2[python,${PYTHON_USEDEP}] |
258 |
- sys-devel/bison |
259 |
- sys-devel/flex |
260 |
- virtual/pkgconfig |
261 |
- >=x11-proto/dri2proto-2.6 |
262 |
- >=x11-proto/glproto-1.4.15-r1 |
263 |
- >=x11-proto/xextproto-7.0.99.1 |
264 |
- x11-proto/xf86driproto |
265 |
- x11-proto/xf86vidmodeproto |
266 |
-" |
267 |
- |
268 |
-S="${WORKDIR}/${MY_P}" |
269 |
- |
270 |
-# It is slow without texrels, if someone wants slow |
271 |
-# mesa without texrels +pic use is worth the shot |
272 |
-QA_EXECSTACK="usr/lib*/opengl/xorg-x11/lib/libGL.so*" |
273 |
-QA_WX_LOAD="usr/lib*/opengl/xorg-x11/lib/libGL.so*" |
274 |
- |
275 |
-# Think about: ggi, fbcon, no-X configs |
276 |
- |
277 |
-pkg_setup() { |
278 |
- # workaround toc-issue wrt #386545 |
279 |
- use ppc64 && append-flags -mminimal-toc |
280 |
- |
281 |
- python-single-r1_pkg_setup |
282 |
-} |
283 |
- |
284 |
-src_unpack() { |
285 |
- default |
286 |
- [[ $PV = 9999* ]] && git-2_src_unpack |
287 |
-} |
288 |
- |
289 |
-src_prepare() { |
290 |
- # apply patches |
291 |
- if [[ ${PV} != 9999* && -n ${SRC_PATCHES} ]]; then |
292 |
- EPATCH_FORCE="yes" \ |
293 |
- EPATCH_SOURCE="${WORKDIR}/patches" \ |
294 |
- EPATCH_SUFFIX="patch" \ |
295 |
- epatch |
296 |
- fi |
297 |
- |
298 |
- # relax the requirement that r300 must have llvm, bug 380303 |
299 |
- epatch "${FILESDIR}"/${PN}-8.1-dont-require-llvm-for-r300.patch |
300 |
- |
301 |
- # fix for hardened pax_kernel, bug 240956 |
302 |
- [[ ${PV} != 9999* ]] && epatch "${FILESDIR}"/glx_ro_text_segm.patch |
303 |
- |
304 |
- # Solaris needs some recent POSIX stuff in our case |
305 |
- if [[ ${CHOST} == *-solaris* ]] ; then |
306 |
- sed -i -e "s/-DSVR4/-D_POSIX_C_SOURCE=200112L/" configure.ac || die |
307 |
- fi |
308 |
- |
309 |
- # Tests fail against python-3, bug #407887 |
310 |
- sed -i 's|/usr/bin/env python|/usr/bin/env python2|' src/glsl/tests/compare_ir || die |
311 |
- |
312 |
- base_src_prepare |
313 |
- |
314 |
- eautoreconf |
315 |
-} |
316 |
- |
317 |
-src_configure() { |
318 |
- local myconf |
319 |
- |
320 |
- if use classic; then |
321 |
- # Configurable DRI drivers |
322 |
- driver_enable swrast |
323 |
- |
324 |
- # Intel code |
325 |
- driver_enable video_cards_i915 i915 |
326 |
- driver_enable video_cards_i965 i965 |
327 |
- if ! use video_cards_i915 && \ |
328 |
- ! use video_cards_i965; then |
329 |
- driver_enable video_cards_intel i915 i965 |
330 |
- fi |
331 |
- |
332 |
- # Nouveau code |
333 |
- driver_enable video_cards_nouveau nouveau |
334 |
- |
335 |
- # ATI code |
336 |
- driver_enable video_cards_r100 radeon |
337 |
- driver_enable video_cards_r200 r200 |
338 |
- if ! use video_cards_r100 && \ |
339 |
- ! use video_cards_r200; then |
340 |
- driver_enable video_cards_radeon radeon r200 |
341 |
- fi |
342 |
- fi |
343 |
- |
344 |
- if use egl; then |
345 |
- myconf+=" |
346 |
- --with-egl-platforms=x11$(use wayland && echo ",wayland")$(use gbm && echo ",drm") |
347 |
- $(use_enable gallium gallium-egl) |
348 |
- " |
349 |
- fi |
350 |
- |
351 |
- if use gallium; then |
352 |
- myconf+=" |
353 |
- $(use_enable llvm gallium-llvm) |
354 |
- $(use_enable openvg) |
355 |
- $(use_enable r600-llvm-compiler) |
356 |
- $(use_enable vdpau) |
357 |
- $(use_enable xvmc) |
358 |
- " |
359 |
- gallium_enable swrast |
360 |
- gallium_enable video_cards_vmware svga |
361 |
- gallium_enable video_cards_nouveau nouveau |
362 |
- gallium_enable video_cards_i915 i915 |
363 |
- if ! use video_cards_i915; then |
364 |
- gallium_enable video_cards_intel i915 |
365 |
- fi |
366 |
- |
367 |
- gallium_enable video_cards_r300 r300 |
368 |
- gallium_enable video_cards_r600 r600 |
369 |
- gallium_enable video_cards_radeonsi radeonsi |
370 |
- if ! use video_cards_r300 && \ |
371 |
- ! use video_cards_r600; then |
372 |
- gallium_enable video_cards_radeon r300 r600 |
373 |
- fi |
374 |
- fi |
375 |
- |
376 |
- # x86 hardened pax_kernel needs glx-rts, bug 240956 |
377 |
- if use pax_kernel; then |
378 |
- myconf+=" |
379 |
- $(use_enable x86 glx-rts) |
380 |
- " |
381 |
- fi |
382 |
- |
383 |
- # build fails with BSD indent, bug #428112 |
384 |
- use userland_GNU || export INDENT=cat |
385 |
- |
386 |
- econf \ |
387 |
- --enable-dri \ |
388 |
- --enable-glx \ |
389 |
- $(use_enable !bindist texture-float) \ |
390 |
- $(use_enable debug) \ |
391 |
- $(use_enable egl) \ |
392 |
- $(use_enable gbm) \ |
393 |
- $(use_enable gles1) \ |
394 |
- $(use_enable gles2) \ |
395 |
- $(use_enable nptl glx-tls) \ |
396 |
- $(use_enable osmesa) \ |
397 |
- $(use_enable !pic asm) \ |
398 |
- $(use_enable shared-glapi) \ |
399 |
- $(use_enable xa) \ |
400 |
- $(use_enable xorg) \ |
401 |
- --with-dri-drivers=${DRI_DRIVERS} \ |
402 |
- --with-gallium-drivers=${GALLIUM_DRIVERS} \ |
403 |
- PYTHON2="${PYTHON}" \ |
404 |
- ${myconf} |
405 |
-} |
406 |
- |
407 |
-src_install() { |
408 |
- base_src_install |
409 |
- |
410 |
- find "${ED}" -name '*.la' -exec rm -f {} + || die |
411 |
- |
412 |
- if use !bindist; then |
413 |
- dodoc docs/patents.txt |
414 |
- fi |
415 |
- |
416 |
- # Install config file for eselect mesa |
417 |
- insinto /usr/share/mesa |
418 |
- newins "${FILESDIR}/eselect-mesa.conf.8.1" eselect-mesa.conf |
419 |
- |
420 |
- # Move libGL and others from /usr/lib to /usr/lib/opengl/blah/lib |
421 |
- # because user can eselect desired GL provider. |
422 |
- ebegin "Moving libGL and friends for dynamic switching" |
423 |
- local x |
424 |
- local gl_dir="/usr/$(get_libdir)/opengl/${OPENGL_DIR}/" |
425 |
- dodir ${gl_dir}/{lib,extensions,include/GL} |
426 |
- for x in "${ED}"/usr/$(get_libdir)/lib{EGL,GL*,OpenVG}.{la,a,so*}; do |
427 |
- if [ -f ${x} -o -L ${x} ]; then |
428 |
- mv -f "${x}" "${ED}${gl_dir}"/lib \ |
429 |
- || die "Failed to move ${x}" |
430 |
- fi |
431 |
- done |
432 |
- for x in "${ED}"/usr/include/GL/{gl.h,glx.h,glext.h,glxext.h}; do |
433 |
- if [ -f ${x} -o -L ${x} ]; then |
434 |
- mv -f "${x}" "${ED}${gl_dir}"/include/GL \ |
435 |
- || die "Failed to move ${x}" |
436 |
- fi |
437 |
- done |
438 |
- for x in "${ED}"/usr/include/{EGL,GLES*,VG,KHR}; do |
439 |
- if [ -d ${x} ]; then |
440 |
- mv -f "${x}" "${ED}${gl_dir}"/include \ |
441 |
- || die "Failed to move ${x}" |
442 |
- fi |
443 |
- done |
444 |
- eend $? |
445 |
- |
446 |
- if use classic || use gallium; then |
447 |
- ebegin "Moving DRI/Gallium drivers for dynamic switching" |
448 |
- local gallium_drivers=( i915_dri.so i965_dri.so r300_dri.so r600_dri.so swrast_dri.so ) |
449 |
- keepdir /usr/$(get_libdir)/dri |
450 |
- dodir /usr/$(get_libdir)/mesa |
451 |
- for x in ${gallium_drivers[@]}; do |
452 |
- if [ -f "${S}/$(get_libdir)/gallium/${x}" ]; then |
453 |
- mv -f "${ED}/usr/$(get_libdir)/dri/${x}" "${ED}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \ |
454 |
- || die "Failed to move ${x}" |
455 |
- insinto "/usr/$(get_libdir)/dri/" |
456 |
- if [ -f "${S}/$(get_libdir)/${x}" ]; then |
457 |
- insopts -m0755 |
458 |
- doins "${S}/$(get_libdir)/${x}" |
459 |
- fi |
460 |
- fi |
461 |
- done |
462 |
- for x in "${ED}"/usr/$(get_libdir)/dri/*.so; do |
463 |
- if [ -f ${x} -o -L ${x} ]; then |
464 |
- mv -f "${x}" "${x/dri/mesa}" \ |
465 |
- || die "Failed to move ${x}" |
466 |
- fi |
467 |
- done |
468 |
- pushd "${ED}"/usr/$(get_libdir)/dri || die "pushd failed" |
469 |
- ln -s ../mesa/*.so . || die "Creating symlink failed" |
470 |
- # remove symlinks to drivers known to eselect |
471 |
- for x in ${gallium_drivers[@]}; do |
472 |
- if [ -f ${x} -o -L ${x} ]; then |
473 |
- rm "${x}" || die "Failed to remove ${x}" |
474 |
- fi |
475 |
- done |
476 |
- popd |
477 |
- eend $? |
478 |
- fi |
479 |
-} |
480 |
- |
481 |
-pkg_postinst() { |
482 |
- # Switch to the xorg implementation. |
483 |
- echo |
484 |
- eselect opengl set --use-old ${OPENGL_DIR} |
485 |
- |
486 |
- # switch to xorg-x11 and back if necessary, bug #374647 comment 11 |
487 |
- OLD_IMPLEM="$(eselect opengl show)" |
488 |
- if [[ ${OPENGL_DIR}x != ${OLD_IMPLEM}x ]]; then |
489 |
- eselect opengl set ${OPENGL_DIR} |
490 |
- eselect opengl set ${OLD_IMPLEM} |
491 |
- fi |
492 |
- |
493 |
- # Select classic/gallium drivers |
494 |
- if use classic || use gallium; then |
495 |
- eselect mesa set --auto |
496 |
- fi |
497 |
- |
498 |
- # warn about patent encumbered texture-float |
499 |
- if use !bindist; then |
500 |
- elog "USE=\"bindist\" was not set. Potentially patent encumbered code was" |
501 |
- elog "enabled. Please see patents.txt for an explanation." |
502 |
- fi |
503 |
- |
504 |
- local using_radeon r_flag |
505 |
- for r_flag in ${RADEON_CARDS}; do |
506 |
- if use video_cards_${r_flag}; then |
507 |
- using_radeon=1 |
508 |
- break |
509 |
- fi |
510 |
- done |
511 |
- |
512 |
- if [[ ${using_radeon} = 1 ]] && ! has_version media-libs/libtxc_dxtn; then |
513 |
- elog "Note that in order to have full S3TC support, it is necessary to install" |
514 |
- elog "media-libs/libtxc_dxtn as well. This may be necessary to get nice" |
515 |
- elog "textures in some apps, and some others even require this to run." |
516 |
- fi |
517 |
-} |
518 |
- |
519 |
-# $1 - VIDEO_CARDS flag |
520 |
-# other args - names of DRI drivers to enable |
521 |
-# TODO: avoid code duplication for a more elegant implementation |
522 |
-driver_enable() { |
523 |
- case $# in |
524 |
- # for enabling unconditionally |
525 |
- 1) |
526 |
- DRI_DRIVERS+=",$1" |
527 |
- ;; |
528 |
- *) |
529 |
- if use $1; then |
530 |
- shift |
531 |
- for i in $@; do |
532 |
- DRI_DRIVERS+=",${i}" |
533 |
- done |
534 |
- fi |
535 |
- ;; |
536 |
- esac |
537 |
-} |
538 |
- |
539 |
-gallium_enable() { |
540 |
- case $# in |
541 |
- # for enabling unconditionally |
542 |
- 1) |
543 |
- GALLIUM_DRIVERS+=",$1" |
544 |
- ;; |
545 |
- *) |
546 |
- if use $1; then |
547 |
- shift |
548 |
- for i in $@; do |
549 |
- GALLIUM_DRIVERS+=",${i}" |
550 |
- done |
551 |
- fi |
552 |
- ;; |
553 |
- esac |
554 |
-} |
555 |
|
556 |
diff --git a/media-libs/mesa/metadata.xml b/media-libs/mesa/metadata.xml |
557 |
index 837da73..bb27bfa 100644 |
558 |
--- a/media-libs/mesa/metadata.xml |
559 |
+++ b/media-libs/mesa/metadata.xml |
560 |
@@ -8,7 +8,6 @@ |
561 |
<flag name='egl'>Enable EGL support.</flag> |
562 |
<flag name='gallium'>Build drivers based on Gallium3D, the new architecture for 3D graphics drivers.</flag> |
563 |
<flag name='gbm'>Enable the Graphics Buffer Manager for EGL on KMS.</flag> |
564 |
- <flag name='shared-glapi'>Enable sharing of common code for the OpenGL API.</flag> |
565 |
<flag name='gles1'>Enable GLESv1 support.</flag> |
566 |
<flag name='gles2'>Enable GLESv2 support.</flag> |
567 |
<flag name='llvm'>Enable LLVM backend for Gallium3D.</flag> |