From f20958f66a5e97c92cc44354e07e3e3089dfc23d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 2 May 2023 23:23:40 +0100 Subject: gentoo auto-resync : 02:05:2023 - 23:23:39 --- app-emulation/wine-proton/Manifest | 6 +- .../files/wine-proton-7.0.6-mingw64-11.0.0.patch | 20 ++ app-emulation/wine-proton/wine-proton-7.0.6.ebuild | 1 + .../wine-proton/wine-proton-7.0.9999.ebuild | 326 -------------------- .../wine-proton/wine-proton-8.0.2c.ebuild | 328 +++++++++++++++++++++ 5 files changed, 353 insertions(+), 328 deletions(-) create mode 100644 app-emulation/wine-proton/files/wine-proton-7.0.6-mingw64-11.0.0.patch delete mode 100644 app-emulation/wine-proton/wine-proton-7.0.9999.ebuild create mode 100644 app-emulation/wine-proton/wine-proton-8.0.2c.ebuild (limited to 'app-emulation/wine-proton') diff --git a/app-emulation/wine-proton/Manifest b/app-emulation/wine-proton/Manifest index af0b174c79d5..f8e7ac3f48f3 100644 --- a/app-emulation/wine-proton/Manifest +++ b/app-emulation/wine-proton/Manifest @@ -3,13 +3,15 @@ AUX wine-proton-7.0.4-musl.patch 505 BLAKE2B 5c6d46c505e38c19e4c92e05243244739e6 AUX wine-proton-7.0.4-noexecstack.patch 223 BLAKE2B dff1867e2977bd14fcfab9dfa2c2f1d3288f7edca75ddd7c9f02bfd06e9f63fac37bd59ea8aa891e13ab77bac35b369825d5490a9175ed9a7736e523b61d8944 SHA512 4ba3677042b693e513fc7a133c76a509f63d0ca20633d1e8d448bca9534c0d1a0fc58e77fa9b28fd8d936393605e97ee6e3bb5fac00872d6ac5808b7712586e3 AUX wine-proton-7.0.4-restore-menubuilder.patch 572 BLAKE2B 7ace97fb82498d8f19297cab205d8b9ca07c5293172a0b017b5d887ec1f5daeb3ed64eb0a322904e528a72f4a225813c27b544015587d71fce97c41b6b1463a2 SHA512 1384f06d4264e22d332eb12fabd7408b8e250e39c195460f876460fe40d35d617c73100815c395f481e3af66676ccaa1a14592c05f1e5b092bfafe2f87112106 AUX wine-proton-7.0.4-unwind.patch 1694 BLAKE2B 954cb0a395c3b45afc7a3f39f33d34cf041b9cf5a6c77d0a217d296c4c8d1f6503322c4f77188c4729b98318913b9bc86d37b7573713643590550297a0ae372a SHA512 f958e811a4754614bc9e7223f727e2c581c18607dccf14c6d7014012ff29107bd850540a40ff7a62e7bae6b87ae1ac28fd104fbbaf9ce954bf3acb38ddbeb7df +AUX wine-proton-7.0.6-mingw64-11.0.0.patch 849 BLAKE2B 26833ef532e7c5b8b0ae1442485c6c44f55a550c571942be2a894aada62ce87398973dfa5619f5a8d498b51479dda84eeae72803370539a7d28575a74310e173 SHA512 189bb20e8c399374567db308c2d3cf43a2b5e2d76b43970edaa3975c0c4ddb7fa245b9d05ed0f7a3452c8bf5264e743acff5a4830a94abd1c7df13664afc21e7 AUX wine-proton-8.0.1c-unwind.patch 1488 BLAKE2B 1a6d69484fb36f94f32d74679e809cfd7666363bede5dddedd2449e07251823b1ce86a717e06d342eec782aff501f27bc23433511c163da0b2a50c411df7ac53 SHA512 82ff0510fcab35471aa0db8f32f48cd62dbf78b3f5f36e3d191b86be55cb476df1ee689e5cd53c95d4f02199b5900eb0c8a45959693739a6c35e4c8b3cfa243f DIST proton-wine-7.0-5.tar.gz 45724439 BLAKE2B d5ad4f00ca658b31c562c2ff4eb5ae33707126eee44ccfd9f33084ab5d184743034541efe3f9d18eb2a6941111da4c5134555f93769e8370b118b6f04e00ae1e SHA512 b16ace9c0bfa6d2685ea53617be2bba7e82c5c8da604f9e188bf782219785cfaed4317578c4314f2bde89d363a2e115f3bceeaa69d4a85f078a5fdb1ec64d33b DIST proton-wine-7.0-6.tar.gz 45780326 BLAKE2B f140fcfdd1a47904c34a49d0795fa3326d7cf0d3fac8d6c2ef2a4926181a46223f43a2d1ca96c543e800c8c46b2a3cc51ae306a029d68a42608876e869e177d5 SHA512 793bbe2b23042301a1b518717d78cfff01eaffa0388883d010659a45779b9136d33cfac63f0c3fbb1e458953a954b423eb70ac4fa87633352267db890ceb2fef DIST proton-wine-8.0-1d.tar.gz 48198535 BLAKE2B 7ed7c4130d4c74d3f411880d253727469cbdaa78943b7783f3d2162177072503bffd588ba3c6c147014ce4e422850cb49e83c2d2d807777fcd01c101199f922d SHA512 4a5a2a2753f8fd025f8c0fe56341a67ed780befc8ae9bffe03872019d4227ec8324edf892c327b99330c3de29a3b8adaac656b41d3487de03a8a82cef9234da7 +DIST proton-wine-8.0-2c.tar.gz 48207888 BLAKE2B 8dc37f136c6d8758c521c0e5c2f16c88e9ede8b22ce7902bb7377a1555bf6aa5bcfaa46f3b9edb4fced1700675fc50f920f9ead17036c9ad1b8bc742ba7e8de3 SHA512 126c06352b6c8b38c133861ce13bc1ce4f1ecf9d451edc2928db54592707c94b07b3a346eb302895cc96c56fede8679b44111be7e1b451c4059c7afcb5fcff57 EBUILD wine-proton-7.0.5.ebuild 10463 BLAKE2B dcf02ff2ec1ee2720e849dad0d3bc0408c3ff5f87693c76f23b1e6fa53fc3b1f3edea6912601b52e7792e8c0d913d2f2780d5de6bc52ecf878d320d8db204515 SHA512 79ba000715910b4d33d1a96aeeebdb5006e92d1e147beacf104c7504f17d8f58c275bb824da9c58101d6d4b471e7f946d0ed64eb0f7a23dcbff5d01987b2b18b -EBUILD wine-proton-7.0.6.ebuild 10468 BLAKE2B 6776113c3bbf9340b028355d164d9875c5c75c37711ff0c638336777bdb7b4c0529d8d087616d6cf88d2185aaa54330b2359e0550e817b3f82940d493db11a62 SHA512 19ea07774efc5d82cd7ce4ab3b520ff5554aad65efb6a20c593ea262af4a063a80b03f691d8b986dfae9adc507970e5fa50c5d70f5867865b9934490b1436754 -EBUILD wine-proton-7.0.9999.ebuild 10468 BLAKE2B 6776113c3bbf9340b028355d164d9875c5c75c37711ff0c638336777bdb7b4c0529d8d087616d6cf88d2185aaa54330b2359e0550e817b3f82940d493db11a62 SHA512 19ea07774efc5d82cd7ce4ab3b520ff5554aad65efb6a20c593ea262af4a063a80b03f691d8b986dfae9adc507970e5fa50c5d70f5867865b9934490b1436754 +EBUILD wine-proton-7.0.6.ebuild 10516 BLAKE2B 4c6580f3f072652a243f2efbf316b85120afb96b35557ce5b8fb62924e4d6667fb7a57c578842d0c64ece7287c36b326e6568de0486653520cfb5887018eaa70 SHA512 a8d6580120773efd55538493418734db4079133752ea3a998acd76d55cfab1ac5ad769f2ec13d67cc42b67304ffa88535049a627201b0d7eb7271d261afeb03e EBUILD wine-proton-8.0.1d.ebuild 10520 BLAKE2B 8ea5ffaf512ca46588491a4478db8d518a23dede07df3ea5ef075d9f28e5ed7082f9adec0aadccf6b32a26455a134a705d7c01c593f9f8ecfd9aa1a063742a3f SHA512 76cb1f93deb70d365d9615078f4ced3b381d4746590fd56d1685f41869c94e3609c37ef37704c27f3203ad8edd0fc5db2f192a7bd551050df431d763f10bf7c1 +EBUILD wine-proton-8.0.2c.ebuild 10520 BLAKE2B 8ea5ffaf512ca46588491a4478db8d518a23dede07df3ea5ef075d9f28e5ed7082f9adec0aadccf6b32a26455a134a705d7c01c593f9f8ecfd9aa1a063742a3f SHA512 76cb1f93deb70d365d9615078f4ced3b381d4746590fd56d1685f41869c94e3609c37ef37704c27f3203ad8edd0fc5db2f192a7bd551050df431d763f10bf7c1 EBUILD wine-proton-8.0.9999.ebuild 10520 BLAKE2B 8ea5ffaf512ca46588491a4478db8d518a23dede07df3ea5ef075d9f28e5ed7082f9adec0aadccf6b32a26455a134a705d7c01c593f9f8ecfd9aa1a063742a3f SHA512 76cb1f93deb70d365d9615078f4ced3b381d4746590fd56d1685f41869c94e3609c37ef37704c27f3203ad8edd0fc5db2f192a7bd551050df431d763f10bf7c1 MISC metadata.xml 1222 BLAKE2B 75e8a33a16e4d718c5299ae719cdd009e9ac6f0d2eafb112c9e38e7d860a51d7f4d5be14912c1c812718b36fd4d71a9d3ddf2c68f5a076fc71f5d47fab120736 SHA512 3fc770b9d6f1e7cb7cba7fc28f90d5f51ad431f38e757dcb47b03543985d0919e29b6648b8c3f6bb6e1c7b172bb164cde35e2fea24564e476088c1a91e6131c8 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 new file mode 100644 index 000000000000..54ecc49c7235 --- /dev/null +++ b/app-emulation/wine-proton/files/wine-proton-7.0.6-mingw64-11.0.0.patch @@ -0,0 +1,20 @@ +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/wine-proton-7.0.6.ebuild b/app-emulation/wine-proton/wine-proton-7.0.6.ebuild index 2c927df19297..0479380661a8 100644 --- a/app-emulation/wine-proton/wine-proton-7.0.6.ebuild +++ b/app-emulation/wine-proton/wine-proton-7.0.6.ebuild @@ -117,6 +117,7 @@ PATCHES=( "${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 ) pkg_pretend() { diff --git a/app-emulation/wine-proton/wine-proton-7.0.9999.ebuild b/app-emulation/wine-proton/wine-proton-7.0.9999.ebuild deleted file mode 100644 index 2c927df19297..000000000000 --- a/app-emulation/wine-proton/wine-proton-7.0.9999.ebuild +++ /dev/null @@ -1,326 +0,0 @@ -# Copyright 2022-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MULTILIB_COMPAT=( abi_x86_{32,64} ) -PYTHON_COMPAT=( python3_{9..11} ) -inherit autotools flag-o-matic multilib multilib-build python-any-r1 -inherit 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="experimental_$(ver_cut 1-2)" -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[${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? ( sys-libs/llvm-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 -) - -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 - - # ensure .desktop calls this variant + slot - sed -i "/^Exec=/s/wine /${P} /" loader/wine.desktop || die - - # similarly to staging, append to `wine --version` for identification - sed -i "s/wine_build[^1]*1/& (Proton-${WINE_PV})/" configure.ac || die - - # always update for patches (including user's wrt #432348) - eautoreconf - tools/make_requests || die # perl - dlls/winevulkan/make_vulkan -x vk.xml || die # python, needed for proton's -} - -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 - use custom-cflags || strip-flags # can break in obscure ways at runtime - use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH} - - # 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 - - # 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 - 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 - - eselect wine update --if-unset || die -} - -pkg_postrm() { - eselect wine update --if-unset || die -} diff --git a/app-emulation/wine-proton/wine-proton-8.0.2c.ebuild b/app-emulation/wine-proton/wine-proton-8.0.2c.ebuild new file mode 100644 index 000000000000..62e33d58f9bd --- /dev/null +++ b/app-emulation/wine-proton/wine-proton-8.0.2c.ebuild @@ -0,0 +1,328 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MULTILIB_COMPAT=( abi_x86_{32,64} ) +PYTHON_COMPAT=( python3_{9..11} ) +inherit autotools flag-o-matic multilib multilib-build python-any-r1 +inherit readme.gentoo-r1 toolchain-funcs wrapper + +WINE_GECKO=2.47.3 +WINE_MONO=7.4.1 +WINE_PV=$(ver_rs 2 -) + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/ValveSoftware/wine.git" + EGIT_BRANCH="experimental_$(ver_cut 1-2)" +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 OPENLDAP 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 osmesa + perl pulseaudio +sdl selinux +ssl udev udisks +unwind usb v4l + +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[${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}] + ) + pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] ) + udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] ) + unwind? ( + llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] ) + !llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] ) + ) + usb? ( dev-libs/libusb:1[${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}-8.0.1c-unwind.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 + + # ensure .desktop calls this variant + slot + sed -i "/^Exec=/s/wine /${P} /" loader/wine.desktop || die + + # similarly to staging, append to `wine --version` for identification + sed -i "s/wine_build[^1]*1/& (Proton-${WINE_PV})/" configure.ac || die + + # always update for patches (including user's wrt #432348) + eautoreconf + tools/make_requests || die # perl + dlls/winevulkan/make_vulkan -x vk.xml || die # python, needed for proton's +} + +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-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 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 xcomposite) + $(use_with xinerama) + ) + + tc-ld-force-bfd # builds with non-bfd but broken at runtime (bug #867097) + filter-lto # build failure + use custom-cflags || strip-flags # can break in obscure ways at runtime + use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH} + + # 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 + + # 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 + + 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 + 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}}" + + # 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:=$( + # >=wine-7.21 configure.ac no longer adds -fno-strict by mistake + append-cflags '-fno-strict-aliasing' + filter-flags '-fstack-protector*' #870136 + filter-flags '-mfunction-return=thunk*' #878849 + CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}" + : "${CROSSLDFLAGS:=$( + filter-flags '-fuse-ld=*' + CC=${CROSSCC} test-flags-CCLD ${LDFLAGS})}" + export CROSS{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 + + eselect wine update --if-unset || die +} + +pkg_postrm() { + eselect wine update --if-unset || die +} -- cgit v1.2.3