diff options
| author |   Ionen Wolkens <ionen@gentoo.org> | 2022-11-12 04:16:09 -0500 |
|---|---|---|
| committer | Ionen Wolkens <ionen@gentoo.org> | 2022-11-12 06:15:58 -0500 |
| commit | b922435b5dda83cce459ef59ea5ca8358e035b7e (patch) | |
| tree | 59ed6790a12c72041eb0e154fdc28aff959fb98b /app-emulation | |
| parent | app-emulation/wine-vanilla: add 7.21 (diff) | |
| download | gentoo-b922435b5dda83cce459ef59ea5ca8358e035b7e.tar.gz gentoo-b922435b5dda83cce459ef59ea5ca8358e035b7e.tar.bz2 gentoo-b922435b5dda83cce459ef59ea5ca8358e035b7e.zip | |
app-emulation/wine-vanilla: sync live
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
Diffstat (limited to 'app-emulation')
| -rw-r--r-- | app-emulation/wine-vanilla/wine-vanilla-9999.ebuild | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild index 3ac3d5488908..5b5c6577712d 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild @@ -27,10 +27,10 @@ SLOT="${PV}" IUSE=" +X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos llvm-libunwind debug custom-cflags +fontconfig +gecko gphoto2 - +gstreamer kerberos ldap +mingw +mono netapi nls odbc openal - opencl +opengl osmesa pcap perl pulseaudio samba scanner +sdl - selinux +ssl +truetype udev udisks +unwind usb v4l +vulkan - +xcomposite xinerama" + +gstreamer kerberos ldap +mingw +mono netapi nls odbc opencl + +opengl osmesa pcap perl pulseaudio samba scanner +sdl selinux + +ssl +truetype udev udisks +unwind usb v4l +vulkan +xcomposite + xinerama" REQUIRED_USE=" X? ( truetype ) crossdev-mingw? ( mingw )" # bug #551124 for truetype @@ -81,7 +81,6 @@ WINE_COMMON_DEPEND=" media-libs/gstreamer:1.0[${MULTILIB_USEDEP}] ) ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] ) - openal? ( media-libs/openal[${MULTILIB_USEDEP}] ) opencl? ( virtual/opencl[${MULTILIB_USEDEP}] ) pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] ) pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] ) @@ -115,7 +114,9 @@ BDEPEND=" sys-devel/bison sys-devel/flex virtual/pkgconfig - mingw? ( !crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] ) ) + mingw? ( !crossdev-mingw? ( + >=dev-util/mingw64-toolchain-10.0.0_p1-r2[${MULTILIB_USEDEP}] + ) ) nls? ( sys-devel/gettext )" IDEPEND="app-eselect/eselect-wine" @@ -124,6 +125,7 @@ QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext PATCHES=( "${FILESDIR}"/${PN}-7.0-noexecstack.patch "${FILESDIR}"/${PN}-7.20-unwind.patch + "${FILESDIR}"/${PN}-7.21-crossflags.patch ) pkg_pretend() { @@ -191,7 +193,6 @@ src_configure() { $(use_with mingw) $(use_with netapi) $(use_with nls gettext) - $(use_with openal) $(use_with opencl) $(use_with opengl) $(use_with osmesa) @@ -227,8 +228,9 @@ src_configure() { mkdir ../build${bits} || die cd ../build${bits} || die - # CROSSCC_amd64/x86 are unused by Wine, but recognized here for users + pe_arch=i386 if (( bits == 64 )); then + pe_arch=x86_64 : "${CROSSCC:=${CROSSCC_amd64:-x86_64-w64-mingw32-gcc}}" conf+=( --enable-win64 ) elif use amd64; then @@ -241,8 +243,12 @@ src_configure() { fi : "${CROSSCC:=${CROSSCC_x86:-i686-w64-mingw32-gcc}}" - # use *FLAGS for mingw, but strip unsupported (e.g. --hash-style=gnu) if use mingw; then + # CROSSCC is no longer recognized by Wine, but still use for now + # (future handling for CROSS* variables is subject to changes) + conf+=( ac_cv_prog_${pe_arch}_CC="${CROSSCC}" ) + + # use *FLAGS for mingw, but strip unsupported : "${CROSSCFLAGS:=$( filter-flags '-fstack-clash-protection' #758914 filter-flags '-fstack-protector*' #870136 @@ -251,7 +257,7 @@ src_configure() { : "${CROSSLDFLAGS:=$( filter-flags '-fuse-ld=*' CC=${CROSSCC} test-flags-CCLD ${LDFLAGS})}" - export CROSS{CC,{C,LD}FLAGS} + export CROSS{C,LD}FLAGS fi ECONF_SOURCE=${S} econf "${conf[@]}" |