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.28-r1.ebuild (-6 / +1 lines)
Lines 40-51 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 txc_dxtn +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 +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 )
49
	osmesa? ( opengl )" #286560
48
	osmesa? ( opengl )" #286560
50
# winepulse patches needed for gstreamer due to http://bugs.winehq.org/show_bug.cgi?id=30557
49
# winepulse patches needed for gstreamer due to http://bugs.winehq.org/show_bug.cgi?id=30557
51
50
Lines 87-93 Link Here
87
	odbc? ( dev-db/unixODBC:= )
86
	odbc? ( dev-db/unixODBC:= )
88
	osmesa? ( media-libs/mesa[osmesa] )
87
	osmesa? ( media-libs/mesa[osmesa] )
89
	pipelight? ( sys-apps/attr )
88
	pipelight? ( sys-apps/attr )
90
	txc_dxtn? ( media-libs/libtxc_dxtn )
91
	pulseaudio? ( media-sound/pulseaudio )
89
	pulseaudio? ( media-sound/pulseaudio )
92
	xml? ( dev-libs/libxml2 dev-libs/libxslt )
90
	xml? ( dev-libs/libxml2 dev-libs/libxslt )
93
	scanner? ( media-gfx/sane-backends:= )
91
	scanner? ( media-gfx/sane-backends:= )
Lines 199-205 Link Here
199
				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
197
				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
200
				>=sys-apps/attr-2.4.47-r1[abi_x86_32(-)]
198
				>=sys-apps/attr-2.4.47-r1[abi_x86_32(-)]
201
			) )
199
			) )
202
			txc_dxtn? ( >=media-libs/libtxc_dxtn-1.0.1-r1[abi_x86_32(-)] )
203
			pulseaudio? ( || (
200
			pulseaudio? ( || (
204
				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
201
				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
205
				>=media-sound/pulseaudio-5.0[abi_x86_32(-)]
202
				>=media-sound/pulseaudio-5.0[abi_x86_32(-)]
Lines 314-320 Link Here
314
	local COMPHOLIO_MAKE_ARGS="-W fonts-Missing_Fonts.ok"
311
	local COMPHOLIO_MAKE_ARGS="-W fonts-Missing_Fonts.ok"
315
312
316
	use pulseaudio || COMPHOLIO_MAKE_ARGS="${COMPHOLIO_MAKE_ARGS} -W winepulse-PulseAudio_Support.ok"
313
	use pulseaudio || COMPHOLIO_MAKE_ARGS="${COMPHOLIO_MAKE_ARGS} -W winepulse-PulseAudio_Support.ok"
317
	#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"
318
	if use gstreamer; then
314
	if use gstreamer; then
319
		# See http://bugs.winehq.org/show_bug.cgi?id=30557
315
		# See http://bugs.winehq.org/show_bug.cgi?id=30557
320
		ewarn "Applying experimental patch to fix GStreamer support. Note that"
316
		ewarn "Applying experimental patch to fix GStreamer support. Note that"
Lines 410-416 Link Here
410
406
411
	use pulseaudio && myconf+=( --with-pulse )
407
	use pulseaudio && myconf+=( --with-pulse )
412
	use pipelight && myconf+=( --with-xattr )
408
	use pipelight && myconf+=( --with-xattr )
413
	use txc_dxtn && myconf+=( $(use_with txc_dxtn) )
414
409
415
	local PKG_CONFIG AR RANLIB
410
	local PKG_CONFIG AR RANLIB
416
	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
411
	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038

Return to bug 534732