1 |
chithanh 13/08/02 12:52:38 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: mesa-9.1.6.ebuild |
5 |
Log: |
6 |
Version bump. |
7 |
|
8 |
(Portage version: 2.1.12.2/cvs/Linux x86_64, unsigned Manifest commit) |
9 |
|
10 |
Revision Changes Path |
11 |
1.492 media-libs/mesa/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/mesa/ChangeLog?rev=1.492&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/mesa/ChangeLog?rev=1.492&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/mesa/ChangeLog?r1=1.491&r2=1.492 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v |
20 |
retrieving revision 1.491 |
21 |
retrieving revision 1.492 |
22 |
diff -u -r1.491 -r1.492 |
23 |
--- ChangeLog 29 Jul 2013 15:22:27 -0000 1.491 |
24 |
+++ ChangeLog 2 Aug 2013 12:52:38 -0000 1.492 |
25 |
@@ -1,6 +1,12 @@ |
26 |
# ChangeLog for media-libs/mesa |
27 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.491 2013/07/29 15:22:27 chithanh Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.492 2013/08/02 12:52:38 chithanh Exp $ |
30 |
+ |
31 |
+*mesa-9.1.6 (02 Aug 2013) |
32 |
+ |
33 |
+ 02 Aug 2013; Chí-Thanh Christopher Nguyễn <chithanh@g.o> |
34 |
+ +mesa-9.1.6.ebuild: |
35 |
+ Version bump. |
36 |
|
37 |
*mesa-9.1.5 (29 Jul 2013) |
38 |
|
39 |
|
40 |
|
41 |
|
42 |
1.1 media-libs/mesa/mesa-9.1.6.ebuild |
43 |
|
44 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/mesa/mesa-9.1.6.ebuild?rev=1.1&view=markup |
45 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/mesa/mesa-9.1.6.ebuild?rev=1.1&content-type=text/plain |
46 |
|
47 |
Index: mesa-9.1.6.ebuild |
48 |
=================================================================== |
49 |
# Copyright 1999-2013 Gentoo Foundation |
50 |
# Distributed under the terms of the GNU General Public License v2 |
51 |
# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-9.1.6.ebuild,v 1.1 2013/08/02 12:52:38 chithanh Exp $ |
52 |
|
53 |
EAPI=5 |
54 |
|
55 |
EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa" |
56 |
|
57 |
if [[ ${PV} = 9999* ]]; then |
58 |
GIT_ECLASS="git-2" |
59 |
EXPERIMENTAL="true" |
60 |
fi |
61 |
|
62 |
PYTHON_COMPAT=( python{2_6,2_7} ) |
63 |
|
64 |
inherit base autotools multilib flag-o-matic python-single-r1 toolchain-funcs ${GIT_ECLASS} |
65 |
|
66 |
OPENGL_DIR="xorg-x11" |
67 |
|
68 |
MY_PN="${PN/m/M}" |
69 |
MY_P="${MY_PN}-${PV/_rc/-rc}" |
70 |
MY_SRC_P="${MY_PN}Lib-${PV/_rc/-rc}" |
71 |
|
72 |
FOLDER="${PV/_rc*/}" |
73 |
|
74 |
DESCRIPTION="OpenGL-like graphic library for Linux" |
75 |
HOMEPAGE="http://mesa3d.sourceforge.net/" |
76 |
|
77 |
#SRC_PATCHES="mirror://gentoo/${PN}-9.1-gentoo-patches-05.tar.bz2" |
78 |
if [[ $PV = 9999* ]]; then |
79 |
SRC_URI="${SRC_PATCHES}" |
80 |
else |
81 |
SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${FOLDER}/${MY_SRC_P}.tar.bz2 |
82 |
${SRC_PATCHES}" |
83 |
fi |
84 |
|
85 |
# The code is MIT/X11. |
86 |
# GLES[2]/gl[2]{,ext,platform}.h are SGI-B-2.0 |
87 |
LICENSE="MIT SGI-B-2.0" |
88 |
SLOT="0" |
89 |
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" |
90 |
|
91 |
INTEL_CARDS="i915 i965 intel" |
92 |
RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi" |
93 |
VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} nouveau vmware" |
94 |
for card in ${VIDEO_CARDS}; do |
95 |
IUSE_VIDEO_CARDS+=" video_cards_${card}" |
96 |
done |
97 |
|
98 |
IUSE="${IUSE_VIDEO_CARDS} |
99 |
bindist +classic debug +egl +gallium gbm gles1 gles2 +llvm +nptl |
100 |
openvg osmesa pax_kernel pic r600-llvm-compiler selinux +shared-glapi vdpau |
101 |
wayland xvmc xa xorg kernel_FreeBSD" |
102 |
|
103 |
REQUIRED_USE=" |
104 |
llvm? ( gallium ) |
105 |
openvg? ( egl gallium ) |
106 |
gbm? ( shared-glapi ) |
107 |
gles1? ( egl ) |
108 |
gles2? ( egl ) |
109 |
r600-llvm-compiler? ( gallium llvm || ( video_cards_r600 video_cards_radeon ) ) |
110 |
wayland? ( egl ) |
111 |
xa? ( gallium ) |
112 |
xorg? ( gallium ) |
113 |
video_cards_intel? ( || ( classic gallium ) ) |
114 |
video_cards_i915? ( || ( classic gallium ) ) |
115 |
video_cards_i965? ( classic ) |
116 |
video_cards_nouveau? ( || ( classic gallium ) ) |
117 |
video_cards_radeon? ( || ( classic gallium ) ) |
118 |
video_cards_r100? ( classic ) |
119 |
video_cards_r200? ( classic ) |
120 |
video_cards_r300? ( gallium ) |
121 |
video_cards_r600? ( gallium ) |
122 |
video_cards_radeonsi? ( gallium llvm ) |
123 |
video_cards_vmware? ( gallium ) |
124 |
" |
125 |
|
126 |
LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.42" |
127 |
# keep correct libdrm and dri2proto dep |
128 |
# keep blocks in rdepend for binpkg |
129 |
RDEPEND=" |
130 |
!<x11-base/xorg-server-1.7 |
131 |
!<=x11-proto/xf86driproto-2.0.3 |
132 |
classic? ( app-admin/eselect-mesa ) |
133 |
gallium? ( app-admin/eselect-mesa ) |
134 |
>=app-admin/eselect-opengl-1.2.7 |
135 |
dev-libs/expat |
136 |
gbm? ( virtual/udev ) |
137 |
>=x11-libs/libX11-1.3.99.901 |
138 |
x11-libs/libXdamage |
139 |
x11-libs/libXext |
140 |
x11-libs/libXxf86vm |
141 |
>=x11-libs/libxcb-1.8.1 |
142 |
vdpau? ( >=x11-libs/libvdpau-0.4.1 ) |
143 |
wayland? ( >=dev-libs/wayland-1.0.3 ) |
144 |
xorg? ( |
145 |
x11-base/xorg-server:=[-minimal] |
146 |
x11-libs/libdrm[libkms] |
147 |
) |
148 |
xvmc? ( >=x11-libs/libXvMC-1.0.6 ) |
149 |
${LIBDRM_DEPSTRING}[video_cards_nouveau?,video_cards_vmware?] |
150 |
" |
151 |
for card in ${INTEL_CARDS}; do |
152 |
RDEPEND="${RDEPEND} |
153 |
video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_intel] ) |
154 |
" |
155 |
done |
156 |
|
157 |
for card in ${RADEON_CARDS}; do |
158 |
RDEPEND="${RDEPEND} |
159 |
video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] ) |
160 |
" |
161 |
done |
162 |
|
163 |
DEPEND="${RDEPEND} |
164 |
llvm? ( |
165 |
>=sys-devel/llvm-2.9 |
166 |
r600-llvm-compiler? ( sys-devel/llvm[video_cards_radeon] ) |
167 |
video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] ) |
168 |
) |
169 |
${PYTHON_DEPS} |
170 |
dev-libs/libxml2[python,${PYTHON_USEDEP}] |
171 |
sys-devel/bison |
172 |
sys-devel/flex |
173 |
virtual/pkgconfig |
174 |
>=x11-proto/dri2proto-2.6 |
175 |
>=x11-proto/glproto-1.4.15-r1 |
176 |
>=x11-proto/xextproto-7.0.99.1 |
177 |
x11-proto/xf86driproto |
178 |
x11-proto/xf86vidmodeproto |
179 |
" |
180 |
|
181 |
S="${WORKDIR}/${MY_P}" |
182 |
|
183 |
# It is slow without texrels, if someone wants slow |
184 |
# mesa without texrels +pic use is worth the shot |
185 |
QA_EXECSTACK="usr/lib*/opengl/xorg-x11/lib/libGL.so*" |
186 |
QA_WX_LOAD="usr/lib*/opengl/xorg-x11/lib/libGL.so*" |
187 |
|
188 |
# Think about: ggi, fbcon, no-X configs |
189 |
|
190 |
pkg_setup() { |
191 |
# workaround toc-issue wrt #386545 |
192 |
use ppc64 && append-flags -mminimal-toc |
193 |
|
194 |
python-single-r1_pkg_setup |
195 |
} |
196 |
|
197 |
src_unpack() { |
198 |
default |
199 |
[[ $PV = 9999* ]] && git-2_src_unpack |
200 |
} |
201 |
|
202 |
src_prepare() { |
203 |
# apply patches |
204 |
if [[ ${PV} != 9999* && -n ${SRC_PATCHES} ]]; then |
205 |
EPATCH_FORCE="yes" \ |
206 |
EPATCH_SOURCE="${WORKDIR}/patches" \ |
207 |
EPATCH_SUFFIX="patch" \ |
208 |
epatch |
209 |
fi |
210 |
|
211 |
# relax the requirement that r300 must have llvm, bug 380303 |
212 |
epatch "${FILESDIR}"/${PN}-8.1-dont-require-llvm-for-r300.patch |
213 |
|
214 |
# fix for hardened pax_kernel, bug 240956 |
215 |
[[ ${PV} != 9999* ]] && epatch "${FILESDIR}"/glx_ro_text_segm.patch |
216 |
|
217 |
# Solaris needs some recent POSIX stuff in our case |
218 |
if [[ ${CHOST} == *-solaris* ]] ; then |
219 |
sed -i -e "s/-DSVR4/-D_POSIX_C_SOURCE=200112L/" configure.ac || die |
220 |
fi |
221 |
|
222 |
# Tests fail against python-3, bug #407887 |
223 |
sed -i 's|/usr/bin/env python|/usr/bin/env python2|' src/glsl/tests/compare_ir || die |
224 |
|
225 |
base_src_prepare |
226 |
|
227 |
eautoreconf |
228 |
} |
229 |
|
230 |
src_configure() { |
231 |
local myconf |
232 |
|
233 |
if use classic; then |
234 |
# Configurable DRI drivers |
235 |
driver_enable swrast |
236 |
|
237 |
# Intel code |
238 |
driver_enable video_cards_i915 i915 |
239 |
driver_enable video_cards_i965 i965 |
240 |
if ! use video_cards_i915 && \ |
241 |
! use video_cards_i965; then |
242 |
driver_enable video_cards_intel i915 i965 |
243 |
fi |
244 |
|
245 |
# Nouveau code |
246 |
driver_enable video_cards_nouveau nouveau |
247 |
|
248 |
# ATI code |
249 |
driver_enable video_cards_r100 radeon |
250 |
driver_enable video_cards_r200 r200 |
251 |
if ! use video_cards_r100 && \ |
252 |
! use video_cards_r200; then |
253 |
driver_enable video_cards_radeon radeon r200 |
254 |
fi |
255 |
fi |
256 |
|
257 |
if use egl; then |
258 |
myconf+=" |
259 |
--with-egl-platforms=x11$(use wayland && echo ",wayland")$(use gbm && echo ",drm") |
260 |
$(use_enable gallium gallium-egl) |
261 |
" |
262 |
fi |
263 |
|
264 |
if use gallium; then |
265 |
myconf+=" |
266 |
$(use_enable llvm gallium-llvm) |
267 |
$(use_enable openvg) |
268 |
$(use_enable r600-llvm-compiler) |
269 |
$(use_enable vdpau) |
270 |
$(use_enable xvmc) |
271 |
" |
272 |
gallium_enable swrast |
273 |
gallium_enable video_cards_vmware svga |
274 |
gallium_enable video_cards_nouveau nouveau |
275 |
gallium_enable video_cards_i915 i915 |
276 |
if ! use video_cards_i915; then |
277 |
gallium_enable video_cards_intel i915 |
278 |
fi |
279 |
|
280 |
gallium_enable video_cards_r300 r300 |
281 |
gallium_enable video_cards_r600 r600 |
282 |
gallium_enable video_cards_radeonsi radeonsi |
283 |
if ! use video_cards_r300 && \ |
284 |
! use video_cards_r600; then |
285 |
gallium_enable video_cards_radeon r300 r600 |
286 |
fi |
287 |
fi |
288 |
|
289 |
# x86 hardened pax_kernel needs glx-rts, bug 240956 |
290 |
if use pax_kernel; then |
291 |
myconf+=" |
292 |
$(use_enable x86 glx-rts) |
293 |
" |
294 |
fi |
295 |
|
296 |
# build fails with BSD indent, bug #428112 |
297 |
use userland_GNU || export INDENT=cat |
298 |
|
299 |
econf \ |
300 |
--enable-dri \ |
301 |
--enable-glx \ |
302 |
$(use_enable !bindist texture-float) \ |
303 |
$(use_enable debug) \ |
304 |
$(use_enable egl) \ |
305 |
$(use_enable gbm) \ |
306 |
$(use_enable gles1) \ |
307 |
$(use_enable gles2) \ |
308 |
$(use_enable nptl glx-tls) \ |
309 |
$(use_enable osmesa) \ |
310 |
$(use_enable !pic asm) \ |
311 |
$(use_enable shared-glapi) \ |
312 |
$(use_enable xa) \ |
313 |
$(use_enable xorg) \ |
314 |
--with-dri-drivers=${DRI_DRIVERS} \ |
315 |
--with-gallium-drivers=${GALLIUM_DRIVERS} \ |
316 |
PYTHON2="${PYTHON}" \ |
317 |
${myconf} |
318 |
} |
319 |
|
320 |
src_install() { |
321 |
base_src_install |
322 |
|
323 |
find "${ED}" -name '*.la' -exec rm -f {} + || die |
324 |
|
325 |
if use !bindist; then |
326 |
dodoc docs/patents.txt |
327 |
fi |
328 |
|
329 |
# Install config file for eselect mesa |
330 |
insinto /usr/share/mesa |
331 |
newins "${FILESDIR}/eselect-mesa.conf.8.1" eselect-mesa.conf |
332 |
|
333 |
# Move libGL and others from /usr/lib to /usr/lib/opengl/blah/lib |
334 |
# because user can eselect desired GL provider. |
335 |
ebegin "Moving libGL and friends for dynamic switching" |
336 |
local x |
337 |
local gl_dir="/usr/$(get_libdir)/opengl/${OPENGL_DIR}/" |
338 |
dodir ${gl_dir}/{lib,extensions,include/GL} |
339 |
for x in "${ED}"/usr/$(get_libdir)/lib{EGL,GL*,OpenVG}.{la,a,so*}; do |
340 |
if [ -f ${x} -o -L ${x} ]; then |
341 |
mv -f "${x}" "${ED}${gl_dir}"/lib \ |
342 |
|| die "Failed to move ${x}" |
343 |
fi |
344 |
done |
345 |
for x in "${ED}"/usr/include/GL/{gl.h,glx.h,glext.h,glxext.h}; do |
346 |
if [ -f ${x} -o -L ${x} ]; then |
347 |
mv -f "${x}" "${ED}${gl_dir}"/include/GL \ |
348 |
|| die "Failed to move ${x}" |
349 |
fi |
350 |
done |
351 |
for x in "${ED}"/usr/include/{EGL,GLES*,VG,KHR}; do |
352 |
if [ -d ${x} ]; then |
353 |
mv -f "${x}" "${ED}${gl_dir}"/include \ |
354 |
|| die "Failed to move ${x}" |
355 |
fi |
356 |
done |
357 |
eend $? |
358 |
|
359 |
if use classic || use gallium; then |
360 |
ebegin "Moving DRI/Gallium drivers for dynamic switching" |
361 |
local gallium_drivers=( i915_dri.so i965_dri.so r300_dri.so r600_dri.so swrast_dri.so ) |
362 |
keepdir /usr/$(get_libdir)/dri |
363 |
dodir /usr/$(get_libdir)/mesa |
364 |
for x in ${gallium_drivers[@]}; do |
365 |
if [ -f "${S}/$(get_libdir)/gallium/${x}" ]; then |
366 |
mv -f "${ED}/usr/$(get_libdir)/dri/${x}" "${ED}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \ |
367 |
|| die "Failed to move ${x}" |
368 |
insinto "/usr/$(get_libdir)/dri/" |
369 |
if [ -f "${S}/$(get_libdir)/${x}" ]; then |
370 |
insopts -m0755 |
371 |
doins "${S}/$(get_libdir)/${x}" |
372 |
fi |
373 |
fi |
374 |
done |
375 |
for x in "${ED}"/usr/$(get_libdir)/dri/*.so; do |
376 |
if [ -f ${x} -o -L ${x} ]; then |
377 |
mv -f "${x}" "${x/dri/mesa}" \ |
378 |
|| die "Failed to move ${x}" |
379 |
fi |
380 |
done |
381 |
pushd "${ED}"/usr/$(get_libdir)/dri || die "pushd failed" |
382 |
ln -s ../mesa/*.so . || die "Creating symlink failed" |
383 |
# remove symlinks to drivers known to eselect |
384 |
for x in ${gallium_drivers[@]}; do |
385 |
if [ -f ${x} -o -L ${x} ]; then |
386 |
rm "${x}" || die "Failed to remove ${x}" |
387 |
fi |
388 |
done |
389 |
popd |
390 |
eend $? |
391 |
fi |
392 |
} |
393 |
|
394 |
pkg_postinst() { |
395 |
# Switch to the xorg implementation. |
396 |
echo |
397 |
eselect opengl set --use-old ${OPENGL_DIR} |
398 |
|
399 |
# switch to xorg-x11 and back if necessary, bug #374647 comment 11 |
400 |
OLD_IMPLEM="$(eselect opengl show)" |
401 |
if [[ ${OPENGL_DIR}x != ${OLD_IMPLEM}x ]]; then |
402 |
eselect opengl set ${OPENGL_DIR} |
403 |
eselect opengl set ${OLD_IMPLEM} |
404 |
fi |
405 |
|
406 |
# Select classic/gallium drivers |
407 |
if use classic || use gallium; then |
408 |
eselect mesa set --auto |
409 |
fi |
410 |
|
411 |
# warn about patent encumbered texture-float |
412 |
if use !bindist; then |
413 |
elog "USE=\"bindist\" was not set. Potentially patent encumbered code was" |
414 |
elog "enabled. Please see patents.txt for an explanation." |
415 |
fi |
416 |
|
417 |
local using_radeon r_flag |
418 |
for r_flag in ${RADEON_CARDS}; do |
419 |
if use video_cards_${r_flag}; then |
420 |
using_radeon=1 |
421 |
break |
422 |
fi |
423 |
done |
424 |
|
425 |
if [[ ${using_radeon} = 1 ]] && ! has_version media-libs/libtxc_dxtn; then |
426 |
elog "Note that in order to have full S3TC support, it is necessary to install" |
427 |
elog "media-libs/libtxc_dxtn as well. This may be necessary to get nice" |
428 |
elog "textures in some apps, and some others even require this to run." |
429 |
fi |
430 |
} |
431 |
|
432 |
# $1 - VIDEO_CARDS flag |
433 |
# other args - names of DRI drivers to enable |
434 |
# TODO: avoid code duplication for a more elegant implementation |
435 |
driver_enable() { |
436 |
case $# in |
437 |
# for enabling unconditionally |
438 |
1) |
439 |
DRI_DRIVERS+=",$1" |
440 |
;; |
441 |
*) |
442 |
if use $1; then |
443 |
shift |
444 |
for i in $@; do |
445 |
DRI_DRIVERS+=",${i}" |
446 |
done |
447 |
fi |
448 |
;; |
449 |
esac |
450 |
} |
451 |
|
452 |
gallium_enable() { |
453 |
case $# in |
454 |
# for enabling unconditionally |
455 |
1) |
456 |
GALLIUM_DRIVERS+=",$1" |
457 |
;; |
458 |
*) |
459 |
if use $1; then |
460 |
shift |
461 |
for i in $@; do |
462 |
GALLIUM_DRIVERS+=",${i}" |
463 |
done |
464 |
fi |
465 |
;; |
466 |
esac |
467 |
} |