--- wine-1.7.28.ebuild 2015-01-04 18:29:10.938256017 -0500 +++ wine-1.7.28-r1.ebuild 2015-01-04 21:52:30.704196858 -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 # winepulse patches needed for gstreamer due to http://bugs.winehq.org/show_bug.cgi?id=30557 @@ -86,6 +87,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:= ) @@ -194,9 +196,10 @@ >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)] ) ) pipelight? ( || ( - app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)] - >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)] + 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(-)] @@ -311,6 +314,7 @@ 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" @@ -406,6 +410,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