Merge pull request #892 from CvH/virtual_patch_4.8

fix Virtual for 4.8
This commit is contained in:
Christian Hewitt 2016-10-28 21:29:27 +04:00 committed by GitHub
commit d32cb9c184
4 changed files with 7 additions and 6 deletions

View File

@ -17,7 +17,7 @@
################################################################################ ################################################################################
PKG_NAME="vboxguest" PKG_NAME="vboxguest"
PKG_VERSION="5.0.22" PKG_VERSION="5.1.8"
PKG_REV="1" PKG_REV="1"
PKG_ARCH="x86_64" PKG_ARCH="x86_64"
PKG_LICENSE="GPL" PKG_LICENSE="GPL"

View File

@ -17,7 +17,7 @@
################################################################################ ################################################################################
PKG_NAME="xf86-video-virtualbox" PKG_NAME="xf86-video-virtualbox"
PKG_VERSION="5.0.22" PKG_VERSION="5.1.8"
PKG_REV="1" PKG_REV="1"
PKG_ARCH="x86_64" PKG_ARCH="x86_64"
PKG_LICENSE="OSS" PKG_LICENSE="OSS"

View File

@ -1,7 +1,7 @@
diff -Naur a/Config.kmk b/Config.kmk diff -Naur a/Config.kmk b/Config.kmk
--- a/Config.kmk 2016-04-28 06:07:46.000000000 -0700 --- a/Config.kmk 2016-04-28 06:07:46.000000000 -0700
+++ b/Config.kmk 2016-06-12 12:58:09.503823599 -0700 +++ b/Config.kmk 2016-06-12 12:58:09.503823599 -0700
@@ -428,10 +428,6 @@ @@ -449,10 +449,6 @@
if1of ($(KBUILD_TARGET), linux solaris) if1of ($(KBUILD_TARGET), linux solaris)
VBOX_WITH_DBUS = 1 VBOX_WITH_DBUS = 1
endif endif
@ -9,6 +9,6 @@ diff -Naur a/Config.kmk b/Config.kmk
-if1of ($(KBUILD_TARGET), linux solaris) -if1of ($(KBUILD_TARGET), linux solaris)
- VBOX_WITH_PAM = 1 - VBOX_WITH_PAM = 1
-endif -endif
# Disable WINMM support for Windows (not implemented).
VBOX_WITH_WINMM =
# Enable internal networking. # Enable internal networking.
VBOX_WITH_INTERNAL_NETWORKING = 1
# Enable vmsvga (svga2) graphics device variant, 2D part

View File

@ -3242,7 +3242,8 @@ CONFIG_DRM_I915_USERPTR=y
# CONFIG_DRM_VIA is not set # CONFIG_DRM_VIA is not set
# CONFIG_DRM_SAVAGE is not set # CONFIG_DRM_SAVAGE is not set
# CONFIG_DRM_VGEM is not set # CONFIG_DRM_VGEM is not set
# CONFIG_DRM_VMWGFX is not set CONFIG_DRM_VMWGFX=y
CONFIG_DRM_VMWGFX_FBCON=y
# CONFIG_DRM_GMA500 is not set # CONFIG_DRM_GMA500 is not set
# CONFIG_DRM_UDL is not set # CONFIG_DRM_UDL is not set
# CONFIG_DRM_AST is not set # CONFIG_DRM_AST is not set