From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 26FDF1582EF for ; Fri, 14 Feb 2025 05:28:29 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 135BE3430EC for ; Fri, 14 Feb 2025 05:28:29 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id E9C4B110472; Fri, 14 Feb 2025 05:28:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id D561C110471 for ; Fri, 14 Feb 2025 05:28:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 603DD343079 for ; Fri, 14 Feb 2025 05:28:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EF4EA26C6 for ; Fri, 14 Feb 2025 05:28:20 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1739510854.0ecfdb0d902dd0e8cc3e292063f9a8160b6a14da.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/files/, app-emulation/wine-proton/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/wine-proton/Manifest app-emulation/wine-proton/files/wine-proton-7.0.4-restore-menubuilder.patch app-emulation/wine-proton/files/wine-proton-7.0.4-unwind.patch app-emulation/wine-proton/files/wine-proton-7.0.6-mingw64-11.0.0.patch app-emulation/wine-proton/files/wine-proton-7.0.6-vulkan-libm.patch app-emulation/wine-proton/metadata.xml app-emulation/wine-proton/wine-proton-7.0.6.ebuild X-VCS-Directories: app-emulation/wine-proton/ app-emulation/wine-proton/files/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 0ecfdb0d902dd0e8cc3e292063f9a8160b6a14da X-VCS-Branch: master Date: Fri, 14 Feb 2025 05:28:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7d58cbea-790c-4064-bcf6-0d808b0cf994 X-Archives-Hash: 0d1c2ca349a6e9703e9231b0ada6a571 commit: 0ecfdb0d902dd0e8cc3e292063f9a8160b6a14da Author: Ionen Wolkens gentoo org> AuthorDate: Fri Feb 14 03:08:57 2025 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Fri Feb 14 05:27:34 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ecfdb0d app-emulation/wine-proton: drop 7.0.6 (last of 7.x) Haven't tried this old version but, like the others, this is likely broken with mingw binutils-2.44 and backporting the fix for that only applies to >=wine-8 as-is. Seems time to drop support for this one. There is no indication that Valve will ever release a (fixed) new version of this branch. Signed-off-by: Ionen Wolkens gentoo.org> app-emulation/wine-proton/Manifest | 1 - .../wine-proton-7.0.4-restore-menubuilder.patch | 14 - .../files/wine-proton-7.0.4-unwind.patch | 40 --- .../files/wine-proton-7.0.6-mingw64-11.0.0.patch | 20 -- .../files/wine-proton-7.0.6-vulkan-libm.patch | 12 - app-emulation/wine-proton/metadata.xml | 1 - app-emulation/wine-proton/wine-proton-7.0.6.ebuild | 390 --------------------- 7 files changed, 478 deletions(-) diff --git a/app-emulation/wine-proton/Manifest b/app-emulation/wine-proton/Manifest index c43bcc91bf2c..ac9a8becba97 100644 --- a/app-emulation/wine-proton/Manifest +++ b/app-emulation/wine-proton/Manifest @@ -1,4 +1,3 @@ -DIST proton-wine-7.0-6.tar.gz 45780326 BLAKE2B f140fcfdd1a47904c34a49d0795fa3326d7cf0d3fac8d6c2ef2a4926181a46223f43a2d1ca96c543e800c8c46b2a3cc51ae306a029d68a42608876e869e177d5 SHA512 793bbe2b23042301a1b518717d78cfff01eaffa0388883d010659a45779b9136d33cfac63f0c3fbb1e458953a954b423eb70ac4fa87633352267db890ceb2fef DIST proton-wine-8.0-5c.tar.gz 48710071 BLAKE2B 99627baea6fb3d51231aa1e75a2734c3c1baba88326baf15b3d421d57a00472d25ba51c2140b51152c8aeae7dd240d3d77bb0d8835aa7eb3b745a51be120f8bb SHA512 0cf98d4e67866e55cc8cd5ea8da0d76aee8e37b130b3cbca604083c913e98ddf9038ecd6f9761d2e11443e282b372977400e251456c6d40e1365210c7578234d DIST proton-wine-9.0-2.tar.gz 49125171 BLAKE2B ac1e4a63f94689bc4fcc6ab4e2d12cfc214f54181515434ab950d8975d131a5f6333b1e6cb9b67eda61cf3e652e57e27e60ba3cff6a6ac403b07178f382f7e25 SHA512 82efee3100da80f650229d1abf3df4896ab71af4a79c6e5cf03aa646c56f435daf07c6f084a3264067cf90ce509102e3d7ee6d4bf7d0650baf645b5ece08cc7c DIST proton-wine-9.0-4.tar.gz 49339922 BLAKE2B 914ca093ac288c26400e4eeb2ea33943fc8ad89052aa7c97b5c44286dc175745720455d65163baa90b0d0271eb8028549315a3e8095b91947db2bd96c6fc4852 SHA512 e061f0a55b25493f67ca3add8c7e41020bb57cb15e8fb4fdf3c23f0cab2d00b703c90fbcf0dc1ca8b67e1726a76cee910e9ea6f567c88bc6c520dd6c9dbb75e9 diff --git a/app-emulation/wine-proton/files/wine-proton-7.0.4-restore-menubuilder.patch b/app-emulation/wine-proton/files/wine-proton-7.0.4-restore-menubuilder.patch deleted file mode 100644 index 760340791060..000000000000 --- a/app-emulation/wine-proton/files/wine-proton-7.0.4-restore-menubuilder.patch +++ /dev/null @@ -1,14 +0,0 @@ -Without Steam there is no launcher by default, users with more custom -setups may not need this but others will want access to desktop entries. ---- a/configure.ac -+++ b/configure.ac -@@ -3683,2 +3683,3 @@ - WINE_CONFIG_MAKEFILE(programs/winefile) -+WINE_CONFIG_MAKEFILE(programs/winemenubuilder) - WINE_CONFIG_MAKEFILE(programs/winemine) ---- a/loader/wine.inf.in -+++ b/loader/wine.inf.in -@@ -5630,2 +5630,3 @@ - [Services] -+HKLM,%CurrentVersion%\RunServices,"winemenubuilder",2,"%11%\winemenubuilder.exe -a -r" - HKLM,"System\CurrentControlSet\Services\Eventlog\Application",,16 diff --git a/app-emulation/wine-proton/files/wine-proton-7.0.4-unwind.patch b/app-emulation/wine-proton/files/wine-proton-7.0.4-unwind.patch deleted file mode 100644 index 372def52ba0c..000000000000 --- a/app-emulation/wine-proton/files/wine-proton-7.0.4-unwind.patch +++ /dev/null @@ -1,40 +0,0 @@ -Fix build with llvm-libunwind, and also fix for non-llvm libunwind -when using clang+bfd given clang doesn't have _Unwind_Find_FDE in -its rtlib and expects it from llvm-libunwind. - -The _CONFIG_H_ check is for Rip - 1), &bases ); - - if (fde) - return dwarf_virtual_unwind( context->Rip, &dispatch->EstablisherFrame, context, fde, - &bases, &dispatch->LanguageHandler, &dispatch->HandlerData ); -+#endif - #ifdef HAVE_LIBUNWIND - return libunwind_virtual_unwind( context->Rip, &dispatch->EstablisherFrame, context, - &dispatch->LanguageHandler, &dispatch->HandlerData ); diff --git a/app-emulation/wine-proton/files/wine-proton-7.0.6-mingw64-11.0.0.patch b/app-emulation/wine-proton/files/wine-proton-7.0.6-mingw64-11.0.0.patch deleted file mode 100644 index 54ecc49c7235..000000000000 --- a/app-emulation/wine-proton/files/wine-proton-7.0.6-mingw64-11.0.0.patch +++ /dev/null @@ -1,20 +0,0 @@ -Hack: this does not actually need stdarg.h, but including it ensures -that _mingw.h will be loaded before the rest of Wine's winnt.h avoiding -issues with mingw64-runtime-11.0.0, e.g.: - - _mingw.h:602:60: error: redefinition of ‘__fastfail’ - make[1]: *** [Makefile:5900: dlls/advapi32/crypt_des.cross.o] Error 1 - -(other crypt_*.c happen to include stdarg.h first and don't fail, but this -one does not, same for several other files in dlls/) - -Not an issue with non-proton Wine 7.0 as Wine did not define __fastfail -until ~wine-7.10. Wine 8 does define it but does not seem to be a problem -there (perhaps due to different header layout). A more "right" fix would -be welcome, but given Proton-7 seems EOL it is not judged important. ---- a/include/winnt.h -+++ b/include/winnt.h -@@ -32,2 +32,3 @@ - #include -+#include - #endif diff --git a/app-emulation/wine-proton/files/wine-proton-7.0.6-vulkan-libm.patch b/app-emulation/wine-proton/files/wine-proton-7.0.6-vulkan-libm.patch deleted file mode 100644 index b81778fb957c..000000000000 --- a/app-emulation/wine-proton/files/wine-proton-7.0.6-vulkan-libm.patch +++ /dev/null @@ -1,12 +0,0 @@ -Valve's patches add use of "ceil" without using libm, it works -by accident with -O2 but fails with -Os. - -ld: dlls/winevulkan/vulkan.o: in function `fshack_vk_queue_present': -vulkan.c:(.text+0x12f46): undefined reference to `ceil' ---- a/dlls/winevulkan/Makefile.in -+++ b/dlls/winevulkan/Makefile.in -@@ -4,3 +4,3 @@ - IMPORTS = user32 gdi32 advapi32 setupapi win32u --EXTRALIBS = $(PTHREAD_LIBS) -+EXTRALIBS = -lm $(PTHREAD_LIBS) - diff --git a/app-emulation/wine-proton/metadata.xml b/app-emulation/wine-proton/metadata.xml index 3eb642f0a513..4e53c42efe00 100644 --- a/app-emulation/wine-proton/metadata.xml +++ b/app-emulation/wine-proton/metadata.xml @@ -20,7 +20,6 @@ Enable off-screen rendering (OpenGL in bitmaps) support Install helpers that require perl (winedump/winemaker) Enable gamepad support using media-libs/libsdl2 - Enable DirectX 12 support using app-emulation/vkd3d Enable running 32bit applications without 32bit ELF multilib by mapping to 64bit calls (experimental, diff --git a/app-emulation/wine-proton/wine-proton-7.0.6.ebuild b/app-emulation/wine-proton/wine-proton-7.0.6.ebuild deleted file mode 100644 index c4630cc016e8..000000000000 --- a/app-emulation/wine-proton/wine-proton-7.0.6.ebuild +++ /dev/null @@ -1,390 +0,0 @@ -# Copyright 2022-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MULTILIB_COMPAT=( abi_x86_{32,64} ) -PYTHON_COMPAT=( python3_{10..13} ) -inherit autotools flag-o-matic multilib multilib-build prefix -inherit python-any-r1 readme.gentoo-r1 toolchain-funcs wrapper - -WINE_GECKO=2.47.3 -WINE_MONO=7.4.0 -WINE_PV=$(ver_rs 2 -) - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/ValveSoftware/wine.git" - EGIT_BRANCH="bleeding-edge" -else - SRC_URI="https://github.com/ValveSoftware/wine/archive/refs/tags/proton-wine-${WINE_PV}.tar.gz" - S="${WORKDIR}/${PN}-wine-${WINE_PV}" - KEYWORDS="-* amd64 ~x86" -fi - -DESCRIPTION="Valve Software's fork of Wine" -HOMEPAGE="https://github.com/ValveSoftware/wine/" - -LICENSE="LGPL-2.1+ BSD-2 IJG MIT ZLIB gsm libpng2 libtiff" -SLOT="${PV}" -IUSE=" - +abi_x86_32 +abi_x86_64 +alsa crossdev-mingw custom-cflags debug - +fontconfig +gecko +gstreamer llvm-libunwind +mono nls openal - osmesa perl pulseaudio +sdl selinux +ssl udev udisks +unwind usb - v4l +vkd3d +xcomposite xinerama -" - -# tests are non-trivial to run, can hang easily, don't play well with -# sandbox, and several need real opengl/vulkan or network access -RESTRICT="test" - -# `grep WINE_CHECK_SONAME configure.ac` + if not directly linked -WINE_DLOPEN_DEPEND=" - dev-libs/libgcrypt:=[${MULTILIB_USEDEP}] - media-libs/freetype[${MULTILIB_USEDEP}] - media-libs/libglvnd[X,${MULTILIB_USEDEP}] - media-libs/vulkan-loader[X,${MULTILIB_USEDEP}] - x11-libs/libXcursor[${MULTILIB_USEDEP}] - x11-libs/libXfixes[${MULTILIB_USEDEP}] - x11-libs/libXi[${MULTILIB_USEDEP}] - x11-libs/libXrandr[${MULTILIB_USEDEP}] - x11-libs/libXrender[${MULTILIB_USEDEP}] - x11-libs/libXxf86vm[${MULTILIB_USEDEP}] - fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] ) - osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] ) - sdl? ( media-libs/libsdl2[haptic,joystick,${MULTILIB_USEDEP}] ) - ssl? ( - dev-libs/gmp:=[${MULTILIB_USEDEP}] - net-libs/gnutls:=[${MULTILIB_USEDEP}] - ) - udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) - v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] ) - xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] ) - xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) -" -WINE_COMMON_DEPEND=" - ${WINE_DLOPEN_DEPEND} - x11-libs/libX11[${MULTILIB_USEDEP}] - x11-libs/libXext[${MULTILIB_USEDEP}] - alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] ) - gstreamer? ( - dev-libs/glib:2[${MULTILIB_USEDEP}] - media-libs/gst-plugins-base:1.0[opengl,${MULTILIB_USEDEP}] - media-libs/gstreamer:1.0[${MULTILIB_USEDEP}] - ) - openal? ( media-libs/openal[${MULTILIB_USEDEP}] ) - pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] ) - udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] ) - unwind? ( - llvm-libunwind? ( llvm-runtimes/libunwind[${MULTILIB_USEDEP}] ) - !llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] ) - ) - usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] ) - vkd3d? ( >=app-emulation/vkd3d-1.2[${MULTILIB_USEDEP}] ) -" -RDEPEND=" - ${WINE_COMMON_DEPEND} - app-emulation/wine-desktop-common - gecko? ( app-emulation/wine-gecko:${WINE_GECKO}[${MULTILIB_USEDEP}] ) - gstreamer? ( media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] ) - mono? ( app-emulation/wine-mono:${WINE_MONO} ) - perl? ( - dev-lang/perl - dev-perl/XML-LibXML - ) - selinux? ( sec-policy/selinux-wine ) - udisks? ( sys-fs/udisks:2 ) -" -DEPEND=" - ${WINE_COMMON_DEPEND} - sys-kernel/linux-headers - x11-base/xorg-proto -" -BDEPEND=" - ${PYTHON_DEPS} - dev-lang/perl - sys-devel/binutils - sys-devel/bison - sys-devel/flex - virtual/pkgconfig - nls? ( sys-devel/gettext ) - !crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] ) -" -IDEPEND=">=app-eselect/eselect-wine-2" - -QA_CONFIG_IMPL_DECL_SKIP=( - __clear_cache # unused on amd64+x86 (bug #900332) - res_getservers # false positive -) -QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext - -PATCHES=( - "${FILESDIR}"/${PN}-7.0.4-musl.patch - "${FILESDIR}"/${PN}-7.0.4-noexecstack.patch - "${FILESDIR}"/${PN}-7.0.4-restore-menubuilder.patch - "${FILESDIR}"/${PN}-7.0.4-unwind.patch - "${FILESDIR}"/${PN}-7.0.6-mingw64-11.0.0.patch - "${FILESDIR}"/${PN}-7.0.6-vulkan-libm.patch -) - -pkg_pretend() { - [[ ${MERGE_TYPE} == binary ]] && return - - if use crossdev-mingw && [[ ! -v MINGW_BYPASS ]]; then - local mingw=-w64-mingw32 - for mingw in $(usev abi_x86_64 x86_64${mingw}) $(usev abi_x86_32 i686${mingw}); do - if ! type -P ${mingw}-gcc >/dev/null; then - eerror "With USE=crossdev-mingw, you must prepare the MinGW toolchain" - eerror "yourself by installing sys-devel/crossdev then running:" - eerror - eerror " crossdev --target ${mingw}" - eerror - eerror "For more information, please see: https://wiki.gentoo.org/wiki/Mingw" - eerror "--> Note that mingw builds are default for ${PN} even without this USE." - die "USE=crossdev-mingw is enabled, but ${mingw}-gcc was not found" - fi - done - fi -} - -src_prepare() { - # sanity check, bumping these has a history of oversights - local geckomono=$(sed -En '/^#define (GECKO|MONO)_VER/{s/[^0-9.]//gp}' \ - dlls/appwiz.cpl/addons.c || die) - if [[ ${WINE_GECKO}$'\n'${WINE_MONO} != "${geckomono}" ]]; then - local gmfatal= - [[ ${PV} == *9999 ]] && gmfatal=nonfatal - ${gmfatal} die -n "gecko/mono mismatch in ebuild, has: " ${geckomono} " (please file a bug)" - fi - - default - - if tc-is-clang; then - # -mabi=ms was ignored by /etc/portage/env/app-emulation/wine-proton -} - -src_configure() { - WINE_PREFIX=/usr/lib/${P} - WINE_DATADIR=/usr/share/${P} - - local conf=( - --prefix="${EPREFIX}"${WINE_PREFIX} - --datadir="${EPREFIX}"${WINE_DATADIR} - --includedir="${EPREFIX}"/usr/include/${P} - --libdir="${EPREFIX}"${WINE_PREFIX} - --mandir="${EPREFIX}"${WINE_DATADIR}/man - - # upstream (Valve) doesn't really support misc configurations (e.g. - # adds vulkan code not always guarded by --with-vulkan), so force - # some major options that are typically needed by games either way - --with-freetype - --with-mingw # needed by many, notably Blizzard titles - --with-opengl - --with-vulkan - --with-x - - # ...and disable most options unimportant for games and unused by - # Proton rather than expose as volatile USEs with little support - --without-capi - --without-cups - --without-gphoto - --without-gssapi - --without-krb5 - --without-ldap - --without-netapi - --without-opencl - --without-pcap - --without-sane - ac_cv_lib_soname_odbc= - - $(use_enable gecko mshtml) - $(use_enable mono mscoree) - --disable-tests - $(use_with alsa) - $(use_with fontconfig) - $(use_with gstreamer) - $(use_with nls gettext) - $(use_with openal) - $(use_with osmesa) - --without-oss # media-sound/oss is not packaged (OSSv4) - $(use_with pulseaudio pulse) - $(use_with sdl) - $(use_with ssl gnutls) - $(use_with udev) - $(use_with udisks dbus) # dbus is only used for udisks - $(use_with unwind) - $(use_with usb) - $(use_with v4l v4l2) - $(use_with vkd3d) - $(use_with xcomposite) - $(use_with xinerama) - ) - - tc-ld-force-bfd # builds with non-bfd but broken at runtime (bug #867097) - filter-lto # build failure - filter-flags -Wl,--gc-sections # runtime issues (bug #931329) - use custom-cflags || strip-flags # can break in obscure ways at runtime - use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH} - - # broken with gcc-15's c23 default (TODO: try w/o occasionally, bug #943849) - append-cflags -std=gnu17 - - # temporary workaround for tc-ld-force-bfd not yet enforcing with mold - # https://github.com/gentoo/gentoo/pull/28355 - [[ $($(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) == mold* ]] && - append-ldflags -fuse-ld=bfd - - # >=wine-proton-9 has proper fixes and builds with gcc-14, but would - # rather not have to worry about fixing old branches (bug #924486) - append-cflags $(test-flags-CC -Wno-error=incompatible-pointer-types) - - # build using upstream's way (--with-wine64) - # order matters: configure+compile 64->32, install 32->64 - local -i bits - for bits in $(usev abi_x86_64 64) $(usev abi_x86_32 32); do - ( - einfo "Configuring ${PN} for ${bits}bits in ${WORKDIR}/build${bits} ..." - - mkdir ../build${bits} || die - cd ../build${bits} || die - - # CROSSCC_amd64/x86 are unused by Wine, but recognized here for users - if (( bits == 64 )); then - : "${CROSSCC:=${CROSSCC_amd64:-x86_64-w64-mingw32-gcc}}" - conf+=( --enable-win64 ) - elif use amd64; then - conf+=( - $(usev abi_x86_64 --with-wine64=../build64) - TARGETFLAGS=-m32 # for widl - ) - # _setup is optional, but use over Wine's auto-detect (+#472038) - multilib_toolchain_setup x86 - fi - : "${CROSSCC:=${CROSSCC_x86:-i686-w64-mingw32-gcc}}" - - # use *FLAGS for mingw, but strip unsupported (e.g. --hash-style=gnu) - : "${CROSSCFLAGS:=$( - filter-flags '-fstack-protector*' #870136 - filter-flags '-mfunction-return=thunk*' #878849 - - # some bashrc-mv users tend to do CFLAGS="${LDFLAGS}" and then - # strip-unsupported-flags miss these during compile-only tests - # (primarily done for 23.0 profiles' -z, not full coverage) - filter-flags '-Wl,-z,*' - - # -mavx with mingw-gcc has a history of obscure issues and - # disabling is seen as safer, e.g. `WINEARCH=win32 winecfg` - # crashes with -march=skylake >=wine-8.10, similar issues with - # znver4: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110273 - append-cflags -mno-avx #912268 - - CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}" - : "${CROSSLDFLAGS:=$( - filter-flags '-fuse-ld=*' - CC=${CROSSCC} test-flags-CCLD ${LDFLAGS})}" - export CROSS{CC,{C,LD}FLAGS} - - ECONF_SOURCE=${S} econf "${conf[@]}" - ) - done -} - -src_compile() { - use abi_x86_64 && emake -C ../build64 # do first - use abi_x86_32 && emake -C ../build32 -} - -src_install() { - use abi_x86_32 && emake DESTDIR="${D}" -C ../build32 install - use abi_x86_64 && emake DESTDIR="${D}" -C ../build64 install # do last - - # symlink for plain 'wine' and install its man pages if 64bit-only #404331 - if use abi_x86_64 && use !abi_x86_32; then - dosym wine64 ${WINE_PREFIX}/bin/wine - dosym wine64-preloader ${WINE_PREFIX}/bin/wine-preloader - local man - for man in ../build64/loader/wine.*man; do - : "${man##*/wine}" - : "${_%.*}" - insinto ${WINE_DATADIR}/man/${_:+${_#.}/}man1 - newins ${man} wine.1 - done - fi - - use perl || rm "${ED}"${WINE_DATADIR}/man/man1/wine{dump,maker}.1 \ - "${ED}"${WINE_PREFIX}/bin/{function_grep.pl,wine{dump,maker}} || die - - # create variant wrappers for eselect-wine - local bin - for bin in "${ED}"${WINE_PREFIX}/bin/*; do - make_wrapper "${bin##*/}-${P#wine-}" "${bin#"${ED}"}" - done - - # don't let portage try to strip PE files with the wrong - # strip executable and instead handle it here (saves ~120MB) - dostrip -x ${WINE_PREFIX}/wine/{i386,x86_64}-windows - use debug || - find "${ED}"${WINE_PREFIX}/wine/*-windows -regex '.*\.\(a\|dll\|exe\)' \ - -exec $(usex abi_x86_64 x86_64 i686)-w64-mingw32-strip --strip-unneeded {} + || die - - dodoc ANNOUNCE AUTHORS README* documentation/README* - readme.gentoo_create_doc -} - -pkg_preinst() { - has_version ${CATEGORY}/${PN} && WINE_HAD_ANY_SLOT= -} - -pkg_postinst() { - [[ -v WINE_HAD_ANY_SLOT ]] || readme.gentoo_print_elog - - if use abi_x86_32; then - # difficult to tell what is needed from here, but try to warn - if has_version 'x11-drivers/nvidia-drivers'; then - if has_version 'x11-drivers/nvidia-drivers[-abi_x86_32]'; then - ewarn "x11-drivers/nvidia-drivers is installed but is built without" - ewarn "USE=abi_x86_32 (ABI_X86=32), hardware acceleration with 32bit" - ewarn "applications under ${PN} will likely not be usable." - ewarn "Multi-card setups may need this on media-libs/mesa as well." - fi - elif has_version 'media-libs/mesa[-abi_x86_32]'; then - ewarn "media-libs/mesa seems to be in use but is built without" - ewarn "USE=abi_x86_32 (ABI_X86=32), hardware acceleration with 32bit" - ewarn "applications under ${PN} will likely not be usable." - fi - fi - - ewarn - ewarn "Warning: please consider ${PN} provided as-is without real" - ewarn "support. Upstream does not want bug reports unless can reproduce" - ewarn "with real Steam+Proton, and Gentoo is largely unable to help" - ewarn "unless it is a build/packaging issue. So, if need support, try" - ewarn "normal Wine or Proton instead." - - eselect wine update --if-unset || die -} - -pkg_postrm() { - eselect wine update --if-unset || die -}