[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2026-02-17 Thread Sam James
commit: 9b34ab5269af9cfaa3440135087f41eb25fa23ea
Author: Sam James  gentoo  org>
AuthorDate: Wed Feb 18 07:13:08 2026 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Feb 18 07:13:08 2026 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b34ab52

app-emulation/wine-proton: Stabilize 10.0.4 amd64, #970169

Signed-off-by: Sam James  gentoo.org>

 app-emulation/wine-proton/wine-proton-10.0.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/wine-proton/wine-proton-10.0.4.ebuild 
b/app-emulation/wine-proton/wine-proton-10.0.4.ebuild
index 3b7a3dd6a4fc..a08574e05cf9 100644
--- a/app-emulation/wine-proton/wine-proton-10.0.4.ebuild
+++ b/app-emulation/wine-proton/wine-proton-10.0.4.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} ==  ]]; then
 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"
+   KEYWORDS="-* amd64 ~x86"
 fi
 
 DESCRIPTION="Valve Software's fork of Wine"



[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2026-01-26 Thread Ionen Wolkens
commit: 4f5bcd843f9055a26a1dd824fc39426fd43110ff
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Jan 27 00:00:52 2026 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Jan 27 00:00:52 2026 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f5bcd84

app-emulation/wine-proton: add 10.0.4

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/Manifest |   1 +
 .../wine-proton/wine-proton-10.0.4.ebuild  | 256 +
 2 files changed, 257 insertions(+)

diff --git a/app-emulation/wine-proton/Manifest 
b/app-emulation/wine-proton/Manifest
index cbcdfa7b4490..e19d96909fc3 100644
--- a/app-emulation/wine-proton/Manifest
+++ b/app-emulation/wine-proton/Manifest
@@ -1,3 +1,4 @@
 DIST proton-wine-10.0-3.tar.gz 52629264 BLAKE2B 
14edd27b736e3c980d8b92ed8e9c1f3c07084431ffbc9253ddf3b800fa47ac0b21ef22e402decb6e3ad505574b9b37aa4ac1fe8e210f9df2d2f0ca7762326571
 SHA512 
0140fcb4a145542d4163ad2a25fb0da8d361b202e4d77bad852e533487524d0abe772e38feec91ca0b14bad7c6ac8e44282d776adf31b9bcba1d95d31b5551b8
+DIST proton-wine-10.0-4.tar.gz 52736432 BLAKE2B 
71986c2362934879d5d9a74ea13e29593240a9e7a5dc6b9a9ffdfdaf528be4dec2ac34500afcd525fa256d2fed2efc1e3cb6bd7c5f51b4e4249d714ca9bbc3ef
 SHA512 
e74aece7dad25fd1e8041d370718bfd0dd695469c7b74d95209ac6030d0fb30221d1ccce7c8483dddb097c0f1b2df768452de79fd4041c46dd3695934816dd2a
 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.4.ebuild 
b/app-emulation/wine-proton/wine-proton-10.0.4.ebuild
new file mode 100644
index ..3b7a3dd6a4fc
--- /dev/null
+++ b/app-emulation/wine-proton/wine-proton-10.0.4.ebuild
@@ -0,0 +1,256 @@
+# Copyright 2022-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{11..14} )
+inherit optfeature python-any-r1 readme.gentoo-r1 toolchain-funcs wine
+
+WINE_GECKO=2.47.4
+WINE_MONO=10.4.1
+WINE_PV=$(ver_rs 2 -)
+
+if [[ ${PV} ==  ]]; 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
+   || ( WTFPL-2 public-domain )
+"
+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 xinerama
+"
+# headless is not really supported here, and udev needs sdl due to Valve's
+# changes (bug #959263), use normal wine instead if need to avoid these
+REQUIRED_USE="
+   || ( X wayland )
+   udev? ( sdl )
+"
+
+# 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/libXcomposite[${WINE_USEDEP}]
+   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}]
+   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-li

[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2026-01-26 Thread Ionen Wolkens
commit: 633ec2f8ada8a0de5fa25788fd6d9bac7844bd02
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Jan 26 23:38:14 2026 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Jan 26 23:58:39 2026 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=633ec2f8

app-emulation/wine-proton: drop 10.0.2d

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/Manifest |   1 -
 .../wine-proton/wine-proton-10.0.2d.ebuild | 256 -
 2 files changed, 257 deletions(-)

diff --git a/app-emulation/wine-proton/Manifest 
b/app-emulation/wine-proton/Manifest
index 31ba629fa53f..cbcdfa7b4490 100644
--- a/app-emulation/wine-proton/Manifest
+++ b/app-emulation/wine-proton/Manifest
@@ -1,4 +1,3 @@
-DIST proton-wine-10.0-2d.tar.gz 52537248 BLAKE2B 
1a696a51d9c34ba6f3801561eb0cef37b60857917785da677bb24b383c8e4d1865e54cc0de696cd4d41d8778d5ff7c5660cbdd909864d0ae8daa63364376abaa
 SHA512 
006651f1b54cee410093ade7229ffa0d8932556c157b0caf7ba9cd96a39495d499fc4432b6b7d94733c7055f21b9e62b250c783787f82a97b78a52197dd948b1
 DIST proton-wine-10.0-3.tar.gz 52629264 BLAKE2B 
14edd27b736e3c980d8b92ed8e9c1f3c07084431ffbc9253ddf3b800fa47ac0b21ef22e402decb6e3ad505574b9b37aa4ac1fe8e210f9df2d2f0ca7762326571
 SHA512 
0140fcb4a145542d4163ad2a25fb0da8d361b202e4d77bad852e533487524d0abe772e38feec91ca0b14bad7c6ac8e44282d776adf31b9bcba1d95d31b5551b8
 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.2d.ebuild 
b/app-emulation/wine-proton/wine-proton-10.0.2d.ebuild
deleted file mode 100644
index 0b1c9b2a2e7e..
--- a/app-emulation/wine-proton/wine-proton-10.0.2d.ebuild
+++ /dev/null
@@ -1,256 +0,0 @@
-# Copyright 2022-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{11..14} )
-inherit optfeature python-any-r1 readme.gentoo-r1 toolchain-funcs wine
-
-WINE_GECKO=2.47.4
-WINE_MONO=10.0.0
-WINE_PV=$(ver_rs 2 -)
-
-if [[ ${PV} ==  ]]; 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
-   || ( WTFPL-2 public-domain )
-"
-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 here, and udev needs sdl due to Valve's
-# changes (bug #959263), use normal wine instead if need to avoid these
-REQUIRED_USE="
-   || ( X wayland )
-   udev? ( sdl )
-"
-
-# 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[${

[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2026-01-06 Thread Ionen Wolkens
commit: 456e42acd0b325d42f66487e405b5be36f1a4cf9
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Jan  6 20:57:41 2026 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Jan  6 20:57:51 2026 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=456e42ac

app-emulation/wine-proton: update live

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/wine-proton-.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-emulation/wine-proton/wine-proton-.ebuild 
b/app-emulation/wine-proton/wine-proton-.ebuild
index 63d3efad2137..3b7a3dd6a4fc 100644
--- a/app-emulation/wine-proton/wine-proton-.ebuild
+++ b/app-emulation/wine-proton/wine-proton-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2025 Gentoo Authors
+# Copyright 2022-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{11..14} )
 inherit optfeature python-any-r1 readme.gentoo-r1 toolchain-funcs wine
 
 WINE_GECKO=2.47.4
-WINE_MONO=10.4.0
+WINE_MONO=10.4.1
 WINE_PV=$(ver_rs 2 -)
 
 if [[ ${PV} ==  ]]; then



[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/, app-emulation/wine-staging/, ...

2025-12-15 Thread Ionen Wolkens
commit: 8356688c4e9b8dfa1a637c84e35304cac57de954
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Dec 15 23:53:39 2025 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Dec 16 00:05:29 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8356688c

app-emulation/wine-*: drop IUSE=xcomposite in live (enabled with X)

Was already default and feel there is no reason to ever disable this
with USE=X, and disabling seem to have recently been causing issues
with CEF / Steam and similar which may be hard to figure out for users.

Leaving off-by-default IUSE=xinerama alone given it is hardly needed
nowadays and can be considered deprecated, no reason to force users to
newly set USE=abi_x86_32 on an extra library over this.

Will backport the change to other versions probably after wine-11 is
stable (if do not forget) to minimize rebuilds. Likely will not revbump
all wine versions over even though it's a removed->enabled change.

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/wine-proton-.ebuild   | 5 ++---
 app-emulation/wine-staging/wine-staging-.ebuild | 5 ++---
 app-emulation/wine-vanilla/wine-vanilla-.ebuild | 5 ++---
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/app-emulation/wine-proton/wine-proton-.ebuild 
b/app-emulation/wine-proton/wine-proton-.ebuild
index 44509dccf3da..63d3efad2137 100644
--- a/app-emulation/wine-proton/wine-proton-.ebuild
+++ b/app-emulation/wine-proton/wine-proton-.ebuild
@@ -31,7 +31,7 @@ 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
+   +unwind usb v4l wayland video_cards_amdgpu xinerama
 "
 # headless is not really supported here, and udev needs sdl due to Valve's
 # changes (bug #959263), use normal wine instead if need to avoid these
@@ -51,13 +51,13 @@ WINE_DLOPEN_DEPEND="
media-libs/libglvnd[X?,${WINE_USEDEP}]
media-libs/vulkan-loader[X?,wayland?,${WINE_USEDEP}]
X? (
+   x11-libs/libXcomposite[${WINE_USEDEP}]
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}] )
@@ -214,7 +214,6 @@ src_configure() {
$(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

diff --git a/app-emulation/wine-staging/wine-staging-.ebuild 
b/app-emulation/wine-staging/wine-staging-.ebuild
index e2746ef1b3b0..a93ef2a49b5a 100644
--- a/app-emulation/wine-staging/wine-staging-.ebuild
+++ b/app-emulation/wine-staging/wine-staging-.ebuild
@@ -41,7 +41,7 @@ IUSE="
+fontconfig +gecko gphoto2 +gstreamer kerberos +mono netapi
nls odbc opencl +opengl pcap perl pulseaudio samba scanner
+sdl selinux smartcard +ssl +truetype udev +unwind usb v4l
-   +vulkan wayland +xcomposite xinerama
+   +vulkan wayland xinerama
 "
 REQUIRED_USE="
X? ( truetype )
@@ -56,13 +56,13 @@ RESTRICT="test"
 # `grep WINE_CHECK_SONAME configure.ac` + if not directly linked
 WINE_DLOPEN_DEPEND="
X? (
+   x11-libs/libXcomposite[${WINE_USEDEP}]
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}] )
)
cups? ( net-print/cups[${WINE_USEDEP}] )
@@ -228,7 +228,6 @@ src_configure() {
$(use_with v4l v4l2)
$(use_with vulkan)
$(use_with wayland)
-   $(use_with xcomposite)
$(use_with xinerama)
 
$(usev !bluetooth '

diff --git a/app-emulation/wine-vanilla/wine-vanilla-.ebuild 
b/app-emulation/wine-vanilla/wine-vanilla-.ebuild
index 51b66905e8f9..f19e4ee6943a 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-.ebuild
@@ -35,7 +35,7 @@ IUSE="
+fontconfig +gecko gphoto2 +gstreamer kerberos +mono netapi
nls odbc opencl +openg

[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2025-12-06 Thread Ionen Wolkens
commit: f5e58d9b4bb3d7260b8b1a80c2aad8e9e5ce6c10
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sun Dec  7 05:09:56 2025 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sun Dec  7 05:10:18 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5e58d9b

app-emulation/wine-proton: update live

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/wine-proton-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/wine-proton/wine-proton-.ebuild 
b/app-emulation/wine-proton/wine-proton-.ebuild
index 5f6ffda50903..44509dccf3da 100644
--- a/app-emulation/wine-proton/wine-proton-.ebuild
+++ b/app-emulation/wine-proton/wine-proton-.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{11..14} )
 inherit optfeature python-any-r1 readme.gentoo-r1 toolchain-funcs wine
 
 WINE_GECKO=2.47.4
-WINE_MONO=10.3.0
+WINE_MONO=10.4.0
 WINE_PV=$(ver_rs 2 -)
 
 if [[ ${PV} ==  ]]; then



[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2025-12-06 Thread Ionen Wolkens
commit: 45e5c79c9a6864fe1272525b9700422e7ece11af
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sat Dec  6 08:01:09 2025 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat Dec  6 11:32:24 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45e5c79c

app-emulation/wine-proton: stabilize 10.0.3 for amd64

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/wine-proton-10.0.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/wine-proton/wine-proton-10.0.3.ebuild 
b/app-emulation/wine-proton/wine-proton-10.0.3.ebuild
index 3e4341c6c1ab..0b1c9b2a2e7e 100644
--- a/app-emulation/wine-proton/wine-proton-10.0.3.ebuild
+++ b/app-emulation/wine-proton/wine-proton-10.0.3.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} ==  ]]; then
 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"
+   KEYWORDS="-* amd64 ~x86"
 fi
 
 DESCRIPTION="Valve Software's fork of Wine"



[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2025-11-14 Thread Ionen Wolkens
commit: f7ef589db2b8d1b7051c2eb29af0037bb81b4f48
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri Nov 14 11:41:16 2025 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri Nov 14 12:14:06 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7ef589d

app-emulation/wine-proton: add 10.0.3

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/Manifest |   1 +
 .../wine-proton/wine-proton-10.0.3.ebuild  | 256 +
 2 files changed, 257 insertions(+)

diff --git a/app-emulation/wine-proton/Manifest 
b/app-emulation/wine-proton/Manifest
index cb6b40b240a7..31ba629fa53f 100644
--- a/app-emulation/wine-proton/Manifest
+++ b/app-emulation/wine-proton/Manifest
@@ -1,3 +1,4 @@
 DIST proton-wine-10.0-2d.tar.gz 52537248 BLAKE2B 
1a696a51d9c34ba6f3801561eb0cef37b60857917785da677bb24b383c8e4d1865e54cc0de696cd4d41d8778d5ff7c5660cbdd909864d0ae8daa63364376abaa
 SHA512 
006651f1b54cee410093ade7229ffa0d8932556c157b0caf7ba9cd96a39495d499fc4432b6b7d94733c7055f21b9e62b250c783787f82a97b78a52197dd948b1
+DIST proton-wine-10.0-3.tar.gz 52629264 BLAKE2B 
14edd27b736e3c980d8b92ed8e9c1f3c07084431ffbc9253ddf3b800fa47ac0b21ef22e402decb6e3ad505574b9b37aa4ac1fe8e210f9df2d2f0ca7762326571
 SHA512 
0140fcb4a145542d4163ad2a25fb0da8d361b202e4d77bad852e533487524d0abe772e38feec91ca0b14bad7c6ac8e44282d776adf31b9bcba1d95d31b5551b8
 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.3.ebuild 
b/app-emulation/wine-proton/wine-proton-10.0.3.ebuild
new file mode 100644
index ..3e4341c6c1ab
--- /dev/null
+++ b/app-emulation/wine-proton/wine-proton-10.0.3.ebuild
@@ -0,0 +1,256 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{11..14} )
+inherit optfeature python-any-r1 readme.gentoo-r1 toolchain-funcs wine
+
+WINE_GECKO=2.47.4
+WINE_MONO=10.0.0
+WINE_PV=$(ver_rs 2 -)
+
+if [[ ${PV} ==  ]]; 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
+   || ( WTFPL-2 public-domain )
+"
+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 here, and udev needs sdl due to Valve's
+# changes (bug #959263), use normal wine instead if need to avoid these
+REQUIRED_USE="
+   || ( X wayland )
+   udev? ( sdl )
+"
+
+# 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_US

[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2025-11-04 Thread Ionen Wolkens
commit: 02a6484b18522d56606c1c006c3b91f4c429fcdc
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Nov  4 09:47:39 2025 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Nov  4 10:19:38 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02a6484b

app-emulation/wine-proton: drop 10.0.2c

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/Manifest |   1 -
 .../wine-proton/wine-proton-10.0.2c.ebuild | 252 -
 2 files changed, 253 deletions(-)

diff --git a/app-emulation/wine-proton/Manifest 
b/app-emulation/wine-proton/Manifest
index 83378b0a019d..cb6b40b240a7 100644
--- a/app-emulation/wine-proton/Manifest
+++ b/app-emulation/wine-proton/Manifest
@@ -1,4 +1,3 @@
-DIST proton-wine-10.0-2c.tar.gz 52532755 BLAKE2B 
69a7ac41577e24fec9350662420f3991a0834757e1e876be174eb0760ecd9ae60828d0e8612605fefc8f12f7ce474acd324e994edbda3d18a39d7f5e0e666ceb
 SHA512 
8669b0b578fd1d3f9ca9496c2ae1d2f39c082ec841aab15459adf5e5e66fc783bf8e149da5a6341f65e4188b4766273f5b4781f2f63d2fb2c4d0b13649a5a801
 DIST proton-wine-10.0-2d.tar.gz 52537248 BLAKE2B 
1a696a51d9c34ba6f3801561eb0cef37b60857917785da677bb24b383c8e4d1865e54cc0de696cd4d41d8778d5ff7c5660cbdd909864d0ae8daa63364376abaa
 SHA512 
006651f1b54cee410093ade7229ffa0d8932556c157b0caf7ba9cd96a39495d499fc4432b6b7d94733c7055f21b9e62b250c783787f82a97b78a52197dd948b1
 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.2c.ebuild 
b/app-emulation/wine-proton/wine-proton-10.0.2c.ebuild
deleted file mode 100644
index 686b3a0276c0..
--- a/app-emulation/wine-proton/wine-proton-10.0.2c.ebuild
+++ /dev/null
@@ -1,252 +0,0 @@
-# Copyright 2022-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{11..14} )
-inherit optfeature python-any-r1 readme.gentoo-r1 toolchain-funcs wine
-
-WINE_GECKO=2.47.4
-WINE_MONO=10.0.0
-WINE_PV=$(ver_rs 2 -)
-
-if [[ ${PV} ==  ]]; 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
-   || ( WTFPL-2 public-domain )
-"
-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 here, and udev needs sdl due to Valve's
-# changes (bug #959263), use normal wine instead if need to avoid these
-REQUIRED_USE="
-   || ( X wayland )
-   udev? ( sdl )
-"
-
-# 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[

[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/files/, app-emulation/wine-proton/

2025-11-04 Thread Ionen Wolkens
commit: 2a83e65516ede46e788b39a1198b2568e6a703e4
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Nov  4 09:50:54 2025 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Nov  4 10:24:53 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a83e655

app-emulation/wine-proton: always pull gst-plugins-libav+bad

Not overly worth a revbump+rebuild over, but want to propagate
it over time. Hard-dependency also ensures USE=abi_x86_32 is
properly set where needed.

Had an application crash mentioning that h264 support was missing
despite gst-plugins-libav was installed which resolved itself after
installing -bad. Was formerly under the impression -libav was enough
for that but maybe(?) it's needed for h264parser or so before it can
use -libav or -openh264 (possibly only with the way wine is using it).

...and then sometime seen users confused by similar issues despite
"it works with real Proton".

Regardless of if -bad is really needed for h264 or not, real Proton
does ship with -base + -good (provided by -meta), -libav, -bad (with
auto_features=disabled + videoparsers/hls/mpegtsdemux=enabled), and
-dav1d -- so, to ensure things work as expected, let's just hard depend
on everything except -dav1d (from gst-plugins-rs, currently unpackaged
and it would also be an unpopular default given the rust requirement --
hopefully av1 works through libav+ffmpeg[dav1d] but I have not tested).

This may annoy more miminalistic users that didn't need these for their
use case, but would rather not keep this as optfeature or gated behind
USE and instead stay closer to upstream Proton. IMO minimalist users
should use wine-vanilla instead which offers more control in general,
wine-proton is more meant as a "should mostly just work" alternative
for games (e.g. wine-proton doesn't allow disabling opengl/vulkan too,
not tried recently but it didn't even build when vulkan was disabled).

Could take it further and match what Proton enables in each plugins set
like pull gst-plugins-vpx/mpg123/hls among others but believe most of
these should work through -libav and default ffmpeg USE and they may be
redundant (or at least for decoding, games rarely need to do encoding).
Believe Proton enables these given ffmpeg is shipped separately and it
serves as a fallback if missing.

Not depending on e.g. -meta[ffmpeg] as this does nothing but annoy
users into setting the USE. Arguably could drop -meta entirely and
depend on -good but it doesn't hurt to keep to pull additional things
depending on global USE.

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/files/README.gentoo | 4 
 app-emulation/wine-proton/wine-proton-10.0.2d.ebuild  | 6 +-
 app-emulation/wine-proton/wine-proton-8.0.5c.ebuild   | 6 +-
 app-emulation/wine-proton/wine-proton-9.0.4-r2.ebuild | 6 +-
 app-emulation/wine-proton/wine-proton-.ebuild | 6 +-
 5 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/app-emulation/wine-proton/files/README.gentoo 
b/app-emulation/wine-proton/files/README.gentoo
index 48f3d568a013..741ddf0f8ef7 100644
--- a/app-emulation/wine-proton/files/README.gentoo
+++ b/app-emulation/wine-proton/files/README.gentoo
@@ -42,10 +42,6 @@ Many other proton-specific improvements / fixes are always 
enabled, and
 some game-specific quirks are auto-enabled as needed (can see a few from
 running winecfg).
 
-If have audio/video playback issues, note to look at GStreamer plugins.
-Notably USE=ffmpeg on media-plugins/gst-plugins-meta which Proton normally
-provide by default.
-
 ---
 
 If have other Wine variants installed, remember to either use `eselect wine`

diff --git a/app-emulation/wine-proton/wine-proton-10.0.2d.ebuild 
b/app-emulation/wine-proton/wine-proton-10.0.2d.ebuild
index f6707f22b614..0b1c9b2a2e7e 100644
--- a/app-emulation/wine-proton/wine-proton-10.0.2d.ebuild
+++ b/app-emulation/wine-proton/wine-proton-10.0.2d.ebuild
@@ -102,7 +102,11 @@ RDEPEND="
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}] )
+   gstreamer? (
+   media-libs/gst-plugins-bad:1.0[${WINE_USEDEP}]
+   media-plugins/gst-plugins-libav:1.0[${WINE_USEDEP}]
+   media-plugins/gst-plugins-meta:1.0[${WINE_USEDEP}]
+   )
mono? ( app-emulation/wine-mono:${WINE_MONO} )
perl? (
dev-lang/perl

diff --git a/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild 
b/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
index 37fba75f172e..dc65928cf595 100644
--- a/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
+++ b/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
@@ -84,7 +84,11 @@ RDEPEND="
${WINE_COMMON_DEPEND}
app-emulation/wine-desktop-common
gecko? ( app-emulation/wine-gecko:${WINE_GECKO}[${MULTILIB_USEDEP}] )
- 

[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2025-10-24 Thread Arthur Zamarin
commit: 3c5d532d3207cb49f2d496e1ec543b55f97bfe69
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Oct 24 20:35:55 2025 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Oct 24 20:35:55 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c5d532d

app-emulation/wine-proton: Stabilize 10.0.2d amd64, #957548

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-emulation/wine-proton/wine-proton-10.0.2d.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/wine-proton/wine-proton-10.0.2d.ebuild 
b/app-emulation/wine-proton/wine-proton-10.0.2d.ebuild
index 686b3a0276c0..f6707f22b614 100644
--- a/app-emulation/wine-proton/wine-proton-10.0.2d.ebuild
+++ b/app-emulation/wine-proton/wine-proton-10.0.2d.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} ==  ]]; then
 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"
+   KEYWORDS="-* amd64 ~x86"
 fi
 
 DESCRIPTION="Valve Software's fork of Wine"



[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2025-10-17 Thread Ionen Wolkens
commit: 8813b35c4346dfbb8018fcf456ad0751583ba69e
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri Oct 17 23:45:27 2025 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat Oct 18 02:59:05 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8813b35c

app-emulation/wine-proton: update live

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/wine-proton-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/wine-proton/wine-proton-.ebuild 
b/app-emulation/wine-proton/wine-proton-.ebuild
index 76eda374f28d..f0713f1af650 100644
--- a/app-emulation/wine-proton/wine-proton-.ebuild
+++ b/app-emulation/wine-proton/wine-proton-.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{11..14} )
 inherit optfeature python-any-r1 readme.gentoo-r1 toolchain-funcs wine
 
 WINE_GECKO=2.47.4
-WINE_MONO=10.2.0
+WINE_MONO=10.3.0
 WINE_PV=$(ver_rs 2 -)
 
 if [[ ${PV} ==  ]]; then



[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2025-09-04 Thread Ionen Wolkens
commit: a54fe8feadeb288ca296be0d60c357ff6335817d
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu Sep  4 04:25:41 2025 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Sep  4 04:26:06 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a54fe8fe

app-emulation/wine-proton: update live

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/wine-proton-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/wine-proton/wine-proton-.ebuild 
b/app-emulation/wine-proton/wine-proton-.ebuild
index 8dea08a038a7..76eda374f28d 100644
--- a/app-emulation/wine-proton/wine-proton-.ebuild
+++ b/app-emulation/wine-proton/wine-proton-.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{11..14} )
 inherit optfeature python-any-r1 readme.gentoo-r1 toolchain-funcs wine
 
 WINE_GECKO=2.47.4
-WINE_MONO=10.1.0
+WINE_MONO=10.2.0
 WINE_PV=$(ver_rs 2 -)
 
 if [[ ${PV} ==  ]]; then



[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2025-08-26 Thread Ionen Wolkens
commit: 49a51018c40a1b2aff6e69d6a8b0489a9981fe12
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed Aug 27 04:40:00 2025 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Aug 27 04:40:09 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49a51018

app-emulation/wine-proton: update live

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/wine-proton-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/wine-proton/wine-proton-.ebuild 
b/app-emulation/wine-proton/wine-proton-.ebuild
index 889c566b6ed6..8dea08a038a7 100644
--- a/app-emulation/wine-proton/wine-proton-.ebuild
+++ b/app-emulation/wine-proton/wine-proton-.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{11..14} )
 inherit optfeature python-any-r1 readme.gentoo-r1 toolchain-funcs wine
 
 WINE_GECKO=2.47.4
-WINE_MONO=10.0.0
+WINE_MONO=10.1.0
 WINE_PV=$(ver_rs 2 -)
 
 if [[ ${PV} ==  ]]; then



[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2025-08-26 Thread Ionen Wolkens
commit: 6c562ca410d96e9ca06064fa187ed151bb2dd402
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Aug 26 14:52:18 2025 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Aug 26 15:37:56 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c562ca4

app-emulation/wine-proton: add 10.0.2d

Only has a 1 line of code difference compared to 10.0.2c to fix
issues with video playback in some games.

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/Manifest |   1 +
 .../wine-proton/wine-proton-10.0.2d.ebuild | 252 +
 2 files changed, 253 insertions(+)

diff --git a/app-emulation/wine-proton/Manifest 
b/app-emulation/wine-proton/Manifest
index 112d1accdb68..83378b0a019d 100644
--- a/app-emulation/wine-proton/Manifest
+++ b/app-emulation/wine-proton/Manifest
@@ -1,3 +1,4 @@
 DIST proton-wine-10.0-2c.tar.gz 52532755 BLAKE2B 
69a7ac41577e24fec9350662420f3991a0834757e1e876be174eb0760ecd9ae60828d0e8612605fefc8f12f7ce474acd324e994edbda3d18a39d7f5e0e666ceb
 SHA512 
8669b0b578fd1d3f9ca9496c2ae1d2f39c082ec841aab15459adf5e5e66fc783bf8e149da5a6341f65e4188b4766273f5b4781f2f63d2fb2c4d0b13649a5a801
+DIST proton-wine-10.0-2d.tar.gz 52537248 BLAKE2B 
1a696a51d9c34ba6f3801561eb0cef37b60857917785da677bb24b383c8e4d1865e54cc0de696cd4d41d8778d5ff7c5660cbdd909864d0ae8daa63364376abaa
 SHA512 
006651f1b54cee410093ade7229ffa0d8932556c157b0caf7ba9cd96a39495d499fc4432b6b7d94733c7055f21b9e62b250c783787f82a97b78a52197dd948b1
 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.2d.ebuild 
b/app-emulation/wine-proton/wine-proton-10.0.2d.ebuild
new file mode 100644
index ..686b3a0276c0
--- /dev/null
+++ b/app-emulation/wine-proton/wine-proton-10.0.2d.ebuild
@@ -0,0 +1,252 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{11..14} )
+inherit optfeature python-any-r1 readme.gentoo-r1 toolchain-funcs wine
+
+WINE_GECKO=2.47.4
+WINE_MONO=10.0.0
+WINE_PV=$(ver_rs 2 -)
+
+if [[ ${PV} ==  ]]; 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
+   || ( WTFPL-2 public-domain )
+"
+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 here, and udev needs sdl due to Valve's
+# changes (bug #959263), use normal wine instead if need to avoid these
+REQUIRED_USE="
+   || ( X wayland )
+   udev? ( sdl )
+"
+
+# 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}]

[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2025-08-17 Thread Ionen Wolkens
commit: 12529a622c4a37555b024f0084119c1f3141c58a
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Aug 18 05:52:19 2025 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Aug 18 05:52:27 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12529a62

app-emulation/wine-proton: drop 10.0.1f

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/Manifest |   1 -
 .../wine-proton/wine-proton-10.0.1f.ebuild | 249 -
 2 files changed, 250 deletions(-)

diff --git a/app-emulation/wine-proton/Manifest 
b/app-emulation/wine-proton/Manifest
index 1ed885e501b2..112d1accdb68 100644
--- a/app-emulation/wine-proton/Manifest
+++ b/app-emulation/wine-proton/Manifest
@@ -1,4 +1,3 @@
-DIST proton-wine-10.0-1f.tar.gz 52177353 BLAKE2B 
f6d0ca0c8ffed0b71fca63d4d5b185979fc3d7e3d6ff0f9011051b39c5c1f71920c37c3ce5b83937a2b7f47541ce6408e8171a2d76965d848bb76061c61df674
 SHA512 
5e8893f769fc958bf73e671efa23fac2af173b8ee847b37f773631cc99b13eecbcf4782c8c070c663bee3440cce0a6f0d6c7fe889fe58cde4720da6f5c09ca34
 DIST proton-wine-10.0-2c.tar.gz 52532755 BLAKE2B 
69a7ac41577e24fec9350662420f3991a0834757e1e876be174eb0760ecd9ae60828d0e8612605fefc8f12f7ce474acd324e994edbda3d18a39d7f5e0e666ceb
 SHA512 
8669b0b578fd1d3f9ca9496c2ae1d2f39c082ec841aab15459adf5e5e66fc783bf8e149da5a6341f65e4188b4766273f5b4781f2f63d2fb2c4d0b13649a5a801
 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.1f.ebuild 
b/app-emulation/wine-proton/wine-proton-10.0.1f.ebuild
deleted file mode 100644
index 1d58eebd659c..
--- a/app-emulation/wine-proton/wine-proton-10.0.1f.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 2022-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{11..14} )
-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} ==  ]]; 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 here, and udev needs sdl due to Valve's
-# changes (bug #959263), use normal wine instead if need to avoid these
-REQUIRED_USE="
-   || ( X wayland )
-   udev? ( sdl )
-"
-
-# 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[

[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2025-07-29 Thread Ionen Wolkens
commit: 4b13d0f969abb2e3f56a06e70b1109309174dc7a
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed Jul 30 03:20:39 2025 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Jul 30 04:03:22 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b13d0f9

app-emulation/wine-proton: cleanup duplicate sed in live

The 2nd one does nothing given only the one before eautoreconf
matters, seems forgot to remove when updated for wine.eclass
only in live.

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/wine-proton-.ebuild | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app-emulation/wine-proton/wine-proton-.ebuild 
b/app-emulation/wine-proton/wine-proton-.ebuild
index 626d02aae0bb..889c566b6ed6 100644
--- a/app-emulation/wine-proton/wine-proton-.ebuild
+++ b/app-emulation/wine-proton/wine-proton-.ebuild
@@ -160,9 +160,6 @@ src_prepare() {
-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



[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2025-07-29 Thread Ionen Wolkens
commit: 5da48a90473ab28992623c5d969954d4494ca8b7
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed Jul 30 03:25:13 2025 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Jul 30 04:03:22 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5da48a90

app-emulation/wine-proton: add 10.0.2c

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/Manifest |   1 +
 .../wine-proton/wine-proton-10.0.2c.ebuild | 252 +
 2 files changed, 253 insertions(+)

diff --git a/app-emulation/wine-proton/Manifest 
b/app-emulation/wine-proton/Manifest
index 45896ebacfe9..1ed885e501b2 100644
--- a/app-emulation/wine-proton/Manifest
+++ b/app-emulation/wine-proton/Manifest
@@ -1,3 +1,4 @@
 DIST proton-wine-10.0-1f.tar.gz 52177353 BLAKE2B 
f6d0ca0c8ffed0b71fca63d4d5b185979fc3d7e3d6ff0f9011051b39c5c1f71920c37c3ce5b83937a2b7f47541ce6408e8171a2d76965d848bb76061c61df674
 SHA512 
5e8893f769fc958bf73e671efa23fac2af173b8ee847b37f773631cc99b13eecbcf4782c8c070c663bee3440cce0a6f0d6c7fe889fe58cde4720da6f5c09ca34
+DIST proton-wine-10.0-2c.tar.gz 52532755 BLAKE2B 
69a7ac41577e24fec9350662420f3991a0834757e1e876be174eb0760ecd9ae60828d0e8612605fefc8f12f7ce474acd324e994edbda3d18a39d7f5e0e666ceb
 SHA512 
8669b0b578fd1d3f9ca9496c2ae1d2f39c082ec841aab15459adf5e5e66fc783bf8e149da5a6341f65e4188b4766273f5b4781f2f63d2fb2c4d0b13649a5a801
 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.2c.ebuild 
b/app-emulation/wine-proton/wine-proton-10.0.2c.ebuild
new file mode 100644
index ..686b3a0276c0
--- /dev/null
+++ b/app-emulation/wine-proton/wine-proton-10.0.2c.ebuild
@@ -0,0 +1,252 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{11..14} )
+inherit optfeature python-any-r1 readme.gentoo-r1 toolchain-funcs wine
+
+WINE_GECKO=2.47.4
+WINE_MONO=10.0.0
+WINE_PV=$(ver_rs 2 -)
+
+if [[ ${PV} ==  ]]; 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
+   || ( WTFPL-2 public-domain )
+"
+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 here, and udev needs sdl due to Valve's
+# changes (bug #959263), use normal wine instead if need to avoid these
+REQUIRED_USE="
+   || ( X wayland )
+   udev? ( sdl )
+"
+
+# 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[${WI

[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2025-06-28 Thread Ionen Wolkens
commit: 7a70d6baa47ffc8e424ef157699002e53be68f70
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sun Jun 29 03:24:48 2025 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sun Jun 29 04:18:58 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a70d6ba

app-emulation/wine-proton: require USE=sdl when udev is set

USE=-sdl seems fine when udev is disabled, and issue is specific to
Valve's changes (doesn't apply to wine-vanilla, nor older wine-proton).

No major reason to try fixing this in wine-proton (Valve likely does
not test/support this configuration and has a lot of custom code around
sdl/udev for gamepad and other input support), so just add the REQ USE.

Closes: https://bugs.gentoo.org/959263
Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/wine-proton-10.0.1f.ebuild | 8 ++--
 app-emulation/wine-proton/wine-proton-.ebuild| 8 ++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/app-emulation/wine-proton/wine-proton-10.0.1f.ebuild 
b/app-emulation/wine-proton/wine-proton-10.0.1f.ebuild
index 36f7f4c8045d..1d58eebd659c 100644
--- a/app-emulation/wine-proton/wine-proton-10.0.1f.ebuild
+++ b/app-emulation/wine-proton/wine-proton-10.0.1f.ebuild
@@ -30,8 +30,12 @@ IUSE="
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 )"
+# headless is not really supported here, and udev needs sdl due to Valve's
+# changes (bug #959263), use normal wine instead if need to avoid these
+REQUIRED_USE="
+   || ( X wayland )
+   udev? ( sdl )
+"
 
 # tests are non-trivial to run, can hang easily, don't play well with
 # sandbox, and several need real opengl/vulkan or network access

diff --git a/app-emulation/wine-proton/wine-proton-.ebuild 
b/app-emulation/wine-proton/wine-proton-.ebuild
index 064a3387d86a..626d02aae0bb 100644
--- a/app-emulation/wine-proton/wine-proton-.ebuild
+++ b/app-emulation/wine-proton/wine-proton-.ebuild
@@ -33,8 +33,12 @@ IUSE="
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 )"
+# headless is not really supported here, and udev needs sdl due to Valve's
+# changes (bug #959263), use normal wine instead if need to avoid these
+REQUIRED_USE="
+   || ( X wayland )
+   udev? ( sdl )
+"
 
 # tests are non-trivial to run, can hang easily, don't play well with
 # sandbox, and several need real opengl/vulkan or network access



[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2025-06-09 Thread Ionen Wolkens
commit: 553c4c53a46774b8a039faba57cc8b07ce44e067
Author: Sasha Finkelstein  gmail  com>
AuthorDate: Mon Jun  9 11:37:26 2025 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Jun  9 13:10:25 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=553c4c53

app-emulation/wine-proton: Tweak wow64 flag description

Signed-off-by: Sasha Finkelstein  gmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/42514
Closes: https://github.com/gentoo/gentoo/pull/42514
Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/metadata.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app-emulation/wine-proton/metadata.xml 
b/app-emulation/wine-proton/metadata.xml
index 92b0fad9838f..56b64ea52244 100644
--- a/app-emulation/wine-proton/metadata.xml
+++ b/app-emulation/wine-proton/metadata.xml
@@ -31,8 +31,7 @@
but that can be done even with /no-multilib/ profiles.
 
This can also be enabled on arm64 to allow running
-   x86 applications, but that requires to manually
-   setup xtajit.dll in the wine prefix for x86 emulation.
+   x86 applications via binary translation.






[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2025-06-01 Thread Ionen Wolkens
commit: 3004457c79381173c66927b71f2f020132ff2fb5
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Jun  2 02:08:02 2025 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Jun  2 03:03:45 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3004457c

app-emulation/wine-proton: drop 9.0.4-r1

Signed-off-by: Ionen Wolkens  gentoo.org>

 .../wine-proton/wine-proton-9.0.4-r1.ebuild| 453 -
 1 file changed, 453 deletions(-)

diff --git a/app-emulation/wine-proton/wine-proton-9.0.4-r1.ebuild 
b/app-emulation/wine-proton/wine-proton-9.0.4-r1.ebuild
deleted file mode 100644
index c53f79e78672..
--- a/app-emulation/wine-proton/wine-proton-9.0.4-r1.ebuild
+++ /dev/null
@@ -1,453 +0,0 @@
-# Copyright 2022-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MULTILIB_COMPAT=( abi_x86_{32,64} )
-PYTHON_COMPAT=( python3_{11..14} )
-inherit autotools flag-o-matic multilib multilib-build prefix
-inherit python-any-r1 readme.gentoo-r1 toolchain-funcs wrapper
-
-WINE_GECKO=2.47.4
-WINE_MONO=9.3.1
-WINE_PV=$(ver_rs 2 -)
-
-if [[ ${PV} ==  ]]; 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 OPENLDAP ZLIB gsm libpng2 libtiff"
-SLOT="${PV}"
-IUSE="
-   +abi_x86_32 +abi_x86_64 +alsa crossdev-mingw custom-cflags +dbus
-   +fontconfig +gecko +gstreamer llvm-libunwind +mono nls perl
-   pulseaudio +sdl selinux +ssl +strip udev +unwind usb v4l
-   video_cards_amdgpu wow64 +xcomposite xinerama
-"
-REQUIRED_USE="wow64? ( abi_x86_64 !abi_x86_32 )"
-
-# 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}]
-   dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-   fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] )
-   sdl? ( media-libs/libsdl2[haptic,joystick,${MULTILIB_USEDEP}] )
-   ssl? (
-   dev-libs/gmp:=[${MULTILIB_USEDEP}]
-   net-libs/gnutls:=[${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}]
-   x11-libs/libdrm[video_cards_amdgpu?,${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? ( llvm-runtimes/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}]
-   wow64? ( app-emulation/wine-gecko[abi_x86_32] )
-   )
-   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 )
-"
-DEPEND="
-   ${WINE_COMMON_DEPEND}
-   || (
-   sys-devel/gcc:*
-   llvm-runtimes/compiler-rt:*[atomic-builtins(-)]
-   )
-   sys-kernel/linux-headers
-   x11-base/xorg-proto
-"
-BDEPEND="
-   ${PYTHON_DEPS}
-   || (
-   sys-devel/binutils
-   llvm-core/lld
-   )
-   dev-lang/perl
-   sys-devel/bison

[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2025-05-15 Thread Ionen Wolkens
commit: d0fe70414e6b13bc7f7f2020c73aa238df9172cd
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri May 16 02:56:06 2025 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri May 16 04:35:10 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0fe7041

app-emulation/wine-proton: stabilize 9.0.4-r2 for amd64

Closes: https://bugs.gentoo.org/955104
Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/wine-proton-9.0.4-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/wine-proton/wine-proton-9.0.4-r2.ebuild 
b/app-emulation/wine-proton/wine-proton-9.0.4-r2.ebuild
index 15a669f6e826..b795ebe79427 100644
--- a/app-emulation/wine-proton/wine-proton-9.0.4-r2.ebuild
+++ b/app-emulation/wine-proton/wine-proton-9.0.4-r2.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} ==  ]]; then
 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"
+   KEYWORDS="-* amd64 ~x86"
 fi
 
 DESCRIPTION="Valve Software's fork of Wine"



[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2025-05-11 Thread Ionen Wolkens
commit: 0345cf3a90563de3ed994fec653a98a94503666c
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon May 12 01:26:56 2025 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon May 12 01:44:40 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0345cf3a

app-emulation/wine-proton: drop 10.0.1b, 10.0.1c, 10.0.1d

Short-lived versions with only minor code differences (b and c
are even identical and changes were in Proton itself), should
be no reason to keep for an extended period.

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/Manifest |   3 -
 .../wine-proton/wine-proton-10.0.1b.ebuild | 245 -
 .../wine-proton/wine-proton-10.0.1c.ebuild | 245 -
 .../wine-proton/wine-proton-10.0.1d.ebuild | 245 -
 4 files changed, 738 deletions(-)

diff --git a/app-emulation/wine-proton/Manifest 
b/app-emulation/wine-proton/Manifest
index 13700304411a..45896ebacfe9 100644
--- a/app-emulation/wine-proton/Manifest
+++ b/app-emulation/wine-proton/Manifest
@@ -1,6 +1,3 @@
-DIST proton-wine-10.0-1b.tar.gz 52174837 BLAKE2B 
3ee655d34cf469265aa405e4079d80c8bfadbaa1d49d21d80cec55ef568f8a330212d1d104785f435deb778c2b74a7b0b3c5a82822c2875cff6d35eaa06c569e
 SHA512 
752dfa5182f0eb9ada4bb75e6877382d04a19ba9e0945b1affeb24bd31a151a98d473986054510086120f1165e715dfe48c24efb51dacb7d372795f57a2517ce
-DIST proton-wine-10.0-1c.tar.gz 52178143 BLAKE2B 
350e392785f39458e47ddb7ad4759fed4b3d85c6a59e340ee5b4612648eaedc3d17497f9a313096afce7c86c867de81af7c034731e97d7e147bb7daabbec
 SHA512 
dcdc1abd754b5c38ebcde8e558c8e96f1007a93739f19a15f8def9889183aae2006e8bbeccfd80d137ed5e75f261f2ae757eef490c5813d2fe889fed2e0bfa3b
-DIST proton-wine-10.0-1d.tar.gz 52176410 BLAKE2B 
dd7b0c1954b22b2ea07b5b441d3bcbf703a562784bb24d50d50d93107fc47f70ccad6ac01c76144bd0268a114f3b5ffb1f7d99b004e65f591ed749cead3c
 SHA512 
c20b307e17b56fb2ef9f138d5ac86db5ac0f4e82264f66b3a3448a2bfdc0ecaea25447fde01c20068092026e71cb96c4d56ba962b0e6665d7b89631394386d82
 DIST proton-wine-10.0-1f.tar.gz 52177353 BLAKE2B 
f6d0ca0c8ffed0b71fca63d4d5b185979fc3d7e3d6ff0f9011051b39c5c1f71920c37c3ce5b83937a2b7f47541ce6408e8171a2d76965d848bb76061c61df674
 SHA512 
5e8893f769fc958bf73e671efa23fac2af173b8ee847b37f773631cc99b13eecbcf4782c8c070c663bee3440cce0a6f0d6c7fe889fe58cde4720da6f5c09ca34
 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
deleted file mode 100644
index 2a45acabcb62..
--- a/app-emulation/wine-proton/wine-proton-10.0.1b.ebuild
+++ /dev/null
@@ -1,245 +0,0 @@
-# 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} ==  ]]; 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/lib

[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2025-05-11 Thread Ionen Wolkens
commit: 6248fb0cfe541e0f429322690cf4d1ccf1ffdb32
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon May 12 01:28:06 2025 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon May 12 01:44:40 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6248fb0c

app-emulation/wine-proton: enable py3.14

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/wine-proton-10.0.1f.ebuild  | 2 +-
 app-emulation/wine-proton/wine-proton-8.0.5c.ebuild   | 2 +-
 app-emulation/wine-proton/wine-proton-9.0.4-r1.ebuild | 2 +-
 app-emulation/wine-proton/wine-proton-9.0.4-r2.ebuild | 2 +-
 app-emulation/wine-proton/wine-proton-.ebuild | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app-emulation/wine-proton/wine-proton-10.0.1f.ebuild 
b/app-emulation/wine-proton/wine-proton-10.0.1f.ebuild
index 2a45acabcb62..36f7f4c8045d 100644
--- a/app-emulation/wine-proton/wine-proton-10.0.1f.ebuild
+++ b/app-emulation/wine-proton/wine-proton-10.0.1f.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_COMPAT=( python3_{11..14} )
 inherit optfeature python-any-r1 readme.gentoo-r1 toolchain-funcs wine
 
 WINE_GECKO=2.47.4

diff --git a/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild 
b/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
index 555be389510c..37fba75f172e 100644
--- a/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
+++ b/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
-PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_COMPAT=( python3_{11..14} )
 inherit autotools flag-o-matic multilib multilib-build prefix
 inherit python-any-r1 readme.gentoo-r1 toolchain-funcs wrapper
 

diff --git a/app-emulation/wine-proton/wine-proton-9.0.4-r1.ebuild 
b/app-emulation/wine-proton/wine-proton-9.0.4-r1.ebuild
index 50ad60d0da49..c53f79e78672 100644
--- a/app-emulation/wine-proton/wine-proton-9.0.4-r1.ebuild
+++ b/app-emulation/wine-proton/wine-proton-9.0.4-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
-PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_COMPAT=( python3_{11..14} )
 inherit autotools flag-o-matic multilib multilib-build prefix
 inherit python-any-r1 readme.gentoo-r1 toolchain-funcs wrapper
 

diff --git a/app-emulation/wine-proton/wine-proton-9.0.4-r2.ebuild 
b/app-emulation/wine-proton/wine-proton-9.0.4-r2.ebuild
index b00295ba0e43..15a669f6e826 100644
--- a/app-emulation/wine-proton/wine-proton-9.0.4-r2.ebuild
+++ b/app-emulation/wine-proton/wine-proton-9.0.4-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_COMPAT=( python3_{11..14} )
 inherit python-any-r1 readme.gentoo-r1 toolchain-funcs wine
 
 WINE_GECKO=2.47.4

diff --git a/app-emulation/wine-proton/wine-proton-.ebuild 
b/app-emulation/wine-proton/wine-proton-.ebuild
index abed162aa49a..064a3387d86a 100644
--- a/app-emulation/wine-proton/wine-proton-.ebuild
+++ b/app-emulation/wine-proton/wine-proton-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_COMPAT=( python3_{11..14} )
 inherit optfeature python-any-r1 readme.gentoo-r1 toolchain-funcs wine
 
 WINE_GECKO=2.47.4



[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2025-05-09 Thread Ionen Wolkens
commit: 6b6459508e55859cac9494f0c2b5669d0e7ab37a
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri May  9 22:06:22 2025 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri May  9 22:24:44 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b645950

app-emulation/wine-proton: add 10.0.1f

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/Manifest |   1 +
 .../wine-proton/wine-proton-10.0.1f.ebuild | 245 +
 2 files changed, 246 insertions(+)

diff --git a/app-emulation/wine-proton/Manifest 
b/app-emulation/wine-proton/Manifest
index 0208d92c04bd..13700304411a 100644
--- a/app-emulation/wine-proton/Manifest
+++ b/app-emulation/wine-proton/Manifest
@@ -1,5 +1,6 @@
 DIST proton-wine-10.0-1b.tar.gz 52174837 BLAKE2B 
3ee655d34cf469265aa405e4079d80c8bfadbaa1d49d21d80cec55ef568f8a330212d1d104785f435deb778c2b74a7b0b3c5a82822c2875cff6d35eaa06c569e
 SHA512 
752dfa5182f0eb9ada4bb75e6877382d04a19ba9e0945b1affeb24bd31a151a98d473986054510086120f1165e715dfe48c24efb51dacb7d372795f57a2517ce
 DIST proton-wine-10.0-1c.tar.gz 52178143 BLAKE2B 
350e392785f39458e47ddb7ad4759fed4b3d85c6a59e340ee5b4612648eaedc3d17497f9a313096afce7c86c867de81af7c034731e97d7e147bb7daabbec
 SHA512 
dcdc1abd754b5c38ebcde8e558c8e96f1007a93739f19a15f8def9889183aae2006e8bbeccfd80d137ed5e75f261f2ae757eef490c5813d2fe889fed2e0bfa3b
 DIST proton-wine-10.0-1d.tar.gz 52176410 BLAKE2B 
dd7b0c1954b22b2ea07b5b441d3bcbf703a562784bb24d50d50d93107fc47f70ccad6ac01c76144bd0268a114f3b5ffb1f7d99b004e65f591ed749cead3c
 SHA512 
c20b307e17b56fb2ef9f138d5ac86db5ac0f4e82264f66b3a3448a2bfdc0ecaea25447fde01c20068092026e71cb96c4d56ba962b0e6665d7b89631394386d82
+DIST proton-wine-10.0-1f.tar.gz 52177353 BLAKE2B 
f6d0ca0c8ffed0b71fca63d4d5b185979fc3d7e3d6ff0f9011051b39c5c1f71920c37c3ce5b83937a2b7f47541ce6408e8171a2d76965d848bb76061c61df674
 SHA512 
5e8893f769fc958bf73e671efa23fac2af173b8ee847b37f773631cc99b13eecbcf4782c8c070c663bee3440cce0a6f0d6c7fe889fe58cde4720da6f5c09ca34
 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.1f.ebuild 
b/app-emulation/wine-proton/wine-proton-10.0.1f.ebuild
new file mode 100644
index ..2a45acabcb62
--- /dev/null
+++ b/app-emulation/wine-proton/wine-proton-10.0.1f.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} ==  ]]; 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_U

[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2025-05-07 Thread Ionen Wolkens
commit: ceb4ec6ea52227a97b8d92c4cb290920f56c3bbf
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu May  8 05:56:55 2025 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu May  8 05:57:45 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ceb4ec6e

app-emulation/wine-proton: update live

Still based on wine-10.0 but valve has cherry picked the tomcrypt
addition from development wine.

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/wine-proton-.ebuild | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app-emulation/wine-proton/wine-proton-.ebuild 
b/app-emulation/wine-proton/wine-proton-.ebuild
index bf2fba43c22d..abed162aa49a 100644
--- a/app-emulation/wine-proton/wine-proton-.ebuild
+++ b/app-emulation/wine-proton/wine-proton-.ebuild
@@ -23,7 +23,10 @@ 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"
+LICENSE="
+   LGPL-2.1+ BSD BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff
+   || ( WTFPL-2 public-domain )
+"
 SLOT="${PV}"
 IUSE="
+X +alsa crossdev-mingw +dbus ffmpeg +fontconfig +gecko +gstreamer



[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2025-05-06 Thread Ionen Wolkens
commit: a0fc93af9308e369f3f291ce25ce0a1e648f2107
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed May  7 00:08:23 2025 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed May  7 00:19:17 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0fc93af

app-emulation/wine-proton: add 10.0.1d

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/Manifest |   1 +
 .../wine-proton/wine-proton-10.0.1d.ebuild | 245 +
 2 files changed, 246 insertions(+)

diff --git a/app-emulation/wine-proton/Manifest 
b/app-emulation/wine-proton/Manifest
index cd5de8fdb236..0208d92c04bd 100644
--- a/app-emulation/wine-proton/Manifest
+++ b/app-emulation/wine-proton/Manifest
@@ -1,4 +1,5 @@
 DIST proton-wine-10.0-1b.tar.gz 52174837 BLAKE2B 
3ee655d34cf469265aa405e4079d80c8bfadbaa1d49d21d80cec55ef568f8a330212d1d104785f435deb778c2b74a7b0b3c5a82822c2875cff6d35eaa06c569e
 SHA512 
752dfa5182f0eb9ada4bb75e6877382d04a19ba9e0945b1affeb24bd31a151a98d473986054510086120f1165e715dfe48c24efb51dacb7d372795f57a2517ce
 DIST proton-wine-10.0-1c.tar.gz 52178143 BLAKE2B 
350e392785f39458e47ddb7ad4759fed4b3d85c6a59e340ee5b4612648eaedc3d17497f9a313096afce7c86c867de81af7c034731e97d7e147bb7daabbec
 SHA512 
dcdc1abd754b5c38ebcde8e558c8e96f1007a93739f19a15f8def9889183aae2006e8bbeccfd80d137ed5e75f261f2ae757eef490c5813d2fe889fed2e0bfa3b
+DIST proton-wine-10.0-1d.tar.gz 52176410 BLAKE2B 
dd7b0c1954b22b2ea07b5b441d3bcbf703a562784bb24d50d50d93107fc47f70ccad6ac01c76144bd0268a114f3b5ffb1f7d99b004e65f591ed749cead3c
 SHA512 
c20b307e17b56fb2ef9f138d5ac86db5ac0f4e82264f66b3a3448a2bfdc0ecaea25447fde01c20068092026e71cb96c4d56ba962b0e6665d7b89631394386d82
 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.1d.ebuild 
b/app-emulation/wine-proton/wine-proton-10.0.1d.ebuild
new file mode 100644
index ..2a45acabcb62
--- /dev/null
+++ b/app-emulation/wine-proton/wine-proton-10.0.1d.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} ==  ]]; 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}]
+   

[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2025-04-30 Thread Ionen Wolkens
commit: 742c2b529773a012a3342f6f9df2413bfa497c6f
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed Apr 30 22:08:40 2025 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Apr 30 22:13:41 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=742c2b52

app-emulation/wine-proton: add 10.0.1c

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/Manifest |   1 +
 .../wine-proton/wine-proton-10.0.1c.ebuild | 245 +
 2 files changed, 246 insertions(+)

diff --git a/app-emulation/wine-proton/Manifest 
b/app-emulation/wine-proton/Manifest
index 49e1f30bb925..cd5de8fdb236 100644
--- a/app-emulation/wine-proton/Manifest
+++ b/app-emulation/wine-proton/Manifest
@@ -1,3 +1,4 @@
 DIST proton-wine-10.0-1b.tar.gz 52174837 BLAKE2B 
3ee655d34cf469265aa405e4079d80c8bfadbaa1d49d21d80cec55ef568f8a330212d1d104785f435deb778c2b74a7b0b3c5a82822c2875cff6d35eaa06c569e
 SHA512 
752dfa5182f0eb9ada4bb75e6877382d04a19ba9e0945b1affeb24bd31a151a98d473986054510086120f1165e715dfe48c24efb51dacb7d372795f57a2517ce
+DIST proton-wine-10.0-1c.tar.gz 52178143 BLAKE2B 
350e392785f39458e47ddb7ad4759fed4b3d85c6a59e340ee5b4612648eaedc3d17497f9a313096afce7c86c867de81af7c034731e97d7e147bb7daabbec
 SHA512 
dcdc1abd754b5c38ebcde8e558c8e96f1007a93739f19a15f8def9889183aae2006e8bbeccfd80d137ed5e75f261f2ae757eef490c5813d2fe889fed2e0bfa3b
 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.1c.ebuild 
b/app-emulation/wine-proton/wine-proton-10.0.1c.ebuild
new file mode 100644
index ..2a45acabcb62
--- /dev/null
+++ b/app-emulation/wine-proton/wine-proton-10.0.1c.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} ==  ]]; 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

[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2025-04-29 Thread Ionen Wolkens
commit: 6b909fb4e2273e7f27e04c44a85e34fd36ea3393
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed Apr 30 03:27:23 2025 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Apr 30 03:29:01 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b909fb4

app-emulation/wine-proton: fix wine --version missing proton

...with wine.eclass. The sed was being ran after eautoreconf
was run and thus never used. Purely informational so not going
to revbump.

Do not really like doing seds before patches are applied though,
but this one should be fairly harmless.

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/wine-proton-10.0.1b.ebuild  | 6 +++---
 app-emulation/wine-proton/wine-proton-9.0.4-r2.ebuild | 6 +++---
 app-emulation/wine-proton/wine-proton-.ebuild | 3 +++
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/app-emulation/wine-proton/wine-proton-10.0.1b.ebuild 
b/app-emulation/wine-proton/wine-proton-10.0.1b.ebuild
index 99f3e85107f0..2a45acabcb62 100644
--- a/app-emulation/wine-proton/wine-proton-10.0.1b.ebuild
+++ b/app-emulation/wine-proton/wine-proton-10.0.1b.ebuild
@@ -138,6 +138,9 @@ PATCHES=(
 )
 
 src_prepare() {
+   # similarly to staging, append to `wine --version` for identification
+   sed -i "s/wine_build[^1]*1/& (Proton-${WINE_PV})/" configure.ac || die
+
wine_src_prepare
 
# this is kind-of best effort and ignores llvm slots, ideally
@@ -150,9 +153,6 @@ src_prepare() {
-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

diff --git a/app-emulation/wine-proton/wine-proton-9.0.4-r2.ebuild 
b/app-emulation/wine-proton/wine-proton-9.0.4-r2.ebuild
index 348806a7ad36..b00295ba0e43 100644
--- a/app-emulation/wine-proton/wine-proton-9.0.4-r2.ebuild
+++ b/app-emulation/wine-proton/wine-proton-9.0.4-r2.ebuild
@@ -127,6 +127,9 @@ PATCHES=(
 )
 
 src_prepare() {
+   # similarly to staging, append to `wine --version` for identification
+   sed -i "s/wine_build[^1]*1/& (Proton-${WINE_PV})/" configure.ac || die
+
wine_src_prepare
 
# this is kind-of best effort and ignores llvm slots, ideally
@@ -139,9 +142,6 @@ src_prepare() {
-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 vk.xml || die # python

diff --git a/app-emulation/wine-proton/wine-proton-.ebuild 
b/app-emulation/wine-proton/wine-proton-.ebuild
index 26d64e28a5c4..bf2fba43c22d 100644
--- a/app-emulation/wine-proton/wine-proton-.ebuild
+++ b/app-emulation/wine-proton/wine-proton-.ebuild
@@ -138,6 +138,9 @@ PATCHES=(
 )
 
 src_prepare() {
+   # similarly to staging, append to `wine --version` for identification
+   sed -i "s/wine_build[^1]*1/& (Proton-${WINE_PV})/" configure.ac || die
+
wine_src_prepare
 
# this is kind-of best effort and ignores llvm slots, ideally



[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2025-04-29 Thread Ionen Wolkens
commit: 15fdeae19d121f92eb6f130f6115b50fa7f5d9a8
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Apr 29 22:47:25 2025 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Apr 30 02:33:48 2025 +
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- 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 ..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} ==  ]]; 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? (
+

[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2025-04-29 Thread Ionen Wolkens
commit: fa339c77a0baca89157112af032324d8c4b3a1f2
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed Apr 30 00:51:03 2025 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Apr 30 02:33:49 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa339c77

app-emulation/wine-proton: sync live (mostly)

Identical to 10.0.1b except for passing --without-vosk which is still
a bleeding-edge branch only thing, and using wine-mono-10.0.0.

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/wine-proton-.ebuild | 66 +--
 1 file changed, 39 insertions(+), 27 deletions(-)

diff --git a/app-emulation/wine-proton/wine-proton-.ebuild 
b/app-emulation/wine-proton/wine-proton-.ebuild
index 524892b2adf2..26d64e28a5c4 100644
--- a/app-emulation/wine-proton/wine-proton-.ebuild
+++ b/app-emulation/wine-proton/wine-proton-.ebuild
@@ -4,10 +4,10 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{10..13} )
-inherit python-any-r1 readme.gentoo-r1 toolchain-funcs wine
+inherit optfeature python-any-r1 readme.gentoo-r1 toolchain-funcs wine
 
 WINE_GECKO=2.47.4
-WINE_MONO=9.3.1
+WINE_MONO=10.0.0
 WINE_PV=$(ver_rs 2 -)
 
 if [[ ${PV} ==  ]]; then
@@ -23,13 +23,15 @@ 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"
+LICENSE="LGPL-2.1+ BSD BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff"
 SLOT="${PV}"
 IUSE="
-   +alsa crossdev-mingw +dbus +fontconfig +gecko +gstreamer
+   +X +alsa crossdev-mingw +dbus ffmpeg +fontconfig +gecko +gstreamer
llvm-libunwind +mono nls perl pulseaudio +sdl selinux +ssl udev
-   +unwind usb v4l video_cards_amdgpu +xcomposite xinerama
+   +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
@@ -39,14 +41,18 @@ RESTRICT="test"
 WINE_DLOPEN_DEPEND="
dev-libs/libgcrypt:=[${WINE_USEDEP}]
media-libs/freetype[${WINE_USEDEP}]
-   media-libs/libglvnd[X,${WINE_USEDEP}]
-   media-libs/vulkan-loader[X,${WINE_USEDEP}]
-   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}]
+   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}] )
@@ -55,14 +61,15 @@ WINE_DLOPEN_DEPEND="
net-libs/gnutls:=[${WINE_USEDEP}]
)
v4l? ( media-libs/libv4l[${WINE_USEDEP}] )
-   xcomposite? ( x11-libs/libXcomposite[${WINE_USEDEP}] )
-   xinerama? ( x11-libs/libXinerama[${WINE_USEDEP}] )
 "
 WINE_COMMON_DEPEND="
${WINE_DLOPEN_DEPEND}
-   x11-libs/libX11[${WINE_USEDEP}]
-   x11-libs/libXext[${WINE_USEDEP}]
+   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}]
@@ -76,6 +83,10 @@ WINE_COMMON_DEPEND="
)
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}
@@ -99,7 +110,7 @@ DEPEND="
llvm-runtimes/compiler-rt:*[atomic-builtins(-)]
)
sys-kernel/linux-headers
-   x11-base/xorg-proto
+   X? ( x11-base/xorg-proto )
 "
 BDEPEND="
${PYTHON_DEPS}
@@ -108,6 +119,7 @@ BDEPEND="
sys-devel/flex
virtual/pkgconfig
nls? ( sys-devel/gettext )
+   wayland? ( dev-util/wayland-scanner )
 "
 
 QA_CONFIG_IMPL_DECL_SKIP=(
@@ -121,7 +133,6 @@ PATCHES=(
"${FILESDIR}"/${PN}-7.0.4-noexecs

[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2025-04-29 Thread Ionen Wolkens
commit: b57802b78eb32185ed375c740231cb3599f56575
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed Apr 30 00:18:31 2025 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Apr 30 02:33:48 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b57802b7

app-emulation/wine-proton: adjust libdrm dependency

Realistically everyone will have this either way, but it
does not link with it when amdgpu is disabled.

Not worth revbumps.

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/wine-proton-8.0.5c.ebuild   | 2 +-
 app-emulation/wine-proton/wine-proton-9.0.4-r2.ebuild | 2 +-
 app-emulation/wine-proton/wine-proton-.ebuild | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild 
b/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
index b340c0774c60..555be389510c 100644
--- a/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
+++ b/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
@@ -65,7 +65,6 @@ WINE_COMMON_DEPEND="
${WINE_DLOPEN_DEPEND}
x11-libs/libX11[${MULTILIB_USEDEP}]
x11-libs/libXext[${MULTILIB_USEDEP}]
-   x11-libs/libdrm[video_cards_amdgpu?,${MULTILIB_USEDEP}]
alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
gstreamer? (
dev-libs/glib:2[${MULTILIB_USEDEP}]
@@ -79,6 +78,7 @@ WINE_COMMON_DEPEND="
!llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
)
usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )
+   video_cards_amdgpu? ( 
x11-libs/libdrm[video_cards_amdgpu,${MULTILIB_USEDEP}] )
 "
 RDEPEND="
${WINE_COMMON_DEPEND}

diff --git a/app-emulation/wine-proton/wine-proton-9.0.4-r2.ebuild 
b/app-emulation/wine-proton/wine-proton-9.0.4-r2.ebuild
index 07a633f2b0a1..348806a7ad36 100644
--- a/app-emulation/wine-proton/wine-proton-9.0.4-r2.ebuild
+++ b/app-emulation/wine-proton/wine-proton-9.0.4-r2.ebuild
@@ -62,7 +62,6 @@ WINE_COMMON_DEPEND="
${WINE_DLOPEN_DEPEND}
x11-libs/libX11[${WINE_USEDEP}]
x11-libs/libXext[${WINE_USEDEP}]
-   x11-libs/libdrm[video_cards_amdgpu?,${WINE_USEDEP}]
alsa? ( media-libs/alsa-lib[${WINE_USEDEP}] )
gstreamer? (
dev-libs/glib:2[${WINE_USEDEP}]
@@ -76,6 +75,7 @@ WINE_COMMON_DEPEND="
!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}] )
 "
 RDEPEND="
${WINE_COMMON_DEPEND}

diff --git a/app-emulation/wine-proton/wine-proton-.ebuild 
b/app-emulation/wine-proton/wine-proton-.ebuild
index 6a2b523edb8e..524892b2adf2 100644
--- a/app-emulation/wine-proton/wine-proton-.ebuild
+++ b/app-emulation/wine-proton/wine-proton-.ebuild
@@ -62,7 +62,6 @@ WINE_COMMON_DEPEND="
${WINE_DLOPEN_DEPEND}
x11-libs/libX11[${WINE_USEDEP}]
x11-libs/libXext[${WINE_USEDEP}]
-   x11-libs/libdrm[video_cards_amdgpu?,${WINE_USEDEP}]
alsa? ( media-libs/alsa-lib[${WINE_USEDEP}] )
gstreamer? (
dev-libs/glib:2[${WINE_USEDEP}]
@@ -76,6 +75,7 @@ WINE_COMMON_DEPEND="
!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}] )
 "
 RDEPEND="
${WINE_COMMON_DEPEND}



[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2025-04-20 Thread Ionen Wolkens
commit: 4a4bddd831c214609f2de25ef295c68fe9aea82b
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sat Apr 19 08:43:41 2025 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Apr 21 01:52:49 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a4bddd8

app-emulation/wine-proton: migrate to wine.eclass

Only the latest given eclass does not support wine-8.x.

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/metadata.xml |   1 +
 .../wine-proton/wine-proton-9.0.4-r2.ebuild| 231 ++
 app-emulation/wine-proton/wine-proton-.ebuild  | 334 -
 3 files changed, 288 insertions(+), 278 deletions(-)

diff --git a/app-emulation/wine-proton/metadata.xml 
b/app-emulation/wine-proton/metadata.xml
index 330e8b084f6d..ae2b52fb35c5 100644
--- a/app-emulation/wine-proton/metadata.xml
+++ b/app-emulation/wine-proton/metadata.xml
@@ -16,6 +16,7 @@
and is mostly unsupported, try disabling if have issues)

Enable mshtml support using 
app-emulation/wine-gecko
+   Build PE files using 
dev-util/mingw64-toolchain (more tested) rather than 
llvm-core/clang (newer)
Enable .NET support using 
app-emulation/wine-mono
Install helpers that require perl 
(winedump/winemaker)
Enable gamepad support using 
media-libs/libsdl2

diff --git a/app-emulation/wine-proton/wine-proton-9.0.4-r2.ebuild 
b/app-emulation/wine-proton/wine-proton-9.0.4-r2.ebuild
new file mode 100644
index ..07a633f2b0a1
--- /dev/null
+++ b/app-emulation/wine-proton/wine-proton-9.0.4-r2.ebuild
@@ -0,0 +1,231 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit python-any-r1 readme.gentoo-r1 toolchain-funcs wine
+
+WINE_GECKO=2.47.4
+WINE_MONO=9.3.1
+WINE_PV=$(ver_rs 2 -)
+
+if [[ ${PV} ==  ]]; 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 OPENLDAP ZLIB gsm libpng2 libtiff"
+SLOT="${PV}"
+IUSE="
+   +alsa crossdev-mingw +dbus +fontconfig +gecko +gstreamer
+   llvm-libunwind +mono nls perl pulseaudio +sdl selinux +ssl udev
+   +unwind usb v4l video_cards_amdgpu +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:=[${WINE_USEDEP}]
+   media-libs/freetype[${WINE_USEDEP}]
+   media-libs/libglvnd[X,${WINE_USEDEP}]
+   media-libs/vulkan-loader[X,${WINE_USEDEP}]
+   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}]
+   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}] )
+   xcomposite? ( x11-libs/libXcomposite[${WINE_USEDEP}] )
+   xinerama? ( x11-libs/libXinerama[${WINE_USEDEP}] )
+"
+WINE_COMMON_DEPEND="
+   ${WINE_DLOPEN_DEPEND}
+   x11-libs/libX11[${WINE_USEDEP}]
+   x11-libs/libXext[${WINE_USEDEP}]
+   x11-libs/libdrm[video_cards_amdgpu?,${WINE_USEDEP}]
+   alsa? ( media-libs/alsa-lib[${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}] )
+"
+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.

[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/, app-emulation/wine-staging/, ...

2025-02-28 Thread Ionen Wolkens
commit: 3c7ac38f9f354666527766cc2f6b2578d1461ea7
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri Feb 28 18:27:33 2025 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri Feb 28 18:45:45 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c7ac38f

app-emulation/wine-*: replace IUSE=udisks by generic IUSE=+dbus

This actually had been bothering me for a while, and bug #950382
is a good excuse to finally rename it.

There is little reason to treat dbus communication specially and
handle each services with its own USE vs just having USE=dbus.
...and per the bug, this now gained additional usage with bluetooth
(and perhaps more in the future) making current USE=udisks an issue.

Also feel it makes more sense enabled by default to avoid confusion,
but users that know they don't need it may want to optionally
disable it to skip USE=abi_x86_32 on dbus (albeit it's trivial).
Note wine will not even link with libdbus, this just enables support
for dlopen'ing it when needed.

Unfortunately this will cause semi-unnessary rebuilds for all wine
users.

Closes: https://bugs.gentoo.org/950382
Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/wine-proton-8.0.5c.ebuild  | 11 +--
 app-emulation/wine-proton/wine-proton-9.0.4.ebuild   | 11 +--
 app-emulation/wine-proton/wine-proton-.ebuild| 11 +--
 app-emulation/wine-staging/wine-staging-10.0.ebuild  | 11 +--
 app-emulation/wine-staging/wine-staging-10.1.ebuild  | 11 +--
 app-emulation/wine-staging/wine-staging-10.2.ebuild  | 11 +--
 app-emulation/wine-staging/wine-staging-9.0.ebuild   | 11 +--
 app-emulation/wine-staging/wine-staging-.ebuild  | 11 +--
 app-emulation/wine-vanilla/wine-vanilla-10.0.ebuild  | 11 +--
 app-emulation/wine-vanilla/wine-vanilla-10.1.ebuild  | 11 +--
 app-emulation/wine-vanilla/wine-vanilla-10.2.ebuild  | 11 +--
 app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild |  9 -
 app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild   | 12 ++--
 app-emulation/wine-vanilla/wine-vanilla-.ebuild  | 11 +--
 14 files changed, 70 insertions(+), 83 deletions(-)

diff --git a/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild 
b/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
index 369241a19cb1..6843554f7424 100644
--- a/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
+++ b/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
@@ -28,10 +28,10 @@ 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
+   +abi_x86_32 +abi_x86_64 +alsa crossdev-mingw custom-cflags +dbus
+fontconfig +gecko +gstreamer llvm-libunwind +mono nls osmesa
-   perl pulseaudio +sdl selinux +ssl +strip udev udisks +unwind
-   usb v4l video_cards_amdgpu +xcomposite xinerama
+   perl pulseaudio +sdl selinux +ssl +strip udev +unwind usb v4l
+   video_cards_amdgpu +xcomposite xinerama
 "
 
 # tests are non-trivial to run, can hang easily, don't play well with
@@ -50,6 +50,7 @@ WINE_DLOPEN_DEPEND="
x11-libs/libXrandr[${MULTILIB_USEDEP}]
x11-libs/libXrender[${MULTILIB_USEDEP}]
x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+   dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] )
osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] )
sdl? ( media-libs/libsdl2[haptic,joystick,${MULTILIB_USEDEP}] )
@@ -57,7 +58,6 @@ WINE_DLOPEN_DEPEND="
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}] )
@@ -92,7 +92,6 @@ RDEPEND="
dev-perl/XML-LibXML
)
selinux? ( sec-policy/selinux-wine )
-   udisks? ( sys-fs/udisks:2 )
 "
 DEPEND="
${WINE_COMMON_DEPEND}
@@ -238,6 +237,7 @@ src_configure() {
$(use_enable video_cards_amdgpu amd_ags_x64)
--disable-tests
$(use_with alsa)
+   $(use_with dbus)
$(use_with fontconfig)
$(use_with gstreamer)
$(use_with nls gettext)
@@ -247,7 +247,6 @@ src_configure() {
$(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)

diff --git a/app-emulation/wine-proton/wine-proton-9.0.4.ebuild 
b/app-emulation/wine-proton/wine-proton-9.0.4.ebuild
index df0e7b0ea031..440bd

[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2025-02-27 Thread Ionen Wolkens
commit: 92b400555b42d0f9b1e3d12ad53ec7f806ed4214
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu Feb 27 12:27:39 2025 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Feb 27 12:27:39 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92b40055

app-emulation/wine-proton: drop 9.0.2

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/Manifest |   1 -
 app-emulation/wine-proton/wine-proton-9.0.2.ebuild | 451 -
 2 files changed, 452 deletions(-)

diff --git a/app-emulation/wine-proton/Manifest 
b/app-emulation/wine-proton/Manifest
index ac9a8becba97..3221632246df 100644
--- a/app-emulation/wine-proton/Manifest
+++ b/app-emulation/wine-proton/Manifest
@@ -1,3 +1,2 @@
 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/wine-proton-9.0.2.ebuild 
b/app-emulation/wine-proton/wine-proton-9.0.2.ebuild
deleted file mode 100644
index 2314a5a096c4..
--- a/app-emulation/wine-proton/wine-proton-9.0.2.ebuild
+++ /dev/null
@@ -1,451 +0,0 @@
-# Copyright 2022-2025 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.4
-WINE_MONO=9.1.0
-WINE_PV=$(ver_rs 2 -)
-
-if [[ ${PV} ==  ]]; 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 OPENLDAP ZLIB gsm libpng2 libtiff"
-SLOT="${PV}"
-IUSE="
-   +abi_x86_32 +abi_x86_64 +alsa crossdev-mingw custom-cflags
-   +fontconfig +gecko +gstreamer llvm-libunwind +mono nls osmesa
-   perl pulseaudio +sdl selinux +ssl +strip udev udisks +unwind
-   usb v4l video_cards_amdgpu wow64 +xcomposite xinerama
-"
-REQUIRED_USE="wow64? ( abi_x86_64 !abi_x86_32 )"
-
-# 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}]
-   x11-libs/libdrm[video_cards_amdgpu?,${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

[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2025-02-26 Thread Arthur Zamarin
commit: d3d3e74c9ca295354cd1716d8626ef337abb0502
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Feb 26 20:32:51 2025 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Feb 26 20:32:51 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3d3e74c

app-emulation/wine-proton: Stabilize 9.0.4 amd64, #941091

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-emulation/wine-proton/wine-proton-9.0.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/wine-proton/wine-proton-9.0.4.ebuild 
b/app-emulation/wine-proton/wine-proton-9.0.4.ebuild
index 62681918df8f..df0e7b0ea031 100644
--- a/app-emulation/wine-proton/wine-proton-9.0.4.ebuild
+++ b/app-emulation/wine-proton/wine-proton-9.0.4.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} ==  ]]; then
 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"
+   KEYWORDS="-* amd64 ~x86"
 fi
 
 DESCRIPTION="Valve Software's fork of Wine"



[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/files/, app-emulation/wine-proton/

2025-02-13 Thread Ionen Wolkens
commit: 0ecfdb0d902dd0e8cc3e292063f9a8160b6a14da
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri Feb 14 03:08:57 2025 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri Feb 14 05:27:34 2025 +
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 
793bbe2b23042301a1b518717d78cfff01eaffa033d010659a45779b9136d33cfac63f0c3fbb1e458953a954b423eb70ac4fa87633352267db890ceb2fef
 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..
--- 
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..
--- 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..
--- 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

[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2024-12-31 Thread Ionen Wolkens
commit: 5effed3c7d175e67f36a92153863a25d31a36c71
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Dec 31 23:44:27 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Dec 31 23:44:27 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5effed3c

app-emulation/wine-proton: drop 9.0.3

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/Manifest |   1 -
 app-emulation/wine-proton/wine-proton-9.0.3.ebuild | 448 -
 2 files changed, 449 deletions(-)

diff --git a/app-emulation/wine-proton/Manifest 
b/app-emulation/wine-proton/Manifest
index 0bb571679312..c43bcc91bf2c 100644
--- a/app-emulation/wine-proton/Manifest
+++ b/app-emulation/wine-proton/Manifest
@@ -1,5 +1,4 @@
 DIST proton-wine-7.0-6.tar.gz 45780326 BLAKE2B 
f140fcfdd1a47904c34a49d0795fa3326d7cf0d3fac8d6c2ef2a4926181a46223f43a2d1ca96c543e800c8c46b2a3cc51ae306a029d68a42608876e869e177d5
 SHA512 
793bbe2b23042301a1b518717d78cfff01eaffa033d010659a45779b9136d33cfac63f0c3fbb1e458953a954b423eb70ac4fa87633352267db890ceb2fef
 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-3.tar.gz 49153588 BLAKE2B 
81f80fbcf7045c9e08b8c4fd5feeb24fdc65f4266d6ecc2198e8638e56e6fd65cbf7e6d3d113d84ea0bd24ac8bb4780db0bb8dbfdf93f120b4f3b6a5948eedae
 SHA512 
1ec948c781576bc21d5735db4ad572c7d73ecd046d2d2e45958ddc08ec9591441397bb582bfe8b5eb94c584da7000cf4ab138b67bda4b3e717568842595f0d8f
 DIST proton-wine-9.0-4.tar.gz 49339922 BLAKE2B 
914ca093ac288c26400e4eeb2ea33943fc8ad89052aa7c97b5c44286dc175745720455d65163baa90b0d0271eb8028549315a3e8095b91947db2bd96c6fc4852
 SHA512 
e061f0a55b25493f67ca3add8c7e41020bb57cb15e8fb4fdf3c23f0cab2d00b703c90fbcf0dc1ca8b67e1726a76cee910e9ea6f567c88bc6c520dd6c9dbb75e9

diff --git a/app-emulation/wine-proton/wine-proton-9.0.3.ebuild 
b/app-emulation/wine-proton/wine-proton-9.0.3.ebuild
deleted file mode 100644
index 1f038c794152..
--- a/app-emulation/wine-proton/wine-proton-9.0.3.ebuild
+++ /dev/null
@@ -1,448 +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.4
-WINE_MONO=9.2.0
-WINE_PV=$(ver_rs 2 -)
-
-if [[ ${PV} ==  ]]; 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 OPENLDAP ZLIB gsm libpng2 libtiff"
-SLOT="${PV}"
-IUSE="
-   +abi_x86_32 +abi_x86_64 +alsa crossdev-mingw custom-cflags
-   +fontconfig +gecko +gstreamer llvm-libunwind +mono nls osmesa
-   perl pulseaudio +sdl selinux +ssl +strip udev udisks +unwind
-   usb v4l video_cards_amdgpu wow64 +xcomposite xinerama
-"
-REQUIRED_USE="wow64? ( abi_x86_64 !abi_x86_32 )"
-
-# 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? ( me

[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2024-12-11 Thread Ionen Wolkens
commit: d44305291c8a9bc2ec47be977c2aed14a24d8229
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed Dec 11 21:12:19 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Dec 11 21:41:55 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4430529

app-emulation/wine-proton: sync EGIT_BRANCH in all ebuilds

Still setup from back when had x.x. experimental branches.

Doesn't really matter but these ebuilds will be there for a while
and when comparing ebuilds it comes up as a distracting difference.

At same time, drop a no longer needed wildcard.

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/wine-proton-7.0.6.ebuild  | 4 ++--
 app-emulation/wine-proton/wine-proton-8.0.5c.ebuild | 4 ++--
 app-emulation/wine-proton/wine-proton-9.0.2.ebuild  | 4 ++--
 app-emulation/wine-proton/wine-proton-9.0.3.ebuild  | 4 ++--
 app-emulation/wine-proton/wine-proton-.ebuild   | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

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 9f23795cdf4d..c4630cc016e8 100644
--- a/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
+++ b/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
@@ -12,10 +12,10 @@ WINE_GECKO=2.47.3
 WINE_MONO=7.4.0
 WINE_PV=$(ver_rs 2 -)
 
-if [[ ${PV} == * ]]; then
+if [[ ${PV} ==  ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/ValveSoftware/wine.git";
-   EGIT_BRANCH="experimental_$(ver_cut 1-2)"
+   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}"

diff --git a/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild 
b/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
index e6f5aa611df1..ca291e4a2bfa 100644
--- a/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
+++ b/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
@@ -12,10 +12,10 @@ WINE_GECKO=2.47.3
 WINE_MONO=8.1.0
 WINE_PV=$(ver_rs 2 -)
 
-if [[ ${PV} == * ]]; then
+if [[ ${PV} ==  ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/ValveSoftware/wine.git";
-   EGIT_BRANCH="experimental_$(ver_cut 1-2)"
+   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}"

diff --git a/app-emulation/wine-proton/wine-proton-9.0.2.ebuild 
b/app-emulation/wine-proton/wine-proton-9.0.2.ebuild
index 4855ae40fca3..21ce4922b7c7 100644
--- a/app-emulation/wine-proton/wine-proton-9.0.2.ebuild
+++ b/app-emulation/wine-proton/wine-proton-9.0.2.ebuild
@@ -12,10 +12,10 @@ WINE_GECKO=2.47.4
 WINE_MONO=9.1.0
 WINE_PV=$(ver_rs 2 -)
 
-if [[ ${PV} == * ]]; then
+if [[ ${PV} ==  ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/ValveSoftware/wine.git";
-   EGIT_BRANCH="experimental_$(ver_cut 1-2)"
+   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}"

diff --git a/app-emulation/wine-proton/wine-proton-9.0.3.ebuild 
b/app-emulation/wine-proton/wine-proton-9.0.3.ebuild
index 63f043ab153c..1f038c794152 100644
--- a/app-emulation/wine-proton/wine-proton-9.0.3.ebuild
+++ b/app-emulation/wine-proton/wine-proton-9.0.3.ebuild
@@ -12,10 +12,10 @@ WINE_GECKO=2.47.4
 WINE_MONO=9.2.0
 WINE_PV=$(ver_rs 2 -)
 
-if [[ ${PV} == * ]]; then
+if [[ ${PV} ==  ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/ValveSoftware/wine.git";
-   EGIT_BRANCH="experimental_$(ver_cut 1-2)"
+   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}"

diff --git a/app-emulation/wine-proton/wine-proton-.ebuild 
b/app-emulation/wine-proton/wine-proton-.ebuild
index 4642b41877ee..4319a3a8efc7 100644
--- a/app-emulation/wine-proton/wine-proton-.ebuild
+++ b/app-emulation/wine-proton/wine-proton-.ebuild
@@ -12,7 +12,7 @@ WINE_GECKO=2.47.4
 WINE_MONO=9.3.1
 WINE_PV=$(ver_rs 2 -)
 
-if [[ ${PV} == * ]]; then
+if [[ ${PV} ==  ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/ValveSoftware/wine.git";
EGIT_BRANCH="bleeding-edge"



[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2024-12-11 Thread Ionen Wolkens
commit: 2f8211d8d12db54f70cfa96cc021db27732b169e
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed Dec 11 21:15:05 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Dec 11 21:41:55 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f8211d8

app-emulation/wine-proton: add 9.0.4

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/Manifest |   1 +
 app-emulation/wine-proton/wine-proton-9.0.4.ebuild | 448 +
 2 files changed, 449 insertions(+)

diff --git a/app-emulation/wine-proton/Manifest 
b/app-emulation/wine-proton/Manifest
index 62c1af0a3a83..0bb571679312 100644
--- a/app-emulation/wine-proton/Manifest
+++ b/app-emulation/wine-proton/Manifest
@@ -2,3 +2,4 @@ DIST proton-wine-7.0-6.tar.gz 45780326 BLAKE2B 
f140fcfdd1a47904c34a49d0795fa3326
 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-3.tar.gz 49153588 BLAKE2B 
81f80fbcf7045c9e08b8c4fd5feeb24fdc65f4266d6ecc2198e8638e56e6fd65cbf7e6d3d113d84ea0bd24ac8bb4780db0bb8dbfdf93f120b4f3b6a5948eedae
 SHA512 
1ec948c781576bc21d5735db4ad572c7d73ecd046d2d2e45958ddc08ec9591441397bb582bfe8b5eb94c584da7000cf4ab138b67bda4b3e717568842595f0d8f
+DIST proton-wine-9.0-4.tar.gz 49339922 BLAKE2B 
914ca093ac288c26400e4eeb2ea33943fc8ad89052aa7c97b5c44286dc175745720455d65163baa90b0d0271eb8028549315a3e8095b91947db2bd96c6fc4852
 SHA512 
e061f0a55b25493f67ca3add8c7e41020bb57cb15e8fb4fdf3c23f0cab2d00b703c90fbcf0dc1ca8b67e1726a76cee910e9ea6f567c88bc6c520dd6c9dbb75e9

diff --git a/app-emulation/wine-proton/wine-proton-9.0.4.ebuild 
b/app-emulation/wine-proton/wine-proton-9.0.4.ebuild
new file mode 100644
index ..1755a53c0c96
--- /dev/null
+++ b/app-emulation/wine-proton/wine-proton-9.0.4.ebuild
@@ -0,0 +1,448 @@
+# 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.4
+WINE_MONO=9.3.1
+WINE_PV=$(ver_rs 2 -)
+
+if [[ ${PV} ==  ]]; 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 OPENLDAP ZLIB gsm libpng2 libtiff"
+SLOT="${PV}"
+IUSE="
+   +abi_x86_32 +abi_x86_64 +alsa crossdev-mingw custom-cflags
+   +fontconfig +gecko +gstreamer llvm-libunwind +mono nls osmesa
+   perl pulseaudio +sdl selinux +ssl +strip udev udisks +unwind
+   usb v4l video_cards_amdgpu wow64 +xcomposite xinerama
+"
+REQUIRED_USE="wow64? ( abi_x86_64 !abi_x86_32 )"
+
+# 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-lib

[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2024-12-11 Thread Ionen Wolkens
commit: 2f5e25acd29e18341f6b9d94fbcde1c47aa4564f
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed Dec 11 08:32:19 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Dec 11 08:45:01 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f5e25ac

app-emulation/wine-proton: bump WINE_MONO to 9.3.1 in live

Not 9.4.0 for some reason, they even went out of their way to change
the automatic download url (unused here) given 9.3.1 is not on winehq.

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/wine-proton-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/wine-proton/wine-proton-.ebuild 
b/app-emulation/wine-proton/wine-proton-.ebuild
index 84d47f7e7cab..6d5eab1af541 100644
--- a/app-emulation/wine-proton/wine-proton-.ebuild
+++ b/app-emulation/wine-proton/wine-proton-.ebuild
@@ -9,7 +9,7 @@ inherit autotools flag-o-matic multilib multilib-build prefix
 inherit python-any-r1 readme.gentoo-r1 toolchain-funcs wrapper
 
 WINE_GECKO=2.47.4
-WINE_MONO=9.3.0
+WINE_MONO=9.3.1
 WINE_PV=$(ver_rs 2 -)
 
 if [[ ${PV} == * ]]; then



[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2024-11-27 Thread Ionen Wolkens
commit: a15fa5bb5c73df85a7261af00158780ca309f357
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu Nov 28 03:48:48 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Nov 28 05:36:27 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a15fa5bb

app-emulation/wine-proton: allow using compiler-rt[atomic-builtins]

Passing -latomic is no longer needed when using the new compiler-rt
w/ USE=atomic-builtins, and lets gcc be optional on llvm profiles.

To recap:
* gcc: don't need -latomic
* clang (w/o compiler-rt): don't need -latomic
* clang + compiler-rt[atomic-builtins]: don't need -latomic
* clang + compiler-rt[-atomic-builtins]: needs -latomic

So, if compiler-rt always provides atomics in the future (rather
than optional) all workarounds could be dropped.

The || ( ) is a bit "best effort" given dependencies don't know
what is actually going to be used.

(not worth a revbump, if really want to depclean gcc please
re-emerge manually)

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/wine-proton-8.0.5c.ebuild | 19 ++-
 app-emulation/wine-proton/wine-proton-9.0.2.ebuild  | 19 ++-
 app-emulation/wine-proton/wine-proton-9.0.3.ebuild  | 19 ++-
 app-emulation/wine-proton/wine-proton-.ebuild   | 19 ++-
 4 files changed, 56 insertions(+), 20 deletions(-)

diff --git a/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild 
b/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
index fe281d763060..484175067031 100644
--- a/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
+++ b/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
@@ -62,10 +62,8 @@ WINE_DLOPEN_DEPEND="
xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
 "
-# gcc: for -latomic with clang
 WINE_COMMON_DEPEND="
${WINE_DLOPEN_DEPEND}
-   sys-devel/gcc:*
x11-libs/libX11[${MULTILIB_USEDEP}]
x11-libs/libXext[${MULTILIB_USEDEP}]
x11-libs/libdrm[video_cards_amdgpu?,${MULTILIB_USEDEP}]
@@ -98,6 +96,10 @@ RDEPEND="
 "
 DEPEND="
${WINE_COMMON_DEPEND}
+   || (
+   sys-devel/gcc:*
+   sys-libs/compiler-rt:*[atomic-builtins(-)]
+   )
sys-kernel/linux-headers
x11-base/xorg-proto
 "
@@ -165,9 +167,16 @@ src_prepare() {
# drop as a quick fix for now which hopefully should be safe
sed -i '/MSVCRTFLAGS=/s/-mabi=ms//' configure.ac || die
 
-   # needed by Valve's fsync patches if using clang (undef 
atomic_load_8)
-   sed -e '/^UNIX_LIBS.*=/s/$/ -latomic/' \
-   -i dlls/{ntdll,winevulkan}/Makefile.in || die
+   # note: this is kind-of best effort and ignores llvm slots, 
rather
+   # than do LLVM_SLOT it may(?) be better to force atomic-builtins
+   # then could drop this altogether in the future
+   if [[ $(tc-get-c-rtlib) == compiler-rt ]] &&
+   has_version 'sys-libs/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
fi
 
# ensure .desktop calls this variant + slot

diff --git a/app-emulation/wine-proton/wine-proton-9.0.2.ebuild 
b/app-emulation/wine-proton/wine-proton-9.0.2.ebuild
index 4a959910a693..e025b12e1398 100644
--- a/app-emulation/wine-proton/wine-proton-9.0.2.ebuild
+++ b/app-emulation/wine-proton/wine-proton-9.0.2.ebuild
@@ -63,10 +63,8 @@ WINE_DLOPEN_DEPEND="
xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
 "
-# gcc: for -latomic with clang
 WINE_COMMON_DEPEND="
${WINE_DLOPEN_DEPEND}
-   sys-devel/gcc:*
x11-libs/libX11[${MULTILIB_USEDEP}]
x11-libs/libXext[${MULTILIB_USEDEP}]
x11-libs/libdrm[video_cards_amdgpu?,${MULTILIB_USEDEP}]
@@ -102,6 +100,10 @@ RDEPEND="
 "
 DEPEND="
${WINE_COMMON_DEPEND}
+   || (
+   sys-devel/gcc:*
+   sys-libs/compiler-rt:*[atomic-builtins(-)]
+   )
sys-kernel/linux-headers
x11-base/xorg-proto
 "
@@ -177,9 +179,16 @@ src_prepare() {
# drop as a quick fix for now which hopefully should be safe
sed -i '/MSVCRTFLAGS=/s/-mabi=ms//' configure.ac || die
 
-   # needed by Valve's fsync patches if using clang (undef 
atomic_load_8)
-   sed -e '/^UNIX_LIBS.*=/s/$/ -latomic/' \
-   -i dlls/{ntdll,winevulkan}/Makefile.in || die
+   # note: this is kind-of best effort and ignores llvm slots, 
rather
+   # than do LLVM_SLOT it may(?) be better to force atomic-buil

[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2024-11-27 Thread Ionen Wolkens
commit: ba30f061e47084a7ca6e9287b42e5cc9b667b621
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed Nov 27 09:36:00 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Nov 27 09:58:07 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba30f061

app-emulation/wine-proton: update live

Even if it was packaged, as far as I can tell this is used to
implement text-to-speech (protontts) and needs extra files from
Proton/Steam and so wouldn't work on its own.

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/wine-proton-.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app-emulation/wine-proton/wine-proton-.ebuild 
b/app-emulation/wine-proton/wine-proton-.ebuild
index 512564eccefb..66402fb77063 100644
--- a/app-emulation/wine-proton/wine-proton-.ebuild
+++ b/app-emulation/wine-proton/wine-proton-.ebuild
@@ -266,6 +266,7 @@ src_configure() {
$(use_with xcomposite)
$(use_with xinerama)
 
+   --without-piper # unpackaged, for tts but unusable without steam
--without-vosk # unpackaged, file a bug if you need this
)
 



[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2024-11-18 Thread Ionen Wolkens
commit: 9ef338cb5aec0c85fe0a6c65f61bc395237a789f
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Nov 18 22:35:25 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Nov 18 22:35:58 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ef338cb

app-emulation/wine-proton: pass -std=gnu17 for gcc15 for now

Bug: https://bugs.gentoo.org/943849
Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/wine-proton-7.0.6.ebuild  | 3 +++
 app-emulation/wine-proton/wine-proton-8.0.5c.ebuild | 3 +++
 app-emulation/wine-proton/wine-proton-9.0.2.ebuild  | 3 +++
 app-emulation/wine-proton/wine-proton-9.0.3.ebuild  | 3 +++
 app-emulation/wine-proton/wine-proton-.ebuild   | 3 +++
 5 files changed, 15 insertions(+)

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 0885f72efe17..4ebc2d33e911 100644
--- a/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
+++ b/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
@@ -247,6 +247,9 @@ src_configure() {
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* ]] &&

diff --git a/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild 
b/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
index cd3bf6391ea7..fe281d763060 100644
--- a/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
+++ b/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
@@ -251,6 +251,9 @@ src_configure() {
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* ]] &&

diff --git a/app-emulation/wine-proton/wine-proton-9.0.2.ebuild 
b/app-emulation/wine-proton/wine-proton-9.0.2.ebuild
index d8dfaa48476b..4a959910a693 100644
--- a/app-emulation/wine-proton/wine-proton-9.0.2.ebuild
+++ b/app-emulation/wine-proton/wine-proton-9.0.2.ebuild
@@ -271,6 +271,9 @@ src_configure() {
filter-flags -Wl,--gc-sections # runtime issues (bug #931329)
use custom-cflags || strip-flags # can break in obscure ways at runtime
 
+   # broken with gcc-15's c23 default (TODO: try w/o occasionally, bug 
#943849)
+   append-cflags -std=gnu17
+
# wine uses linker tricks unlikely to work with non-bfd/lld (bug 
#867097)
# (do self test until https://github.com/gentoo/gentoo/pull/28355)
if [[ $(LC_ALL=C $(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) != 
@(LLD|GNU\ ld)* ]]

diff --git a/app-emulation/wine-proton/wine-proton-9.0.3.ebuild 
b/app-emulation/wine-proton/wine-proton-9.0.3.ebuild
index 158df4efa795..1b6c3be815f9 100644
--- a/app-emulation/wine-proton/wine-proton-9.0.3.ebuild
+++ b/app-emulation/wine-proton/wine-proton-9.0.3.ebuild
@@ -271,6 +271,9 @@ src_configure() {
filter-flags -Wl,--gc-sections # runtime issues (bug #931329)
use custom-cflags || strip-flags # can break in obscure ways at runtime
 
+   # broken with gcc-15's c23 default (TODO: try w/o occasionally, bug 
#943849)
+   append-cflags -std=gnu17
+
# wine uses linker tricks unlikely to work with non-bfd/lld (bug 
#867097)
# (do self test until https://github.com/gentoo/gentoo/pull/28355)
if [[ $(LC_ALL=C $(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) != 
@(LLD|GNU\ ld)* ]]

diff --git a/app-emulation/wine-proton/wine-proton-.ebuild 
b/app-emulation/wine-proton/wine-proton-.ebuild
index 10f556feb152..512564eccefb 100644
--- a/app-emulation/wine-proton/wine-proton-.ebuild
+++ b/app-emulation/wine-proton/wine-proton-.ebuild
@@ -273,6 +273,9 @@ src_configure() {
filter-flags -Wl,--gc-sections # runtime issues (bug #931329)
use custom-cflags || strip-flags # can break in obscure ways at runtime
 
+   # broken with gcc-15's c23 default (TODO: try w/o occasionally, bug 
#943849)
+   append-cflags -std=gnu17
+
# wine uses linker tricks unlikely to work with non-bfd/lld (bug 
#867097)
# (do self test until https://github.com/gentoo/gentoo/pull/28355)
if [[ $(LC_ALL=C $(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) != 
@(LLD|GNU\ ld)* ]]



[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/, app-emulation/wine-proton/files/

2024-11-07 Thread Ionen Wolkens
commit: c61a33e9c6f517465fac77ae9995bb01ce000a36
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu Nov  7 23:47:50 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Nov  7 23:59:47 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c61a33e9

app-emulation/wine-proton: more clearly warn about lack of support

And repeat it every time rather than just on first install through
the README.gentoo so that (hopefully) upstream Valve will not get
more bug reports from here.

Furthermore note that we also can't really do much about issues
either and users seeking support should use normal Wine or normal
Proton.

Bug: https://bugs.gentoo.org/943001
Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/files/README.gentoo   | 4 
 app-emulation/wine-proton/wine-proton-7.0.6.ebuild  | 7 +++
 app-emulation/wine-proton/wine-proton-8.0.5c.ebuild | 7 +++
 app-emulation/wine-proton/wine-proton-9.0.2.ebuild  | 7 +++
 app-emulation/wine-proton/wine-proton-9.0.3.ebuild  | 7 +++
 app-emulation/wine-proton/wine-proton-.ebuild   | 7 +++
 6 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/app-emulation/wine-proton/files/README.gentoo 
b/app-emulation/wine-proton/files/README.gentoo
index 0d88628a45ff..48f3d568a013 100644
--- a/app-emulation/wine-proton/files/README.gentoo
+++ b/app-emulation/wine-proton/files/README.gentoo
@@ -46,10 +46,6 @@ If have audio/video playback issues, note to look at 
GStreamer plugins.
 Notably USE=ffmpeg on media-plugins/gst-plugins-meta which Proton normally
 provide by default.
 
-Note that upstream may not be interested in bug reports without first
-reproducing using the actual Steam+Proton rather than this custom
-standalone build (esp. if lacking certain things like dxvk).
-
 ---
 
 If have other Wine variants installed, remember to either use `eselect wine`

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 29b0e02ef24a..0885f72efe17 100644
--- a/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
+++ b/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
@@ -372,6 +372,13 @@ pkg_postinst() {
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
 }
 

diff --git a/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild 
b/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
index cecd79a0c1f7..cd3bf6391ea7 100644
--- a/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
+++ b/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
@@ -389,6 +389,13 @@ pkg_postinst() {
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
 }
 

diff --git a/app-emulation/wine-proton/wine-proton-9.0.2.ebuild 
b/app-emulation/wine-proton/wine-proton-9.0.2.ebuild
index 17bdf7ebbeef..d8dfaa48476b 100644
--- a/app-emulation/wine-proton/wine-proton-9.0.2.ebuild
+++ b/app-emulation/wine-proton/wine-proton-9.0.2.ebuild
@@ -421,6 +421,13 @@ pkg_postinst() {
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
 }
 

diff --git a/app-emulation/wine-proton/wine-proton-9.0.3.ebuild 
b/app-emulation/wine-proton/wine-proton-9.0.3.ebuild
index 3895030f61ab..158df4efa795 100644
--- a/app-emulation/wine-proton/wine-proton-9.0.3.ebuild
+++ b/app-emulation/wine-proton/wine-proton-9.0.3.ebuild
@@ -421,6 +421,13 @@ pkg_postinst() {
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
 }
 

diff --

[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2024-10-05 Thread Ionen Wolkens
commit: 179cd17d5ffd5021f0b6481eb927112593ebbecd
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sat Oct  5 06:28:51 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat Oct  5 08:11:34 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=179cd17d

app-emulation/wine-proton: drop 9.0.1

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/Manifest |   1 -
 app-emulation/wine-proton/wine-proton-9.0.1.ebuild | 429 -
 2 files changed, 430 deletions(-)

diff --git a/app-emulation/wine-proton/Manifest 
b/app-emulation/wine-proton/Manifest
index 4916697a6785..62c1af0a3a83 100644
--- a/app-emulation/wine-proton/Manifest
+++ b/app-emulation/wine-proton/Manifest
@@ -1,5 +1,4 @@
 DIST proton-wine-7.0-6.tar.gz 45780326 BLAKE2B 
f140fcfdd1a47904c34a49d0795fa3326d7cf0d3fac8d6c2ef2a4926181a46223f43a2d1ca96c543e800c8c46b2a3cc51ae306a029d68a42608876e869e177d5
 SHA512 
793bbe2b23042301a1b518717d78cfff01eaffa033d010659a45779b9136d33cfac63f0c3fbb1e458953a954b423eb70ac4fa87633352267db890ceb2fef
 DIST proton-wine-8.0-5c.tar.gz 48710071 BLAKE2B 
99627baea6fb3d51231aa1e75a2734c3c1baba88326baf15b3d421d57a00472d25ba51c2140b51152c8aeae7dd240d3d77bb0d8835aa7eb3b745a51be120f8bb
 SHA512 
0cf98d4e67866e55cc8cd5ea8da0d76aee8e37b130b3cbca604083c913e98ddf9038ecd6f9761d2e11443e282b372977400e251456c6d40e1365210c7578234d
-DIST proton-wine-9.0-1.tar.gz 49048661 BLAKE2B 
cf237c314e8b222bb36f52f316baae2351a30d22995d610c7977accc9588c474d0e598702000aa81b34fc2f3daeccd09f54ef53b7a2250c0b012ca47d69628eb
 SHA512 
d7d3e4725a86ca120d059e5b8f9760bce45a5db0ae814cd76aa51dc361bb67af9c2834917ddad3858fc324a1d048acdd9942492c77d0f396aae7d537c70e3ca1
 DIST proton-wine-9.0-2.tar.gz 49125171 BLAKE2B 
ac1e4a63f94689bc4fcc6ab4e2d12cfc214f54181515434ab950d8975d131a5f6333b1e6cb9b67eda61cf3e652e57e27e60ba3cff6a6ac403b07178f382f7e25
 SHA512 
82efee3100da80f650229d1abf3df4896ab71af4a79c6e5cf03aa646c56f435daf07c6f084a3264067cf90ce509102e3d7ee6d4bf7d0650baf645b5ece08cc7c
 DIST proton-wine-9.0-3.tar.gz 49153588 BLAKE2B 
81f80fbcf7045c9e08b8c4fd5feeb24fdc65f4266d6ecc2198e8638e56e6fd65cbf7e6d3d113d84ea0bd24ac8bb4780db0bb8dbfdf93f120b4f3b6a5948eedae
 SHA512 
1ec948c781576bc21d5735db4ad572c7d73ecd046d2d2e45958ddc08ec9591441397bb582bfe8b5eb94c584da7000cf4ab138b67bda4b3e717568842595f0d8f

diff --git a/app-emulation/wine-proton/wine-proton-9.0.1.ebuild 
b/app-emulation/wine-proton/wine-proton-9.0.1.ebuild
deleted file mode 100644
index aaa8d2f07d3c..
--- a/app-emulation/wine-proton/wine-proton-9.0.1.ebuild
+++ /dev/null
@@ -1,429 +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.4
-WINE_MONO=8.1.0
-WINE_PV=$(ver_rs 2 -)
-
-if [[ ${PV} == * ]]; 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
-   +fontconfig +gecko +gstreamer llvm-libunwind +mono nls osmesa
-   perl pulseaudio +sdl selinux +ssl +strip udev udisks +unwind
-   usb v4l video_cards_amdgpu wow64 +xcomposite xinerama
-"
-REQUIRED_USE="wow64? ( abi_x86_64 !abi_x86_32 )"
-
-# 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}] )
-  

[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2024-10-05 Thread Ionen Wolkens
commit: e61124270b92f9e4720e3ca423d9555ad0c82dcb
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sat Oct  5 06:28:23 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat Oct  5 08:11:34 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6112427

app-emulation/wine-proton: add , drop 9.0.

Using the "bleeding-edge" branch. Pretty sure this branch did not
exist when formerly added the live ebuild and so had settled for
the versioned experimental branch.

Do not wish to maintain two live ebuilds, and it probably make more
sense to use bleeding edge if any (experimental is not updated that
often, and may lack fixes for very recent games that some users may
need).

Signed-off-by: Ionen Wolkens  gentoo.org>

 .../{wine-proton-9.0..ebuild => wine-proton-.ebuild}  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-emulation/wine-proton/wine-proton-9.0..ebuild 
b/app-emulation/wine-proton/wine-proton-.ebuild
similarity index 99%
rename from app-emulation/wine-proton/wine-proton-9.0..ebuild
rename to app-emulation/wine-proton/wine-proton-.ebuild
index 9c233aee5903..dc95b99493af 100644
--- a/app-emulation/wine-proton/wine-proton-9.0..ebuild
+++ b/app-emulation/wine-proton/wine-proton-.ebuild
@@ -9,13 +9,13 @@ inherit autotools flag-o-matic multilib multilib-build prefix
 inherit python-any-r1 readme.gentoo-r1 toolchain-funcs wrapper
 
 WINE_GECKO=2.47.4
-WINE_MONO=9.1.0
+WINE_MONO=9.3.0
 WINE_PV=$(ver_rs 2 -)
 
 if [[ ${PV} == * ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/ValveSoftware/wine.git";
-   EGIT_BRANCH="experimental_$(ver_cut 1-2)"
+   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}"



[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2024-10-01 Thread Ionen Wolkens
commit: 7d8fe16667c8efeb957dce16f704563ce87d699c
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed Oct  2 04:30:52 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Oct  2 04:34:40 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d8fe166

app-emulation/wine-proton: update live?

wine-mono was at 9.3.0 (still seeing the old value in a old checkout)
but seems the commit that made that change is gone, was the
experimental_9.0 branch force pushed?

Odds are it's a mistake and will have to change it back, but adjust
anyway in the interim.

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/wine-proton-9.0..ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/wine-proton/wine-proton-9.0..ebuild 
b/app-emulation/wine-proton/wine-proton-9.0..ebuild
index 40365fde2442..9c233aee5903 100644
--- a/app-emulation/wine-proton/wine-proton-9.0..ebuild
+++ b/app-emulation/wine-proton/wine-proton-9.0..ebuild
@@ -9,7 +9,7 @@ inherit autotools flag-o-matic multilib multilib-build prefix
 inherit python-any-r1 readme.gentoo-r1 toolchain-funcs wrapper
 
 WINE_GECKO=2.47.4
-WINE_MONO=9.3.0
+WINE_MONO=9.1.0
 WINE_PV=$(ver_rs 2 -)
 
 if [[ ${PV} == * ]]; then



[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/files/

2024-09-26 Thread Ionen Wolkens
commit: fd0dc4bb6317b1e9fa859e38705e215373edee88
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu Sep 26 21:44:47 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Sep 26 21:45:21 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd0dc4bb

app-emulation/wine-proton: warn about bug reports in README.gentoo

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/files/README.gentoo | 4 
 1 file changed, 4 insertions(+)

diff --git a/app-emulation/wine-proton/files/README.gentoo 
b/app-emulation/wine-proton/files/README.gentoo
index 48f3d568a013..0d88628a45ff 100644
--- a/app-emulation/wine-proton/files/README.gentoo
+++ b/app-emulation/wine-proton/files/README.gentoo
@@ -46,6 +46,10 @@ If have audio/video playback issues, note to look at 
GStreamer plugins.
 Notably USE=ffmpeg on media-plugins/gst-plugins-meta which Proton normally
 provide by default.
 
+Note that upstream may not be interested in bug reports without first
+reproducing using the actual Steam+Proton rather than this custom
+standalone build (esp. if lacking certain things like dxvk).
+
 ---
 
 If have other Wine variants installed, remember to either use `eselect wine`



[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2024-09-20 Thread Ionen Wolkens
commit: c69bb4ed9c919da4083f9e114b915cd6b23f525f
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri Sep 20 07:11:40 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri Sep 20 07:15:24 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c69bb4ed

app-emulation/wine-proton: update live

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/wine-proton-9.0..ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/wine-proton/wine-proton-9.0..ebuild 
b/app-emulation/wine-proton/wine-proton-9.0..ebuild
index 78a63d876e93..40365fde2442 100644
--- a/app-emulation/wine-proton/wine-proton-9.0..ebuild
+++ b/app-emulation/wine-proton/wine-proton-9.0..ebuild
@@ -9,7 +9,7 @@ inherit autotools flag-o-matic multilib multilib-build prefix
 inherit python-any-r1 readme.gentoo-r1 toolchain-funcs wrapper
 
 WINE_GECKO=2.47.4
-WINE_MONO=9.2.0
+WINE_MONO=9.3.0
 WINE_PV=$(ver_rs 2 -)
 
 if [[ ${PV} == * ]]; then



[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2024-09-19 Thread Ionen Wolkens
commit: 7243846fa1381b4842b45ff378bd9f501e28d41a
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu Sep 19 20:49:36 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Sep 19 21:05:54 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7243846f

app-emulation/wine-proton: add 9.0.3

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/Manifest |   1 +
 app-emulation/wine-proton/wine-proton-9.0.3.ebuild | 429 +
 2 files changed, 430 insertions(+)

diff --git a/app-emulation/wine-proton/Manifest 
b/app-emulation/wine-proton/Manifest
index a78cd9208436..4916697a6785 100644
--- a/app-emulation/wine-proton/Manifest
+++ b/app-emulation/wine-proton/Manifest
@@ -2,3 +2,4 @@ DIST proton-wine-7.0-6.tar.gz 45780326 BLAKE2B 
f140fcfdd1a47904c34a49d0795fa3326
 DIST proton-wine-8.0-5c.tar.gz 48710071 BLAKE2B 
99627baea6fb3d51231aa1e75a2734c3c1baba88326baf15b3d421d57a00472d25ba51c2140b51152c8aeae7dd240d3d77bb0d8835aa7eb3b745a51be120f8bb
 SHA512 
0cf98d4e67866e55cc8cd5ea8da0d76aee8e37b130b3cbca604083c913e98ddf9038ecd6f9761d2e11443e282b372977400e251456c6d40e1365210c7578234d
 DIST proton-wine-9.0-1.tar.gz 49048661 BLAKE2B 
cf237c314e8b222bb36f52f316baae2351a30d22995d610c7977accc9588c474d0e598702000aa81b34fc2f3daeccd09f54ef53b7a2250c0b012ca47d69628eb
 SHA512 
d7d3e4725a86ca120d059e5b8f9760bce45a5db0ae814cd76aa51dc361bb67af9c2834917ddad3858fc324a1d048acdd9942492c77d0f396aae7d537c70e3ca1
 DIST proton-wine-9.0-2.tar.gz 49125171 BLAKE2B 
ac1e4a63f94689bc4fcc6ab4e2d12cfc214f54181515434ab950d8975d131a5f6333b1e6cb9b67eda61cf3e652e57e27e60ba3cff6a6ac403b07178f382f7e25
 SHA512 
82efee3100da80f650229d1abf3df4896ab71af4a79c6e5cf03aa646c56f435daf07c6f084a3264067cf90ce509102e3d7ee6d4bf7d0650baf645b5ece08cc7c
+DIST proton-wine-9.0-3.tar.gz 49153588 BLAKE2B 
81f80fbcf7045c9e08b8c4fd5feeb24fdc65f4266d6ecc2198e8638e56e6fd65cbf7e6d3d113d84ea0bd24ac8bb4780db0bb8dbfdf93f120b4f3b6a5948eedae
 SHA512 
1ec948c781576bc21d5735db4ad572c7d73ecd046d2d2e45958ddc08ec9591441397bb582bfe8b5eb94c584da7000cf4ab138b67bda4b3e717568842595f0d8f

diff --git a/app-emulation/wine-proton/wine-proton-9.0.3.ebuild 
b/app-emulation/wine-proton/wine-proton-9.0.3.ebuild
new file mode 100644
index ..3895030f61ab
--- /dev/null
+++ b/app-emulation/wine-proton/wine-proton-9.0.3.ebuild
@@ -0,0 +1,429 @@
+# 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.4
+WINE_MONO=9.2.0
+WINE_PV=$(ver_rs 2 -)
+
+if [[ ${PV} == * ]]; 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
+   +fontconfig +gecko +gstreamer llvm-libunwind +mono nls osmesa
+   perl pulseaudio +sdl selinux +ssl +strip udev udisks +unwind
+   usb v4l video_cards_amdgpu wow64 +xcomposite xinerama
+"
+REQUIRED_USE="wow64? ( abi_x86_64 !abi_x86_32 )"
+
+# 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}] )
+"
+# gcc: for -latomic with clang
+WINE_COMMON_DEPEND=

[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2024-07-06 Thread Ionen Wolkens
commit: 571e804223ddb840722f40486c72267ce95d2be4
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sat Jul  6 07:02:48 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat Jul  6 07:02:54 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=571e8042

app-emulation/wine-proton: update live

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/wine-proton-9.0..ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/wine-proton/wine-proton-9.0..ebuild 
b/app-emulation/wine-proton/wine-proton-9.0..ebuild
index 9c233aee5903..78a63d876e93 100644
--- a/app-emulation/wine-proton/wine-proton-9.0..ebuild
+++ b/app-emulation/wine-proton/wine-proton-9.0..ebuild
@@ -9,7 +9,7 @@ inherit autotools flag-o-matic multilib multilib-build prefix
 inherit python-any-r1 readme.gentoo-r1 toolchain-funcs wrapper
 
 WINE_GECKO=2.47.4
-WINE_MONO=9.1.0
+WINE_MONO=9.2.0
 WINE_PV=$(ver_rs 2 -)
 
 if [[ ${PV} == * ]]; then



[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2024-06-12 Thread Ionen Wolkens
commit: 59c8eae7592a4de4b1b06b3aec93d220d8cfa6cc
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed Jun 12 23:19:25 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Jun 12 23:51:43 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59c8eae7

app-emulation/wine-proton: sync live

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/wine-proton-9.0..ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/wine-proton/wine-proton-9.0..ebuild 
b/app-emulation/wine-proton/wine-proton-9.0..ebuild
index caa389a5712f..9c233aee5903 100644
--- a/app-emulation/wine-proton/wine-proton-9.0..ebuild
+++ b/app-emulation/wine-proton/wine-proton-9.0..ebuild
@@ -9,7 +9,7 @@ inherit autotools flag-o-matic multilib multilib-build prefix
 inherit python-any-r1 readme.gentoo-r1 toolchain-funcs wrapper
 
 WINE_GECKO=2.47.4
-WINE_MONO=9.0.0
+WINE_MONO=9.1.0
 WINE_PV=$(ver_rs 2 -)
 
 if [[ ${PV} == * ]]; then



[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2024-06-12 Thread Ionen Wolkens
commit: 2d6401a181645d5f7f55b012232cbb7ecbad7f8e
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed Jun 12 23:19:17 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Jun 12 23:51:43 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d6401a1

app-emulation/wine-proton: add 9.0.2

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/Manifest |   1 +
 app-emulation/wine-proton/wine-proton-9.0.2.ebuild | 429 +
 2 files changed, 430 insertions(+)

diff --git a/app-emulation/wine-proton/Manifest 
b/app-emulation/wine-proton/Manifest
index 4e84f540f297..a78cd9208436 100644
--- a/app-emulation/wine-proton/Manifest
+++ b/app-emulation/wine-proton/Manifest
@@ -1,3 +1,4 @@
 DIST proton-wine-7.0-6.tar.gz 45780326 BLAKE2B 
f140fcfdd1a47904c34a49d0795fa3326d7cf0d3fac8d6c2ef2a4926181a46223f43a2d1ca96c543e800c8c46b2a3cc51ae306a029d68a42608876e869e177d5
 SHA512 
793bbe2b23042301a1b518717d78cfff01eaffa033d010659a45779b9136d33cfac63f0c3fbb1e458953a954b423eb70ac4fa87633352267db890ceb2fef
 DIST proton-wine-8.0-5c.tar.gz 48710071 BLAKE2B 
99627baea6fb3d51231aa1e75a2734c3c1baba88326baf15b3d421d57a00472d25ba51c2140b51152c8aeae7dd240d3d77bb0d8835aa7eb3b745a51be120f8bb
 SHA512 
0cf98d4e67866e55cc8cd5ea8da0d76aee8e37b130b3cbca604083c913e98ddf9038ecd6f9761d2e11443e282b372977400e251456c6d40e1365210c7578234d
 DIST proton-wine-9.0-1.tar.gz 49048661 BLAKE2B 
cf237c314e8b222bb36f52f316baae2351a30d22995d610c7977accc9588c474d0e598702000aa81b34fc2f3daeccd09f54ef53b7a2250c0b012ca47d69628eb
 SHA512 
d7d3e4725a86ca120d059e5b8f9760bce45a5db0ae814cd76aa51dc361bb67af9c2834917ddad3858fc324a1d048acdd9942492c77d0f396aae7d537c70e3ca1
+DIST proton-wine-9.0-2.tar.gz 49125171 BLAKE2B 
ac1e4a63f94689bc4fcc6ab4e2d12cfc214f54181515434ab950d8975d131a5f6333b1e6cb9b67eda61cf3e652e57e27e60ba3cff6a6ac403b07178f382f7e25
 SHA512 
82efee3100da80f650229d1abf3df4896ab71af4a79c6e5cf03aa646c56f435daf07c6f084a3264067cf90ce509102e3d7ee6d4bf7d0650baf645b5ece08cc7c

diff --git a/app-emulation/wine-proton/wine-proton-9.0.2.ebuild 
b/app-emulation/wine-proton/wine-proton-9.0.2.ebuild
new file mode 100644
index ..5b65bf80cc44
--- /dev/null
+++ b/app-emulation/wine-proton/wine-proton-9.0.2.ebuild
@@ -0,0 +1,429 @@
+# 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.4
+WINE_MONO=9.1.0
+WINE_PV=$(ver_rs 2 -)
+
+if [[ ${PV} == * ]]; 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
+   +fontconfig +gecko +gstreamer llvm-libunwind +mono nls osmesa
+   perl pulseaudio +sdl selinux +ssl +strip udev udisks +unwind
+   usb v4l video_cards_amdgpu wow64 +xcomposite xinerama
+"
+REQUIRED_USE="wow64? ( abi_x86_64 !abi_x86_32 )"
+
+# 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}] )
+"
+# gcc: for -latomic with clang
+WINE_COMMON_DEPEND="
+   ${WINE_DLOPEN_DEPEND}
+   sys-devel/gcc:*
+   x11-libs/libX11[${

[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/, app-emulation/wine-proton/files/

2024-06-01 Thread Ionen Wolkens
commit: 593965e4bc4692323d330191d13bea191203d717
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sun Jun  2 02:57:10 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sun Jun  2 03:43:36 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=593965e4

app-emulation/wine-proton: fix build with -Os

Signed-off-by: Ionen Wolkens  gentoo.org>

 .../wine-proton/files/wine-proton-7.0.6-vulkan-libm.patch| 12 
 .../wine-proton/files/wine-proton-8.0.5c-vulkan-libm.patch   | 12 
 app-emulation/wine-proton/wine-proton-7.0.6.ebuild   |  1 +
 app-emulation/wine-proton/wine-proton-8.0.5c.ebuild  |  1 +
 app-emulation/wine-proton/wine-proton-9.0.1.ebuild   |  1 +
 app-emulation/wine-proton/wine-proton-9.0..ebuild|  1 +
 6 files changed, 28 insertions(+)

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
new file mode 100644
index ..b81778fb957c
--- /dev/null
+++ b/app-emulation/wine-proton/files/wine-proton-7.0.6-vulkan-libm.patch
@@ -0,0 +1,12 @@
+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/files/wine-proton-8.0.5c-vulkan-libm.patch 
b/app-emulation/wine-proton/files/wine-proton-8.0.5c-vulkan-libm.patch
new file mode 100644
index ..c3d9794fbbfe
--- /dev/null
+++ b/app-emulation/wine-proton/files/wine-proton-8.0.5c-vulkan-libm.patch
@@ -0,0 +1,12 @@
+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
+-UNIX_LIBS = -lwin32u $(PTHREAD_LIBS)
++UNIX_LIBS = -lm -lwin32u $(PTHREAD_LIBS)
+ 

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 cdab45831b77..29b0e02ef24a 100644
--- a/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
+++ b/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
@@ -124,6 +124,7 @@ PATCHES=(
"${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() {

diff --git a/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild 
b/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
index 83417e7c34f7..cecd79a0c1f7 100644
--- a/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
+++ b/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
@@ -124,6 +124,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-7.0.4-noexecstack.patch
"${FILESDIR}"/${PN}-8.0.1c-unwind.patch
"${FILESDIR}"/${PN}-8.0.4-restore-menubuilder.patch
+   "${FILESDIR}"/${PN}-8.0.5c-vulkan-libm.patch
 )
 
 pkg_pretend() {

diff --git a/app-emulation/wine-proton/wine-proton-9.0.1.ebuild 
b/app-emulation/wine-proton/wine-proton-9.0.1.ebuild
index 1dd72b877060..227f0cf4916a 100644
--- a/app-emulation/wine-proton/wine-proton-9.0.1.ebuild
+++ b/app-emulation/wine-proton/wine-proton-9.0.1.ebuild
@@ -134,6 +134,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-7.0.4-noexecstack.patch
"${FILESDIR}"/${PN}-8.0.1c-unwind.patch
"${FILESDIR}"/${PN}-8.0.4-restore-menubuilder.patch
+   "${FILESDIR}"/${PN}-8.0.5c-vulkan-libm.patch
"${FILESDIR}"/${PN}-9.0-rpath.patch
 )
 

diff --git a/app-emulation/wine-proton/wine-proton-9.0..ebuild 
b/app-emulation/wine-proton/wine-proton-9.0..ebuild
index f43dad37ae8e..caa389a5712f 100644
--- a/app-emulation/wine-proton/wine-proton-9.0..ebuild
+++ b/app-emulation/wine-proton/wine-proton-9.0..ebuild
@@ -134,6 +134,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-7.0.4-noexecstack.patch
"${FILESDIR}"/${PN}-8.0.1c-unwind.patch
"${FILESDIR}"/${PN}-8.0.4-restore-menubuilder.patch
+   "${FILESDIR}"/${PN}-8.0.5c-vulkan-libm.patch
"${FILESDIR}"/${PN}-9.0-rpath.patch
 )
 



[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2024-05-30 Thread Ionen Wolkens
commit: 28ce3c60e87f00db74c1b08ec1f174deff9e39a9
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri May 31 06:09:20 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri May 31 06:19:48 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28ce3c60

app-emulation/wine-proton: extend 32bit hwaccel warning for mesa

Hard to tell what's actually needed, nvidia users do not need
it on mesa (or need mesa at all), mesa users do not need it on
nvidia, and multi-card users likely need it on both.

If do this through dependencies, *could* always depend on
mesa[abi_x86_32] even if it may be wrong, and depend on nvidia's
if USE=video_cards_nvidia -- but for now sticking to a warning.

Ultimately it's also kind of an optfeature, only needed if
running 32bit hardware accelerated applications and not needed
at build time.

Non-issue for users doing abi_x86_32 globally.

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/wine-proton-7.0.6.ebuild| 19 ++-
 app-emulation/wine-proton/wine-proton-8.0.5c.ebuild   | 19 ++-
 app-emulation/wine-proton/wine-proton-9.0.1.ebuild| 19 ++-
 app-emulation/wine-proton/wine-proton-9.0..ebuild | 19 ++-
 4 files changed, 56 insertions(+), 20 deletions(-)

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 546bcaf60b4a..cdab45831b77 100644
--- a/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
+++ b/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
@@ -355,11 +355,20 @@ pkg_preinst() {
 pkg_postinst() {
[[ -v WINE_HAD_ANY_SLOT ]] || readme.gentoo_print_elog
 
-   if use abi_x86_32 && 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."
+   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
 
eselect wine update --if-unset || die

diff --git a/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild 
b/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
index e5b25d63323f..83417e7c34f7 100644
--- a/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
+++ b/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
@@ -372,11 +372,20 @@ pkg_preinst() {
 pkg_postinst() {
[[ -v WINE_HAD_ANY_SLOT ]] || readme.gentoo_print_elog
 
-   if use abi_x86_32 && 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."
+   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
 
eselect win

[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2024-05-21 Thread Ionen Wolkens
commit: f148a5bd2cbd0b8094b11865d5b0f9884f551127
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed May 22 02:11:24 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed May 22 03:30:58 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f148a5bd

Revert "app-emulation/wine-proton: add workaround for gcc14 ICE w/ mingw"

This reverts commit b701bf35fd508f2bc15c42805e7ab2ad131ff5f6.

Fixing in mingw64-toolchain instead, *could* keep the workaround
longer for those that didn't update but likely doesn't affect many.

Bug: https://bugs.gentoo.org/932319
Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/wine-proton-7.0.6.ebuild| 3 ---
 app-emulation/wine-proton/wine-proton-8.0.5c.ebuild   | 3 ---
 app-emulation/wine-proton/wine-proton-9.0.1.ebuild| 3 ---
 app-emulation/wine-proton/wine-proton-9.0..ebuild | 3 ---
 4 files changed, 12 deletions(-)

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 81d3096abf6b..546bcaf60b4a 100644
--- a/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
+++ b/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
@@ -295,9 +295,6 @@ src_configure() {
# znver4: 
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110273
append-cflags -mno-avx #912268
 
-   # gcc14 -fno-omit-frame-pointer ICE workaround (bug 
#932319)
-   append-flags -fomit-frame-pointer
-
CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"
: "${CROSSLDFLAGS:=$(
filter-flags '-fuse-ld=*'

diff --git a/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild 
b/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
index c0e755952564..e5b25d63323f 100644
--- a/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
+++ b/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
@@ -308,9 +308,6 @@ src_configure() {
# znver4: 
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110273
append-cflags -mno-avx #912268
 
-   # gcc14 -fno-omit-frame-pointer ICE workaround (bug 
#932319)
-   append-flags -fomit-frame-pointer
-
CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"
: "${CROSSLDFLAGS:=$(
filter-flags '-fuse-ld=*'

diff --git a/app-emulation/wine-proton/wine-proton-9.0.1.ebuild 
b/app-emulation/wine-proton/wine-proton-9.0.1.ebuild
index f3d2a4dc29e1..4558c65461b2 100644
--- a/app-emulation/wine-proton/wine-proton-9.0.1.ebuild
+++ b/app-emulation/wine-proton/wine-proton-9.0.1.ebuild
@@ -301,9 +301,6 @@ src_configure() {
# (primarily done for 23.0 profiles' -z, not full 
coverage)
filter-flags '-Wl,-z,*'
 
-   # gcc14 -fno-omit-frame-pointer ICE workaround (bug 
#932319)
-   append-flags -fomit-frame-pointer
-
CC=${mingwcc} test-flags-CC ${CFLAGS:--O2}
)}"
 

diff --git a/app-emulation/wine-proton/wine-proton-9.0..ebuild 
b/app-emulation/wine-proton/wine-proton-9.0..ebuild
index 8a5138a724ad..ceddb4a00eec 100644
--- a/app-emulation/wine-proton/wine-proton-9.0..ebuild
+++ b/app-emulation/wine-proton/wine-proton-9.0..ebuild
@@ -303,9 +303,6 @@ src_configure() {
# (primarily done for 23.0 profiles' -z, not full 
coverage)
filter-flags '-Wl,-z,*'
 
-   # gcc14 -fno-omit-frame-pointer ICE workaround (bug 
#932319)
-   append-flags -fomit-frame-pointer
-
CC=${mingwcc} test-flags-CC ${CFLAGS:--O2}
)}"
 



[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2024-05-20 Thread Ionen Wolkens
commit: b701bf35fd508f2bc15c42805e7ab2ad131ff5f6
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue May 21 02:23:48 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue May 21 02:58:15 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b701bf35

app-emulation/wine-proton: add workaround for gcc14 ICE w/ mingw

Bug: https://bugs.gentoo.org/932319
Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/wine-proton-7.0.6.ebuild| 3 +++
 app-emulation/wine-proton/wine-proton-8.0.5c.ebuild   | 3 +++
 app-emulation/wine-proton/wine-proton-9.0.1.ebuild| 3 +++
 app-emulation/wine-proton/wine-proton-9.0..ebuild | 3 +++
 4 files changed, 12 insertions(+)

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 546bcaf60b4a..81d3096abf6b 100644
--- a/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
+++ b/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
@@ -295,6 +295,9 @@ src_configure() {
# znver4: 
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110273
append-cflags -mno-avx #912268
 
+   # gcc14 -fno-omit-frame-pointer ICE workaround (bug 
#932319)
+   append-flags -fomit-frame-pointer
+
CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"
: "${CROSSLDFLAGS:=$(
filter-flags '-fuse-ld=*'

diff --git a/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild 
b/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
index e5b25d63323f..c0e755952564 100644
--- a/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
+++ b/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
@@ -308,6 +308,9 @@ src_configure() {
# znver4: 
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110273
append-cflags -mno-avx #912268
 
+   # gcc14 -fno-omit-frame-pointer ICE workaround (bug 
#932319)
+   append-flags -fomit-frame-pointer
+
CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"
: "${CROSSLDFLAGS:=$(
filter-flags '-fuse-ld=*'

diff --git a/app-emulation/wine-proton/wine-proton-9.0.1.ebuild 
b/app-emulation/wine-proton/wine-proton-9.0.1.ebuild
index 4558c65461b2..f3d2a4dc29e1 100644
--- a/app-emulation/wine-proton/wine-proton-9.0.1.ebuild
+++ b/app-emulation/wine-proton/wine-proton-9.0.1.ebuild
@@ -301,6 +301,9 @@ src_configure() {
# (primarily done for 23.0 profiles' -z, not full 
coverage)
filter-flags '-Wl,-z,*'
 
+   # gcc14 -fno-omit-frame-pointer ICE workaround (bug 
#932319)
+   append-flags -fomit-frame-pointer
+
CC=${mingwcc} test-flags-CC ${CFLAGS:--O2}
)}"
 

diff --git a/app-emulation/wine-proton/wine-proton-9.0..ebuild 
b/app-emulation/wine-proton/wine-proton-9.0..ebuild
index ceddb4a00eec..8a5138a724ad 100644
--- a/app-emulation/wine-proton/wine-proton-9.0..ebuild
+++ b/app-emulation/wine-proton/wine-proton-9.0..ebuild
@@ -303,6 +303,9 @@ src_configure() {
# (primarily done for 23.0 profiles' -z, not full 
coverage)
filter-flags '-Wl,-z,*'
 
+   # gcc14 -fno-omit-frame-pointer ICE workaround (bug 
#932319)
+   append-flags -fomit-frame-pointer
+
CC=${mingwcc} test-flags-CC ${CFLAGS:--O2}
)}"
 



[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2024-05-15 Thread Ionen Wolkens
commit: cde08ef0b18352b2c340b2fdb35d74c66c01a0b8
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu May 16 02:04:33 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu May 16 02:05:22 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cde08ef0

app-emulation/wine-proton: depend on vulkan-loader[X]

Not worth a revbump, rather few people disable that.

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/wine-proton-7.0.6.ebuild| 2 +-
 app-emulation/wine-proton/wine-proton-8.0.5c.ebuild   | 2 +-
 app-emulation/wine-proton/wine-proton-9.0.1.ebuild| 2 +-
 app-emulation/wine-proton/wine-proton-9.0..ebuild | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

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 fe8d48046141..546bcaf60b4a 100644
--- a/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
+++ b/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
@@ -43,7 +43,7 @@ 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}]
+   media-libs/vulkan-loader[X,${MULTILIB_USEDEP}]
x11-libs/libXcursor[${MULTILIB_USEDEP}]
x11-libs/libXfixes[${MULTILIB_USEDEP}]
x11-libs/libXi[${MULTILIB_USEDEP}]

diff --git a/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild 
b/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
index d241cf82281d..e5b25d63323f 100644
--- a/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
+++ b/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
@@ -43,7 +43,7 @@ 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}]
+   media-libs/vulkan-loader[X,${MULTILIB_USEDEP}]
x11-libs/libXcursor[${MULTILIB_USEDEP}]
x11-libs/libXfixes[${MULTILIB_USEDEP}]
x11-libs/libXi[${MULTILIB_USEDEP}]

diff --git a/app-emulation/wine-proton/wine-proton-9.0.1.ebuild 
b/app-emulation/wine-proton/wine-proton-9.0.1.ebuild
index 024f4d039fc9..4558c65461b2 100644
--- a/app-emulation/wine-proton/wine-proton-9.0.1.ebuild
+++ b/app-emulation/wine-proton/wine-proton-9.0.1.ebuild
@@ -44,7 +44,7 @@ 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}]
+   media-libs/vulkan-loader[X,${MULTILIB_USEDEP}]
x11-libs/libXcursor[${MULTILIB_USEDEP}]
x11-libs/libXfixes[${MULTILIB_USEDEP}]
x11-libs/libXi[${MULTILIB_USEDEP}]

diff --git a/app-emulation/wine-proton/wine-proton-9.0..ebuild 
b/app-emulation/wine-proton/wine-proton-9.0..ebuild
index 6a86d9f190b0..ceddb4a00eec 100644
--- a/app-emulation/wine-proton/wine-proton-9.0..ebuild
+++ b/app-emulation/wine-proton/wine-proton-9.0..ebuild
@@ -44,7 +44,7 @@ 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}]
+   media-libs/vulkan-loader[X,${MULTILIB_USEDEP}]
x11-libs/libXcursor[${MULTILIB_USEDEP}]
x11-libs/libXfixes[${MULTILIB_USEDEP}]
x11-libs/libXi[${MULTILIB_USEDEP}]



[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2024-05-09 Thread Ionen Wolkens
commit: 6665ace8a528cefef5e33a7966ca56ae432e1fb2
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri May 10 04:11:27 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri May 10 04:11:27 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6665ace8

app-emulation/wine-proton: enable py3.13

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/wine-proton-7.0.6.ebuild| 2 +-
 app-emulation/wine-proton/wine-proton-8.0.5c.ebuild   | 2 +-
 app-emulation/wine-proton/wine-proton-9.0.1.ebuild| 2 +-
 app-emulation/wine-proton/wine-proton-9.0..ebuild | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

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 4820984ae397..fe8d48046141 100644
--- a/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
+++ b/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 inherit autotools flag-o-matic multilib multilib-build prefix
 inherit python-any-r1 readme.gentoo-r1 toolchain-funcs wrapper
 

diff --git a/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild 
b/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
index a68574673402..d241cf82281d 100644
--- a/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
+++ b/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 inherit autotools flag-o-matic multilib multilib-build prefix
 inherit python-any-r1 readme.gentoo-r1 toolchain-funcs wrapper
 

diff --git a/app-emulation/wine-proton/wine-proton-9.0.1.ebuild 
b/app-emulation/wine-proton/wine-proton-9.0.1.ebuild
index 3826048c0fcc..024f4d039fc9 100644
--- a/app-emulation/wine-proton/wine-proton-9.0.1.ebuild
+++ b/app-emulation/wine-proton/wine-proton-9.0.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 inherit autotools flag-o-matic multilib multilib-build prefix
 inherit python-any-r1 readme.gentoo-r1 toolchain-funcs wrapper
 

diff --git a/app-emulation/wine-proton/wine-proton-9.0..ebuild 
b/app-emulation/wine-proton/wine-proton-9.0..ebuild
index 4cabfe3111be..6a86d9f190b0 100644
--- a/app-emulation/wine-proton/wine-proton-9.0..ebuild
+++ b/app-emulation/wine-proton/wine-proton-9.0..ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 inherit autotools flag-o-matic multilib multilib-build prefix
 inherit python-any-r1 readme.gentoo-r1 toolchain-funcs wrapper
 



[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2024-05-07 Thread Ionen Wolkens
commit: 664b7392058f7d0d747b6ef514b08d3bd3acc1fc
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue May  7 14:19:30 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue May  7 14:23:05 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=664b7392

app-emulation/wine-proton: remove unused option

Forgot to remove it when copied from , this is only
used in experimental and not in releases.

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/wine-proton-9.0.1.ebuild | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app-emulation/wine-proton/wine-proton-9.0.1.ebuild 
b/app-emulation/wine-proton/wine-proton-9.0.1.ebuild
index 34ad2375a843..3826048c0fcc 100644
--- a/app-emulation/wine-proton/wine-proton-9.0.1.ebuild
+++ b/app-emulation/wine-proton/wine-proton-9.0.1.ebuild
@@ -264,8 +264,6 @@ src_configure() {
$(use_with v4l v4l2)
$(use_with xcomposite)
$(use_with xinerama)
-
-   --without-vosk # unpackaged, file a bug if you need this
)
 
filter-lto # build failure



[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2024-05-07 Thread Ionen Wolkens
commit: 14fedbed424316e0287e11054aac509376ac226b
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue May  7 07:04:30 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue May  7 07:18:16 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14fedbed

app-emulation/wine-proton: filter -Wl,--gc-sections

Is an issue with both lld and bfd that I can see, likely due to
the linker tricks wine uses. Let's just filter it as it's fragile.

Skipping revbump given the option is rarely used and shouldn't
affect many.

Bug: https://bugs.gentoo.org/931329
Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/wine-proton-7.0.6.ebuild| 1 +
 app-emulation/wine-proton/wine-proton-8.0.5c.ebuild   | 1 +
 app-emulation/wine-proton/wine-proton-9.0.1.ebuild| 1 +
 app-emulation/wine-proton/wine-proton-9.0..ebuild | 1 +
 4 files changed, 4 insertions(+)

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 25ee6175708f..4820984ae397 100644
--- a/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
+++ b/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
@@ -242,6 +242,7 @@ src_configure() {
 
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}
 

diff --git a/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild 
b/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
index 9d8a60b340e9..a68574673402 100644
--- a/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
+++ b/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
@@ -246,6 +246,7 @@ src_configure() {
 
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}
 

diff --git a/app-emulation/wine-proton/wine-proton-9.0.1.ebuild 
b/app-emulation/wine-proton/wine-proton-9.0.1.ebuild
index 5971fb4a6f56..34ad2375a843 100644
--- a/app-emulation/wine-proton/wine-proton-9.0.1.ebuild
+++ b/app-emulation/wine-proton/wine-proton-9.0.1.ebuild
@@ -269,6 +269,7 @@ src_configure() {
)
 
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
 
# wine uses linker tricks unlikely to work with non-bfd/lld (bug 
#867097)

diff --git a/app-emulation/wine-proton/wine-proton-9.0..ebuild 
b/app-emulation/wine-proton/wine-proton-9.0..ebuild
index fda342d879f2..4cabfe3111be 100644
--- a/app-emulation/wine-proton/wine-proton-9.0..ebuild
+++ b/app-emulation/wine-proton/wine-proton-9.0..ebuild
@@ -269,6 +269,7 @@ src_configure() {
)
 
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
 
# wine uses linker tricks unlikely to work with non-bfd/lld (bug 
#867097)



[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2024-05-02 Thread Ionen Wolkens
commit: a53143e095bca88a7c78a5c30435e13e7d5a7b30
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri May  3 00:17:58 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri May  3 00:18:03 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a53143e0

app-emulation/wine-proton: add 9.0.1

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/Manifest |   1 +
 app-emulation/wine-proton/wine-proton-9.0.1.ebuild | 420 +
 2 files changed, 421 insertions(+)

diff --git a/app-emulation/wine-proton/Manifest 
b/app-emulation/wine-proton/Manifest
index 34b2254d80d2..4e84f540f297 100644
--- a/app-emulation/wine-proton/Manifest
+++ b/app-emulation/wine-proton/Manifest
@@ -1,2 +1,3 @@
 DIST proton-wine-7.0-6.tar.gz 45780326 BLAKE2B 
f140fcfdd1a47904c34a49d0795fa3326d7cf0d3fac8d6c2ef2a4926181a46223f43a2d1ca96c543e800c8c46b2a3cc51ae306a029d68a42608876e869e177d5
 SHA512 
793bbe2b23042301a1b518717d78cfff01eaffa033d010659a45779b9136d33cfac63f0c3fbb1e458953a954b423eb70ac4fa87633352267db890ceb2fef
 DIST proton-wine-8.0-5c.tar.gz 48710071 BLAKE2B 
99627baea6fb3d51231aa1e75a2734c3c1baba88326baf15b3d421d57a00472d25ba51c2140b51152c8aeae7dd240d3d77bb0d8835aa7eb3b745a51be120f8bb
 SHA512 
0cf98d4e67866e55cc8cd5ea8da0d76aee8e37b130b3cbca604083c913e98ddf9038ecd6f9761d2e11443e282b372977400e251456c6d40e1365210c7578234d
+DIST proton-wine-9.0-1.tar.gz 49048661 BLAKE2B 
cf237c314e8b222bb36f52f316baae2351a30d22995d610c7977accc9588c474d0e598702000aa81b34fc2f3daeccd09f54ef53b7a2250c0b012ca47d69628eb
 SHA512 
d7d3e4725a86ca120d059e5b8f9760bce45a5db0ae814cd76aa51dc361bb67af9c2834917ddad3858fc324a1d048acdd9942492c77d0f396aae7d537c70e3ca1

diff --git a/app-emulation/wine-proton/wine-proton-9.0.1.ebuild 
b/app-emulation/wine-proton/wine-proton-9.0.1.ebuild
new file mode 100644
index ..5971fb4a6f56
--- /dev/null
+++ b/app-emulation/wine-proton/wine-proton-9.0.1.ebuild
@@ -0,0 +1,420 @@
+# 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..12} )
+inherit autotools flag-o-matic multilib multilib-build prefix
+inherit python-any-r1 readme.gentoo-r1 toolchain-funcs wrapper
+
+WINE_GECKO=2.47.4
+WINE_MONO=8.1.0
+WINE_PV=$(ver_rs 2 -)
+
+if [[ ${PV} == * ]]; 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
+   +fontconfig +gecko +gstreamer llvm-libunwind +mono nls osmesa
+   perl pulseaudio +sdl selinux +ssl +strip udev udisks +unwind
+   usb v4l video_cards_amdgpu wow64 +xcomposite xinerama
+"
+REQUIRED_USE="wow64? ( abi_x86_64 !abi_x86_32 )"
+
+# 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}] )
+"
+# gcc: for -latomic with clang
+WINE_COMMON_DEPEND="
+   ${WINE_DLOPEN_DEPEND}
+   sys-devel/gcc:*
+   x11-libs/libX11[${MULTILIB_USEDEP}]
+   x11-libs/libXext[${MULTILIB_USEDEP}]
+   x11-libs/libdrm[video_cards_amdgpu?,${MULTILIB_USEDEP}]
+   alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+   gstreamer? (
+   dev-libs/glib:2[${MULTILIB_USEDEP}]
+   media-libs/gst-plugins-base:1.0[opengl,${MUL

[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2024-04-22 Thread Ionen Wolkens
commit: 22bcdb814979170228cfd85a49cd421a934c0903
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Apr 22 19:44:31 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Apr 22 20:31:13 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22bcdb81

app-emulation/wine-proton: "fix" build with gcc-14 for old branches

No release yet but current 9.0. builds fine as-is, and
would rather not worry about backporting for old branches.

Closes: https://bugs.gentoo.org/924486
Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/wine-proton-7.0.6.ebuild  | 4 
 app-emulation/wine-proton/wine-proton-8.0.5c.ebuild | 4 
 2 files changed, 8 insertions(+)

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 50cc8ae8ca6c..25ee6175708f 100644
--- a/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
+++ b/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
@@ -250,6 +250,10 @@ src_configure() {
[[ $($(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

diff --git a/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild 
b/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
index bb1944292c4d..9d8a60b340e9 100644
--- a/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
+++ b/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
@@ -254,6 +254,10 @@ src_configure() {
[[ $($(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



[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2024-04-22 Thread Ionen Wolkens
commit: 4e91942e6f35771c9d48a436520353ec0301d185
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Apr 22 18:40:34 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Apr 22 20:31:13 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e91942e

app-emulation/wine-proton: drop 8.0.

Seem like a dead branch, use 9.0. instead.

Signed-off-by: Ionen Wolkens  gentoo.org>

 .../wine-proton/wine-proton-8.0..ebuild| 384 -
 1 file changed, 384 deletions(-)

diff --git a/app-emulation/wine-proton/wine-proton-8.0..ebuild 
b/app-emulation/wine-proton/wine-proton-8.0..ebuild
deleted file mode 100644
index 78b03242a34b..
--- a/app-emulation/wine-proton/wine-proton-8.0..ebuild
+++ /dev/null
@@ -1,384 +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..12} )
-inherit autotools flag-o-matic multilib multilib-build prefix
-inherit python-any-r1 readme.gentoo-r1 toolchain-funcs wrapper
-
-WINE_GECKO=2.47.4
-WINE_MONO=8.1.0
-WINE_PV=$(ver_rs 2 -)
-
-if [[ ${PV} == * ]]; 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
-   +fontconfig +gecko +gstreamer llvm-libunwind +mono nls osmesa
-   perl pulseaudio +sdl selinux +ssl +strip udev udisks +unwind
-   usb v4l video_cards_amdgpu +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}] )
-"
-# gcc: for -latomic with clang
-WINE_COMMON_DEPEND="
-   ${WINE_DLOPEN_DEPEND}
-   sys-devel/gcc:*
-   x11-libs/libX11[${MULTILIB_USEDEP}]
-   x11-libs/libXext[${MULTILIB_USEDEP}]
-   x11-libs/libdrm[video_cards_amdgpu?,${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 )
-   !cro

[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2024-03-24 Thread Ionen Wolkens
commit: 5f02566649d4a1e6dc602102add6cc2fccc52c4d
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sun Mar 24 18:31:03 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sun Mar 24 18:37:35 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f025666

app-emulation/wine-proton: filter -Wl,-z,* ... for CFLAGS

test-flags-CC was not meant to test LDFLAGS and -Wl,* are no-ops
at compile-time and thus don't get stripped even if they don't work
(same happens when using strip-unsupported-flags) and then if a
package compiles and links anything at same time it fails.

This used not to be a big problem but now that 23.0 profiles
do -Wl,-z,pack-relative-relocs (mingw ld has no -z) this is
hitting bashrc-mv users that tend to do CFLAGS="${LDFLAGS}"
by default. Tempting to ignore it because of how wrong it is,
but well.

An alternate route could be to eventually have strip-flags
and/or strip-unsupported-flags remove -Wl,* from non-LDFLAGS
given this could affect more than mingw (e.g. switching to
bfd when there is a lld-only option).

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/wine-proton-7.0.6.ebuild| 5 +
 app-emulation/wine-proton/wine-proton-8.0.5c.ebuild   | 5 +
 app-emulation/wine-proton/wine-proton-8.0..ebuild | 5 +
 app-emulation/wine-proton/wine-proton-9.0..ebuild | 6 ++
 4 files changed, 21 insertions(+)

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 b04f298e473a..50cc8ae8ca6c 100644
--- a/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
+++ b/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
@@ -279,6 +279,11 @@ src_configure() {
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

diff --git a/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild 
b/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
index 64e517a897ea..bb1944292c4d 100644
--- a/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
+++ b/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
@@ -292,6 +292,11 @@ src_configure() {
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

diff --git a/app-emulation/wine-proton/wine-proton-8.0..ebuild 
b/app-emulation/wine-proton/wine-proton-8.0..ebuild
index a2711662b536..78b03242a34b 100644
--- a/app-emulation/wine-proton/wine-proton-8.0..ebuild
+++ b/app-emulation/wine-proton/wine-proton-8.0..ebuild
@@ -294,6 +294,11 @@ src_configure() {
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

diff --git a/app-emulation/wine-proton/wine-proton-9.0..ebuild 
b/app-emulation/wine-proton/wine-proton-9.0..ebuild
index 42b55c99ed92..fda342d879f2 100644
--- a/app-emulation/wine-proton/wine-proton-9.0..ebuild
+++ b/app-emulation/wine-proton/wine-proton-9.0..ebuild
@@ -296,6 +296,12 @@ src_configure() {
CROSSCFLAGS="${CROSSCFLAGS:-$(
filter-flags '-fstack-protector*' #870136
filter-flags '-mfunction-return=thunk*' #

[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2024-03-22 Thread Ionen Wolkens
commit: 5c81bf1b9b70d0099537771d25cd5f1ac2d5f113
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri Mar 22 12:26:58 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri Mar 22 12:30:43 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c81bf1b

app-emulation/wine-proton: reword USE=wow64 again

There is alternate realities where OpenGL works great for some, and is
1fps unusable for others (likely depending on what is being run and/or
drivers). So saying "slightly" may be misleading.

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/wine-proton/metadata.xml 
b/app-emulation/wine-proton/metadata.xml
index 2e414ed41543..cc21bdb8ce89 100644
--- a/app-emulation/wine-proton/metadata.xml
+++ b/app-emulation/wine-proton/metadata.xml
@@ -23,7 +23,7 @@

Enable running 32bit applications without 32bit ELF
multilib by mapping to 64bit calls (experimental,
-   may have slightly worse OpenGL performance or other
+   *may* have worse/unusable OpenGL performance or other
issues compared to USE=abi_x86_32, also lacks 16bit
support) -- still need 
dev-util/mingw64-toolchain
with abi_x86_32 which itself does not need multilib



[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2024-03-20 Thread Ionen Wolkens
commit: 278e265ca7998fe2dd1f329753f65b171edd6e2b
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed Mar 20 05:09:04 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Mar 20 07:01:01 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=278e265c

app-emulation/wine-proton: drop 8.0.4

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/Manifest |   1 -
 app-emulation/wine-proton/wine-proton-8.0.4.ebuild | 375 -
 2 files changed, 376 deletions(-)

diff --git a/app-emulation/wine-proton/Manifest 
b/app-emulation/wine-proton/Manifest
index a6b7dd2607b1..34b2254d80d2 100644
--- a/app-emulation/wine-proton/Manifest
+++ b/app-emulation/wine-proton/Manifest
@@ -1,3 +1,2 @@
 DIST proton-wine-7.0-6.tar.gz 45780326 BLAKE2B 
f140fcfdd1a47904c34a49d0795fa3326d7cf0d3fac8d6c2ef2a4926181a46223f43a2d1ca96c543e800c8c46b2a3cc51ae306a029d68a42608876e869e177d5
 SHA512 
793bbe2b23042301a1b518717d78cfff01eaffa033d010659a45779b9136d33cfac63f0c3fbb1e458953a954b423eb70ac4fa87633352267db890ceb2fef
-DIST proton-wine-8.0-4.tar.gz 48317622 BLAKE2B 
53047016897c8919cf3b51d7e51025806d267bb2f04fb3d464b8cf0f133c36b53d9c6c3e591aff4c71a95c6e167eed67b6ad84cc549e1aa1682175233da79835
 SHA512 
837772856aafb4d47c700997655c0d98f17cafdcc76008e04d064dd071e8d3163ed094bfc57441ef8ec4f2f7ea6303815351dc707ce5515f8c22f9aba8c5f83b
 DIST proton-wine-8.0-5c.tar.gz 48710071 BLAKE2B 
99627baea6fb3d51231aa1e75a2734c3c1baba88326baf15b3d421d57a00472d25ba51c2140b51152c8aeae7dd240d3d77bb0d8835aa7eb3b745a51be120f8bb
 SHA512 
0cf98d4e67866e55cc8cd5ea8da0d76aee8e37b130b3cbca604083c913e98ddf9038ecd6f9761d2e11443e282b372977400e251456c6d40e1365210c7578234d

diff --git a/app-emulation/wine-proton/wine-proton-8.0.4.ebuild 
b/app-emulation/wine-proton/wine-proton-8.0.4.ebuild
deleted file mode 100644
index 359ad7c9f4e1..
--- a/app-emulation/wine-proton/wine-proton-8.0.4.ebuild
+++ /dev/null
@@ -1,375 +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..12} )
-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=8.0.1
-WINE_PV=$(ver_rs 2 -)
-
-if [[ ${PV} == * ]]; 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
-   +fontconfig +gecko +gstreamer llvm-libunwind +mono nls osmesa
-   perl pulseaudio +sdl selinux +ssl +strip 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}] )
-"
-# gcc: for -latomic with clang
-WINE_COMMON_DEPEND="
-   ${WINE_DLOPEN_DEPEND}
-   sys-devel/gcc:*
-   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[${MULTIL

[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2024-03-11 Thread Ionen Wolkens
commit: a8395ab333f5b5f1c384ccc48c93ea9a9682e2fb
Author: Matoro Mahri  matoro  tk>
AuthorDate: Tue Mar 12 04:02:29 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Mar 12 04:11:27 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8395ab3

app-emulation/wine-proton: Stabilize 8.0.5c amd64, #924198

Signed-off-by: Matoro Mahri  matoro.tk>
Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/wine-proton-8.0.5c.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild 
b/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
index 28ec733f1806..64e517a897ea 100644
--- a/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
+++ b/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == * ]]; then
 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"
+   KEYWORDS="-* amd64 ~x86"
 fi
 
 DESCRIPTION="Valve Software's fork of Wine"



[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2024-03-04 Thread Ionen Wolkens
commit: 541ef52c7dab695bc09b11f88113760f1da2cfa3
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Mar  5 05:54:56 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Mar  5 05:55:43 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=541ef52c

app-emulation/wine-proton: improve USE=wow64 description further

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/metadata.xml | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app-emulation/wine-proton/metadata.xml 
b/app-emulation/wine-proton/metadata.xml
index 16afd8a54c41..2e414ed41543 100644
--- a/app-emulation/wine-proton/metadata.xml
+++ b/app-emulation/wine-proton/metadata.xml
@@ -23,9 +23,10 @@

Enable running 32bit applications without 32bit ELF
multilib by mapping to 64bit calls (experimental,
-   may have worse OpenGL performance or other issues
-   compared to USE=abi_x86_32) -- still requires (just)
-   dev-util/mingw64-toolchain with abi_x86_32
+   may have slightly worse OpenGL performance or other
+   issues compared to USE=abi_x86_32, also lacks 16bit
+   support) -- still need 
dev-util/mingw64-toolchain
+   with abi_x86_32 which itself does not need multilib






[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/, app-emulation/wine-proton/files/

2024-02-26 Thread Ionen Wolkens
commit: 10c55e3ba49d15d2d191442a56f7601ea1b3739c
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Feb 26 23:39:03 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Feb 27 00:50:20 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10c55e3b

app-emulation/wine-proton: add 9.0. (experimental_9.0 branch)

No plans to add the 9.0 beta (will wait for a normal release),
but if really want to try 9.0 early then there is this.

May differ a bit given the releases are not fully based on the
experimental branches.

Not tested much yet, please report issues.

Signed-off-by: Ionen Wolkens  gentoo.org>

 .../wine-proton/files/wine-proton-9.0-rpath.patch  |  14 +
 app-emulation/wine-proton/metadata.xml |   7 +
 .../wine-proton/wine-proton-9.0..ebuild| 414 +
 3 files changed, 435 insertions(+)

diff --git a/app-emulation/wine-proton/files/wine-proton-9.0-rpath.patch 
b/app-emulation/wine-proton/files/wine-proton-9.0-rpath.patch
new file mode 100644
index ..78e4393d390d
--- /dev/null
+++ b/app-emulation/wine-proton/files/wine-proton-9.0-rpath.patch
@@ -0,0 +1,14 @@
+--- a/configure.ac
 b/configure.ac
+@@ -813,8 +813,11 @@
+ ;;
+ esac
+ ;;
+ esac
++
++# do this at the end because it needs double dollar for makefile
++WINE_TRY_CFLAGS([-Wl,-rpath,\\\$ORIGIN],[UNIXLDFLAGS="$UNIXLDFLAGS 
'-Wl,-rpath,\$\$ORIGIN'"])
+ ;;
+ esac
+ 
+ enable_winecoreaudio_drv=${enable_winecoreaudio_drv:-no}

diff --git a/app-emulation/wine-proton/metadata.xml 
b/app-emulation/wine-proton/metadata.xml
index e0ea57df1f22..16afd8a54c41 100644
--- a/app-emulation/wine-proton/metadata.xml
+++ b/app-emulation/wine-proton/metadata.xml
@@ -20,6 +20,13 @@
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,
+   may have worse OpenGL performance or other issues
+   compared to USE=abi_x86_32) -- still requires (just)
+   dev-util/mingw64-toolchain with abi_x86_32
+   



https://github.com/ValveSoftware/Proton/wiki/Changelog

diff --git a/app-emulation/wine-proton/wine-proton-9.0..ebuild 
b/app-emulation/wine-proton/wine-proton-9.0..ebuild
new file mode 100644
index ..42b55c99ed92
--- /dev/null
+++ b/app-emulation/wine-proton/wine-proton-9.0..ebuild
@@ -0,0 +1,414 @@
+# 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..12} )
+inherit autotools flag-o-matic multilib multilib-build prefix
+inherit python-any-r1 readme.gentoo-r1 toolchain-funcs wrapper
+
+WINE_GECKO=2.47.4
+WINE_MONO=9.0.0
+WINE_PV=$(ver_rs 2 -)
+
+if [[ ${PV} == * ]]; 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
+   +fontconfig +gecko +gstreamer llvm-libunwind +mono nls osmesa
+   perl pulseaudio +sdl selinux +ssl +strip udev udisks +unwind
+   usb v4l video_cards_amdgpu wow64 +xcomposite xinerama
+"
+REQUIRED_USE="wow64? ( abi_x86_64 !abi_x86_32 )"
+
+# 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:=[${

[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2024-01-22 Thread Ionen Wolkens
commit: bc28a96889976cf3fab1228b04caa9e54cdce402
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Jan 22 22:58:43 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Jan 22 23:31:42 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc28a968

app-emulation/wine-proton: add 8.0.5c

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/Manifest |   1 +
 .../wine-proton/wine-proton-8.0.5c.ebuild  | 377 +
 2 files changed, 378 insertions(+)

diff --git a/app-emulation/wine-proton/Manifest 
b/app-emulation/wine-proton/Manifest
index 92f166f9ef22..a6b7dd2607b1 100644
--- a/app-emulation/wine-proton/Manifest
+++ b/app-emulation/wine-proton/Manifest
@@ -1,2 +1,3 @@
 DIST proton-wine-7.0-6.tar.gz 45780326 BLAKE2B 
f140fcfdd1a47904c34a49d0795fa3326d7cf0d3fac8d6c2ef2a4926181a46223f43a2d1ca96c543e800c8c46b2a3cc51ae306a029d68a42608876e869e177d5
 SHA512 
793bbe2b23042301a1b518717d78cfff01eaffa033d010659a45779b9136d33cfac63f0c3fbb1e458953a954b423eb70ac4fa87633352267db890ceb2fef
 DIST proton-wine-8.0-4.tar.gz 48317622 BLAKE2B 
53047016897c8919cf3b51d7e51025806d267bb2f04fb3d464b8cf0f133c36b53d9c6c3e591aff4c71a95c6e167eed67b6ad84cc549e1aa1682175233da79835
 SHA512 
837772856aafb4d47c700997655c0d98f17cafdcc76008e04d064dd071e8d3163ed094bfc57441ef8ec4f2f7ea6303815351dc707ce5515f8c22f9aba8c5f83b
+DIST proton-wine-8.0-5c.tar.gz 48710071 BLAKE2B 
99627baea6fb3d51231aa1e75a2734c3c1baba88326baf15b3d421d57a00472d25ba51c2140b51152c8aeae7dd240d3d77bb0d8835aa7eb3b745a51be120f8bb
 SHA512 
0cf98d4e67866e55cc8cd5ea8da0d76aee8e37b130b3cbca604083c913e98ddf9038ecd6f9761d2e11443e282b372977400e251456c6d40e1365210c7578234d

diff --git a/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild 
b/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
new file mode 100644
index ..28ec733f1806
--- /dev/null
+++ b/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild
@@ -0,0 +1,377 @@
+# 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..12} )
+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=8.1.0
+WINE_PV=$(ver_rs 2 -)
+
+if [[ ${PV} == * ]]; 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
+   +fontconfig +gecko +gstreamer llvm-libunwind +mono nls osmesa
+   perl pulseaudio +sdl selinux +ssl +strip udev udisks +unwind
+   usb v4l video_cards_amdgpu +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}] )
+"
+# gcc: for -latomic with clang
+WINE_COMMON_DEPEND="
+   ${WINE_DLOPEN_DEPEND}
+   sys-devel/gcc:*
+   x11-libs/libX11[${MULTILIB_USEDEP}]
+   x11-libs/libXext[${MULTILIB_USEDEP}]
+   x11-libs/libdrm[video_cards_amdgpu?,${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:

[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2024-01-17 Thread Ionen Wolkens
commit: 8dd5687bfa3b6e6a45d19f24e1e119ca03ec1dd2
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed Jan 17 15:50:13 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Jan 17 16:19:37 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8dd5687b

app-emulation/wine-proton: add ebuild comment tip for user patches

Closes: https://github.com/gentoo/gentoo/pull/34865
Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/wine-proton-7.0.6.ebuild| 3 +++
 app-emulation/wine-proton/wine-proton-8.0.4.ebuild| 3 +++
 app-emulation/wine-proton/wine-proton-8.0..ebuild | 3 +++
 3 files changed, 9 insertions(+)

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 7e922c196988..b04f298e473a 100644
--- a/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
+++ b/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
@@ -178,6 +178,9 @@ src_prepare() {
eautoreconf
tools/make_requests || die # perl
dlls/winevulkan/make_vulkan -x vk.xml || die # python, needed for 
proton's
+   # tip: if need more for user patches, with portage can e.g. do
+   # echo "post_src_prepare() { tools/make_specfiles || die; }" \
+   # > /etc/portage/env/app-emulation/wine-proton
 }
 
 src_configure() {

diff --git a/app-emulation/wine-proton/wine-proton-8.0.4.ebuild 
b/app-emulation/wine-proton/wine-proton-8.0.4.ebuild
index 8ab559caf709..359ad7c9f4e1 100644
--- a/app-emulation/wine-proton/wine-proton-8.0.4.ebuild
+++ b/app-emulation/wine-proton/wine-proton-8.0.4.ebuild
@@ -181,6 +181,9 @@ src_prepare() {
eautoreconf
tools/make_requests || die # perl
dlls/winevulkan/make_vulkan -x vk.xml || die # python, needed for 
proton's
+   # tip: if need more for user patches, with portage can e.g. do
+   # echo "post_src_prepare() { tools/make_specfiles || die; }" \
+   # > /etc/portage/env/app-emulation/wine-proton
 }
 
 src_configure() {

diff --git a/app-emulation/wine-proton/wine-proton-8.0..ebuild 
b/app-emulation/wine-proton/wine-proton-8.0..ebuild
index e6660a9082bf..a2711662b536 100644
--- a/app-emulation/wine-proton/wine-proton-8.0..ebuild
+++ b/app-emulation/wine-proton/wine-proton-8.0..ebuild
@@ -182,6 +182,9 @@ src_prepare() {
eautoreconf
tools/make_requests || die # perl
dlls/winevulkan/make_vulkan -x vk.xml || die # python, needed for 
proton's
+   # tip: if need more for user patches, with portage can e.g. do
+   # echo "post_src_prepare() { tools/make_specfiles || die; }" \
+   # > /etc/portage/env/app-emulation/wine-proton
 }
 
 src_configure() {



[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2024-01-13 Thread Ionen Wolkens
commit: 2c17819192fa039c17d96ab87d86ce275161f25e
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sat Jan 13 12:26:04 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat Jan 13 13:10:22 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c178191

app-emulation/wine-proton: make libdrm[video_cards_amdgpu] optional in live

Had forgotten about it but wine offers generic switches for all dlls,
so can use that rather than modify sources. The dll being entirely
missing hopefully has no negative impact (should gracefully just not
use it even for amdgpu).

Imagine may be new releases soon'ish (or proton 9), and meant to adjust
this before then as it'll be annoying for non-amdgpu users to enable it
on libdrm.

May possibly need masking on x86 (32bit), have not tested if it builds
anyway. Albeit doubt this is usable there regardless. Generally unsure
if the proton variant should even keep x86 keywords though (was kind
of flaky when I tested it for x86 while considering stable and not
entirely sure it works on a real system).

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/wine-proton-8.0..ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app-emulation/wine-proton/wine-proton-8.0..ebuild 
b/app-emulation/wine-proton/wine-proton-8.0..ebuild
index ed67e6b6fe21..e6660a9082bf 100644
--- a/app-emulation/wine-proton/wine-proton-8.0..ebuild
+++ b/app-emulation/wine-proton/wine-proton-8.0..ebuild
@@ -31,7 +31,7 @@ IUSE="
+abi_x86_32 +abi_x86_64 +alsa crossdev-mingw custom-cflags
+fontconfig +gecko +gstreamer llvm-libunwind +mono nls osmesa
perl pulseaudio +sdl selinux +ssl +strip udev udisks +unwind
-   usb v4l +xcomposite xinerama
+   usb v4l video_cards_amdgpu +xcomposite xinerama
 "
 
 # tests are non-trivial to run, can hang easily, don't play well with
@@ -68,7 +68,7 @@ WINE_COMMON_DEPEND="
sys-devel/gcc:*
x11-libs/libX11[${MULTILIB_USEDEP}]
x11-libs/libXext[${MULTILIB_USEDEP}]
-   x11-libs/libdrm[video_cards_amdgpu,${MULTILIB_USEDEP}]
+   x11-libs/libdrm[video_cards_amdgpu?,${MULTILIB_USEDEP}]
alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
gstreamer? (
dev-libs/glib:2[${MULTILIB_USEDEP}]
@@ -221,6 +221,7 @@ src_configure() {
 
$(use_enable gecko mshtml)
$(use_enable mono mscoree)
+   $(use_enable video_cards_amdgpu amd_ags_x64)
--disable-tests
$(use_with alsa)
$(use_with fontconfig)



[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2024-01-13 Thread Ionen Wolkens
commit: a356059a59ad128ce51e44d42632749eb4017151
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sat Jan 13 12:14:40 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat Jan 13 13:10:22 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a356059a

app-emulation/wine-proton: adjust style

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/wine-proton-7.0.6.ebuild   | 20 +---
 app-emulation/wine-proton/wine-proton-8.0.4.ebuild   | 18 --
 .../wine-proton/wine-proton-8.0..ebuild  | 18 --
 3 files changed, 37 insertions(+), 19 deletions(-)

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 b0d8137fd450..7e922c196988 100644
--- a/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
+++ b/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -31,7 +31,8 @@ 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"
+   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
@@ -59,7 +60,8 @@ WINE_DLOPEN_DEPEND="
udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
-   xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )"
+   xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+"
 WINE_COMMON_DEPEND="
${WINE_DLOPEN_DEPEND}
x11-libs/libX11[${MULTILIB_USEDEP}]
@@ -78,7 +80,8 @@ WINE_COMMON_DEPEND="
!llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
)
usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )
-   vkd3d? ( >=app-emulation/vkd3d-1.2[${MULTILIB_USEDEP}] )"
+   vkd3d? ( >=app-emulation/vkd3d-1.2[${MULTILIB_USEDEP}] )
+"
 RDEPEND="
${WINE_COMMON_DEPEND}
app-emulation/wine-desktop-common
@@ -90,11 +93,13 @@ RDEPEND="
dev-perl/XML-LibXML
)
selinux? ( sec-policy/selinux-wine )
-   udisks? ( sys-fs/udisks:2 )"
+   udisks? ( sys-fs/udisks:2 )
+"
 DEPEND="
${WINE_COMMON_DEPEND}
sys-kernel/linux-headers
-   x11-base/xorg-proto"
+   x11-base/xorg-proto
+"
 BDEPEND="
${PYTHON_DEPS}
dev-lang/perl
@@ -103,7 +108,8 @@ BDEPEND="
sys-devel/flex
virtual/pkgconfig
nls? ( sys-devel/gettext )
-   !crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] )"
+   !crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] )
+"
 IDEPEND=">=app-eselect/eselect-wine-2"
 
 QA_CONFIG_IMPL_DECL_SKIP=(

diff --git a/app-emulation/wine-proton/wine-proton-8.0.4.ebuild 
b/app-emulation/wine-proton/wine-proton-8.0.4.ebuild
index be98e0d28d22..8ab559caf709 100644
--- a/app-emulation/wine-proton/wine-proton-8.0.4.ebuild
+++ b/app-emulation/wine-proton/wine-proton-8.0.4.ebuild
@@ -31,7 +31,8 @@ IUSE="
+abi_x86_32 +abi_x86_64 +alsa crossdev-mingw custom-cflags
+fontconfig +gecko +gstreamer llvm-libunwind +mono nls osmesa
perl pulseaudio +sdl selinux +ssl +strip udev udisks +unwind
-   usb v4l +xcomposite xinerama"
+   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
@@ -59,7 +60,8 @@ WINE_DLOPEN_DEPEND="
udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
-   xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )"
+   xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+"
 # gcc: for -latomic with clang
 WINE_COMMON_DEPEND="
${WINE_DLOPEN_DEPEND}
@@ -78,7 +80,8 @@ WINE_COMMON_DEPEND="
llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] )
!llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
)
-   usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )"
+   usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )
+"
 RDEPEND="
${WINE_COMMON_DEPEND}
app-emulation/wine-desktop-common
@@ -90,11 +93,13 @@ RDEPEND="
dev-perl/XML-LibXML
)
selinux? ( sec-policy/selinux-wine )
-   udisks? ( sys-fs/udisks:2 )"
+   udisks? ( sys-fs/udisks:2 )
+"
 DEPEND="
${WINE_COMMON_DEPEND}
sys-kernel/linux-headers
-   x11-base/xorg-proto"
+  

[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2024-01-08 Thread Ionen Wolkens
commit: 2bbf5db6fe135a9e0b51b3cd8f62f487fe8efd3b
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Jan  8 21:28:25 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Jan  8 21:35:04 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bbf5db6

app-emulation/wine-proton: use -latomic for winevulkan with clang

Seems newly needed on top of ntdll and missed that.

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/wine-proton-8.0.4.ebuild| 5 +++--
 app-emulation/wine-proton/wine-proton-8.0..ebuild | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app-emulation/wine-proton/wine-proton-8.0.4.ebuild 
b/app-emulation/wine-proton/wine-proton-8.0.4.ebuild
index cc16907c46de..be98e0d28d22 100644
--- a/app-emulation/wine-proton/wine-proton-8.0.4.ebuild
+++ b/app-emulation/wine-proton/wine-proton-8.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -158,7 +158,8 @@ src_prepare() {
sed -i '/MSVCRTFLAGS=/s/-mabi=ms//' configure.ac || die
 
# needed by Valve's fsync patches if using clang (undef 
atomic_load_8)
-   sed -i '/^UNIX_LIBS.*=/s/$/ -latomic/' dlls/ntdll/Makefile.in 
|| die
+   sed -e '/^UNIX_LIBS.*=/s/$/ -latomic/' \
+   -i dlls/{ntdll,winevulkan}/Makefile.in || die
fi
 
# ensure .desktop calls this variant + slot

diff --git a/app-emulation/wine-proton/wine-proton-8.0..ebuild 
b/app-emulation/wine-proton/wine-proton-8.0..ebuild
index 0ee683445ce9..a515a28f2122 100644
--- a/app-emulation/wine-proton/wine-proton-8.0..ebuild
+++ b/app-emulation/wine-proton/wine-proton-8.0..ebuild
@@ -159,7 +159,8 @@ src_prepare() {
sed -i '/MSVCRTFLAGS=/s/-mabi=ms//' configure.ac || die
 
# needed by Valve's fsync patches if using clang (undef 
atomic_load_8)
-   sed -i '/^UNIX_LIBS.*=/s/$/ -latomic/' dlls/ntdll/Makefile.in 
|| die
+   sed -e '/^UNIX_LIBS.*=/s/$/ -latomic/' \
+   -i dlls/{ntdll,winevulkan}/Makefile.in || die
fi
 
# ensure .desktop calls this variant + slot



[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2024-01-08 Thread Ionen Wolkens
commit: 68d5fe74506371e69d08a8cd8885fb2d7dc21f35
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Jan  8 12:47:34 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Jan  8 12:57:52 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68d5fe74

app-emulation/wine-proton: drop 8.0.3c

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/Manifest |   1 -
 .../wine-proton/wine-proton-8.0.3c.ebuild  | 363 -
 2 files changed, 364 deletions(-)

diff --git a/app-emulation/wine-proton/Manifest 
b/app-emulation/wine-proton/Manifest
index 61b2101eff7e..92f166f9ef22 100644
--- a/app-emulation/wine-proton/Manifest
+++ b/app-emulation/wine-proton/Manifest
@@ -1,3 +1,2 @@
 DIST proton-wine-7.0-6.tar.gz 45780326 BLAKE2B 
f140fcfdd1a47904c34a49d0795fa3326d7cf0d3fac8d6c2ef2a4926181a46223f43a2d1ca96c543e800c8c46b2a3cc51ae306a029d68a42608876e869e177d5
 SHA512 
793bbe2b23042301a1b518717d78cfff01eaffa033d010659a45779b9136d33cfac63f0c3fbb1e458953a954b423eb70ac4fa87633352267db890ceb2fef
-DIST proton-wine-8.0-3c.tar.gz 48254135 BLAKE2B 
fee58928555376f71579099d3fb39dbe2242516b671af1ca2507a135c3119422d6e168ed2a258d29c57a8fc33a026e5cf788d8362f238f1c0c4c7c81c9cbb147
 SHA512 
5d473534834ce8ea855d4ee2d39f1596117c0abab0925ee50875245ff6e1f49fe4684fe6f162e92a4b5e408795ff8c9b15b382fb013074216dd565143ecd9efc
 DIST proton-wine-8.0-4.tar.gz 48317622 BLAKE2B 
53047016897c8919cf3b51d7e51025806d267bb2f04fb3d464b8cf0f133c36b53d9c6c3e591aff4c71a95c6e167eed67b6ad84cc549e1aa1682175233da79835
 SHA512 
837772856aafb4d47c700997655c0d98f17cafdcc76008e04d064dd071e8d3163ed094bfc57441ef8ec4f2f7ea6303815351dc707ce5515f8c22f9aba8c5f83b

diff --git a/app-emulation/wine-proton/wine-proton-8.0.3c.ebuild 
b/app-emulation/wine-proton/wine-proton-8.0.3c.ebuild
deleted file mode 100644
index 9f55f65590c2..
--- a/app-emulation/wine-proton/wine-proton-8.0.3c.ebuild
+++ /dev/null
@@ -1,363 +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_{10..12} )
-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.1
-WINE_PV=$(ver_rs 2 -)
-
-if [[ ${PV} == * ]]; 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
-   +fontconfig +gecko +gstreamer llvm-libunwind +mono nls osmesa
-   perl pulseaudio +sdl selinux +ssl +strip 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}] )"
-# gcc: for -latomic with clang
-WINE_COMMON_DEPEND="
-   ${WINE_DLOPEN_DEPEND}
-   sys-devel/gcc:*
-   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[${MULTIL

[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2024-01-08 Thread Ionen Wolkens
commit: 4bdedca68d7f7c13d886d29b11898536b01559d1
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Jan  8 12:45:39 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Jan  8 12:57:52 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bdedca6

Revert "app-emulation/wine-proton: sys-devel/flex -> app-alternatives/lex"

This reverts commit 70004fc841b5b6e11ebd6393e0487e3c3171213a.

This may not set LEX, but that's because wine does not respect
this variable in the first place and looks for flex directly.

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/wine-proton-7.0.6.ebuild| 4 ++--
 app-emulation/wine-proton/wine-proton-8.0.3c.ebuild   | 4 ++--
 app-emulation/wine-proton/wine-proton-8.0.4.ebuild| 4 ++--
 app-emulation/wine-proton/wine-proton-8.0..ebuild | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

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 8ac2d2cc34a7..b0d8137fd450 100644
--- a/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
+++ b/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -100,7 +100,7 @@ BDEPEND="
dev-lang/perl
sys-devel/binutils
sys-devel/bison
-   app-alternatives/lex
+   sys-devel/flex
virtual/pkgconfig
nls? ( sys-devel/gettext )
!crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] )"

diff --git a/app-emulation/wine-proton/wine-proton-8.0.3c.ebuild 
b/app-emulation/wine-proton/wine-proton-8.0.3c.ebuild
index bd975980027b..9f55f65590c2 100644
--- a/app-emulation/wine-proton/wine-proton-8.0.3c.ebuild
+++ b/app-emulation/wine-proton/wine-proton-8.0.3c.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -100,7 +100,7 @@ BDEPEND="
dev-lang/perl
sys-devel/binutils
sys-devel/bison
-   app-alternatives/lex
+   sys-devel/flex
virtual/pkgconfig
nls? ( sys-devel/gettext )
!crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] )"

diff --git a/app-emulation/wine-proton/wine-proton-8.0.4.ebuild 
b/app-emulation/wine-proton/wine-proton-8.0.4.ebuild
index 2fd793a8c37e..cc16907c46de 100644
--- a/app-emulation/wine-proton/wine-proton-8.0.4.ebuild
+++ b/app-emulation/wine-proton/wine-proton-8.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -100,7 +100,7 @@ BDEPEND="
dev-lang/perl
sys-devel/binutils
sys-devel/bison
-   app-alternatives/lex
+   sys-devel/flex
virtual/pkgconfig
nls? ( sys-devel/gettext )
!crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] )"

diff --git a/app-emulation/wine-proton/wine-proton-8.0..ebuild 
b/app-emulation/wine-proton/wine-proton-8.0..ebuild
index 2e32a05cd485..0ee683445ce9 100644
--- a/app-emulation/wine-proton/wine-proton-8.0..ebuild
+++ b/app-emulation/wine-proton/wine-proton-8.0..ebuild
@@ -101,7 +101,7 @@ BDEPEND="
dev-lang/perl
sys-devel/binutils
sys-devel/bison
-   app-alternatives/lex
+   sys-devel/flex
virtual/pkgconfig
nls? ( sys-devel/gettext )
!crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] )"



[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2024-01-04 Thread Ionen Wolkens
commit: 99c16b93d8d046d4f97988556cf6ea47326a2ef8
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu Jan  4 14:13:48 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Jan  4 14:16:14 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99c16b93

app-emulation/wine-proton: update live

This bit won't be needed "here" until wine-proton-9.0., but
it doesn't hurt to add the wildcard for .md in advance while
thinking about it.

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/wine-proton-8.0..ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-emulation/wine-proton/wine-proton-8.0..ebuild 
b/app-emulation/wine-proton/wine-proton-8.0..ebuild
index 1d7cec5c26a9..0ee683445ce9 100644
--- a/app-emulation/wine-proton/wine-proton-8.0..ebuild
+++ b/app-emulation/wine-proton/wine-proton-8.0..ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -342,7 +342,7 @@ src_install() {
eend ${?} || die
fi
 
-   dodoc ANNOUNCE AUTHORS README* documentation/README*
+   dodoc ANNOUNCE* AUTHORS README* documentation/README*
readme.gentoo_create_doc
 }
 



[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2023-12-20 Thread Ionen Wolkens
commit: e7e8364422fcf15d1c5117447cf1e0d79d0e8f2d
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu Dec 21 06:32:40 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Dec 21 06:48:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7e83644

app-emulation/wine-proton: update live

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/wine-proton-8.0..ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/wine-proton/wine-proton-8.0..ebuild 
b/app-emulation/wine-proton/wine-proton-8.0..ebuild
index c41b7ac24d27..1d7cec5c26a9 100644
--- a/app-emulation/wine-proton/wine-proton-8.0..ebuild
+++ b/app-emulation/wine-proton/wine-proton-8.0..ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{10..12} )
 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_GECKO=2.47.4
 WINE_MONO=8.1.0
 WINE_PV=$(ver_rs 2 -)
 



[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/files/, app-emulation/wine-proton/

2023-12-01 Thread Ionen Wolkens
commit: 04ccd546f0e94e09c786fe95c85c525d7a4d841d
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri Dec  1 07:13:25 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri Dec  1 08:03:30 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04ccd546

app-emulation/wine-proton: update winemenubuilder revert

Valve (partially) reverted this in 8.0.4, they now build
winemenubuilder but do not seem to run the service.

Somehow the patch was still applying and in and 8.0. it causes a
build failure due to a misinsertion. It was wrong for 8.0.4 too but
was not doing any harm.

Signed-off-by: Ionen Wolkens  gentoo.org>

 .../wine-proton/files/wine-proton-8.0.4-restore-menubuilder.patch | 8 
 app-emulation/wine-proton/wine-proton-8.0.4.ebuild| 2 +-
 app-emulation/wine-proton/wine-proton-8.0..ebuild | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git 
a/app-emulation/wine-proton/files/wine-proton-8.0.4-restore-menubuilder.patch 
b/app-emulation/wine-proton/files/wine-proton-8.0.4-restore-menubuilder.patch
new file mode 100644
index ..f278a2cbc264
--- /dev/null
+++ 
b/app-emulation/wine-proton/files/wine-proton-8.0.4-restore-menubuilder.patch
@@ -0,0 +1,8 @@
+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/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/wine-proton-8.0.4.ebuild 
b/app-emulation/wine-proton/wine-proton-8.0.4.ebuild
index f021e06e5682..a276fcd47066 100644
--- a/app-emulation/wine-proton/wine-proton-8.0.4.ebuild
+++ b/app-emulation/wine-proton/wine-proton-8.0.4.ebuild
@@ -115,8 +115,8 @@ 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
+   "${FILESDIR}"/${PN}-8.0.4-restore-menubuilder.patch
 )
 
 pkg_pretend() {

diff --git a/app-emulation/wine-proton/wine-proton-8.0..ebuild 
b/app-emulation/wine-proton/wine-proton-8.0..ebuild
index 6741b1c2726b..c1f1e47064f1 100644
--- a/app-emulation/wine-proton/wine-proton-8.0..ebuild
+++ b/app-emulation/wine-proton/wine-proton-8.0..ebuild
@@ -116,8 +116,8 @@ 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
+   "${FILESDIR}"/${PN}-8.0.4-restore-menubuilder.patch
 )
 
 pkg_pretend() {



[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2023-12-01 Thread Ionen Wolkens
commit: 8bb6352802769d08ded5379d3e613498c3facc39
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri Dec  1 07:18:18 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri Dec  1 08:03:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bb63528

app-emulation/wine-proton: update live further

Unfortunately no switch to skip amdgpu even for non-amd users,
may consider patching later but not going to worry too much
about it in live.

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/wine-proton-8.0..ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/wine-proton/wine-proton-8.0..ebuild 
b/app-emulation/wine-proton/wine-proton-8.0..ebuild
index c1f1e47064f1..c41b7ac24d27 100644
--- a/app-emulation/wine-proton/wine-proton-8.0..ebuild
+++ b/app-emulation/wine-proton/wine-proton-8.0..ebuild
@@ -66,7 +66,7 @@ WINE_COMMON_DEPEND="
sys-devel/gcc:*
x11-libs/libX11[${MULTILIB_USEDEP}]
x11-libs/libXext[${MULTILIB_USEDEP}]
-   x11-libs/libdrm[${MULTILIB_USEDEP}]
+   x11-libs/libdrm[video_cards_amdgpu,${MULTILIB_USEDEP}]
alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
gstreamer? (
dev-libs/glib:2[${MULTILIB_USEDEP}]



[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2023-11-30 Thread Ionen Wolkens
commit: 73d70e25aa9981391dd6d954214ebf8d72799282
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri Dec  1 05:11:20 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri Dec  1 06:39:21 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73d70e25

app-emulation/wine-proton: update live

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/wine-proton-8.0..ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app-emulation/wine-proton/wine-proton-8.0..ebuild 
b/app-emulation/wine-proton/wine-proton-8.0..ebuild
index 0a9164591bd5..6741b1c2726b 100644
--- a/app-emulation/wine-proton/wine-proton-8.0..ebuild
+++ b/app-emulation/wine-proton/wine-proton-8.0..ebuild
@@ -66,6 +66,7 @@ WINE_COMMON_DEPEND="
sys-devel/gcc:*
x11-libs/libX11[${MULTILIB_USEDEP}]
x11-libs/libXext[${MULTILIB_USEDEP}]
+   x11-libs/libdrm[${MULTILIB_USEDEP}]
alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
gstreamer? (
dev-libs/glib:2[${MULTILIB_USEDEP}]



[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2023-11-08 Thread Ionen Wolkens
commit: ba2333e2657eba2ee480f553c40dee774562554c
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu Nov  9 05:48:33 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Nov  9 06:37:19 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba2333e2

app-emulation/wine-proton: bump wine-mono to 8.1.0 in live

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/wine-proton-8.0..ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/wine-proton/wine-proton-8.0..ebuild 
b/app-emulation/wine-proton/wine-proton-8.0..ebuild
index 16f19e3a308d..0a9164591bd5 100644
--- a/app-emulation/wine-proton/wine-proton-8.0..ebuild
+++ b/app-emulation/wine-proton/wine-proton-8.0..ebuild
@@ -9,7 +9,7 @@ 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=8.0.1
+WINE_MONO=8.1.0
 WINE_PV=$(ver_rs 2 -)
 
 if [[ ${PV} == * ]]; then



[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2023-10-06 Thread Arthur Zamarin
commit: 1b16019dd302c5f76f6990a4fe351cd05168c45d
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Oct  6 09:23:44 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Oct  6 09:23:44 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b16019d

app-emulation/wine-proton: Stabilize 8.0.3c amd64, #911796

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-emulation/wine-proton/wine-proton-8.0.3c.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/wine-proton/wine-proton-8.0.3c.ebuild 
b/app-emulation/wine-proton/wine-proton-8.0.3c.ebuild
index 0a109f5bc674..9f55f65590c2 100644
--- a/app-emulation/wine-proton/wine-proton-8.0.3c.ebuild
+++ b/app-emulation/wine-proton/wine-proton-8.0.3c.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == * ]]; then
 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"
+   KEYWORDS="-* amd64 ~x86"
 fi
 
 DESCRIPTION="Valve Software's fork of Wine"



[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2023-10-05 Thread Ionen Wolkens
commit: 1715d64a01b600024ad7cc00793449496368521d
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri Oct  6 06:21:56 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri Oct  6 06:22:38 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1715d64a

app-emulation/wine-proton: add 8.0.4

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/Manifest |   1 +
 app-emulation/wine-proton/wine-proton-8.0.4.ebuild | 365 +
 2 files changed, 366 insertions(+)

diff --git a/app-emulation/wine-proton/Manifest 
b/app-emulation/wine-proton/Manifest
index 0e7a1eb1adee..61b2101eff7e 100644
--- a/app-emulation/wine-proton/Manifest
+++ b/app-emulation/wine-proton/Manifest
@@ -1,2 +1,3 @@
 DIST proton-wine-7.0-6.tar.gz 45780326 BLAKE2B 
f140fcfdd1a47904c34a49d0795fa3326d7cf0d3fac8d6c2ef2a4926181a46223f43a2d1ca96c543e800c8c46b2a3cc51ae306a029d68a42608876e869e177d5
 SHA512 
793bbe2b23042301a1b518717d78cfff01eaffa033d010659a45779b9136d33cfac63f0c3fbb1e458953a954b423eb70ac4fa87633352267db890ceb2fef
 DIST proton-wine-8.0-3c.tar.gz 48254135 BLAKE2B 
fee58928555376f71579099d3fb39dbe2242516b671af1ca2507a135c3119422d6e168ed2a258d29c57a8fc33a026e5cf788d8362f238f1c0c4c7c81c9cbb147
 SHA512 
5d473534834ce8ea855d4ee2d39f1596117c0abab0925ee50875245ff6e1f49fe4684fe6f162e92a4b5e408795ff8c9b15b382fb013074216dd565143ecd9efc
+DIST proton-wine-8.0-4.tar.gz 48317622 BLAKE2B 
53047016897c8919cf3b51d7e51025806d267bb2f04fb3d464b8cf0f133c36b53d9c6c3e591aff4c71a95c6e167eed67b6ad84cc549e1aa1682175233da79835
 SHA512 
837772856aafb4d47c700997655c0d98f17cafdcc76008e04d064dd071e8d3163ed094bfc57441ef8ec4f2f7ea6303815351dc707ce5515f8c22f9aba8c5f83b

diff --git a/app-emulation/wine-proton/wine-proton-8.0.4.ebuild 
b/app-emulation/wine-proton/wine-proton-8.0.4.ebuild
new file mode 100644
index ..f021e06e5682
--- /dev/null
+++ b/app-emulation/wine-proton/wine-proton-8.0.4.ebuild
@@ -0,0 +1,365 @@
+# 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_{10..12} )
+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=8.0.1
+WINE_PV=$(ver_rs 2 -)
+
+if [[ ${PV} == * ]]; 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
+   +fontconfig +gecko +gstreamer llvm-libunwind +mono nls osmesa
+   perl pulseaudio +sdl selinux +ssl +strip 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}] )"
+# gcc: for -latomic with clang
+WINE_COMMON_DEPEND="
+   ${WINE_DLOPEN_DEPEND}
+   sys-devel/gcc:*
+   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_USED

[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2023-08-28 Thread Ionen Wolkens
commit: a6fc6d87eb829a9c6cfb837cc2f05b817987f127
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Aug 28 11:59:38 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Aug 28 12:13:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6fc6d87

app-emulation/wine-proton: warn if nvidia[abi_x86_32] is missing

Hard to know for sure if it's really used or not, but do not
want to introduce a kinda no-op VIDEO_CARDS on wine to actually
depend on it over a warning.

Less of an issue with mesa given other dependencies end up
requiring it (technically the dep is wrong given e.g. nvidia
would not need mesa[abi_x86_32], but well).

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/wine-proton-7.0.6.ebuild| 7 +++
 app-emulation/wine-proton/wine-proton-8.0.3c.ebuild   | 7 +++
 app-emulation/wine-proton/wine-proton-8.0..ebuild | 7 +++
 3 files changed, 21 insertions(+)

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 2d64d08da94f..b0d8137fd450 100644
--- a/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
+++ b/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
@@ -336,6 +336,13 @@ pkg_preinst() {
 pkg_postinst() {
[[ -v WINE_HAD_ANY_SLOT ]] || readme.gentoo_print_elog
 
+   if use abi_x86_32 && 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."
+   fi
+
eselect wine update --if-unset || die
 }
 

diff --git a/app-emulation/wine-proton/wine-proton-8.0.3c.ebuild 
b/app-emulation/wine-proton/wine-proton-8.0.3c.ebuild
index 28c682e79696..0a109f5bc674 100644
--- a/app-emulation/wine-proton/wine-proton-8.0.3c.ebuild
+++ b/app-emulation/wine-proton/wine-proton-8.0.3c.ebuild
@@ -348,6 +348,13 @@ pkg_preinst() {
 pkg_postinst() {
[[ -v WINE_HAD_ANY_SLOT ]] || readme.gentoo_print_elog
 
+   if use abi_x86_32 && 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."
+   fi
+
eselect wine update --if-unset || die
 }
 

diff --git a/app-emulation/wine-proton/wine-proton-8.0..ebuild 
b/app-emulation/wine-proton/wine-proton-8.0..ebuild
index 53ac9ce2e64b..16f19e3a308d 100644
--- a/app-emulation/wine-proton/wine-proton-8.0..ebuild
+++ b/app-emulation/wine-proton/wine-proton-8.0..ebuild
@@ -352,6 +352,13 @@ pkg_preinst() {
 pkg_postinst() {
[[ -v WINE_HAD_ANY_SLOT ]] || readme.gentoo_print_elog
 
+   if use abi_x86_32 && 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."
+   fi
+
eselect wine update --if-unset || die
 }
 



[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2023-08-19 Thread Ionen Wolkens
commit: 89ad87b4928349ea287d129f96e1d5d9ace40981
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sat Aug 19 09:44:04 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat Aug 19 09:51:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89ad87b4

app-emulation/wine-proton: use mono-8.0.1 in live

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/wine-proton-8.0..ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-emulation/wine-proton/wine-proton-8.0..ebuild 
b/app-emulation/wine-proton/wine-proton-8.0..ebuild
index 9c15f5e09995..53ac9ce2e64b 100644
--- a/app-emulation/wine-proton/wine-proton-8.0..ebuild
+++ b/app-emulation/wine-proton/wine-proton-8.0..ebuild
@@ -9,7 +9,7 @@ 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=8.0.0
+WINE_MONO=8.0.1
 WINE_PV=$(ver_rs 2 -)
 
 if [[ ${PV} == * ]]; then



[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2023-08-14 Thread Ionen Wolkens
commit: 44d2b75c2b8f8151d6d09e7dd2af4c6818e7b280
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Aug 14 10:22:41 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Aug 14 10:25:47 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44d2b75c

app-emulation/wine-proton: pass -mno-avx with mingw unconditionally

Upon further consideration 84924628f0009acbe92b94ac28141c7ee322548e
result in rather unexpected behavior even if we consider that
USE=custom-cflags is unsupported, and giving a way to skip -mno-avx
may not be all that worth it.

So revert plus tidy and add this bugref.

Closes: https://bugs.gentoo.org/912268
Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/wine-proton-7.0.6.ebuild| 4 +++-
 app-emulation/wine-proton/wine-proton-8.0.3c.ebuild   | 7 +--
 app-emulation/wine-proton/wine-proton-8.0..ebuild | 7 +--
 3 files changed, 13 insertions(+), 5 deletions(-)

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 95664cb0ff23..2d64d08da94f 100644
--- a/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
+++ b/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
@@ -269,11 +269,13 @@ src_configure() {
: "${CROSSCFLAGS:=$(
filter-flags '-fstack-protector*' #870136
filter-flags '-mfunction-return=thunk*' #878849
+
# -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
-   use custom-cflags || append-cflags -mno-avx
+   append-cflags -mno-avx #912268
+
CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"
: "${CROSSLDFLAGS:=$(
filter-flags '-fuse-ld=*'

diff --git a/app-emulation/wine-proton/wine-proton-8.0.3c.ebuild 
b/app-emulation/wine-proton/wine-proton-8.0.3c.ebuild
index c5db812fe92b..28c682e79696 100644
--- a/app-emulation/wine-proton/wine-proton-8.0.3c.ebuild
+++ b/app-emulation/wine-proton/wine-proton-8.0.3c.ebuild
@@ -273,14 +273,17 @@ src_configure() {
: "${CROSSCFLAGS:=$(
# >=wine-7.21 <8.10's configure.ac does not pass 
-fno-strict when
# it should (can be removed when proton is rebased on 
>=8.10)
-   append-cflags '-fno-strict-aliasing'
+   append-cflags -fno-strict-aliasing
+
filter-flags '-fstack-protector*' #870136
filter-flags '-mfunction-return=thunk*' #878849
+
# -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
-   use custom-cflags || append-cflags -mno-avx
+   append-cflags -mno-avx #912268
+
CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"
: "${CROSSLDFLAGS:=$(
filter-flags '-fuse-ld=*'

diff --git a/app-emulation/wine-proton/wine-proton-8.0..ebuild 
b/app-emulation/wine-proton/wine-proton-8.0..ebuild
index 6c5e37bcd5bb..9c15f5e09995 100644
--- a/app-emulation/wine-proton/wine-proton-8.0..ebuild
+++ b/app-emulation/wine-proton/wine-proton-8.0..ebuild
@@ -277,14 +277,17 @@ src_configure() {
: "${CROSSCFLAGS:=$(
# >=wine-7.21 <8.10's configure.ac does not pass 
-fno-strict when
# it should (can be removed when proton is rebased on 
>=8.10)
-   append-cflags '-fno-strict-aliasing'
+   append-cflags -fno-strict-aliasing
+
filter-flags '-fstack-protector*' #870136
filter-flags '-mfunction-return=thunk*' #878849
+
# -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
-   use custom-cflags || append-cflags -mno-avx
+   append-cflags -mno-avx #912268
+
CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"
: "${CROSSLDFLAGS:=$(
filter-flags '-fuse-ld=*'



[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2023-08-13 Thread Ionen Wolkens
commit: 2aec9b5a832e008ba2c3060ef6c5e3bb0d000429
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sun Aug 13 19:42:18 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sun Aug 13 19:44:20 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2aec9b5a

app-emulation/wine-proton: note reminder about mingw if using clang

Albeit likely won't visit this until wine-proton-9 and wow64.

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/wine-proton-8.0..ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app-emulation/wine-proton/wine-proton-8.0..ebuild 
b/app-emulation/wine-proton/wine-proton-8.0..ebuild
index cced91f4ca78..6c5e37bcd5bb 100644
--- a/app-emulation/wine-proton/wine-proton-8.0..ebuild
+++ b/app-emulation/wine-proton/wine-proton-8.0..ebuild
@@ -190,6 +190,8 @@ src_configure() {
# 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
+   # TODO?: --without-mingw could make sense *if* using clang, 
assuming
+   # bug #912237 is resolved (consider when do USE=wow64 in 
proton-9)
--with-freetype
--with-mingw # needed by many, notably Blizzard titles
--with-opengl



[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2023-08-11 Thread Ionen Wolkens
commit: 406299a31b83ceb567a51645f66d0122a27509fc
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri Aug 11 07:14:32 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri Aug 11 10:33:53 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=406299a3

app-emulation/wine-proton: revert TODO about force-bfd

Will keep this matched with wine 8.0 until rebase for proton-9.

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/wine-proton-8.0.3c.ebuild   | 6 +-
 app-emulation/wine-proton/wine-proton-8.0..ebuild | 6 +-
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/app-emulation/wine-proton/wine-proton-8.0.3c.ebuild 
b/app-emulation/wine-proton/wine-proton-8.0.3c.ebuild
index cad46d367304..c5db812fe92b 100644
--- a/app-emulation/wine-proton/wine-proton-8.0.3c.ebuild
+++ b/app-emulation/wine-proton/wine-proton-8.0.3c.ebuild
@@ -230,11 +230,7 @@ src_configure() {
$(use_with xinerama)
)
 
-   # builds with non-bfd but broken at runtime (bug #867097)
-   # TODO: retest mold and lld, and figure out what's wrong if
-   # still broken given (at least) lld is supposed to work
-   tc-ld-force-bfd
-
+   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}

diff --git a/app-emulation/wine-proton/wine-proton-8.0..ebuild 
b/app-emulation/wine-proton/wine-proton-8.0..ebuild
index 248c24788eab..cced91f4ca78 100644
--- a/app-emulation/wine-proton/wine-proton-8.0..ebuild
+++ b/app-emulation/wine-proton/wine-proton-8.0..ebuild
@@ -232,11 +232,7 @@ src_configure() {
--without-vosk # unpackaged, file a bug if you need this
)
 
-   # builds with non-bfd but broken at runtime (bug #867097)
-   # TODO: retest mold and lld, and figure out what's wrong if
-   # still broken given (at least) lld is supposed to work
-   tc-ld-force-bfd
-
+   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}



[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2023-08-11 Thread Ionen Wolkens
commit: 2d51d6027d3fcaf3337c932932a50918d9d38f73
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri Aug 11 06:26:14 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri Aug 11 10:00:06 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d51d602

app-emulation/wine-proton: fix build with clang:17

Was silently ignored with  gentoo.org>

 app-emulation/wine-proton/wine-proton-7.0.6.ebuild| 7 +++
 app-emulation/wine-proton/wine-proton-8.0.3c.ebuild   | 7 +++
 app-emulation/wine-proton/wine-proton-8.0..ebuild | 7 +++
 3 files changed, 21 insertions(+)

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 294e5c9aab65..95664cb0ff23 100644
--- a/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
+++ b/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
@@ -152,6 +152,13 @@ src_prepare() {
 
default
 
+   if tc-is-clang; then
+   # -mabi=ms was ignored by 

[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2023-08-11 Thread Ionen Wolkens
commit: b15be1cefe3f1288144bf23d5251e45a0428faa5
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri Aug 11 07:32:48 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri Aug 11 10:00:07 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b15be1ce

app-emulation/wine-proton: pass -latomic with clang for ntdll.so

Specific to Valve's fync patches, aka:
ntdll/unix/fsync.c:368: undefined reference to `__atomic_load_8'

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/wine-proton-8.0.3c.ebuild   | 5 +
 app-emulation/wine-proton/wine-proton-8.0..ebuild | 5 +
 2 files changed, 10 insertions(+)

diff --git a/app-emulation/wine-proton/wine-proton-8.0.3c.ebuild 
b/app-emulation/wine-proton/wine-proton-8.0.3c.ebuild
index 79fa39b47160..cad46d367304 100644
--- a/app-emulation/wine-proton/wine-proton-8.0.3c.ebuild
+++ b/app-emulation/wine-proton/wine-proton-8.0.3c.ebuild
@@ -60,8 +60,10 @@ WINE_DLOPEN_DEPEND="
v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )"
+# gcc: for -latomic with clang
 WINE_COMMON_DEPEND="
${WINE_DLOPEN_DEPEND}
+   sys-devel/gcc:*
x11-libs/libX11[${MULTILIB_USEDEP}]
x11-libs/libXext[${MULTILIB_USEDEP}]
alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
@@ -154,6 +156,9 @@ src_prepare() {
# and it still gets used in install phase despite --with-mingw,
# drop as a quick fix for now which hopefully should be safe
sed -i '/MSVCRTFLAGS=/s/-mabi=ms//' configure.ac || die
+
+   # needed by Valve's fsync patches if using clang (undef 
atomic_load_8)
+   sed -i '/^UNIX_LIBS.*=/s/$/ -latomic/' dlls/ntdll/Makefile.in 
|| die
fi
 
# ensure .desktop calls this variant + slot

diff --git a/app-emulation/wine-proton/wine-proton-8.0..ebuild 
b/app-emulation/wine-proton/wine-proton-8.0..ebuild
index 264e3ea19172..248c24788eab 100644
--- a/app-emulation/wine-proton/wine-proton-8.0..ebuild
+++ b/app-emulation/wine-proton/wine-proton-8.0..ebuild
@@ -60,8 +60,10 @@ WINE_DLOPEN_DEPEND="
v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )"
+# gcc: for -latomic with clang
 WINE_COMMON_DEPEND="
${WINE_DLOPEN_DEPEND}
+   sys-devel/gcc:*
x11-libs/libX11[${MULTILIB_USEDEP}]
x11-libs/libXext[${MULTILIB_USEDEP}]
alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
@@ -154,6 +156,9 @@ src_prepare() {
# and it still gets used in install phase despite --with-mingw,
# drop as a quick fix for now which hopefully should be safe
sed -i '/MSVCRTFLAGS=/s/-mabi=ms//' configure.ac || die
+
+   # needed by Valve's fsync patches if using clang (undef 
atomic_load_8)
+   sed -i '/^UNIX_LIBS.*=/s/$/ -latomic/' dlls/ntdll/Makefile.in 
|| die
fi
 
# ensure .desktop calls this variant + slot



[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2023-08-10 Thread Ionen Wolkens
commit: 94d5fad239aa407403918106082dc94b17456740
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu Aug 10 09:00:18 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Aug 10 10:35:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94d5fad2

app-emulation/wine-proton: extend force-bfd comment with reminder

Would rather stay conservative with wine, but should
probably revisit still.

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/wine-proton-8.0.3c.ebuild   | 6 +-
 app-emulation/wine-proton/wine-proton-8.0..ebuild | 6 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app-emulation/wine-proton/wine-proton-8.0.3c.ebuild 
b/app-emulation/wine-proton/wine-proton-8.0.3c.ebuild
index e5ff1bbe7cce..e0cf597cbcca 100644
--- a/app-emulation/wine-proton/wine-proton-8.0.3c.ebuild
+++ b/app-emulation/wine-proton/wine-proton-8.0.3c.ebuild
@@ -215,7 +215,11 @@ src_configure() {
$(use_with xinerama)
)
 
-   tc-ld-force-bfd # builds with non-bfd but broken at runtime (bug 
#867097)
+   # builds with non-bfd but broken at runtime (bug #867097)
+   # TODO: retest mold and lld, and figure out what's wrong if
+   # still broken given (at least) lld is supposed to work
+   tc-ld-force-bfd
+
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}

diff --git a/app-emulation/wine-proton/wine-proton-8.0..ebuild 
b/app-emulation/wine-proton/wine-proton-8.0..ebuild
index d44d6d421587..4d53248d4c24 100644
--- a/app-emulation/wine-proton/wine-proton-8.0..ebuild
+++ b/app-emulation/wine-proton/wine-proton-8.0..ebuild
@@ -217,7 +217,11 @@ src_configure() {
--without-vosk # unpackaged, file a bug if you need this
)
 
-   tc-ld-force-bfd # builds with non-bfd but broken at runtime (bug 
#867097)
+   # builds with non-bfd but broken at runtime (bug #867097)
+   # TODO: retest mold and lld, and figure out what's wrong if
+   # still broken given (at least) lld is supposed to work
+   tc-ld-force-bfd
+
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}



[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2023-08-10 Thread Ionen Wolkens
commit: b00af64d6d88d213f473daf06bbbef407971eb26
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu Aug 10 10:09:41 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Aug 10 10:35:04 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b00af64d

app-emulation/wine-proton: fix finding wine-mono on prefix

Technically needs a revbump, but given never got a bug report despite
being broken since forever I'll consider this low priority.

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/wine-proton-7.0.6.ebuild| 7 +--
 app-emulation/wine-proton/wine-proton-8.0.3c.ebuild   | 7 +--
 app-emulation/wine-proton/wine-proton-8.0..ebuild | 7 +--
 3 files changed, 15 insertions(+), 6 deletions(-)

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 0bd8abd05b69..294e5c9aab65 100644
--- a/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
+++ b/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
@@ -5,8 +5,8 @@ EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
 PYTHON_COMPAT=( python3_{10..12} )
-inherit autotools flag-o-matic multilib multilib-build python-any-r1
-inherit readme.gentoo-r1 toolchain-funcs wrapper
+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
@@ -158,6 +158,9 @@ src_prepare() {
# similarly to staging, append to `wine --version` for identification
sed -i "s/wine_build[^1]*1/& (Proton-${WINE_PV})/" configure.ac || die
 
+   # datadir is not where wine-mono is installed, so prefixy alternate 
paths
+   hprefixify -w /get_mono_path/ dlls/mscoree/metahost.c
+
# always update for patches (including user's wrt #432348)
eautoreconf
tools/make_requests || die # perl

diff --git a/app-emulation/wine-proton/wine-proton-8.0.3c.ebuild 
b/app-emulation/wine-proton/wine-proton-8.0.3c.ebuild
index 6ea5954ede28..3f2ba5ab1d26 100644
--- a/app-emulation/wine-proton/wine-proton-8.0.3c.ebuild
+++ b/app-emulation/wine-proton/wine-proton-8.0.3c.ebuild
@@ -5,8 +5,8 @@ EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
 PYTHON_COMPAT=( python3_{10..12} )
-inherit autotools flag-o-matic multilib multilib-build python-any-r1
-inherit readme.gentoo-r1 toolchain-funcs wrapper
+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.1
@@ -155,6 +155,9 @@ src_prepare() {
# similarly to staging, append to `wine --version` for identification
sed -i "s/wine_build[^1]*1/& (Proton-${WINE_PV})/" configure.ac || die
 
+   # datadir is not where wine-mono is installed, so prefixy alternate 
paths
+   hprefixify -w /get_mono_path/ dlls/mscoree/metahost.c
+
# always update for patches (including user's wrt #432348)
eautoreconf
tools/make_requests || die # perl

diff --git a/app-emulation/wine-proton/wine-proton-8.0..ebuild 
b/app-emulation/wine-proton/wine-proton-8.0..ebuild
index db3758ec4c05..68a943a8042e 100644
--- a/app-emulation/wine-proton/wine-proton-8.0..ebuild
+++ b/app-emulation/wine-proton/wine-proton-8.0..ebuild
@@ -5,8 +5,8 @@ EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
 PYTHON_COMPAT=( python3_{10..12} )
-inherit autotools flag-o-matic multilib multilib-build python-any-r1
-inherit readme.gentoo-r1 toolchain-funcs wrapper
+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=8.0.0
@@ -155,6 +155,9 @@ src_prepare() {
# similarly to staging, append to `wine --version` for identification
sed -i "s/wine_build[^1]*1/& (Proton-${WINE_PV})/" configure.ac || die
 
+   # datadir is not where wine-mono is installed, so prefixy alternate 
paths
+   hprefixify -w /get_mono_path/ dlls/mscoree/metahost.c
+
# always update for patches (including user's wrt #432348)
eautoreconf
tools/make_requests || die # perl



[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2023-08-10 Thread Ionen Wolkens
commit: 84924628f0009acbe92b94ac28141c7ee322548e
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu Aug 10 09:08:50 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Aug 10 10:35:04 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84924628

app-emulation/wine-proton: skip -mno-avx with USE=custom-cflags

Don't recommend it (even hardly recommend -march=native!), but
some users like ricing their wine and would rather not see this
if it "works for me".

Others like filter-lto stay regardless given that just will not
build.

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/wine-proton-7.0.6.ebuild| 2 +-
 app-emulation/wine-proton/wine-proton-8.0.3c.ebuild   | 2 +-
 app-emulation/wine-proton/wine-proton-8.0..ebuild | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

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 086837096042..0bd8abd05b69 100644
--- a/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
+++ b/app-emulation/wine-proton/wine-proton-7.0.6.ebuild
@@ -263,7 +263,7 @@ src_configure() {
# 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
+   use custom-cflags || append-cflags -mno-avx
CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"
: "${CROSSLDFLAGS:=$(
filter-flags '-fuse-ld=*'

diff --git a/app-emulation/wine-proton/wine-proton-8.0.3c.ebuild 
b/app-emulation/wine-proton/wine-proton-8.0.3c.ebuild
index e0cf597cbcca..6ea5954ede28 100644
--- a/app-emulation/wine-proton/wine-proton-8.0.3c.ebuild
+++ b/app-emulation/wine-proton/wine-proton-8.0.3c.ebuild
@@ -269,7 +269,7 @@ src_configure() {
# 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
+   use custom-cflags || append-cflags -mno-avx
CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"
: "${CROSSLDFLAGS:=$(
filter-flags '-fuse-ld=*'

diff --git a/app-emulation/wine-proton/wine-proton-8.0..ebuild 
b/app-emulation/wine-proton/wine-proton-8.0..ebuild
index 4d53248d4c24..db3758ec4c05 100644
--- a/app-emulation/wine-proton/wine-proton-8.0..ebuild
+++ b/app-emulation/wine-proton/wine-proton-8.0..ebuild
@@ -271,7 +271,7 @@ src_configure() {
# 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
+   use custom-cflags || append-cflags -mno-avx
CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"
: "${CROSSLDFLAGS:=$(
filter-flags '-fuse-ld=*'



[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2023-08-05 Thread Ionen Wolkens
commit: 06b6b69f2192e7c63d032b3d76df3442e97a0718
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sun Aug  6 01:04:27 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sun Aug  6 04:27:44 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06b6b69f

app-emulation/wine-proton: drop 8.0.2c

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/Manifest |   1 -
 .../wine-proton/wine-proton-8.0.2c.ebuild  | 333 -
 2 files changed, 334 deletions(-)

diff --git a/app-emulation/wine-proton/Manifest 
b/app-emulation/wine-proton/Manifest
index c87fa209107f..0e7a1eb1adee 100644
--- a/app-emulation/wine-proton/Manifest
+++ b/app-emulation/wine-proton/Manifest
@@ -1,3 +1,2 @@
 DIST proton-wine-7.0-6.tar.gz 45780326 BLAKE2B 
f140fcfdd1a47904c34a49d0795fa3326d7cf0d3fac8d6c2ef2a4926181a46223f43a2d1ca96c543e800c8c46b2a3cc51ae306a029d68a42608876e869e177d5
 SHA512 
793bbe2b23042301a1b518717d78cfff01eaffa033d010659a45779b9136d33cfac63f0c3fbb1e458953a954b423eb70ac4fa87633352267db890ceb2fef
-DIST proton-wine-8.0-2c.tar.gz 48207888 BLAKE2B 
8dc37f136c6d8758c521c0e5c2f16c88e9ede8b22ce7902bb7377a1555bf6aa5bcfaa46f3b9edb4fced1700675fc50f920f9ead17036c9ad1b8bc742ba7e8de3
 SHA512 
126c06352b6c8b38c133861ce13bc1ce4f1ecf9d451edc2928db54592707c94b07b3a346eb302895cc96c56fede8679b44111be7e1b451c4059c7afcb5fcff57
 DIST proton-wine-8.0-3c.tar.gz 48254135 BLAKE2B 
fee58928555376f71579099d3fb39dbe2242516b671af1ca2507a135c3119422d6e168ed2a258d29c57a8fc33a026e5cf788d8362f238f1c0c4c7c81c9cbb147
 SHA512 
5d473534834ce8ea855d4ee2d39f1596117c0abab0925ee50875245ff6e1f49fe4684fe6f162e92a4b5e408795ff8c9b15b382fb013074216dd565143ecd9efc

diff --git a/app-emulation/wine-proton/wine-proton-8.0.2c.ebuild 
b/app-emulation/wine-proton/wine-proton-8.0.2c.ebuild
deleted file mode 100644
index 1080ea80dd3f..
--- a/app-emulation/wine-proton/wine-proton-8.0.2c.ebuild
+++ /dev/null
@@ -1,333 +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_{10..12} )
-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} == * ]]; 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_USE

[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2023-07-21 Thread Ionen Wolkens
commit: 2a9c32b782c5896b00f5fa3c33e01412f7e94571
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri Jul 21 20:17:01 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri Jul 21 20:41:42 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a9c32b7

app-emulation/wine-proton: add 8.0.3c

This is probably a stable candidate for 8.0 series, fixes
a fair amount of regressions.

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/Manifest |   1 +
 .../wine-proton/wine-proton-8.0.3c.ebuild  | 338 +
 2 files changed, 339 insertions(+)

diff --git a/app-emulation/wine-proton/Manifest 
b/app-emulation/wine-proton/Manifest
index 85f037745409..c87fa209107f 100644
--- a/app-emulation/wine-proton/Manifest
+++ b/app-emulation/wine-proton/Manifest
@@ -1,2 +1,3 @@
 DIST proton-wine-7.0-6.tar.gz 45780326 BLAKE2B 
f140fcfdd1a47904c34a49d0795fa3326d7cf0d3fac8d6c2ef2a4926181a46223f43a2d1ca96c543e800c8c46b2a3cc51ae306a029d68a42608876e869e177d5
 SHA512 
793bbe2b23042301a1b518717d78cfff01eaffa033d010659a45779b9136d33cfac63f0c3fbb1e458953a954b423eb70ac4fa87633352267db890ceb2fef
 DIST proton-wine-8.0-2c.tar.gz 48207888 BLAKE2B 
8dc37f136c6d8758c521c0e5c2f16c88e9ede8b22ce7902bb7377a1555bf6aa5bcfaa46f3b9edb4fced1700675fc50f920f9ead17036c9ad1b8bc742ba7e8de3
 SHA512 
126c06352b6c8b38c133861ce13bc1ce4f1ecf9d451edc2928db54592707c94b07b3a346eb302895cc96c56fede8679b44111be7e1b451c4059c7afcb5fcff57
+DIST proton-wine-8.0-3c.tar.gz 48254135 BLAKE2B 
fee58928555376f71579099d3fb39dbe2242516b671af1ca2507a135c3119422d6e168ed2a258d29c57a8fc33a026e5cf788d8362f238f1c0c4c7c81c9cbb147
 SHA512 
5d473534834ce8ea855d4ee2d39f1596117c0abab0925ee50875245ff6e1f49fe4684fe6f162e92a4b5e408795ff8c9b15b382fb013074216dd565143ecd9efc

diff --git a/app-emulation/wine-proton/wine-proton-8.0.3c.ebuild 
b/app-emulation/wine-proton/wine-proton-8.0.3c.ebuild
new file mode 100644
index ..e5ff1bbe7cce
--- /dev/null
+++ b/app-emulation/wine-proton/wine-proton-8.0.3c.ebuild
@@ -0,0 +1,338 @@
+# 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_{10..12} )
+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} == * ]]; 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
+   +fontconfig +gecko +gstreamer llvm-libunwind +mono nls osmesa
+   perl pulseaudio +sdl selinux +ssl +strip 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? ( medi

[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2023-07-21 Thread Ionen Wolkens
commit: c8c7d58a8f1157a7b1cf11a6a44775782dbb2b86
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri Jul 21 20:07:05 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri Jul 21 20:41:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8c7d58a

app-emulation/wine-proton: drop 8.0.1d

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/Manifest |   1 -
 .../wine-proton/wine-proton-8.0.1d.ebuild  | 333 -
 2 files changed, 334 deletions(-)

diff --git a/app-emulation/wine-proton/Manifest 
b/app-emulation/wine-proton/Manifest
index 33f4de150db9..85f037745409 100644
--- a/app-emulation/wine-proton/Manifest
+++ b/app-emulation/wine-proton/Manifest
@@ -1,3 +1,2 @@
 DIST proton-wine-7.0-6.tar.gz 45780326 BLAKE2B 
f140fcfdd1a47904c34a49d0795fa3326d7cf0d3fac8d6c2ef2a4926181a46223f43a2d1ca96c543e800c8c46b2a3cc51ae306a029d68a42608876e869e177d5
 SHA512 
793bbe2b23042301a1b518717d78cfff01eaffa033d010659a45779b9136d33cfac63f0c3fbb1e458953a954b423eb70ac4fa87633352267db890ceb2fef
-DIST proton-wine-8.0-1d.tar.gz 48198535 BLAKE2B 
7ed7c4130d4c74d3f411880d253727469cbdaa78943b7783f3d2162177072503bffd588ba3c6c147014ce4e422850cb49e83c2d2d80fcd01c101199f922d
 SHA512 
4a5a2a2753f8fd025f8c0fe56341a67ed780befc8ae9bffe03872019d4227ec8324edf892c327b99330c3de29a3b8adaac656b41d3487de03a8a82cef9234da7
 DIST proton-wine-8.0-2c.tar.gz 48207888 BLAKE2B 
8dc37f136c6d8758c521c0e5c2f16c88e9ede8b22ce7902bb7377a1555bf6aa5bcfaa46f3b9edb4fced1700675fc50f920f9ead17036c9ad1b8bc742ba7e8de3
 SHA512 
126c06352b6c8b38c133861ce13bc1ce4f1ecf9d451edc2928db54592707c94b07b3a346eb302895cc96c56fede8679b44111be7e1b451c4059c7afcb5fcff57

diff --git a/app-emulation/wine-proton/wine-proton-8.0.1d.ebuild 
b/app-emulation/wine-proton/wine-proton-8.0.1d.ebuild
deleted file mode 100644
index 1080ea80dd3f..
--- a/app-emulation/wine-proton/wine-proton-8.0.1d.ebuild
+++ /dev/null
@@ -1,333 +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_{10..12} )
-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} == * ]]; 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_USE

[gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-proton/

2023-07-10 Thread Ionen Wolkens
commit: 68d292c1a404a227ff30b0ec81b8ea09bfef8623
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Jul 11 05:28:28 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Jul 11 05:36:42 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68d292c1

app-emulation/wine-proton: update live

wrt vosk aven't looked at it, but could consider to if there's
interest. Believe this is rather niche (for voice recognition
in Wine it sounds like) and won't go out of my way unless
I know someone wants it.

Signed-off-by: Ionen Wolkens  gentoo.org>

 app-emulation/wine-proton/wine-proton-8.0..ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app-emulation/wine-proton/wine-proton-8.0..ebuild 
b/app-emulation/wine-proton/wine-proton-8.0..ebuild
index e5ff1bbe7cce..d44d6d421587 100644
--- a/app-emulation/wine-proton/wine-proton-8.0..ebuild
+++ b/app-emulation/wine-proton/wine-proton-8.0..ebuild
@@ -9,7 +9,7 @@ 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_MONO=8.0.0
 WINE_PV=$(ver_rs 2 -)
 
 if [[ ${PV} == * ]]; then
@@ -213,6 +213,8 @@ src_configure() {
$(use_with v4l v4l2)
$(use_with xcomposite)
$(use_with xinerama)
+
+   --without-vosk # unpackaged, file a bug if you need this
)
 
tc-ld-force-bfd # builds with non-bfd but broken at runtime (bug 
#867097)



  1   2   >