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

Collapse All | Expand All

(-)wine-1.7.29.ebuild (-4 / +9 lines)
Lines 40-50 Link Here
40
40
41
LICENSE="LGPL-2.1"
41
LICENSE="LGPL-2.1"
42
SLOT="0"
42
SLOT="0"
43
IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pipelight +png +prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype +udisks v4l +X xcomposite xinerama +xml"
43
IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pipelight +png +prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype txc_dxtn +udisks v4l +X xcomposite xinerama +xml"
44
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
44
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
45
	test? ( abi_x86_32 )
45
	test? ( abi_x86_32 )
46
	elibc_glibc? ( threads )
46
	elibc_glibc? ( threads )
47
	mono? ( abi_x86_32 )
47
	mono? ( abi_x86_32 )
48
	txc_dxtn? ( pipelight )
48
	osmesa? ( opengl )" #286560
49
	osmesa? ( opengl )" #286560
49
50
50
# FIXME: the test suite is unsuitable for us; many tests require net access
51
# FIXME: the test suite is unsuitable for us; many tests require net access
Lines 85-90 Link Here
85
	odbc? ( dev-db/unixODBC:= )
86
	odbc? ( dev-db/unixODBC:= )
86
	osmesa? ( media-libs/mesa[osmesa] )
87
	osmesa? ( media-libs/mesa[osmesa] )
87
	pipelight? ( sys-apps/attr )
88
	pipelight? ( sys-apps/attr )
89
	txc_dxtn? ( media-libs/libtxc_dxtn )
88
	pulseaudio? ( media-sound/pulseaudio )
90
	pulseaudio? ( media-sound/pulseaudio )
89
	xml? ( dev-libs/libxml2 dev-libs/libxslt )
91
	xml? ( dev-libs/libxml2 dev-libs/libxslt )
90
	scanner? ( media-gfx/sane-backends:= )
92
	scanner? ( media-gfx/sane-backends:= )
Lines 193-201 Link Here
193
				>=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)]
195
				>=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)]
194
			) )
196
			) )
195
			pipelight? ( || (
197
			pipelight? ( || (
196
				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
198
					app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
197
				>=sys-apps/attr-2.4.47-r1[abi_x86_32(-)]
199
					>=sys-apps/attr-2.4.47-r1[abi_x86_32(-)]
198
			) )
200
			) )
201
			txc_dxtn? ( >=media-libs/libtxc_dxtn-1.0.1-r1[abi_x86_32(-)] )
199
			pulseaudio? ( || (
202
			pulseaudio? ( || (
200
				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
203
				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
201
				>=media-sound/pulseaudio-5.0[abi_x86_32(-)]
204
				>=media-sound/pulseaudio-5.0[abi_x86_32(-)]
Lines 308-315 Link Here
308
		"${FILESDIR}"/${PN}-1.6-memset-O3.patch #480508
311
		"${FILESDIR}"/${PN}-1.6-memset-O3.patch #480508
309
	)
312
	)
310
	local COMPHOLIO_MAKE_ARGS="-W fonts-Missing_Fonts.ok"
313
	local COMPHOLIO_MAKE_ARGS="-W fonts-Missing_Fonts.ok"
311
314
	
312
	use pulseaudio || COMPHOLIO_MAKE_ARGS="${COMPHOLIO_MAKE_ARGS} -W winepulse-PulseAudio_Support.ok"
315
	use pulseaudio || COMPHOLIO_MAKE_ARGS="${COMPHOLIO_MAKE_ARGS} -W winepulse-PulseAudio_Support.ok"
316
	use txc_dxtn || STAGING_MAKE_ARGS="${STAGING_MAKE_ARGS} -W wined3d-CSMT_Helper.ok -W wined3d-CSMT_Main.ok -W d3dx9_36-DXTn.ok -W wined3d-DXTn.ok"
313
	if use gstreamer; then
317
	if use gstreamer; then
314
		# See http://bugs.winehq.org/show_bug.cgi?id=30557
318
		# See http://bugs.winehq.org/show_bug.cgi?id=30557
315
		ewarn "Applying experimental patch to fix GStreamer support. Note that"
319
		ewarn "Applying experimental patch to fix GStreamer support. Note that"
Lines 405-410 Link Here
405
409
406
	use pulseaudio && myconf+=( --with-pulse )
410
	use pulseaudio && myconf+=( --with-pulse )
407
	use pipelight && myconf+=( --with-xattr )
411
	use pipelight && myconf+=( --with-xattr )
412
	use txc_dxtn && myconf+=( $(use_with txc_dxtn) )
408
413
409
	local PKG_CONFIG AR RANLIB
414
	local PKG_CONFIG AR RANLIB
410
	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
415
	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038

Return to bug 534732