diff --git a/config/graphic b/config/graphic index bd45fec6ff..d4fe6b726d 100644 --- a/config/graphic +++ b/config/graphic @@ -74,7 +74,6 @@ get_graphicdrivers() { DRI_DRIVERS="$DRI_DRIVERS,swrast" GALLIUM_DRIVERS="$GALLIUM_DRIVERS,svga" XORG_DRIVERS="$XORG_DRIVERS vmware" -# LLVM_SUPPORT="yes" fi done diff --git a/packages/virtual/virtual/package.mk b/packages/virtual/virtual/package.mk index 53a07f914a..7902113280 100644 --- a/packages/virtual/virtual/package.mk +++ b/packages/virtual/virtual/package.mk @@ -29,3 +29,11 @@ PKG_LONGDESC="virtual is a Meta package to install Virtual project extra depende PKG_IS_ADDON="no" PKG_AUTORECONF="no" + +get_graphicdrivers + +for drv in $GRAPHIC_DRIVERS; do + if [ "$drv" = "vmware" ]; then + PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET open-vm-tools" + fi +done diff --git a/packages/x11/driver/xf86-video-vmware/package.mk b/packages/x11/driver/xf86-video-vmware/package.mk index a8ae49226c..37eba5701f 100644 --- a/packages/x11/driver/xf86-video-vmware/package.mk +++ b/packages/x11/driver/xf86-video-vmware/package.mk @@ -22,7 +22,7 @@ PKG_ARCH="x86_64" PKG_LICENSE="OSS" PKG_SITE="http://www.vmware.com" PKG_URL="http://xorg.freedesktop.org/releases/individual/driver/${PKG_NAME}-${PKG_VERSION}.tar.bz2" -PKG_DEPENDS_TARGET="toolchain mesa glu libX11 xorg-server open-vm-tools" +PKG_DEPENDS_TARGET="toolchain mesa glu libX11 xorg-server" PKG_SECTION="x11/driver" PKG_SHORTDESC="xf86-video-vmware: The Xorg driver for vmware video" PKG_LONGDESC="xf86-video-vmware: The Xorg driver for vmware video" diff --git a/packages/x11/xserver/xorg-server/udev.d/97-xorg.rules b/packages/x11/xserver/xorg-server/udev.d/97-xorg.rules index d2659b6f36..677f7314a0 100644 --- a/packages/x11/xserver/xorg-server/udev.d/97-xorg.rules +++ b/packages/x11/xserver/xorg-server/udev.d/97-xorg.rules @@ -20,12 +20,6 @@ ACTION!="add|change", GOTO="end_video" # xorg_start only does something for subsystem "pci" and "video" class. SUBSYSTEM=="pci", ATTR{class}=="0x030000", GOTO="subsystem_pci" -SUBSYSTEM=="drivers", GOTO="subsystem_drivers" -GOTO="end_video" - -# check for drivers dont use the pci substem -LABEL="subsystem_drivers" -KERNEL=="vmwgfx", ENV{xorg_driver}="vmware", TAG+="systemd", ENV{SYSTEMD_WANTS}+="xorg-configure@vmware.service" GOTO="end_video" # check for drivers using the pci substem @@ -33,6 +27,7 @@ LABEL="subsystem_pci" DRIVER=="i915", ENV{xorg_driver}="i915", TAG+="systemd", ENV{SYSTEMD_WANTS}+="xorg-configure@i915.service" DRIVER=="amdgpu", ENV{xorg_driver}="amdgpu", TAG+="systemd", ENV{SYSTEMD_WANTS}+="xorg-configure@amdgpu.service" DRIVER=="radeon", ENV{xorg_driver}="radeon", TAG+="systemd", ENV{SYSTEMD_WANTS}+="xorg-configure@radeon.service" +DRIVER=="vmwgfx", ENV{xorg_driver}="vmware", TAG+="systemd", ENV{SYSTEMD_WANTS}+="xorg-configure@vmware.service" GOTO="end_video" LABEL="end_video"