[patch] Alternative wine-1.7.29-r1.patch

wine-1.7.29-r1-alt.patch (text/plain), 2.54 KB, created by Adam Feldman on 2015-01-11 18:54:10 UTC

--- wine-1.7.29.ebuild	2015-01-11 13:30:57.335851410 -0500
+++ wine-1.7.29-r1.ebuild	2015-01-11 13:52:54.112858641 -0500
@@ -40,11 +40,12 @@
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-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"
+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"
 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
 	test? ( abi_x86_32 )
 	elibc_glibc? ( threads )
 	mono? ( abi_x86_32 )
+	txc_dxtn? ( pipelight )
 	osmesa? ( opengl )" #286560
 
 # FIXME: the test suite is unsuitable for us; many tests require net access
@@ -85,6 +86,7 @@
 	odbc? ( dev-db/unixODBC:= )
 	osmesa? ( media-libs/mesa[osmesa] )
 	pipelight? ( sys-apps/attr )
+	txc_dxtn? ( media-libs/libtxc_dxtn )
 	pulseaudio? ( media-sound/pulseaudio )
 	xml? ( dev-libs/libxml2 dev-libs/libxslt )
 	scanner? ( media-gfx/sane-backends:= )
@@ -196,6 +198,7 @@
 				app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
 				>=sys-apps/attr-2.4.47-r1[abi_x86_32(-)]
 			) )
+			txc_dxtn? ( >=media-libs/libtxc_dxtn-1.0.1-r1[abi_x86_32(-)] )
 			pulseaudio? ( || (
 				app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
 				>=media-sound/pulseaudio-5.0[abi_x86_32(-)]
@@ -308,8 +311,9 @@
 		"${FILESDIR}"/${PN}-1.6-memset-O3.patch #480508
 	)
 	local COMPHOLIO_MAKE_ARGS="-W fonts-Missing_Fonts.ok"
-
+	
 	use pulseaudio || COMPHOLIO_MAKE_ARGS="${COMPHOLIO_MAKE_ARGS} -W winepulse-PulseAudio_Support.ok"
+	#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"
 	if use gstreamer; then
 		# See http://bugs.winehq.org/show_bug.cgi?id=30557
 		ewarn "Applying experimental patch to fix GStreamer support. Note that"
@@ -405,6 +409,7 @@
 
 	use pulseaudio && myconf+=( --with-pulse )
 	use pipelight && myconf+=( --with-xattr )
+	use txc_dxtn && myconf+=( $(use_with txc_dxtn) )
 
 	local PKG_CONFIG AR RANLIB
 	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038