Update to 5.2.32.

https://www.virtualbox.org/wiki/Changelog-5.2#v32
svn path=/head/; revision=506783
2019-07-16 23:02:43 +00:00 · 2019-07-16 23:02:43 +00:00 · 48de8a4b8c · 2021-03-31 03:12:20 +00:00
commit 48de8a4b8c
parent c612e876ac
10 changed files with 28 additions and 47 deletions
--- a/emulators/virtualbox-ose-additions/Makefile
+++ b/emulators/virtualbox-ose-additions/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	virtualbox-ose
-PORTVERSION=	5.2.30
+PORTVERSION=	5.2.32
 CATEGORIES=	emulators
 MASTER_SITES=	https://download.oracle.com/virtualbox/${PORTVERSION}/
 PKGNAMESUFFIX?=	-additions
@ -90,13 +90,7 @@ KMK_CONFIG+=	VBOX_LIBPATH_X11=${LOCALBASE} VBOX_FREEBSD_SRC=${SRC_BASE}/sys

 .if ${PORT_OPTIONS:MOPENGL}
 VBOX_LIBS=	VBoxEGL.so \
-		VBoxOGL.so \
-		VBoxOGLarrayspu.so \
-		VBoxOGLcrutil.so \
-		VBoxOGLerrorspu.so \
-		VBoxOGLfeedbackspu.so \
-		VBoxOGLpackspu.so \
-		VBoxOGLpassthroughspu.so
+		VBoxOGL.so
 .endif

 .if ${PORT_OPTIONS:MX11}
--- a/emulators/virtualbox-ose-additions/distinfo
+++ b/emulators/virtualbox-ose-additions/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1558040644
-SHA256 (VirtualBox-5.2.30.tar.bz2) = caf19d4a5310d63e31e564acb24cb63e412c8ce56193a804e38c7dcc8db35609
-SIZE (VirtualBox-5.2.30.tar.bz2) = 118462289
+TIMESTAMP = 1563308713
+SHA256 (VirtualBox-5.2.32.tar.bz2) = ff6390e50cb03718cd3f5779627910999c12279b465e340c80d7175778a33958
+SIZE (VirtualBox-5.2.32.tar.bz2) = 118262502
--- a/emulators/virtualbox-ose-additions/pkg-plist
+++ b/emulators/virtualbox-ose-additions/pkg-plist
@ -4,12 +4,6 @@
 %%X11%%etc/xdg/autostart/vboxclient.desktop
 %%OPENGL%%lib/VBoxEGL.so
 %%OPENGL%%lib/VBoxOGL.so
-%%OPENGL%%lib/VBoxOGLarrayspu.so
-%%OPENGL%%lib/VBoxOGLcrutil.so
-%%OPENGL%%lib/VBoxOGLerrorspu.so
-%%OPENGL%%lib/VBoxOGLfeedbackspu.so
-%%OPENGL%%lib/VBoxOGLpackspu.so
-%%OPENGL%%lib/VBoxOGLpassthroughspu.so
 lib/pam_vbox.so
 %%X11%%lib/xorg/modules/drivers/vboxvideo_drv.so
 %%X11%%lib/xorg/modules/input/vboxmouse_drv.so
--- a/emulators/virtualbox-ose-kmod/Makefile
+++ b/emulators/virtualbox-ose-kmod/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	virtualbox-ose
-PORTVERSION=	5.2.30
+PORTVERSION=	5.2.32
 CATEGORIES=	emulators
 MASTER_SITES=	https://download.oracle.com/virtualbox/${PORTVERSION}/
 PKGNAMESUFFIX=	-kmod
--- a/emulators/virtualbox-ose-kmod/distinfo
+++ b/emulators/virtualbox-ose-kmod/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1558040644
-SHA256 (VirtualBox-5.2.30.tar.bz2) = caf19d4a5310d63e31e564acb24cb63e412c8ce56193a804e38c7dcc8db35609
-SIZE (VirtualBox-5.2.30.tar.bz2) = 118462289
+TIMESTAMP = 1563308713
+SHA256 (VirtualBox-5.2.32.tar.bz2) = ff6390e50cb03718cd3f5779627910999c12279b465e340c80d7175778a33958
+SIZE (VirtualBox-5.2.32.tar.bz2) = 118262502
--- a/emulators/virtualbox-ose/Makefile
+++ b/emulators/virtualbox-ose/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	virtualbox-ose
-PORTVERSION=	5.2.30
+PORTVERSION=	5.2.32
 CATEGORIES=	emulators
 MASTER_SITES=	https://download.oracle.com/virtualbox/${PORTVERSION}/
 DISTFILES=	VirtualBox-${PORTVERSION}${EXTRACT_SUFX} ${GUESTADDITIONS}
--- a/emulators/virtualbox-ose/distinfo
+++ b/emulators/virtualbox-ose/distinfo
@ -1,5 +1,5 @@
-TIMESTAMP = 1558040644
-SHA256 (VirtualBox-5.2.30.tar.bz2) = caf19d4a5310d63e31e564acb24cb63e412c8ce56193a804e38c7dcc8db35609
-SIZE (VirtualBox-5.2.30.tar.bz2) = 118462289
-SHA256 (VBoxGuestAdditions_5.2.30.iso) = dd07da975f346608b0f6843f4be4bfdf48b4610ef49a0c0e6aa689ef81c1bd69
-SIZE (VBoxGuestAdditions_5.2.30.iso) = 58578944
+TIMESTAMP = 1563308713
+SHA256 (VirtualBox-5.2.32.tar.bz2) = ff6390e50cb03718cd3f5779627910999c12279b465e340c80d7175778a33958
+SIZE (VirtualBox-5.2.32.tar.bz2) = 118262502
+SHA256 (VBoxGuestAdditions_5.2.32.iso) = 4311c7408a3410e6a33264a9062347d9eec04f58339a49f0a60488c0cabc8996
+SIZE (VBoxGuestAdditions_5.2.32.iso) = 49620992
--- a/emulators/virtualbox-ose/files/patch-src-VBox-GuestHost-OpenGL-Makefile.kmk
+++ b/emulators/virtualbox-ose/files/patch-src-VBox-GuestHost-OpenGL-Makefile.kmk
@ -1,15 +1,15 @@
--- src/VBox/GuestHost/OpenGL/Makefile.kmk.orig	2014-11-21 10:22:21.000000000 -0500
-+++ src/VBox/GuestHost/OpenGL/Makefile.kmk	2014-12-22 17:20:31.000000000 -0500
-@@ -116,7 +116,7 @@
+--- src/VBox/GuestHost/OpenGL/Makefile.kmk.orig	2019-07-12 08:49:27 UTC
+++ src/VBox/GuestHost/OpenGL/Makefile.kmk
+@@ -94,7 +94,7 @@ VBoxOGLcrutil_DEFS.win    += CR_DEBUG_BACKDOOR_ENABLE
+ VBoxOGLcrutil_INCS.win    += $(PATH_ROOT)/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm
+ VBoxOGLcrutil_LIBS.win    += $(VBOX_PATH_ADDITIONS_LIB)/VBoxDispMpLogger$(VBOX_SUFF_LIB)
 endif
- VBoxOGLcrutil_CLEAN = \
- 	$(VBOX_PATH_CROGL_GENFILES)/debug_opcodes.c
 -if1of ($(KBUILD_TARGET), linux)
 +if1of ($(KBUILD_TARGET), linux freebsd)
 VBoxOGLcrutil_LDFLAGS += -Wl,-z,nodelete
 endif
 
-@@ -160,7 +160,7 @@
+@@ -140,7 +140,7 @@ VBoxOGLhostcrutil_TEMPLATE = VBOXCROGLR3HOSTLIB
 if defined(VBOX_SIGNING_MODE) && defined(VBOX_WITH_WDDM)
  VBoxOGLhostcrutil_INSTTYPE.win = both
 endif
@ -17,4 +17,4 @@
 +if1of ($(KBUILD_TARGET), linux freebsd)
 VBoxOGLhostcrutil_LDFLAGS = $(NO_SUCH_VARIABLE)
 endif
- VBoxOGLhostcrutil_LDFLAGS.darwin = $(VBoxOGLcrutil_LDFLAGS.darwin) \
+ VBoxOGLhostcrutil_LIBS.win =  \
--- a/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_Makefile.kmk
+++ b/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_Makefile.kmk
@ -1,6 +1,7 @@
--- src/VBox/Additions/freebsd/Makefile.kmk.orig	2016-07-18 11:50:44 UTC
+--- src/VBox/Additions/freebsd/Makefile.kmk.orig	2019-07-12 08:42:35 UTC
 +++ src/VBox/Additions/freebsd/Makefile.kmk
-@@ -24,7 +24,8 @@ endif
+@@ -23,8 +23,9 @@ $(error "The FreeBSD guest additions installer can onl
+ endif
 
 # Include sub-makefiles.
 -#include $(PATH_SUB_CURRENT)/vboxvfs/Makefile.kmk
@ -11,23 +12,18 @@
 
 #
 # Globals
-@@ -67,6 +67,7 @@ VBOX_FBSD_ADD_STRIP_BIN = \
+@@ -67,11 +68,13 @@ VBOX_FBSD_ADD_STRIP_BIN = \
 	vboxvideo_drv_15.so \
 	vboxvideo_drv_16.so \
 	vboxvideo_drv_17.so \
-+	$(if $(VBOX_WITH_PAM),pam_vbox.so,) \
- 	VBoxOGLarrayspu.so \
- 	VBoxOGLcrutil.so \
- 	VBoxOGLerrorspu.so \
-@@ -76,8 +76,9 @@ VBOX_FBSD_ADD_STRIP_BIN = \
 -	VBoxOGL.so
+	$(if $(VBOX_WITH_PAM),pam_vbox.so,) \
 +	VBoxOGL.so \
 +	mount_vboxvfs
 
 VBOX_FBSD_ADD_MODULES = \
-	vboxguest \
+ 	vboxguest \
 -	vboxvideo_drm
-+	vboxguest \
 +	vboxvfs
 
 #
--- a/emulators/virtualbox-ose/pkg-plist
+++ b/emulators/virtualbox-ose/pkg-plist
@ -397,9 +397,6 @@ lib/virtualbox/VBoxManage
 lib/virtualbox/VBoxNetDHCP.so
@(root,%%VBOXGROUP%%,4510) lib/virtualbox/VBoxNetNAT
 lib/virtualbox/VBoxNetNAT.so
-%%X11%%lib/virtualbox/VBoxOGLhostcrutil.so
-%%X11%%lib/virtualbox/VBoxOGLhosterrorspu.so
-%%X11%%lib/virtualbox/VBoxOGLrenderspu.so
 %%PYTHON%%lib/virtualbox/VBoxPython.so
 %%PYTHON%%lib/virtualbox/VBoxPython%%PYTHON_VERU%%.so
 lib/virtualbox/VBoxREM.so