Attachment #429726 for bug #560096




IUSE="${IUSE_VIDEO_CARDS}
	bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm
	+nptl opencl osmesa pax_kernel openmax pic selinux +udev vaapi vdpau
	wayland +X xvmc xa kernel_FreeBSD"

REQUIRED_USE="
	dri3? ( X )
	d3d9?   ( dri3 gallium )
	llvm?   ( gallium )
	opencl? ( gallium llvm )

	vaapi? ( gallium )
	vdpau? ( gallium )
	wayland? ( egl gbm )
	xvmc? ( X )
	xa?  ( X gallium )
	video_cards_freedreno?  ( gallium )
	video_cards_intel?  ( classic )
	video_cards_i915?   ( || ( classic gallium ) )

# keep correct libdrm and dri2proto dep
# keep blocks in rdepend for binpkg
RDEPEND="
	!<x11-base/xorg-server-1.7
	!<=x11-proto/xf86driproto-2.0.3
	abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
	classic? ( app-eselect/eselect-mesa )
	gallium? ( app-eselect/eselect-mesa )
	>=app-eselect/eselect-opengl-1.3.0
	udev? ( kernel_linux? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] ) )
	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
	X? (
		!<x11-base/xorg-server-1.7
		!<=x11-proto/xf86driproto-2.0.3
		>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
		>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
		>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
		>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
		>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
		>=x11-libs/libxcb-1.9.3:=[${MULTILIB_USEDEP}]
		x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
	)
	llvm? ( !kernel_FreeBSD? (
		video_cards_radeonsi? ( || (
			>=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]

		>=x11-proto/presentproto-1.0:=[${MULTILIB_USEDEP}]
	)
	>=x11-proto/glproto-1.4.17-r1:=[${MULTILIB_USEDEP}]
	X? (
		>=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]
		>=x11-proto/xf86driproto-2.1.1-r1:=[${MULTILIB_USEDEP}]
		>=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}]
	)
"
[[ ${PV} == 9999 ]] && DEPEND+="
	sys-devel/bison

	fi

	if use egl; then
		myconf+=" --with-egl-platforms=$(use X && echo "x11")$(use wayland && echo ",wayland")$(use gbm && echo ",drm")"
	fi

	if use gallium; then

	ECONF_SOURCE="${S}" \
	econf \
		--enable-dri \
		$(if use X; then
			echo "--enable-glx --enable-shared-glapi"
		  else
		    echo "--disable-glx"
		  fi
		) \
		$(use_enable !bindist texture-float) \
		$(use_enable d3d9 nine) \
		$(use_enable debug) \

multilib_src_install() {
	emake install DESTDIR="${D}"

	if ! use X; then
		sed -i '/#if defined(MESA_EGL_NO_X11_HEADERS)/i#define MESA_EGL_NO_X11_HEADERS' "${ED}/usr/include/EGL/eglplatform.h"
	fi

	if use classic || use gallium; then
			ebegin "Moving DRI/Gallium drivers for dynamic switching"
			local gallium_drivers=( i915_dri.so i965_dri.so r300_dri.so r600_dri.so swrast_dri.so )

Return to bug 560096

Lines 45-53 Link Here

(-)/mnt/usr/portage/media-libs/mesa/mesa-11.0.9.ebuild (-17 / +31 lines)
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 vdpau	47	+nptl opencl osmesa pax_kernel openmax pic selinux +udev vaapi vdpau
48	wayland xvmc xa kernel_FreeBSD"	48	wayland +X xvmc xa kernel_FreeBSD"
49		49
50	REQUIRED_USE="	50	REQUIRED_USE="
		51	dri3? ( X )
51	d3d9? ( dri3 gallium )	52	d3d9? ( dri3 gallium )
52	llvm? ( gallium )	53	llvm? ( gallium )
53	opencl? ( gallium llvm )	54	opencl? ( gallium llvm )
Lines 57-63 Link Here
57	vaapi? ( gallium )	58	vaapi? ( gallium )
58	vdpau? ( gallium )	59	vdpau? ( gallium )
59	wayland? ( egl gbm )	60	wayland? ( egl gbm )
60	xa? ( gallium )	61	xvmc? ( X )
		62	xa? ( 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 79-99 Link Here
79	# keep correct libdrm and dri2proto dep	81	# keep correct libdrm and dri2proto dep
80	# keep blocks in rdepend for binpkg	82	# keep blocks in rdepend for binpkg
81	RDEPEND="	83	RDEPEND="
82	!<x11-base/xorg-server-1.7
83	!<=x11-proto/xf86driproto-2.0.3
84	abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )	84	abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
85	classic? ( app-eselect/eselect-mesa )	85	classic? ( app-eselect/eselect-mesa )
86	gallium? ( app-eselect/eselect-mesa )	86	gallium? ( app-eselect/eselect-mesa )
87	>=app-eselect/eselect-opengl-1.3.0	87	>=app-eselect/eselect-opengl-1.3.0
88	udev? ( kernel_linux? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] ) )	88	udev? ( kernel_linux? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] ) )
89	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]	89	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
90	>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]	90	X? (
91	>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]	91	!<x11-base/xorg-server-1.7
92	>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]	92	!<=x11-proto/xf86driproto-2.0.3
93	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]	93	>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
94	>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]	94	>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
95	>=x11-libs/libxcb-1.9.3:=[${MULTILIB_USEDEP}]	95	>=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
96	x11-libs/libXfixes:=[${MULTILIB_USEDEP}]	96	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
		97	>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
		98	>=x11-libs/libxcb-1.9.3:=[${MULTILIB_USEDEP}]
		99	x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
		100	)
97	llvm? ( !kernel_FreeBSD? (	101	llvm? ( !kernel_FreeBSD? (
98	video_cards_radeonsi? ( \|\| (	102	video_cards_radeonsi? ( \|\| (
99	>=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]	103	>=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
Lines 155-163 Link Here
155	>=x11-proto/presentproto-1.0:=[${MULTILIB_USEDEP}]	159	>=x11-proto/presentproto-1.0:=[${MULTILIB_USEDEP}]
156	)	160	)
157	>=x11-proto/glproto-1.4.17-r1:=[${MULTILIB_USEDEP}]	161	>=x11-proto/glproto-1.4.17-r1:=[${MULTILIB_USEDEP}]
158	>=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]	162	X? (
159	>=x11-proto/xf86driproto-2.1.1-r1:=[${MULTILIB_USEDEP}]	163	>=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]
160	>=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}]	164	>=x11-proto/xf86driproto-2.1.1-r1:=[${MULTILIB_USEDEP}]
		165	>=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}]
		166	)
161	"	167	"
162	[[ ${PV} == 9999 ]] && DEPEND+="	168	[[ ${PV} == 9999 ]] && DEPEND+="
163	sys-devel/bison	169	sys-devel/bison
Lines 222-228 Link Here
222	fi	228	fi
223		229
224	if use egl; then	230	if use egl; then
225	myconf+=" --with-egl-platforms=x11$(use wayland && echo ",wayland")$(use gbm && echo ",drm")"	231	myconf+=" --with-egl-platforms=$(use X && echo "x11")$(use wayland && echo ",wayland")$(use gbm && echo ",drm")"
226	fi	232	fi
227		233
228	if use gallium; then	234	if use gallium; then
Lines 281-288 Link Here
281	ECONF_SOURCE="${S}" \	287	ECONF_SOURCE="${S}" \
282	econf \	288	econf \
283	--enable-dri \	289	--enable-dri \
284	--enable-glx \	290	$(if use X; then
285	--enable-shared-glapi \	291	echo "--enable-glx --enable-shared-glapi"
		292	else
		293	echo "--disable-glx"
		294	fi
		295	) \
286	$(use_enable !bindist texture-float) \	296	$(use_enable !bindist texture-float) \
287	$(use_enable d3d9 nine) \	297	$(use_enable d3d9 nine) \
288	$(use_enable debug) \	298	$(use_enable debug) \
Lines 304-309 Link Here
304	multilib_src_install() {	314	multilib_src_install() {
305	emake install DESTDIR="${D}"	315	emake install DESTDIR="${D}"
306		316
		317	if ! use X; then
		318	sed -i '/#if defined(MESA_EGL_NO_X11_HEADERS)/i#define MESA_EGL_NO_X11_HEADERS' "${ED}/usr/include/EGL/eglplatform.h"
		319	fi
		320
307	if use classic \|\| use gallium; then	321	if use classic \|\| use gallium; then
308	ebegin "Moving DRI/Gallium drivers for dynamic switching"	322	ebegin "Moving DRI/Gallium drivers for dynamic switching"
309	local gallium_drivers=( i915_dri.so i965_dri.so r300_dri.so r600_dri.so swrast_dri.so )	323	local gallium_drivers=( i915_dri.so i965_dri.so r300_dri.so r600_dri.so swrast_dri.so )