commit:     dd6b9e072af271f688533e64c2b7160585ceac0c
Author:     Cristian Othón Martínez Vera <cfuga <AT> cfuga <DOT> mx>
AuthorDate: Fri Dec  5 20:01:38 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jan 10 12:53:45 2026 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd6b9e07

app-emulation/open-vm-tools: fix dependencies to support xorg modesetting driver

Mesa 25.2 and up removed XA support, required by x11-drivers/xf86-video-vmware
to run.

Upstream won't update the driver, and recommends to use the modesetting driver
or Wayland.

 * https://gitlab.freedesktop.org/xorg/driver/xf86-video-vmware/-/issues/12
 * https://lists.debian.org/debian-x/2025/10/msg00063.html

The fixed dependencies offer two alternatives, to ease the transition:

 * depend on >=media-libs/mesa-25.1 without both XA support and the vmware
   video driver, x11-base/xorg[xorg] (to make sure it has the modesetting
   driver) and x11-libs/libdrm without the vmware video driver, or
 * depend on <media-libs/mesa-25.1 with XA support
   and x11-libs/libdrm, both requiring the vmware video driver

Closes: https://bugs.gentoo.org/966537
Signed-off-by: Cristian Othón Martínez Vera <cfuga <AT> cfuga.mx>
Part-of: https://github.com/gentoo/gentoo/pull/44920
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-emulation/open-vm-tools/open-vm-tools-12.4.5-r3.ebuild | 12 +++++++++++-
 app-emulation/open-vm-tools/open-vm-tools-12.5.0-r5.ebuild | 12 +++++++++++-
 app-emulation/open-vm-tools/open-vm-tools-13.0.5-r1.ebuild | 12 +++++++++++-
 3 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/app-emulation/open-vm-tools/open-vm-tools-12.4.5-r3.ebuild 
b/app-emulation/open-vm-tools/open-vm-tools-12.4.5-r3.ebuild
index 0d86eef7415e..f9a999792059 100644
--- a/app-emulation/open-vm-tools/open-vm-tools-12.4.5-r3.ebuild
+++ b/app-emulation/open-vm-tools/open-vm-tools-12.4.5-r3.ebuild
@@ -50,8 +50,18 @@ RDEPEND="
        dnet? ( dev-libs/libdnet )
        icu? ( dev-libs/icu:= )
        resolutionkms? (
-               x11-libs/libdrm[video_cards_vmware]
                virtual/libudev
+               || (
+                       (
+                               >=media-libs/mesa-25.2[-video_cards_vmware]
+                               x11-base/xorg-server[xorg]
+                               x11-libs/libdrm[-video_cards_vmware]
+                       )
+                       (
+                               <media-libs/mesa-25.2[video_cards_vmware,xa]
+                               x11-libs/libdrm[video_cards_vmware]
+                       )
+               )
        )"
 DEPEND="${RDEPEND}
        net-libs/rpcsvc-proto"

diff --git a/app-emulation/open-vm-tools/open-vm-tools-12.5.0-r5.ebuild 
b/app-emulation/open-vm-tools/open-vm-tools-12.5.0-r5.ebuild
index a198d09f2706..6421af58a663 100644
--- a/app-emulation/open-vm-tools/open-vm-tools-12.5.0-r5.ebuild
+++ b/app-emulation/open-vm-tools/open-vm-tools-12.5.0-r5.ebuild
@@ -50,8 +50,18 @@ RDEPEND="
        dnet? ( dev-libs/libdnet )
        icu? ( dev-libs/icu:= )
        resolutionkms? (
-               x11-libs/libdrm[video_cards_vmware]
                virtual/libudev
+               || (
+                       (
+                               >=media-libs/mesa-25.2[-video_cards_vmware]
+                               x11-base/xorg-server[xorg]
+                               x11-libs/libdrm[-video_cards_vmware]
+                       )
+                       (
+                               <media-libs/mesa-25.2[video_cards_vmware,xa]
+                               x11-libs/libdrm[video_cards_vmware]
+                       )
+               )
        )"
 DEPEND="${RDEPEND}
        net-libs/rpcsvc-proto"

diff --git a/app-emulation/open-vm-tools/open-vm-tools-13.0.5-r1.ebuild 
b/app-emulation/open-vm-tools/open-vm-tools-13.0.5-r1.ebuild
index 7563f6fa2afb..ccfe2d00e541 100644
--- a/app-emulation/open-vm-tools/open-vm-tools-13.0.5-r1.ebuild
+++ b/app-emulation/open-vm-tools/open-vm-tools-13.0.5-r1.ebuild
@@ -50,8 +50,18 @@ RDEPEND="
        dnet? ( dev-libs/libdnet )
        icu? ( dev-libs/icu:= )
        resolutionkms? (
-               x11-libs/libdrm[video_cards_vmware]
                virtual/libudev
+               || (
+                       (
+                               >=media-libs/mesa-25.2[-video_cards_vmware]
+                               x11-base/xorg-server[xorg]
+                               x11-libs/libdrm[-video_cards_vmware]
+                       )
+                       (
+                               <media-libs/mesa-25.2[video_cards_vmware,xa]
+                               x11-libs/libdrm[video_cards_vmware]
+                       )
+               )
        )"
 DEPEND="${RDEPEND}
        net-libs/rpcsvc-proto"

Reply via email to