Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 560096 | Differences between
and this patch

Collapse All | Expand All

(-)/usr/portage/media-libs/mesa/mesa-12.0.1.ebuild (-24 / +30 lines)
Lines 45-63 Link Here
45
IUSE="${IUSE_VIDEO_CARDS}
45
IUSE="${IUSE_VIDEO_CARDS}
46
	bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm
46
	bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm
47
	+nptl opencl osmesa pax_kernel openmax pic selinux +udev vaapi valgrind
47
	+nptl opencl osmesa pax_kernel openmax pic selinux +udev vaapi valgrind
48
	vdpau wayland xvmc xa kernel_FreeBSD"
48
	vdpau wayland +X xa xvmc kernel_FreeBSD"
49
49
50
REQUIRED_USE="
50
REQUIRED_USE="
51
	d3d9?   ( dri3 gallium )
51
	d3d9?   ( dri3 gallium )
52
	llvm?   ( gallium )
52
	dri3?   ( X )
53
	opencl? ( gallium llvm )
54
	openmax? ( gallium )
55
	gles1?  ( egl )
53
	gles1?  ( egl )
56
	gles2?  ( egl )
54
	gles2?  ( egl )
57
	vaapi? ( gallium )
55
	llvm?   ( gallium )
58
	vdpau? ( gallium )
56
	opencl? ( gallium llvm )
57
	openmax? ( X gallium )
58
	vaapi? ( X gallium )
59
	vdpau? ( X gallium )
59
	wayland? ( egl gbm )
60
	wayland? ( egl gbm )
60
	xa?  ( gallium )
61
	xa?  ( gallium )
62
	xvmc? ( X gallium )
61
	video_cards_freedreno?  ( gallium )
63
	video_cards_freedreno?  ( gallium )
62
	video_cards_intel?  ( classic )
64
	video_cards_intel?  ( classic )
63
	video_cards_i915?   ( || ( classic gallium ) )
65
	video_cards_i915?   ( || ( classic gallium ) )
Lines 87-99 Link Here
87
	>=app-eselect/eselect-opengl-1.3.0
89
	>=app-eselect/eselect-opengl-1.3.0
88
	udev? ( kernel_linux? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] ) )
90
	udev? ( kernel_linux? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] ) )
89
	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
91
	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
90
	>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
92
	X? (
91
	>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
93
		>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
92
	>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
94
		>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
93
	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
95
		>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
94
	>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
96
		>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
95
	>=x11-libs/libxcb-1.9.3:=[${MULTILIB_USEDEP}]
97
		>=x11-libs/libxcb-1.9.3:=[${MULTILIB_USEDEP}]
96
	x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
98
		x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
99
		dri3? ( >=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}] )
100
	)
97
	llvm? ( !kernel_FreeBSD? (
101
	llvm? ( !kernel_FreeBSD? (
98
		video_cards_radeonsi? ( virtual/libelf:0=[${MULTILIB_USEDEP}] )
102
		video_cards_radeonsi? ( virtual/libelf:0=[${MULTILIB_USEDEP}] )
99
		!video_cards_r600? (
103
		!video_cards_r600? (
Lines 143-157 Link Here
143
	sys-devel/gettext
147
	sys-devel/gettext
144
	virtual/pkgconfig
148
	virtual/pkgconfig
145
	valgrind? ( dev-util/valgrind )
149
	valgrind? ( dev-util/valgrind )
146
	>=x11-proto/dri2proto-2.8-r1:=[${MULTILIB_USEDEP}]
150
	X? (
147
	dri3? (
151
		>=x11-proto/dri2proto-2.8-r1:=[${MULTILIB_USEDEP}]
148
		>=x11-proto/dri3proto-1.0:=[${MULTILIB_USEDEP}]
152
		dri3? (
149
		>=x11-proto/presentproto-1.0:=[${MULTILIB_USEDEP}]
153
			>=x11-proto/dri3proto-1.0:=[${MULTILIB_USEDEP}]
150
	)
154
			>=x11-proto/presentproto-1.0:=[${MULTILIB_USEDEP}]
151
	>=x11-proto/glproto-1.4.17-r1:=[${MULTILIB_USEDEP}]
155
		)
152
	>=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]
156
		>=x11-proto/glproto-1.4.17-r1:=[${MULTILIB_USEDEP}]
153
	>=x11-proto/xf86driproto-2.1.1-r1:=[${MULTILIB_USEDEP}]
157
		>=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]
154
	>=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}]
158
		>=x11-proto/xf86driproto-2.1.1-r1:=[${MULTILIB_USEDEP}]
159
		>=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}]
160
	)
155
"
161
"
156
[[ ${PV} == 9999 ]] && DEPEND+="
162
[[ ${PV} == 9999 ]] && DEPEND+="
157
	sys-devel/bison
163
	sys-devel/bison
Lines 216-222 Link Here
216
	fi
222
	fi
217
223
218
	if use egl; then
224
	if use egl; then
219
		myconf+=" --with-egl-platforms=x11$(use wayland && echo ",wayland")$(use gbm && echo ",drm")"
225
		myconf+=" --with-egl-platforms=$(use X && echo "x11")$(use wayland && echo ",wayland")$(use gbm && echo ",drm")"
220
	fi
226
	fi
221
227
222
	if use gallium; then
228
	if use gallium; then
Lines 282-288 Link Here
282
	ECONF_SOURCE="${S}" \
288
	ECONF_SOURCE="${S}" \
283
	econf \
289
	econf \
284
		--enable-dri \
290
		--enable-dri \
285
		--enable-glx \
291
		$(use_enable X glx) \
286
		--enable-shared-glapi \
292
		--enable-shared-glapi \
287
		--disable-shader-cache \
293
		--disable-shader-cache \
288
		$(use_enable !bindist texture-float) \
294
		$(use_enable !bindist texture-float) \

Return to bug 560096