* [gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-vanilla/, app-emulation/wine-staging/
@ 2025-04-30 2:36 Ionen Wolkens
0 siblings, 0 replies; 2+ messages in thread
From: Ionen Wolkens @ 2025-04-30 2:36 UTC (permalink / raw
To: gentoo-commits
commit: b5cf11dfda1b4716808f2d883eef81ecc455f364
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 29 23:12:31 2025 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Apr 30 02:25:44 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5cf11df
app-emulation/wine-*: adjust libglvnd dependencies for wayland
Noticed while working on wine-proton-10 that forgot to setup
the libglvnd dependency in wine-10 for wayland (it newly added
EGL support that was missing in wine-9).
At same time, add a required USE given these are no-op unless
X or wayland is set. fwiw vulkan on the other hand still does
something albeit unsure what it'd be useful for, perhaps headless
filters and such.
Not really worth revbumps, it'd be hard to be missing this and,
even if did, the dlopen nature wouldn't break wine entirely.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
app-emulation/wine-staging/wine-staging-10.0.ebuild | 3 ++-
app-emulation/wine-staging/wine-staging-10.5-r1.ebuild | 3 ++-
app-emulation/wine-staging/wine-staging-10.6.ebuild | 3 ++-
app-emulation/wine-staging/wine-staging-9.0.ebuild | 3 ++-
app-emulation/wine-staging/wine-staging-9999.ebuild | 3 ++-
app-emulation/wine-vanilla/wine-vanilla-10.0-r2.ebuild | 7 +++++--
app-emulation/wine-vanilla/wine-vanilla-10.5-r1.ebuild | 3 ++-
app-emulation/wine-vanilla/wine-vanilla-10.6.ebuild | 3 ++-
app-emulation/wine-vanilla/wine-vanilla-9.0.1-r1.ebuild | 8 ++++++--
app-emulation/wine-vanilla/wine-vanilla-9999.ebuild | 3 ++-
10 files changed, 27 insertions(+), 12 deletions(-)
diff --git a/app-emulation/wine-staging/wine-staging-10.0.ebuild b/app-emulation/wine-staging/wine-staging-10.0.ebuild
index 123f2df0684d..29229ccb78ab 100644
--- a/app-emulation/wine-staging/wine-staging-10.0.ebuild
+++ b/app-emulation/wine-staging/wine-staging-10.0.ebuild
@@ -47,6 +47,7 @@ IUSE="
REQUIRED_USE="
X? ( truetype )
crossdev-mingw? ( mingw )
+ opengl? ( || ( X wayland ) )
wow64? ( abi_x86_64 !abi_x86_32 mingw )
"
@@ -63,7 +64,6 @@ WINE_DLOPEN_DEPEND="
x11-libs/libXrandr[${MULTILIB_USEDEP}]
x11-libs/libXrender[${MULTILIB_USEDEP}]
x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
- opengl? ( media-libs/libglvnd[X,${MULTILIB_USEDEP}] )
xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
)
@@ -73,6 +73,7 @@ WINE_DLOPEN_DEPEND="
kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
netapi? ( net-fs/samba[${MULTILIB_USEDEP}] )
odbc? ( dev-db/unixODBC[${MULTILIB_USEDEP}] )
+ opengl? ( media-libs/libglvnd[X?,${MULTILIB_USEDEP}] )
sdl? ( media-libs/libsdl2[haptic,joystick,${MULTILIB_USEDEP}] )
ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
truetype? ( media-libs/freetype[${MULTILIB_USEDEP}] )
diff --git a/app-emulation/wine-staging/wine-staging-10.5-r1.ebuild b/app-emulation/wine-staging/wine-staging-10.5-r1.ebuild
index ceb699fcd848..a9c8cb0c87f6 100644
--- a/app-emulation/wine-staging/wine-staging-10.5-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-10.5-r1.ebuild
@@ -46,6 +46,7 @@ IUSE="
REQUIRED_USE="
X? ( truetype )
bluetooth? ( dbus )
+ opengl? ( || ( X wayland ) )
"
# tests are non-trivial to run, can hang easily, don't play well with
@@ -61,7 +62,6 @@ WINE_DLOPEN_DEPEND="
x11-libs/libXrandr[${WINE_USEDEP}]
x11-libs/libXrender[${WINE_USEDEP}]
x11-libs/libXxf86vm[${WINE_USEDEP}]
- opengl? ( media-libs/libglvnd[X,${WINE_USEDEP}] )
xcomposite? ( x11-libs/libXcomposite[${WINE_USEDEP}] )
xinerama? ( x11-libs/libXinerama[${WINE_USEDEP}] )
)
@@ -71,6 +71,7 @@ WINE_DLOPEN_DEPEND="
kerberos? ( virtual/krb5[${WINE_USEDEP}] )
netapi? ( net-fs/samba[${WINE_USEDEP}] )
odbc? ( dev-db/unixODBC[${WINE_USEDEP}] )
+ opengl? ( media-libs/libglvnd[X?,${WINE_USEDEP}] )
sdl? ( media-libs/libsdl2[haptic,joystick,${WINE_USEDEP}] )
ssl? ( net-libs/gnutls:=[${WINE_USEDEP}] )
truetype? ( media-libs/freetype[${WINE_USEDEP}] )
diff --git a/app-emulation/wine-staging/wine-staging-10.6.ebuild b/app-emulation/wine-staging/wine-staging-10.6.ebuild
index ceb699fcd848..a9c8cb0c87f6 100644
--- a/app-emulation/wine-staging/wine-staging-10.6.ebuild
+++ b/app-emulation/wine-staging/wine-staging-10.6.ebuild
@@ -46,6 +46,7 @@ IUSE="
REQUIRED_USE="
X? ( truetype )
bluetooth? ( dbus )
+ opengl? ( || ( X wayland ) )
"
# tests are non-trivial to run, can hang easily, don't play well with
@@ -61,7 +62,6 @@ WINE_DLOPEN_DEPEND="
x11-libs/libXrandr[${WINE_USEDEP}]
x11-libs/libXrender[${WINE_USEDEP}]
x11-libs/libXxf86vm[${WINE_USEDEP}]
- opengl? ( media-libs/libglvnd[X,${WINE_USEDEP}] )
xcomposite? ( x11-libs/libXcomposite[${WINE_USEDEP}] )
xinerama? ( x11-libs/libXinerama[${WINE_USEDEP}] )
)
@@ -71,6 +71,7 @@ WINE_DLOPEN_DEPEND="
kerberos? ( virtual/krb5[${WINE_USEDEP}] )
netapi? ( net-fs/samba[${WINE_USEDEP}] )
odbc? ( dev-db/unixODBC[${WINE_USEDEP}] )
+ opengl? ( media-libs/libglvnd[X?,${WINE_USEDEP}] )
sdl? ( media-libs/libsdl2[haptic,joystick,${WINE_USEDEP}] )
ssl? ( net-libs/gnutls:=[${WINE_USEDEP}] )
truetype? ( media-libs/freetype[${WINE_USEDEP}] )
diff --git a/app-emulation/wine-staging/wine-staging-9.0.ebuild b/app-emulation/wine-staging/wine-staging-9.0.ebuild
index 0b3966ccf25f..77f44304c626 100644
--- a/app-emulation/wine-staging/wine-staging-9.0.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9.0.ebuild
@@ -47,6 +47,7 @@ IUSE="
REQUIRED_USE="
X? ( truetype )
crossdev-mingw? ( mingw )
+ opengl? ( X )
wow64? ( abi_x86_64 !abi_x86_32 mingw )
"
@@ -63,7 +64,6 @@ WINE_DLOPEN_DEPEND="
x11-libs/libXrandr[${MULTILIB_USEDEP}]
x11-libs/libXrender[${MULTILIB_USEDEP}]
x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
- opengl? ( media-libs/libglvnd[X,${MULTILIB_USEDEP}] )
xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
)
@@ -72,6 +72,7 @@ WINE_DLOPEN_DEPEND="
fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] )
kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
netapi? ( net-fs/samba[${MULTILIB_USEDEP}] )
+ opengl? ( media-libs/libglvnd[X,${MULTILIB_USEDEP}] )
sdl? ( media-libs/libsdl2[haptic,joystick,${MULTILIB_USEDEP}] )
ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
truetype? ( media-libs/freetype[${MULTILIB_USEDEP}] )
diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild
index ceb699fcd848..a9c8cb0c87f6 100644
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
@@ -46,6 +46,7 @@ IUSE="
REQUIRED_USE="
X? ( truetype )
bluetooth? ( dbus )
+ opengl? ( || ( X wayland ) )
"
# tests are non-trivial to run, can hang easily, don't play well with
@@ -61,7 +62,6 @@ WINE_DLOPEN_DEPEND="
x11-libs/libXrandr[${WINE_USEDEP}]
x11-libs/libXrender[${WINE_USEDEP}]
x11-libs/libXxf86vm[${WINE_USEDEP}]
- opengl? ( media-libs/libglvnd[X,${WINE_USEDEP}] )
xcomposite? ( x11-libs/libXcomposite[${WINE_USEDEP}] )
xinerama? ( x11-libs/libXinerama[${WINE_USEDEP}] )
)
@@ -71,6 +71,7 @@ WINE_DLOPEN_DEPEND="
kerberos? ( virtual/krb5[${WINE_USEDEP}] )
netapi? ( net-fs/samba[${WINE_USEDEP}] )
odbc? ( dev-db/unixODBC[${WINE_USEDEP}] )
+ opengl? ( media-libs/libglvnd[X?,${WINE_USEDEP}] )
sdl? ( media-libs/libsdl2[haptic,joystick,${WINE_USEDEP}] )
ssl? ( net-libs/gnutls:=[${WINE_USEDEP}] )
truetype? ( media-libs/freetype[${WINE_USEDEP}] )
diff --git a/app-emulation/wine-vanilla/wine-vanilla-10.0-r2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-10.0-r2.ebuild
index 3cb7ee8a8d01..9a03fa8a8c38 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-10.0-r2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-10.0-r2.ebuild
@@ -33,7 +33,10 @@ IUSE="
+ssl +truetype udev +unwind usb v4l +vulkan wayland +xcomposite
xinerama
"
-REQUIRED_USE="X? ( truetype )"
+REQUIRED_USE="
+ X? ( truetype )
+ opengl? ( || ( 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
@@ -48,7 +51,6 @@ WINE_DLOPEN_DEPEND="
x11-libs/libXrandr[${WINE_USEDEP}]
x11-libs/libXrender[${WINE_USEDEP}]
x11-libs/libXxf86vm[${WINE_USEDEP}]
- opengl? ( media-libs/libglvnd[X,${WINE_USEDEP}] )
xcomposite? ( x11-libs/libXcomposite[${WINE_USEDEP}] )
xinerama? ( x11-libs/libXinerama[${WINE_USEDEP}] )
)
@@ -58,6 +60,7 @@ WINE_DLOPEN_DEPEND="
kerberos? ( virtual/krb5[${WINE_USEDEP}] )
netapi? ( net-fs/samba[${WINE_USEDEP}] )
odbc? ( dev-db/unixODBC[${WINE_USEDEP}] )
+ opengl? ( media-libs/libglvnd[X?,${WINE_USEDEP}] )
sdl? ( media-libs/libsdl2[haptic,joystick,${WINE_USEDEP}] )
ssl? ( net-libs/gnutls:=[${WINE_USEDEP}] )
truetype? ( media-libs/freetype[${WINE_USEDEP}] )
diff --git a/app-emulation/wine-vanilla/wine-vanilla-10.5-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-10.5-r1.ebuild
index 2b30ca2af920..b85114290793 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-10.5-r1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-10.5-r1.ebuild
@@ -40,6 +40,7 @@ IUSE="
REQUIRED_USE="
X? ( truetype )
bluetooth? ( dbus )
+ opengl? ( || ( X wayland ) )
"
# tests are non-trivial to run, can hang easily, don't play well with
@@ -55,7 +56,6 @@ WINE_DLOPEN_DEPEND="
x11-libs/libXrandr[${WINE_USEDEP}]
x11-libs/libXrender[${WINE_USEDEP}]
x11-libs/libXxf86vm[${WINE_USEDEP}]
- opengl? ( media-libs/libglvnd[X,${WINE_USEDEP}] )
xcomposite? ( x11-libs/libXcomposite[${WINE_USEDEP}] )
xinerama? ( x11-libs/libXinerama[${WINE_USEDEP}] )
)
@@ -65,6 +65,7 @@ WINE_DLOPEN_DEPEND="
kerberos? ( virtual/krb5[${WINE_USEDEP}] )
netapi? ( net-fs/samba[${WINE_USEDEP}] )
odbc? ( dev-db/unixODBC[${WINE_USEDEP}] )
+ opengl? ( media-libs/libglvnd[X?,${WINE_USEDEP}] )
sdl? ( media-libs/libsdl2[haptic,joystick,${WINE_USEDEP}] )
ssl? ( net-libs/gnutls:=[${WINE_USEDEP}] )
truetype? ( media-libs/freetype[${WINE_USEDEP}] )
diff --git a/app-emulation/wine-vanilla/wine-vanilla-10.6.ebuild b/app-emulation/wine-vanilla/wine-vanilla-10.6.ebuild
index 22109693bcd7..061979315628 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-10.6.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-10.6.ebuild
@@ -40,6 +40,7 @@ IUSE="
REQUIRED_USE="
X? ( truetype )
bluetooth? ( dbus )
+ opengl? ( || ( X wayland ) )
"
# tests are non-trivial to run, can hang easily, don't play well with
@@ -55,7 +56,6 @@ WINE_DLOPEN_DEPEND="
x11-libs/libXrandr[${WINE_USEDEP}]
x11-libs/libXrender[${WINE_USEDEP}]
x11-libs/libXxf86vm[${WINE_USEDEP}]
- opengl? ( media-libs/libglvnd[X,${WINE_USEDEP}] )
xcomposite? ( x11-libs/libXcomposite[${WINE_USEDEP}] )
xinerama? ( x11-libs/libXinerama[${WINE_USEDEP}] )
)
@@ -65,6 +65,7 @@ WINE_DLOPEN_DEPEND="
kerberos? ( virtual/krb5[${WINE_USEDEP}] )
netapi? ( net-fs/samba[${WINE_USEDEP}] )
odbc? ( dev-db/unixODBC[${WINE_USEDEP}] )
+ opengl? ( media-libs/libglvnd[X?,${WINE_USEDEP}] )
sdl? ( media-libs/libsdl2[haptic,joystick,${WINE_USEDEP}] )
ssl? ( net-libs/gnutls:=[${WINE_USEDEP}] )
truetype? ( media-libs/freetype[${WINE_USEDEP}] )
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.0.1-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9.0.1-r1.ebuild
index f803137c996e..aee09005dfa4 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9.0.1-r1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9.0.1-r1.ebuild
@@ -33,7 +33,11 @@ IUSE="
+truetype udev +unwind usb v4l +vulkan wayland +xcomposite
xinerama
"
-REQUIRED_USE="X? ( truetype )"
+# wrt opengl, wine-9 did not support EGL with wayland yet, use 10+
+REQUIRED_USE="
+ X? ( truetype )
+ opengl? ( X )
+"
# tests are non-trivial to run, can hang easily, don't play well with
# sandbox, and several need real opengl/vulkan or network access
@@ -48,7 +52,6 @@ WINE_DLOPEN_DEPEND="
x11-libs/libXrandr[${WINE_USEDEP}]
x11-libs/libXrender[${WINE_USEDEP}]
x11-libs/libXxf86vm[${WINE_USEDEP}]
- opengl? ( media-libs/libglvnd[X,${WINE_USEDEP}] )
xcomposite? ( x11-libs/libXcomposite[${WINE_USEDEP}] )
xinerama? ( x11-libs/libXinerama[${WINE_USEDEP}] )
)
@@ -58,6 +61,7 @@ WINE_DLOPEN_DEPEND="
kerberos? ( virtual/krb5[${WINE_USEDEP}] )
netapi? ( net-fs/samba[${WINE_USEDEP}] )
odbc? ( dev-db/unixODBC[${WINE_USEDEP}] )
+ opengl? ( media-libs/libglvnd[X,${WINE_USEDEP}] )
sdl? ( media-libs/libsdl2[haptic,joystick,${WINE_USEDEP}] )
ssl? ( net-libs/gnutls:=[${WINE_USEDEP}] )
truetype? ( media-libs/freetype[${WINE_USEDEP}] )
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
index 22109693bcd7..061979315628 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
@@ -40,6 +40,7 @@ IUSE="
REQUIRED_USE="
X? ( truetype )
bluetooth? ( dbus )
+ opengl? ( || ( X wayland ) )
"
# tests are non-trivial to run, can hang easily, don't play well with
@@ -55,7 +56,6 @@ WINE_DLOPEN_DEPEND="
x11-libs/libXrandr[${WINE_USEDEP}]
x11-libs/libXrender[${WINE_USEDEP}]
x11-libs/libXxf86vm[${WINE_USEDEP}]
- opengl? ( media-libs/libglvnd[X,${WINE_USEDEP}] )
xcomposite? ( x11-libs/libXcomposite[${WINE_USEDEP}] )
xinerama? ( x11-libs/libXinerama[${WINE_USEDEP}] )
)
@@ -65,6 +65,7 @@ WINE_DLOPEN_DEPEND="
kerberos? ( virtual/krb5[${WINE_USEDEP}] )
netapi? ( net-fs/samba[${WINE_USEDEP}] )
odbc? ( dev-db/unixODBC[${WINE_USEDEP}] )
+ opengl? ( media-libs/libglvnd[X?,${WINE_USEDEP}] )
sdl? ( media-libs/libsdl2[haptic,joystick,${WINE_USEDEP}] )
ssl? ( net-libs/gnutls:=[${WINE_USEDEP}] )
truetype? ( media-libs/freetype[${WINE_USEDEP}] )
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-vanilla/, app-emulation/wine-staging/
@ 2025-06-14 0:09 Ionen Wolkens
0 siblings, 0 replies; 2+ messages in thread
From: Ionen Wolkens @ 2025-06-14 0:09 UTC (permalink / raw
To: gentoo-commits
commit: 9f2f4d31e4265321330639a83821874a39f2cd67
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 13 23:43:11 2025 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Jun 14 00:08:19 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f2f4d31
app-emulation/wine-*: bump WINE_MONO to 10.1.0 in live
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
app-emulation/wine-staging/wine-staging-9999.ebuild | 2 +-
app-emulation/wine-vanilla/wine-vanilla-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild
index fa7f19ca7468..9667084b63f6 100644
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{11..14} )
inherit edo optfeature python-any-r1 wine
WINE_GECKO=2.47.4
-WINE_MONO=10.0.0
+WINE_MONO=10.1.0
WINE_P=wine-$(ver_cut 1-2)
if [[ ${PV} == 9999 ]]; then
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
index 3e9289bae63a..f98de2bf9f85 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=8
inherit optfeature wine
WINE_GECKO=2.47.4
-WINE_MONO=10.0.0
+WINE_MONO=10.1.0
if [[ ${PV} == 9999 ]]; then
inherit git-r3
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-06-14 0:09 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-06-14 0:09 [gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-vanilla/, app-emulation/wine-staging/ Ionen Wolkens
-- strict thread matches above, loose matches on Subject: below --
2025-04-30 2:36 Ionen Wolkens
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox