| 1 |
commit: 4187cb6385b0ad01288f38c3b4a99463aad242ba |
| 2 |
Author: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Mar 5 05:28:46 2013 +0000 |
| 4 |
Commit: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Mar 5 05:28:46 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=4187cb63 |
| 7 |
|
| 8 |
Merge branch 'master' into opencl |
| 9 |
|
| 10 |
Conflicts: |
| 11 |
media-libs/mesa/mesa-9999.ebuild |
| 12 |
media-libs/mesa/metadata.xml |
| 13 |
|
| 14 |
|
| 15 |
dev-libs/wayland/wayland-9999.ebuild | 6 +- |
| 16 |
dev-libs/weston/Manifest | 1 - |
| 17 |
dev-libs/weston/weston-0.85.0.ebuild | 55 ----- |
| 18 |
dev-libs/weston/weston-0.95.0.ebuild | 2 +- |
| 19 |
dev-libs/weston/weston-9999.ebuild | 6 +- |
| 20 |
media-libs/glu/glu-9999.ebuild | 4 +- |
| 21 |
media-libs/mesa/mesa-9999.ebuild | 27 +-- |
| 22 |
media-libs/mesa/metadata.xml | 6 +- |
| 23 |
x11-apps/mesa-progs/mesa-progs-9999.ebuild | 4 +- |
| 24 |
x11-apps/mkfontdir/mkfontdir-9999.ebuild | 4 +- |
| 25 |
x11-apps/mkfontscale/mkfontscale-9999.ebuild | 4 +- |
| 26 |
x11-apps/radeontop/radeontop-9999.ebuild | 4 +- |
| 27 |
x11-apps/smproxy/smproxy-9999.ebuild | 4 +- |
| 28 |
x11-apps/x11perf/x11perf-9999.ebuild | 4 +- |
| 29 |
x11-apps/xcursorgen/xcursorgen-9999.ebuild | 4 +- |
| 30 |
x11-apps/xdriinfo/xdriinfo-9999.ebuild | 4 +- |
| 31 |
x11-apps/xev/xev-9999.ebuild | 4 +- |
| 32 |
x11-apps/xinit/xinit-9999.ebuild | 4 +- |
| 33 |
x11-apps/xinput/xinput-9999.ebuild | 4 +- |
| 34 |
x11-apps/xkbevd/xkbevd-9999.ebuild | 4 +- |
| 35 |
x11-apps/xkbutils/xkbutils-9999.ebuild | 4 +- |
| 36 |
x11-apps/xman/xman-9999.ebuild | 4 +- |
| 37 |
x11-apps/xrandr/xrandr-9999.ebuild | 4 +- |
| 38 |
x11-apps/xwininfo/xwininfo-9999.ebuild | 4 +- |
| 39 |
x11-base/nouveau-drm/nouveau-drm-99999999.ebuild | 4 +- |
| 40 |
x11-base/xorg-drivers/xorg-drivers-9999.ebuild | 4 +- |
| 41 |
x11-base/xorg-server/xorg-server-9999.ebuild | 54 +++--- |
| 42 |
x11-drivers/ati-drivers/Manifest | 6 +- |
| 43 |
x11-drivers/ati-drivers/ati-drivers-12.10.ebuild | 8 +- |
| 44 |
.../ati-drivers/ati-drivers-12.11_beta11.ebuild | 65 ++++-- |
| 45 |
...uild => ati-drivers-12.6_beta_pre897-r1.ebuild} | 81 +++++-- |
| 46 |
...12.11_beta11.ebuild => ati-drivers-13.1.ebuild} | 191 ++++++---------- |
| 47 |
...-12.4.ebuild => ati-drivers-13.1_pre897.ebuild} | 241 +++++++++----------- |
| 48 |
...beta11.ebuild => ati-drivers-13.2_beta3.ebuild} | 192 ++++++---------- |
| 49 |
...beta11.ebuild => ati-drivers-13.2_beta7.ebuild} | 192 ++++++---------- |
| 50 |
.../files/ati-drivers-kernel-3.8-acpihandle.patch | 15 ++ |
| 51 |
.../ati-drivers/files/const-notifier-block.patch | 25 ++ |
| 52 |
x11-drivers/ati-drivers/metadata.xml | 9 +- |
| 53 |
.../xf86-input-evdev/xf86-input-evdev-9999.ebuild | 4 +- |
| 54 |
.../xf86-input-joystick-9999.ebuild | 4 +- |
| 55 |
.../xf86-input-keyboard-9999.ebuild | 4 +- |
| 56 |
.../xf86-input-mouse/xf86-input-mouse-9999.ebuild | 4 +- |
| 57 |
.../xf86-input-synaptics-9999.ebuild | 6 +- |
| 58 |
.../xf86-input-wacom/xf86-input-wacom-9999.ebuild | 22 +- |
| 59 |
.../xf86-video-ati/xf86-video-ati-9999.ebuild | 6 +- |
| 60 |
.../xf86-video-glint/xf86-video-glint-9999.ebuild | 4 +- |
| 61 |
.../xf86-video-intel/xf86-video-intel-9999.ebuild | 6 +- |
| 62 |
.../xf86-video-modesetting-9999.ebuild | 4 +- |
| 63 |
.../xf86-video-nested-9999.ebuild | 4 +- |
| 64 |
.../xf86-video-nouveau-9999.ebuild | 4 +- |
| 65 |
.../xf86-video-vmware-9999.ebuild | 4 +- |
| 66 |
x11-libs/glamor/glamor-9999.ebuild | 4 +- |
| 67 |
x11-libs/libFS/libFS-9999.ebuild | 4 +- |
| 68 |
x11-libs/libICE/libICE-9999.ebuild | 7 +- |
| 69 |
x11-libs/libSM/libSM-9999.ebuild | 16 +- |
| 70 |
x11-libs/libX11/libX11-9999.ebuild | 17 +- |
| 71 |
x11-libs/libXScrnSaver/libXScrnSaver-9999.ebuild | 12 +- |
| 72 |
x11-libs/libXTrap/libXTrap-9999.ebuild | 4 +- |
| 73 |
x11-libs/libXamine/libXamine-9999.ebuild | 4 +- |
| 74 |
x11-libs/libXau/libXau-9999.ebuild | 8 +- |
| 75 |
x11-libs/libXaw/libXaw-9999.ebuild | 19 +- |
| 76 |
x11-libs/libXaw3d/libXaw3d-9999.ebuild | 4 +- |
| 77 |
x11-libs/libXcomposite/libXcomposite-9999.ebuild | 13 +- |
| 78 |
x11-libs/libXcursor/libXcursor-9999.ebuild | 12 +- |
| 79 |
x11-libs/libXdamage/libXdamage-9999.ebuild | 14 +- |
| 80 |
x11-libs/libXdmcp/libXdmcp-9999.ebuild | 7 +- |
| 81 |
x11-libs/libXevie/libXevie-9999.ebuild | 4 +- |
| 82 |
x11-libs/libXext/libXext-9999.ebuild | 9 +- |
| 83 |
x11-libs/libXfixes/libXfixes-9999.ebuild | 14 +- |
| 84 |
x11-libs/libXfont/libXfont-9999.ebuild | 4 +- |
| 85 |
x11-libs/libXfontcache/libXfontcache-9999.ebuild | 4 +- |
| 86 |
x11-libs/libXft/libXft-9999.ebuild | 18 +- |
| 87 |
x11-libs/libXi/libXi-9999.ebuild | 17 +- |
| 88 |
x11-libs/libXinerama/libXinerama-9999.ebuild | 14 +- |
| 89 |
x11-libs/libXmu/libXmu-9999.ebuild | 13 +- |
| 90 |
x11-libs/libXp/libXp-9999.ebuild | 14 +- |
| 91 |
x11-libs/libXpm/libXpm-9999.ebuild | 16 +- |
| 92 |
x11-libs/libXrandr/libXrandr-9999.ebuild | 18 +- |
| 93 |
x11-libs/libXrender/libXrender-9999.ebuild | 12 +- |
| 94 |
x11-libs/libXres/libXres-9999.ebuild | 4 +- |
| 95 |
x11-libs/libXt/libXt-9999.ebuild | 16 +- |
| 96 |
x11-libs/libXtst/libXtst-9999.ebuild | 18 +- |
| 97 |
x11-libs/libXv/libXv-9999.ebuild | 14 +- |
| 98 |
x11-libs/libXvMC/libXvMC-9999.ebuild | 16 +- |
| 99 |
x11-libs/libXxf86dga/libXxf86dga-9999.ebuild | 16 +- |
| 100 |
x11-libs/libXxf86misc/libXxf86misc-9999.ebuild | 4 +- |
| 101 |
x11-libs/libXxf86vm/libXxf86vm-9999.ebuild | 16 +- |
| 102 |
x11-libs/libdmx/libdmx-9999.ebuild | 4 +- |
| 103 |
x11-libs/libdrm/libdrm-9999.ebuild | 4 +- |
| 104 |
x11-libs/libfontenc/libfontenc-9999.ebuild | 4 +- |
| 105 |
x11-libs/libpciaccess/libpciaccess-9999.ebuild | 19 ++- |
| 106 |
x11-libs/libxcb/libxcb-9999.ebuild | 11 +- |
| 107 |
x11-libs/libxkbcommon/libxkbcommon-9999.ebuild | 4 +- |
| 108 |
x11-libs/libxkbfile/libxkbfile-9999.ebuild | 4 +- |
| 109 |
x11-libs/libxkbui/libxkbui-9999.ebuild | 4 +- |
| 110 |
x11-libs/pixman/metadata.xml | 9 +- |
| 111 |
x11-libs/pixman/pixman-9999.ebuild | 10 +- |
| 112 |
.../startup-notification-9999.ebuild | 4 +- |
| 113 |
x11-libs/xcb-util-image/xcb-util-image-9999.ebuild | 4 +- |
| 114 |
.../xcb-util-keysyms/xcb-util-keysyms-9999.ebuild | 4 +- |
| 115 |
.../xcb-util-renderutil-9999.ebuild | 4 +- |
| 116 |
x11-libs/xcb-util-wm/xcb-util-wm-9999.ebuild | 4 +- |
| 117 |
x11-libs/xcb-util/xcb-util-9999.ebuild | 4 +- |
| 118 |
x11-libs/xpyb/xpyb-9999.ebuild | 4 +- |
| 119 |
x11-libs/xtrans/xtrans-9999.ebuild | 4 +- |
| 120 |
x11-misc/util-macros/util-macros-9999.ebuild | 4 +- |
| 121 |
x11-misc/xcb-demo/xcb-demo-9999.ebuild | 4 +- |
| 122 |
.../xkeyboard-config/xkeyboard-config-9999.ebuild | 4 +- |
| 123 |
x11-proto/bigreqsproto/bigreqsproto-9999.ebuild | 4 +- |
| 124 |
.../calibrateproto/calibrateproto-9999.ebuild | 4 +- |
| 125 |
.../compositeproto/compositeproto-9999.ebuild | 6 +- |
| 126 |
x11-proto/damageproto/damageproto-9999.ebuild | 6 +- |
| 127 |
x11-proto/dmxproto/dmxproto-9999.ebuild | 4 +- |
| 128 |
x11-proto/dri2proto/dri2proto-9999.ebuild | 4 +- |
| 129 |
x11-proto/evieext/evieext-9999.ebuild | 4 +- |
| 130 |
x11-proto/fixesproto/fixesproto-9999.ebuild | 8 +- |
| 131 |
.../fontcacheproto/fontcacheproto-9999.ebuild | 4 +- |
| 132 |
x11-proto/fontsproto/fontsproto-9999.ebuild | 4 +- |
| 133 |
x11-proto/glproto/glproto-9999.ebuild | 4 +- |
| 134 |
x11-proto/inputproto/inputproto-9999.ebuild | 6 +- |
| 135 |
x11-proto/kbproto/kbproto-9999.ebuild | 6 +- |
| 136 |
x11-proto/lg3dproto/lg3dproto-9999.ebuild | 4 +- |
| 137 |
x11-proto/printproto/printproto-9999.ebuild | 6 +- |
| 138 |
x11-proto/randrproto/randrproto-9999.ebuild | 6 +- |
| 139 |
x11-proto/recordproto/recordproto-9999.ebuild | 5 +- |
| 140 |
x11-proto/renderproto/renderproto-9999.ebuild | 6 +- |
| 141 |
x11-proto/resourceproto/resourceproto-9999.ebuild | 4 +- |
| 142 |
.../scrnsaverproto/scrnsaverproto-9999.ebuild | 5 +- |
| 143 |
x11-proto/trapproto/trapproto-9999.ebuild | 4 +- |
| 144 |
x11-proto/videoproto/videoproto-9999.ebuild | 6 +- |
| 145 |
x11-proto/xcb-proto/xcb-proto-9999.ebuild | 6 +- |
| 146 |
x11-proto/xcmiscproto/xcmiscproto-9999.ebuild | 4 +- |
| 147 |
x11-proto/xextproto/xextproto-9999.ebuild | 5 +- |
| 148 |
.../xf86bigfontproto/xf86bigfontproto-9999.ebuild | 6 +- |
| 149 |
x11-proto/xf86dgaproto/xf86dgaproto-9999.ebuild | 6 +- |
| 150 |
x11-proto/xf86driproto/xf86driproto-9999.ebuild | 4 +- |
| 151 |
x11-proto/xf86miscproto/xf86miscproto-9999.ebuild | 4 +- |
| 152 |
x11-proto/xf86rushproto/xf86rushproto-9999.ebuild | 4 +- |
| 153 |
.../xf86vidmodeproto/xf86vidmodeproto-9999.ebuild | 6 +- |
| 154 |
x11-proto/xineramaproto/xineramaproto-9999.ebuild | 6 +- |
| 155 |
x11-proto/xproto/xproto-9999.ebuild | 5 +- |
| 156 |
141 files changed, 998 insertions(+), 1025 deletions(-) |
| 157 |
|
| 158 |
diff --cc media-libs/mesa/mesa-9999.ebuild |
| 159 |
index b00d581,06c91e8..1aefd57 |
| 160 |
--- a/media-libs/mesa/mesa-9999.ebuild |
| 161 |
+++ b/media-libs/mesa/mesa-9999.ebuild |
| 162 |
@@@ -46,18 -46,16 +46,17 @@@ for card in ${VIDEO_CARDS}; d |
| 163 |
done |
| 164 |
|
| 165 |
IUSE="${IUSE_VIDEO_CARDS} |
| 166 |
- bindist +classic debug +egl g3dvl +gallium gbm gles1 gles2 +llvm +nptl |
| 167 |
- opencl openvg osmesa pax_kernel pic r600-llvm-compiler selinux +shared-glapi vdpau |
| 168 |
- bindist +classic debug +egl +gallium gbm gles1 gles2 +llvm +nptl |
| 169 |
++ bindist +classic debug +egl +gallium gbm gles1 gles2 +llvm +nptl opencl |
| 170 |
+ openvg osmesa pax_kernel pic r600-llvm-compiler selinux +shared-glapi vdpau |
| 171 |
wayland xvmc xa xorg kernel_FreeBSD" |
| 172 |
|
| 173 |
REQUIRED_USE=" |
| 174 |
- g3dvl? ( gallium ) |
| 175 |
llvm? ( gallium ) |
| 176 |
openvg? ( egl gallium ) |
| 177 |
+ opencl? ( gallium r600-llvm-compiler ) |
| 178 |
gbm? ( shared-glapi ) |
| 179 |
- g3dvl? ( || ( vdpau xvmc ) ) |
| 180 |
- vdpau? ( g3dvl ) |
| 181 |
+ gles1? ( egl ) |
| 182 |
+ gles2? ( egl ) |
| 183 |
r600-llvm-compiler? ( gallium llvm || ( video_cards_r600 video_cards_radeon ) ) |
| 184 |
xa? ( gallium ) |
| 185 |
xorg? ( gallium ) |
| 186 |
@@@ -91,12 -88,8 +89,12 @@@ RDEPEND= |
| 187 |
x11-libs/libXext |
| 188 |
x11-libs/libXxf86vm |
| 189 |
>=x11-libs/libxcb-1.8.1 |
| 190 |
+ opencl? ( |
| 191 |
+ app-admin/eselect-opencl |
| 192 |
+ dev-libs/libclc |
| 193 |
+ ) |
| 194 |
vdpau? ( >=x11-libs/libvdpau-0.4.1 ) |
| 195 |
- wayland? ( dev-libs/wayland ) |
| 196 |
+ wayland? ( >=dev-libs/wayland-1.0.3 ) |
| 197 |
xorg? ( |
| 198 |
x11-base/xorg-server |
| 199 |
x11-libs/libdrm[libkms] |
| 200 |
diff --cc media-libs/mesa/metadata.xml |
| 201 |
index e13e854,19fdbbe..2c774e6 |
| 202 |
--- a/media-libs/mesa/metadata.xml |
| 203 |
+++ b/media-libs/mesa/metadata.xml |
| 204 |
@@@ -12,11 -12,10 +12,11 @@@ |
| 205 |
<flag name='gles2'>Enable GLESv2 support.</flag> |
| 206 |
<flag name='llvm'>Enable LLVM backend for Gallium3D.</flag> |
| 207 |
<flag name='openvg'>Enable the OpenVG 2D acceleration API for Gallium3D.</flag> |
| 208 |
+ <flag name='opencl'>Enable OpenCL via mesa</flag> |
| 209 |
- <flag name='osmesa'>Enable the Off-screen Rendering Mesa API</flag> |
| 210 |
+ <flag name='osmesa'>Build the Mesa library for off-screen rendering.</flag> |
| 211 |
<flag name='pax_kernel'>Enable if the user plans to run the package under a pax enabled hardened kernel</flag> |
| 212 |
- <flag name='r600-llvm-compiler'>Enable r600 shader compiler LLVM backend.</flag> |
| 213 |
<flag name='pic'>disable optimized assembly code that is not PIC friendly</flag> |
| 214 |
+ <flag name='r600-llvm-compiler'>Build the LLVM based r600 shader compiler.</flag> |
| 215 |
<flag name='shared-glapi'>Enable sharing of common code for the OpenGL API.</flag> |
| 216 |
<flag name='vdpau'>Enable the VDPAU acceleration interface for the Gallium3D Video Layer.</flag> |
| 217 |
<flag name='wayland'>Enable support for dev-libs/wayland</flag> |
Archives