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 E06C21584AD for ; Wed, 30 Apr 2025 02:36:31 +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 C174B343024 for ; Wed, 30 Apr 2025 02:36:31 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id E9F561103C0; Wed, 30 Apr 2025 02:36:21 +0000 (UTC) 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 bobolink.gentoo.org (Postfix) with ESMTPS id E5C8E1103C0 for ; Wed, 30 Apr 2025 02:36:21 +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 94E72340DD9 for ; Wed, 30 Apr 2025 02:36:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A33F4266A for ; Wed, 30 Apr 2025 02:36:18 +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: <1745980428.15fdeae19d121f92eb6f130f6115b50fa7f5d9a8.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/wine-proton/Manifest app-emulation/wine-proton/wine-proton-10.0.1b.ebuild X-VCS-Directories: app-emulation/wine-proton/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 15fdeae19d121f92eb6f130f6115b50fa7f5d9a8 X-VCS-Branch: master Date: Wed, 30 Apr 2025 02:36:18 +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: 47d89d23-47ac-499b-a294-cb905894908a X-Archives-Hash: 6f24d34a8620022edec37477e67eb095 commit: 15fdeae19d121f92eb6f130f6115b50fa7f5d9a8 Author: Ionen Wolkens gentoo org> AuthorDate: Tue Apr 29 22:47:25 2025 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Wed Apr 30 02:33:48 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15fdeae1 app-emulation/wine-proton: add 10.0.1b Consider this experimental, may want to stick to wine-proton-9 for now if do not want games to break. Changes: * Tentatively re-add X + wayland IUSE, albeit I cannot particularly recommend wayland-only for games at the moment (this did not even support GL with wayland last version) and it is unlikey Valve tests that configuration * make_vulkan newly needs `-X video.xml` to avoid downloading it * pass --without-piper like wine-proton-9999 does, not packaged * drop vulkan-libm.patch, ceil is no longer used Beside that, only changes are typical to changes between wine-9 and 10 and are not proton specific. Not much seem to have changed with proton patches that need ebuild changes albeit it is hard to say at a glance. Signed-off-by: Ionen Wolkens gentoo.org> app-emulation/wine-proton/Manifest | 1 + .../wine-proton/wine-proton-10.0.1b.ebuild | 245 +++++++++++++++++++++ 2 files changed, 246 insertions(+) diff --git a/app-emulation/wine-proton/Manifest b/app-emulation/wine-proton/Manifest index 3221632246df..49e1f30bb925 100644 --- a/app-emulation/wine-proton/Manifest +++ b/app-emulation/wine-proton/Manifest @@ -1,2 +1,3 @@ +DIST proton-wine-10.0-1b.tar.gz 52174837 BLAKE2B 3ee655d34cf469265aa405e4079d80c8bfadbaa1d49d21d80cec55ef568f8a330212d1d104785f435deb778c2b74a7b0b3c5a82822c2875cff6d35eaa06c569e SHA512 752dfa5182f0eb9ada4bb75e6877382d04a19ba9e0945b1affeb24bd31a151a98d473986054510086120f1165e715dfe48c24efb51dacb7d372795f57a2517ce DIST proton-wine-8.0-5c.tar.gz 48710071 BLAKE2B 99627baea6fb3d51231aa1e75a2734c3c1baba88326baf15b3d421d57a00472d25ba51c2140b51152c8aeae7dd240d3d77bb0d8835aa7eb3b745a51be120f8bb SHA512 0cf98d4e67866e55cc8cd5ea8da0d76aee8e37b130b3cbca604083c913e98ddf9038ecd6f9761d2e11443e282b372977400e251456c6d40e1365210c7578234d DIST proton-wine-9.0-4.tar.gz 49339922 BLAKE2B 914ca093ac288c26400e4eeb2ea33943fc8ad89052aa7c97b5c44286dc175745720455d65163baa90b0d0271eb8028549315a3e8095b91947db2bd96c6fc4852 SHA512 e061f0a55b25493f67ca3add8c7e41020bb57cb15e8fb4fdf3c23f0cab2d00b703c90fbcf0dc1ca8b67e1726a76cee910e9ea6f567c88bc6c520dd6c9dbb75e9 diff --git a/app-emulation/wine-proton/wine-proton-10.0.1b.ebuild b/app-emulation/wine-proton/wine-proton-10.0.1b.ebuild new file mode 100644 index 000000000000..99f3e85107f0 --- /dev/null +++ b/app-emulation/wine-proton/wine-proton-10.0.1b.ebuild @@ -0,0 +1,245 @@ +# Copyright 2022-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..13} ) +inherit optfeature python-any-r1 readme.gentoo-r1 toolchain-funcs wine + +WINE_GECKO=2.47.4 +WINE_MONO=9.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 BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff" +SLOT="${PV}" +IUSE=" + +X +alsa crossdev-mingw +dbus ffmpeg +fontconfig +gecko +gstreamer + llvm-libunwind +mono nls perl pulseaudio +sdl selinux +ssl udev + +unwind usb v4l wayland video_cards_amdgpu +xcomposite xinerama +" +# headless is not really supported with wine-proton, use normal Wine +REQUIRED_USE="|| ( X wayland )" + +# 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:=[${WINE_USEDEP}] + media-libs/freetype[${WINE_USEDEP}] + media-libs/libglvnd[X?,${WINE_USEDEP}] + media-libs/vulkan-loader[X?,wayland?,${WINE_USEDEP}] + X? ( + x11-libs/libXcursor[${WINE_USEDEP}] + x11-libs/libXfixes[${WINE_USEDEP}] + x11-libs/libXi[${WINE_USEDEP}] + x11-libs/libXrandr[${WINE_USEDEP}] + x11-libs/libXrender[${WINE_USEDEP}] + x11-libs/libXxf86vm[${WINE_USEDEP}] + xcomposite? ( x11-libs/libXcomposite[${WINE_USEDEP}] ) + xinerama? ( x11-libs/libXinerama[${WINE_USEDEP}] ) + ) + dbus? ( sys-apps/dbus[${WINE_USEDEP}] ) + fontconfig? ( media-libs/fontconfig[${WINE_USEDEP}] ) + sdl? ( media-libs/libsdl2[haptic,joystick,${WINE_USEDEP}] ) + ssl? ( + dev-libs/gmp:=[${WINE_USEDEP}] + net-libs/gnutls:=[${WINE_USEDEP}] + ) + v4l? ( media-libs/libv4l[${WINE_USEDEP}] ) +" +WINE_COMMON_DEPEND=" + ${WINE_DLOPEN_DEPEND} + X? ( + x11-libs/libX11[${WINE_USEDEP}] + x11-libs/libXext[${WINE_USEDEP}] + ) + alsa? ( media-libs/alsa-lib[${WINE_USEDEP}] ) + ffmpeg? ( media-video/ffmpeg:=[${WINE_USEDEP}] ) + gstreamer? ( + dev-libs/glib:2[${WINE_USEDEP}] + media-libs/gst-plugins-base:1.0[opengl,${WINE_USEDEP}] + media-libs/gstreamer:1.0[${WINE_USEDEP}] + ) + pulseaudio? ( media-libs/libpulse[${WINE_USEDEP}] ) + udev? ( virtual/libudev:=[${WINE_USEDEP}] ) + unwind? ( + llvm-libunwind? ( llvm-runtimes/libunwind[${WINE_USEDEP}] ) + !llvm-libunwind? ( sys-libs/libunwind:=[${WINE_USEDEP}] ) + ) + usb? ( dev-libs/libusb:1[${WINE_USEDEP}] ) + video_cards_amdgpu? ( x11-libs/libdrm[video_cards_amdgpu,${WINE_USEDEP}] ) + wayland? ( + dev-libs/wayland[${WINE_USEDEP}] + x11-libs/libxkbcommon[${WINE_USEDEP}] + ) +" +RDEPEND=" + ${WINE_COMMON_DEPEND} + app-emulation/wine-desktop-common + gecko? ( + app-emulation/wine-gecko:${WINE_GECKO}[${WINE_USEDEP}] + wow64? ( app-emulation/wine-gecko[abi_x86_32] ) + ) + gstreamer? ( media-plugins/gst-plugins-meta:1.0[${WINE_USEDEP}] ) + mono? ( app-emulation/wine-mono:${WINE_MONO} ) + perl? ( + dev-lang/perl + dev-perl/XML-LibXML + ) + selinux? ( sec-policy/selinux-wine ) +" +DEPEND=" + ${WINE_COMMON_DEPEND} + || ( + sys-devel/gcc:* + llvm-runtimes/compiler-rt:*[atomic-builtins(-)] + ) + sys-kernel/linux-headers + X? ( x11-base/xorg-proto ) +" +BDEPEND=" + ${PYTHON_DEPS} + dev-lang/perl + sys-devel/bison + sys-devel/flex + virtual/pkgconfig + nls? ( sys-devel/gettext ) + wayland? ( dev-util/wayland-scanner ) +" + +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}-8.0.1c-unwind.patch + "${FILESDIR}"/${PN}-8.0.4-restore-menubuilder.patch + "${FILESDIR}"/${PN}-9.0-rpath.patch + "${FILESDIR}"/${PN}-9.0.4-binutils2.44.patch +) + +src_prepare() { + wine_src_prepare + + # this is kind-of best effort and ignores llvm slots, ideally + # atomic-builtins should be package.use.force then could drop this + if tc-is-clang && [[ $(tc-get-c-rtlib) == compiler-rt ]] && + has_version -d 'llvm-runtimes/compiler-rt[-atomic-builtins(-)]' + then + # needed by Valve's fsync patches if using compiler-rt w/o atomics + sed -e '/^UNIX_LIBS.*=/s/$/ -latomic/' \ + -i dlls/{ntdll,winevulkan}/Makefile.in || die + fi + + # similarly to staging, append to `wine --version` for identification + sed -i "s/wine_build[^1]*1/& (Proton-${WINE_PV})/" configure.ac || die + + # proton variant also needs specfiles and vulkan + tools/make_specfiles || die # perl + dlls/winevulkan/make_vulkan -X video.xml -x vk.xml || die # python +} + +src_configure() { + local wineconfargs=( + # upstream (Valve) doesn't really support misc configurations (e.g. + # adds vulkan code not always guarded by --with-vulkan), so force + # some options that are typically needed by games either way + --with-freetype + --with-opengl + --with-vulkan + + # ...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-pcsclite + --without-sane + ac_cv_lib_soname_odbc= + + $(use_enable gecko mshtml) + $(use_enable mono mscoree) + $(use_enable video_cards_amdgpu amd_ags_x64) + --disable-tests + + $(use_with X x) + $(use_with alsa) + $(use_with dbus) + $(use_with ffmpeg) + $(use_with fontconfig) + $(use_with gstreamer) + $(use_with nls gettext) + --without-osmesa # media-libs/mesa no longer supports this + --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 unwind) + $(use_with usb) + $(use_with v4l v4l2) + $(use_with wayland) + $(use_with xcomposite) + $(use_with xinerama) + + --without-piper # unpackaged, for tts but unusable without steam + ) + + wine_src_configure +} + +src_install() { + use perl || local WINE_SKIP_INSTALL=( + ${WINE_DATADIR}/man/man1/wine{dump,maker}.1 + ${WINE_PREFIX}/bin/{function_grep.pl,wine{dump,maker}} + ) + + wine_src_install + + dodoc ANNOUNCE* AUTHORS README* documentation/README* + readme.gentoo_create_doc +} + +pkg_preinst() { + has_version ${CATEGORY}/${PN} && WINE_HAD_ANY_SLOT= +} + +pkg_postinst() { + wine_src_postinst + + [[ -v WINE_HAD_ANY_SLOT ]] || readme.gentoo_print_elog + + optfeature "/dev/hidraw* access used for *some* controllers (e.g. DualShock4)" \ + games-util/game-device-udev-rules + + 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." +}