1 |
commit: 36b5319e1cac0f145ab4c60c7a15d3816e3b196c |
2 |
Author: Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue May 1 18:56:10 2012 +0000 |
4 |
Commit: Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de> |
5 |
CommitDate: Tue May 1 18:56:10 2012 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=36b5319e |
7 |
|
8 |
media-libs/mesa: Add support for r600-llvm-compiler, shut up repoman. |
9 |
|
10 |
The r600-llvm-compiler requires llvm-3.1 which is not in the portage tree yet. |
11 |
|
12 |
--- |
13 |
media-libs/mesa/mesa-9999.ebuild | 11 +++++++---- |
14 |
media-libs/mesa/metadata.xml | 2 +- |
15 |
2 files changed, 8 insertions(+), 5 deletions(-) |
16 |
|
17 |
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild |
18 |
index 19cc270..ebd5fca 100644 |
19 |
--- a/media-libs/mesa/mesa-9999.ebuild |
20 |
+++ b/media-libs/mesa/mesa-9999.ebuild |
21 |
@@ -1,4 +1,4 @@ |
22 |
-# Copyright 1999-2010 Gentoo Foundation |
23 |
+# Copyright 1999-2012 Gentoo Foundation |
24 |
# Distributed under the terms of the GNU General Public License v2 |
25 |
# $Header: $ |
26 |
|
27 |
@@ -48,8 +48,8 @@ done |
28 |
|
29 |
IUSE="${IUSE_VIDEO_CARDS} |
30 |
bindist +classic d3d debug +egl g3dvl +gallium gbm gles1 gles2 +llvm +nptl |
31 |
- openvg osmesa pax_kernel pic selinux +shared-glapi vdpau wayland xvmc xa |
32 |
- xorg kernel_FreeBSD" |
33 |
+ openvg osmesa pax_kernel pic r600-llvm-compiler selinux +shared-glapi vdpau |
34 |
+ wayland xvmc xa xorg kernel_FreeBSD" |
35 |
|
36 |
REQUIRED_USE=" |
37 |
d3d? ( gallium ) |
38 |
@@ -59,6 +59,7 @@ REQUIRED_USE=" |
39 |
gbm? ( shared-glapi ) |
40 |
g3dvl? ( || ( vdpau xvmc ) ) |
41 |
vdpau? ( g3dvl ) |
42 |
+ r600-llvm-compiler ( gallium llvm || ( video_cards_r600 video_cards_radeon ) ) |
43 |
xa? ( gallium ) |
44 |
xorg? ( gallium ) |
45 |
xvmc? ( g3dvl ) |
46 |
@@ -71,7 +72,7 @@ REQUIRED_USE=" |
47 |
video_cards_r200? ( classic ) |
48 |
video_cards_r300? ( gallium ) |
49 |
video_cards_r600? ( gallium ) |
50 |
- video_cards_radeonsi? ( gallium llvm xorg ) |
51 |
+ video_cards_radeonsi? ( gallium llvm ) |
52 |
video_cards_vmware? ( gallium ) |
53 |
" |
54 |
|
55 |
@@ -123,6 +124,7 @@ done |
56 |
DEPEND="${RDEPEND} |
57 |
llvm? ( |
58 |
>=sys-devel/llvm-2.9 |
59 |
+ r600-llvm-compiler? ( >=sys-devel/llvm-3.1 ) |
60 |
video_cards_radeonsi? ( >=sys-devel/llvm-3.1 ) |
61 |
) |
62 |
=dev-lang/python-2* |
63 |
@@ -223,6 +225,7 @@ src_configure() { |
64 |
$(use_enable g3dvl gallium-g3dvl) |
65 |
$(use_enable llvm gallium-llvm) |
66 |
$(use_enable openvg) |
67 |
+ $(use_enable r600-llvm-compiler) |
68 |
$(use_enable vdpau) |
69 |
$(use_enable xvmc) |
70 |
" |
71 |
|
72 |
diff --git a/media-libs/mesa/metadata.xml b/media-libs/mesa/metadata.xml |
73 |
index ce969ec..a918a88 100644 |
74 |
--- a/media-libs/mesa/metadata.xml |
75 |
+++ b/media-libs/mesa/metadata.xml |
76 |
@@ -15,8 +15,8 @@ |
77 |
<flag name='openvg'>Enable the OpenVG 2D acceleration API for Gallium3D.</flag> |
78 |
<flag name='osmesa'>Enable the Off-screen Rendering Mesa API</flag> |
79 |
<flag name='pax_kernel'>Enable if the user plans to run the package under a pax enabled hardened kernel</flag> |
80 |
+ <flag name='r600-llvm-compiler'>Enable r600 shader compiler LLVM backend.</flag> |
81 |
<flag name='pic'>disable optimized assembly code that is not PIC friendly</flag> |
82 |
- <flag name='shared-dricore'>Enable sharing of common code for classic DRI drivers.</flag> |
83 |
<flag name='shared-glapi'>Enable sharing of common code for the OpenGL API.</flag> |
84 |
<flag name='vdpau'>Enable the VDPAU acceleration interface for the Gallium3D Video Layer.</flag> |
85 |
<flag name='wayland'>Enable support for dev-libs/wayland</flag> |