Attachment #222704 for bug #234878




# $FreeBSD$

PORTNAME=	virtualbox-ose
PORTVERSION=	6.1.18
PORTREVISION=	4
CATEGORIES=	emulators
MASTER_SITES=	https://download.virtualbox.org/virtualbox/${PORTVERSION}/
DISTFILES=	VirtualBox-${PORTVERSION}${EXTRACT_SUFX} ${GUESTADDITIONS}
EXTRACT_ONLY=	VirtualBox-${PORTVERSION}${EXTRACT_SUFX}


LICENSE=	GPLv2
LICENSE_FILE=	${WRKSRC}/COPYING

PATCH_DEPENDS+=	${LOCALBASE}/share/kBuild/tools/GXX3.kmk:devel/kBuild
BUILD_DEPENDS=	yasm:devel/yasm \
		xsltproc:textproc/libxslt \
		kmk:devel/kBuild \

			virtualbox-ose-legacy-[0-9]* \
			virtualbox-ose-lite-[0-9]*

LDFLAGS=	-lpthread

VBOXUSER?=	vboxusers
VBOXWSUSER?=	vboxusers
VBOXGROUP?=	vboxusers

VBOX_UTILS=	VBoxExtPackHelperApp VBoxNetAdpCtl VBoxNetDHCP VBoxNetNAT \
		VBoxSVC VBoxXPCOMIPCD

OPTIONS_DEFINE=	ALSA DBUS DEBUG GUESTADDITIONS MANUAL NLS OPUS PULSEAUDIO \
		PYTHON QT5 R0LOGGING UDPTUNNEL VDE VNC WEBSERVICE VPX X11
OPTIONS_DEFAULT=	DBUS QT5 UDPTUNNEL VNC WEBSERVICE X11
OPTIONS_SUB=	yes

GUESTADDITIONS_DESC=	Build with Guest Additions
MANUAL_DESC=	Build with user manual
NLS_DESC=	Native language support (requires QT5)
OPUS_DESC=	Use libvpx for audio recording (requires VPX)
QT5_DESC=	Build with QT5 frontend (requires X11)
R0LOGGING_DESC=	Enable R0 logging (requires DEBUG)
UDPTUNNEL_DESC=	Build with UDP tunnel support

MANUAL_BUILD_DEPENDS=	${LOCALBASE}/share/xml/docbook/4.4/docbookx.dtd:textproc/docbook-xml
MANUAL_CONFIGURE_OFF=	--disable-docs
NLS_IMPLIES=		QT5
OPUS_CONFIGURE_OFF=	--disable-libopus
OPUS_LIB_DEPENDS=	libopus.so:audio/opus
OPUS_IMPLIES=		VPX
PULSEAUDIO_CONFIGURE_OFF=	--disable-pulse
PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
PYTHON_CONFIGURE_OFF=	--disable-python

.if ${PORT_OPTIONS:MQT5}
CONFIGURE_ARGS+=	--enable-qt5
PLIST_SUB+=	QT=""
USES+=		gl qmake:no_env qt:5
USE_GL=		gl glu
USE_QT=		buildtools_build core dbus gui linguisttools_build opengl
USE_QT+=	printsupport widgets x11extras
USE_XORG=	xcb
INSTALLS_ICONS=	yes
VBOX_PROGS+=	VirtualBox VirtualBoxVM
VBOX_UTILS+=	VBoxTestOGL
VBOX_WITH_QT=	1
.else


.include <bsd.port.pre.mk>

.if ${COMPILER_TYPE} == clang
.if ${COMPILER_VERSION} == 80
# XXX PR236616: Clang 8.0 caused runtime problems.
BUILD_DEPENDS+=	${LOCALBASE}/bin/clang${VBOX_LLVM_VER}:devel/llvm${VBOX_LLVM_VER}
CC=		${LOCALBASE}/bin/clang${VBOX_LLVM_VER}
CXX=		${LOCALBASE}/bin/clang++${VBOX_LLVM_VER}
VBOX_LLVM_VER?=	80
.endif
PATCH_DEPENDS+=	${LOCALBASE}/share/kBuild/tools/GXX3.kmk:devel/kBuild
EXTRA_PATCHES+=	${PATCHDIR}/extrapatch-src-VBox-Devices-PC-ipxe-Makefile.kmk
#EXTRA_PATCHES+=	${PATCHDIR}/extrapatch-Config.kmk \
		${PATCHDIR}/extrapatch-src-VBox-Devices-PC-ipxe-Makefile.kmk
.endif

.if ${PYTHON_MAJOR_VER} >= 3
PLIST_SUB+=	PYTHON_PYCDIR=/__pycache__/ \
		PYTHON_PYCEXT=.cpython-${PYTHON_SUFFIX}.pyc

	    ${WRKSRC}/LocalConfig.kmk
	@${ECHO_CMD} 'VBOX_GCC_PEDANTIC_CXX = -Wshadow $$(VBOX_GCC_WARN) -Wno-long-long' >> \
	    ${WRKSRC}/LocalConfig.kmk
	@${REINPLACE_CMD} -E -e '/soap_socket_errno\(/s/(soap_socket_errno)(\([^)]+\))/\1/' \
		${WRKSRC}/src/VBox/Main/webservice/vboxweb.cpp
.endif
.if empty(PORT_OPTIONS:MX11)
	@${ECHO} 'VBOX_WITH_VMSVGA3D =' >> ${WRKSRC}/LocalConfig.kmk
.endif
.if ${COMPILER_TYPE} == clang
	@${REINPLACE_CMD} -e 's| -finline-limit=8000||' \
	    -e 's| -mpreferred-stack-boundary=2||' ${WRKSRC}/Config.kmk
	    -e 's|%%PYTHON_VERSION%%|${PYTHON_VERSION}|' \
		${WRKSRC}/Config.kmk
	@${REINPLACE_CMD} -e 's| -fpermissive||' ${WRKSRC}/Config.kmk \
	    ${WRKSRC}/src/VBox/Main/webservice/Makefile.kmk
	@${ECHO_CMD} 'TOOL_VBoxGccFreeBSD_LD = ${CXX}' >> ${WRKSRC}/LocalConfig.kmk

	@${SED} -e 's|GXX3|VBoxGccFreeBSD|g' \
	    ${LOCALBASE}/share/kBuild/tools/GXX3.kmk > \
	    ${WRKSRC}/tools/kBuildTools/VBoxGccFreeBSD.kmk
.endif
	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
	    ${WRKSRC}/Config.kmk ${WRKSRC}/configure \
	    ${WRKSRC}/kBuild/header.kmk ${WRKSRC}/kBuild/units/qt4.kmk \


	${MKDIR} ${STAGEDIR}${VBOX_DIR}
	cd ${KMK_BUILDDIR}/bin && ${COPYTREE_SHARE} \
	    "*.fd *.r0 *.so components" ${STAGEDIR}${VBOX_DIR}
.if ${PORT_OPTIONS:MPYTHON} || ${PORT_OPTIONS:MWEBSERVICE}
	${RLN} ${STAGEDIR}${DATADIR}/sdk ${STAGEDIR}${VBOX_DIR}
.endif

Lines 1-5 Link Here

(-)emulators/virtualbox-ose/distinfo (-5 / +5 lines)
1	TIMESTAMP = 1594897148	1	TIMESTAMP = 1613863264
2	SHA256 (VirtualBox-5.2.44.tar.bz2) = ad83b11cfae2734f7d6f619dd2f8bdada7d33492cd7682fab98cb4053122295e	2	SHA256 (VirtualBox-6.1.18.tar.bz2) = 108d42b9b391b7a332a33df1662cf7b0e9d9a80f3079d16288d8b9487f427d40
3	SIZE (VirtualBox-5.2.44.tar.bz2) = 124016934	3	SIZE (VirtualBox-6.1.18.tar.bz2) = 165507486
4	SHA256 (VBoxGuestAdditions_5.2.44.iso) = 9883ee443a309f4ffa1d5dee2833f9e35ced598686c36d159f410e5edbac1ca4	4	SHA256 (VBoxGuestAdditions_6.1.18.iso) = 904432eb331d7ae517afaa4e4304e6492b7947b46ecb8267de7ef792c4921b4c
5	SIZE (VBoxGuestAdditions_5.2.44.iso) = 49829888	5	SIZE (VBoxGuestAdditions_6.1.18.iso) = 61157376

Lines 1-11 Link Here

(-)emulators/virtualbox-ose/files/extrapatch-src-VBox-Additions-x11-VBoxClient-Makefile.kmk (-11 lines)
1	--- src/VBox/Additions/x11/VBoxClient/Makefile.kmk.orig 2013-11-29 14:20:43.000000000 -0500
2	+++ src/VBox/Additions/x11/VBoxClient/Makefile.kmk 2013-12-16 14:03:08.000000000 -0500
3	@@ -50,7 +50,7 @@
4	# Xtst
5	# These are static replacements for gcc-specific parts of libstdc++
6	VBoxClient_LIBS += \
7	- supc++ \
8	+ cxxrt \
9	gcc_eh
10	ifdef VBOX_X11_SEAMLESS_GUEST
11	VBoxClient_DEFS += SEAMLESS_GUEST DYNAMIC_RESIZE

Line 0 Link Here

(-)emulators/virtualbox-ose/files/extrapatch-src-VBox-Devices-PC-ipxe-Makefile.kmk (+11 lines)
	1	--- src/VBox/Devices/PC/ipxe/Makefile.kmk.orig 2013-11-29 14:23:32.000000000 -0500
	2	+++ src/VBox/Devices/PC/ipxe/Makefile.kmk 2013-12-13 15:06:45.000000000 -0500
	3	@@ -35,7 +35,7 @@
	4	iPxeBiosBin_CLEAN = \
	5	$(iPxeBiosBin_0_OUTDIR)/iPxeBiosBin.c \
	6
	7	-if1of ($(KBUILD_TARGET), darwin os2 solaris win)
	8	+if1of ($(KBUILD_TARGET), darwin freebsd os2 solaris win)
	9	$$(iPxeBiosBin_0_OUTDIR)/iPxeBiosBin.c: $(PATH_SUB_CURRENT)/iPxeBiosBin.rom $(VBOX_BIN2C) \| $$(dir $$@)
	10	$(call MSG_TOOL,bin2c,iPxeBiosBin,$<,$@)
	11	$(QUIET)$(VBOX_BIN2C) -min 32 -max 56 -mask 0x1ff -export NetBiosBinary $< $@

Lines 1-11 Link Here

(-)emulators/virtualbox-ose/files/extrapatch-src_VBox_Frontends_VirtualBox_src_net_UIDownloaderAdditions.cpp (-11 lines)
1	--- src/VBox/Frontends/VirtualBox/src/net/UIDownloaderAdditions.cpp.orig 2017-01-17 07:26:50 UTC
2	+++ src/VBox/Frontends/VirtualBox/src/net/UIDownloaderAdditions.cpp
3	@@ -143,7 +143,7 @@ void UIDownloaderAdditions::handleVerifi
4	{
5	const QString strFileName = strRecord.section(" *", 1);
6	const QString strDownloadedSumm = strRecord.section(" *", 0, 0);
7	- if (strFileName == source().fileName())
8	+ if (strFileName == QFileInfo(source().toString()).fileName())
9	{
10	/* Calc the SHA-256 on the bytes, creating a string: */
11	uint8_t abHash[RTSHA256_HASH_SIZE];

Lines 1-11 Link Here

(-)emulators/virtualbox-ose/files/extrapatch-src_VBox_Frontends_VirtualBox_src_net_UIDownloaderExtensionPack.cpp (-11 lines)
1	--- src/VBox/Frontends/VirtualBox/src/net/UIDownloaderExtensionPack.cpp.orig 2017-01-17 07:26:50 UTC
2	+++ src/VBox/Frontends/VirtualBox/src/net/UIDownloaderExtensionPack.cpp
3	@@ -127,7 +127,7 @@ void UIDownloaderExtensionPack::handleVe
4	{
5	const QString strFileName = strRecord.section(" *", 1);
6	const QString strDownloadedSumm = strRecord.section(" *", 0, 0);
7	- if (strFileName == source().fileName())
8	+ if (strFileName == QFileInfo(source().toString()).fileName())
9	{
10	/* Calc the SHA-256 on the bytes, creating a string: */
11	uint8_t abHash[RTSHA256_HASH_SIZE];

Lines 1-10 Link Here

(-)emulators/virtualbox-ose/files/extrapatch-src_VBox_Frontends_VirtualBox_src_settings_global_UIGlobalSettingsNetworkDetailsHost.cpp (-10 lines)
1	--- src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetworkDetailsHost.cpp.orig 2017-03-08 17:19:57 UTC
2	+++ src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetworkDetailsHost.cpp
3	@@ -243,6 +243,6 @@ QString UIGlobalSettingsNetworkDetailsHo
4	address.prepend(QString::number(uPart));
5	uAddress = uAddress >> 8;
6	}
7	- return address.join('.');
8	+ return address.join(".");
9	}
10




--- Config.kmk.orig	2021-01-07 15:31:21 UTC
+++ Config.kmk
@@ -469,11 +469,11 @@ ifn1of ($(KBUILD_TARGET), win darwin)
  # Enable OSS audio support.
  VBOX_WITH_AUDIO_OSS = 1
 endif

  # Enable PulseAudio audio support.
  VBOX_WITH_AUDIO_PULSE = 1
 endif
@@ -489,11 +489,11 @@ VBOX_WITH_AUDIO_MMNOTIFICATION_CLIENT = 1
 # (disabled with 6.1, since it's not complete/useful enough)
 VBOX_WITH_PCI_PASSTHROUGH =
 # Enable statically linked dbus support.
-if1of ($(KBUILD_TARGET), linux solaris)
+if1of ($(KBUILD_TARGET), freebsd linux solaris)

  VBOX_WITH_PAM = 1
 endif
 # Enable internal networking.
@@ -501,7 +501,7 @@ VBOX_WITH_INTERNAL_NETWORKING = 1
 # Enable vmsvga (svga2) graphics device variant, 2D part
 VBOX_WITH_VMSVGA = 1
 # Enable vmsvga (svga2) graphics device variant, 3D part
-if1of ($(KBUILD_TARGET), darwin linux win)
+if1of ($(KBUILD_TARGET), darwin freebsd linux win)
  VBOX_WITH_VMSVGA3D = 1
 endif
 # Enable the generic 3D settings support if at least one 3D capable solution is enabled
@@ -647,7 +647,7 @@ VBOX_WITH_MAIN_USB_ID_DATABASE = 1
 #endif
 # Set this to prefix all C symbols in XPCOM, to avoid dynamic linking problems
 # caused by our XPCOM library polluting the symbol namespace for system libs.
-if1of ($(KBUILD_TARGET), linux solaris)
+if1of ($(KBUILD_TARGET), freebsd linux solaris)
  VBOX_WITH_XPCOM_NAMESPACE_CLEANUP = 1
 endif
 # The webservices api.
@@ -1064,10 +1064,6 @@ ifeq ($(KBUILD_TARGET),darwin)
  VBOX_WITH_VBOXSDL=
 endif
 

 ifeq ($(KBUILD_TARGET),haiku)
  # Don't bother with SDL ttf for now.
  VBOX_WITH_SECURELABEL=
@@ -1228,7 +1224,7 @@ ifdef VBOX_OSE
  VBOX_WITH_KCHMVIEWER=
  VBOX_WITH_PLUGIN_CRYPT=
  VBOX_WITH_DRAG_AND_DROP_PROMISES=

   VBOX_WITH_DOCS=
   VBOX_WITH_DOCS_PACKING=
  endif
@@ -4928,7 +4924,7 @@ define TOOL_FREEBSDKMODLD_LINK_SYSMOD_CMDS
  ifn1of ($(KBUILD_TARGET), darwin linux solaris win)
   VBOX_WITH_INSTALLER=
  endif
- if1of ($(KBUILD_TARGET), win)
+ # if1of ($(KBUILD_TARGET), win)
   # Undefine codec libraries which are not needed.
   VBOX_WITH_LIBVPX=
   VBOX_WITH_LIBOPUS=
   # Disable video recording (with audio support).
   VBOX_WITH_VIDEOREC=
   VBOX_WITH_AUDIO_VIDEOREC=
- endif
+ # endif
  # branding
  VBOX_BRAND_LICENSE_HTML             := $(PATH_ROOT)/doc/License-gpl-2.0.html
  VBOX_BRAND_LICENSE_RTF              := $(PATH_ROOT)/doc/License-gpl-2.0.rtf
@@ -1810,6 +1806,7 @@ ifndef VBOX_BLD_PYTHON
  else
   VBOX_BLD_PYTHON := $(firstword $(which python2.7$(HOSTSUFF_EXE)) $(which python2.6$(HOSTSUFF_EXE)) \
                                  $(which python$(HOSTSUFF_EXE)) $(which python3$(HOSTSUFF_EXE)) \
+                                 $(which %%PYTHON_VERSION%%) \
 				   python-not-found)
  endif
 endif
@@ -2550,6 +2547,10 @@ ifeq ($(KBUILD_HOST),win) ## @todo can drop this now, 
  # This isn't important (yet) on windows, so cook the result until
  # cygwin is feeling better.
  VBOX_GCC_VERSION := $(int-add $(int-mul 10000, 3), $(int-mul 100, 3), 3)
+else ifeq($(KBUILD_HOST,freebsd))
+ # At a minimum, we'll be building with GCC 4.2 on FreeBSD. LLVM will always
+ # pose as GCC 4.2 anyways, so this seems safe.
+ VBOX_GCC_VERSION := $(int-add $(int-mul 10000, 4), $(int-mul 100, 2), 0)
 else
  # This is kind of bad, the returned string needs to be re-evaluated before use.
  # The reason for this hack is that the windows kmk_ash cannot deal with $((1+1)).
@@ -4218,6 +4219,7 @@ ifdef VBOX_WITH_RAW_MODE
  TEMPLATE_VBoxRc_TOOL                = $(VBOX_GCC32_TOOL)
  TEMPLATE_VBoxRc_CXXFLAGS            = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC32_Wno-variadic-macros) -fno-exceptions $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-strict-aliasing $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_fvisibility-inlines-hidden) -fno-rtti $(VBOX_GCC_IPRT_FMT_CHECK)
  TEMPLATE_VBoxRc_CFLAGS              = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C)   $(VBOX_GCC32_Wno-variadic-macros) -fno-exceptions $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-strict-aliasing $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_IPRT_FMT_CHECK)
+ TEMPLATE_VBoxRc_CXXFLAGS.freebsd    = -fno-builtin
   ifeq ($(KBUILD_TARGET),solaris)
    TEMPLATE_VBoxRc_LDFLAGS           = -r
   else
@@ -4359,6 +4361,7 @@ ifeq ($(VBOX_LDR_FMT),elf)
 TEMPLATE_VBoxR0_TOOL                = $(VBOX_GCC_TOOL)
 TEMPLATE_VBoxR0_CFLAGS              = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C)   $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions $(VBOX_GCC_fno-stack-protector) -fno-common $(VBOX_GCC_fvisibility-hidden) -std=gnu99 $(VBOX_GCC_IPRT_FMT_CHECK)
 TEMPLATE_VBoxR0_CXXFLAGS            = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions $(VBOX_GCC_fno-stack-protector) -fno-common $(VBOX_GCC_fvisibility-inlines-hidden) $(VBOX_GCC_fvisibility-hidden) -fno-rtti $(VBOX_GCC_IPRT_FMT_CHECK)
+TEMPLATE_VBoxR0_CXXFLAGS.freebsd    = -fno-builtin
 TEMPLATE_VBoxR0_CFLAGS.amd64        = -m64 -mno-red-zone -mcmodel=kernel -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-asynchronous-unwind-tables -ffreestanding
 TEMPLATE_VBoxR0_CXXFLAGS.amd64      = -m64 -mno-red-zone -mcmodel=kernel -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-asynchronous-unwind-tables
 ifeq ($(KBUILD_TARGET),solaris)
@@ -4683,13 +4686,13 @@ TEMPLATE_VBOXR0DRV_CFLAGS              =  \
 	-O2 -ffreestanding -fno-strict-aliasing -fno-common -finline-limit=8000 \
 	$(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \
 	-nostdinc -std=c99
-TEMPLATE_VBOXR0DRV_CFLAGS.x86          = -m32 -mno-align-long-strings -mpreferred-stack-boundary=2 -mno-mmx -mno-3dnow -mno-sse -mno-sse2
+TEMPLATE_VBOXR0DRV_CFLAGS.x86          = -m32 -mpreferred-stack-boundary=2 -mno-mmx -mno-3dnow -mno-sse -mno-sse2
 TEMPLATE_VBOXR0DRV_CFLAGS.amd64        = -m64 --param inline-unit-growth=100 --param large-function-growth=1000 \
 	-fno-omit-frame-pointer -mcmodel=kernel -mno-red-zone -mfpmath=387 -mno-sse -mno-sse2 -mno-mmx \
 	-mno-3dnow -msoft-float -fno-asynchronous-unwind-tables -Wundef
 TEMPLATE_VBOXR0DRV_CXXFLAGS            = -fno-exceptions -fno-rtti \
 	$(VBOX_GCC_WARN) -Wpointer-arith -Winline \
-	-O2 -fno-strict-aliasing -fno-common -finline-limit=8000 \
+	-O2 -fno-builtin -fno-strict-aliasing -fno-common -finline-limit=8000 \
 	$(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \
 	-nostdinc
 TEMPLATE_VBOXR0DRV_CXXFLAGS.x86        = $(TEMPLATE_VBOXR0DRV_CFLAGS.x86)
@@ -4716,7 +4719,7 @@ define TOOL_FREEBSDKMODLD_LINK_SYSMOD_CMDS
 		| xargs -J% objcopy % $(out)
 
 ## Strip debug info (comment out if debugging or something).
-	objcopy --strip-debug $(out)
+#	objcopy --strip-debug $(out)
 endef
  else # x86
 TOOL_FREEBSDKMODLD_LINK_SYSMOD_OUTPUT = $(outbase).kld
@@ -4730,7 +4733,7 @@ define TOOL_FREEBSDKMODLD_LINK_SYSMOD_CMDS
 		| xargs -J% objcopy % $(outbase).kld
 
 # Link the final .ko (a shared object).
-	ld $(flags) -Bshareable -o $(out) $(outbase).kld
+    ld $(flags) -Bshareable -znotext -o $(out) $(outbase).kld
 endef
  endif # x86
 
@@ -5205,6 +5201,7 @@ TEMPLATE_VBOXR3EXE_LDFLAGS.x86         = -m32
 TEMPLATE_VBOXR3EXE_LDFLAGS.amd64       = -m64
 TEMPLATE_VBOXR3EXE_LDFLAGS.sparc32     = -m32
 TEMPLATE_VBOXR3EXE_LDFLAGS.sparc64     = -m64
+TEMPLATE_VBOXR3EXE_LDFLAGS.freebsd     = -Wl,-z,noexecstack,-z,relro $(VBOX_LD_as_needed)
 TEMPLATE_VBOXR3EXE_LDFLAGS.linux       = -Wl,-z,noexecstack,-z,relro $(VBOX_LD_as_needed)
 TEMPLATE_VBOXR3EXE_LDFLAGS.solaris     = -Wl,-z,ignore # same as VBOX_LD_as_needed
 TEMPLATE_VBOXR3EXE_LDFLAGS.debug       = $(VBOX_GCC_SANITIZER_FLAGS) $(VBOX_GCC_SANITIZER_LDFLAGS)
@@ -5238,10 +5235,18 @@ TEMPLATE_VBOXR3EXE_LIBPATH            += \
 TEMPLATE_VBOXR3EXE_CFLAGS             += -fno-pic
 TEMPLATE_VBOXR3EXE_CXXFLAGS           += -fno-pic
 TEMPLATE_VBOXR3EXE_LDFLAGS            += -fno-pic

 	/usr/include \
 	/usr/X11R6/include \
 	/usr/local/include
@@ -5273,6 +5278,7 @@ TEMPLATE_VBOXR3EXE_CXXFLAGS.kprofile   = $(TEMPLATE_VB
   TEMPLATE_VBOXR3EXE_LDFLAGS          += '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)'
  endif
  ifdef VBOX_WITH_ORIGIN
+  TEMPLATE_VBOXR3EXE_LDFLAGS.freebsd  += $(VBOX_GCC_ORIGIN_OPT)
   TEMPLATE_VBOXR3EXE_LDFLAGS.linux    += $(VBOX_GCC_ORIGIN_OPT)
  endif
 endif
@@ -5412,7 +5418,7 @@ ifeq ($(KBUILD_TARGET),win)
  	$(PATH_TOOL_$(TEMPLATE_VBOXR3STATIC_TOOL.win.amd64)_LIB)/libcmt$(VBOX_VCC_CRT_TYPE).lib \
  	$(PATH_TOOL_$(TEMPLATE_VBOXR3STATIC_TOOL.win.amd64)_LIB)/libcpmt$(VBOX_VCC_CRT_TYPE).lib \
  	$(PATH_TOOL_$(TEMPLATE_VBOXR3STATIC_TOOL.win.amd64)_LIB)/oldnames.lib
-else ifn1of ($(KBUILD_TARGET), darwin linux solaris)
+else ifn1of ($(KBUILD_TARGET), darwin freebsd linux solaris)
  # The gcc guys sans darwin, linux and solaris (don't depend on statically compiled system libs there)
  TEMPLATE_VBOXR3STATIC_CFLAGS          = $(TEMPLATE_VBOXR3EXE_CFLAGS) -static
  TEMPLATE_VBOXR3STATIC_CXXFLAGS        = $(TEMPLATE_VBOXR3EXE_CXXFLAGS) -static
@@ -5557,6 +5563,7 @@ ifeq ($(KBUILD_TARGET),win) # No CRT!
 else ifn1of ($(KBUILD_TARGET), os2 solaris)
  # We want to keep the RPATH on Solaris to be able to find libgcc_1/libstdc++ within $(VBOX_WITH_RUNPATH)
  TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS       = $(filter-out '$(VBOX_GCC_RPATH_OPT)%,$(TEMPLATE_VBOXR3EXE_LDFLAGS))
+ TEMPLATE_VBoxR3HardenedTstDll_LDFLAGS.freebsd = $(filter-out $(VBOX_GCC_ORIGIN_OPT),$(TEMPLATE_VBoxR3TstDll_LDFLAGS.freebsd))
  TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS.linux = $(filter-out $(VBOX_GCC_ORIGIN_OPT),$(TEMPLATE_VBOXR3EXE_LDFLAGS.linux))
 endif
 
@@ -5584,6 +5591,7 @@ TEMPLATE_VBoxR3HardenedTstDll_INST = $(INST_TESTCASE)
  TEMPLATE_VBoxR3HardenedTstDll_LDFLAGS.win = $(TEMPLATE_VBoxR3TstDll_LDFLAGS.win) -IntegrityCheck
 ifn1of ($(KBUILD_TARGET), win os2)
  TEMPLATE_VBoxR3HardenedTstDll_LDFLAGS       = $(filter-out '$(VBOX_GCC_RPATH_OPT)%,$(TEMPLATE_VBoxR3TstDll_LDFLAGS))
+ TEMPLATE_VBoxR3HardenedTstDll_LDFLAGS.freebsd = $(filter-out $(VBOX_GCC_ORIGIN_OPT),$(TEMPLATE_VBoxR3TstDll_LDFLAGS.freebsd))
  TEMPLATE_VBoxR3HardenedTstDll_LDFLAGS.linux = $(filter-out $(VBOX_GCC_ORIGIN_OPT),$(TEMPLATE_VBoxR3TstDll_LDFLAGS.linux))
 endif
 
@@ -5606,6 +5614,7 @@ ifndef VBOX_WITH_HARDENING
   TEMPLATE_VBoxR3SetUidToRoot_LDFLAGS += '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)'
  endif
  ifdef VBOX_WITH_ORIGIN
+  TEMPLATE_VBoxR3SetUidToRoot_LDFLAGS.freebsd += $(VBOX_GCC_ORIGIN_OPT)
   TEMPLATE_VBoxR3SetUidToRoot_LDFLAGS.linux += $(VBOX_GCC_ORIGIN_OPT)
  endif
 endif
@@ -6132,10 +6141,19 @@ TEMPLATE_VBOXMAINEXE_LIBS                = $(LIB_RUNTI
  else ifeq ($(KBUILD_TARGET),haiku)
 TEMPLATE_VBOXMAINEXE_TOOL                = GXX3
 TEMPLATE_VBOXMAINEXE_LIBS                = $(LIB_RUNTIME) network stdc++ supc++

+ else ifeq ($(KBUILD_TARGET),freebsd)
 TEMPLATE_VBOXMAINEXE_TOOL                = GXX3
 TEMPLATE_VBOXMAINEXE_LIBS                = $(LIB_RUNTIME)
+TEMPLATE_VBOXMAINEXE_LDFLAGS.freebsd     = -Wl,-z,noexecstack,-z,relro $(VBOX_LD_as_needed)
+TEMPLATE_VBOXMAINEXE_LDFLAGS.freebsd.x86 = -Wl,-z,notext
 TEMPLATE_VBOXMAINEXE_INCS               += \
+	/usr/local/include

 	/usr/include \
 	/usr/X11R6/include \
 	/usr/local/include
@@ -6167,6 +6185,7 @@ TEMPLATE_VBOXMAINEXE_LDFLAGS            += '$(VBOX_GCC
 TEMPLATE_VBOXMAINEXE_LDFLAGS            += '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)'
  endif
  ifdef VBOX_WITH_ORIGIN
+TEMPLATE_VBOXMAINEXE_LDFLAGS.freebsd    += $(VBOX_GCC_ORIGIN_OPT)
 TEMPLATE_VBOXMAINEXE_LDFLAGS.linux      += $(VBOX_GCC_ORIGIN_OPT)
  endif
 
@@ -6735,13 +6754,11 @@ ifdef VBOX_WITH_QTGUI
    TEMPLATE_VBOXQTGUIEXE_LIBPATH += \
 	$(VBOX_LIBPATH_X11)
    ifeq ($(KBUILD_TARGET),freebsd)
+    TEMPLATE_VBOXQTGUIEXE_LDFLAGS += -Wl,-z,noexecstack,-z,relro $(VBOX_LD_as_needed)
+    TEMPLATE_VBOXQTGUIEXE_LDFLAGS.freebsd.x86 = -Wl,-z,notext
     TEMPLATE_VBOXQTGUIEXE_INCS += \
-	/usr/include \

 	/usr/local/lib
    endif
    ifeq ($(KBUILD_TARGET),solaris)
@@ -6988,10 +7005,17 @@ TEMPLATE_VBoxBldProg_TOOL                = GXX3
 TEMPLATE_VBoxBldProg_LIBS                = network iconv
 TEMPLATE_VBoxBldProg_LIBPATH            += \
 	/boot/common/lib
- else if1of ($(KBUILD_HOST), freebsd openbsd)
+ else ifeq ($(KBUILD_HOST),freebsd)
 TEMPLATE_VBoxBldProg_TOOL                = GXX3
 TEMPLATE_VBoxBldProg_LIBS                = pthread
 TEMPLATE_VBoxBldProg_INCS               += \
+	/usr/local/include
+TEMPLATE_VBoxBldProg_LIBPATH            += \
+	/usr/local/lib
+ else ifeq ($(KBUILD_HOST),openbsd)
+TEMPLATE_VBoxBldProg_TOOL                = GXX3
+TEMPLATE_VBoxBldProg_LIBS                = pthread
+TEMPLATE_VBoxBldProg_INCS               += \
 	/usr/include \
 	/usr/X11R6/include \
 	/usr/local/include
@@ -7115,6 +7139,7 @@ else # the gcc guys
  # Do not inherit sanitizer flags from VBOXR3EXE in guest executables.  Deal with them separately.
  TEMPLATE_VBOXGUESTR3EXE_CXXFLAGS.debug = $(NO_SUCH_VARIABLE)
  TEMPLATE_VBOXGUESTR3EXE_CFLAGS.debug = $(NO_SUCH_VARIABLE)
+ TEMPLATE_VBOXGUESTR3EXE_LDFLAGS.freebsd = $(filter-out $(VBOX_GCC_ORIGIN_OPT),$(TEMPLATE_VBOXR3EXE_LDFLAGS.freebsd))
  TEMPLATE_VBOXGUESTR3EXE_LDFLAGS.linux = $(filter-out $(VBOX_GCC_ORIGIN_OPT),$(TEMPLATE_VBOXR3EXE_LDFLAGS.linux))
  TEMPLATE_VBOXGUESTR3EXE_LDFLAGS.debug = $(NO_SUCH_VARIABLE)
  TEMPLATE_VBOXGUESTR3EXE_LDFLAGS  = $(filter-out '$(VBOX_GCC_RPATH_OPT)%,$(TEMPLATE_VBOXR3EXE_LDFLAGS))
@@ -7138,6 +7163,7 @@ TEMPLATE_VBOXGUESTR3EXE_CXXFLAGS.linux    = \
 	$(VBOX_GCC_fno-stack-protector)
 TEMPLATE_VBOXGUESTR3EXE_CFLAGS.linux      = $(TEMPLATE_VBOXGUESTR3EXE_CXXFLAGS.linux)
 # The GNU_HASH ELF tag is not supported by older systems.
+TEMPLATE_VBOXGUESTR3EXE_LDFLAGS.freebsd    += $(VBOX_LD_hash_style_sysv)
 TEMPLATE_VBOXGUESTR3EXE_LDFLAGS.linux      += $(VBOX_LD_hash_style_sysv)
 
 #
@@ -7345,6 +7371,7 @@ TEMPLATE_VBOXGUESTR3XF86MOD_LIBS.$(KBUILD_TYPE)      =
 TEMPLATE_VBOXGUESTR3XF86MOD_LIBS.$(KBUILD_TARGET)    = $(NO_SUCH_VARIABLE)
 TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.$(KBUILD_TARGET) = $(NO_SUCH_VARIABLE)
 # The GNU_HASH ELF tag is not supported by older glibc dynamic linkers.
+TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.freebsd = $(subst -Wl$(COMMA),,$(VBOX_LD_hash_style_sysv))
 TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.linux = $(subst -Wl$(COMMA),,$(VBOX_LD_hash_style_sysv))
 TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.$(KBUILD_TYPE)   = $(NO_SUCH_VARIABLE)
 TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS          = -r
 	-current_version $(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD) \
 	-compatibility_version $(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)
 TEMPLATE_VBOXCROGLR3HOSTDLL_LDFLAGS.linux    = -Wl,--no-as-needed
+TEMPLATE_VBOXCROGLR3HOSTDLL_LDFLAGS.freebsd  = -Wl,--no-as-needed
 TEMPLATE_VBOXCROGLR3HOSTDLL_BLDDIRS          = $(VBOX_PATH_CROGL_GENFILES)/
 ifeq ($(KBUILD_TARGET),darwin)
  TEMPLATE_VBOXCROGLR3HOSTDLL_CFLAGS          = $(TEMPLATE_VBOXR3NP_CFLAGS) -Wno-deprecated-declarations




--- configure.orig	2021-01-07 15:31:21 UTC
+++ configure
@@ -140,10 +140,14 @@ CXX_FLAGS=""
 if [ "$OS" = "freebsd" ]; then
   INCCURL="-I/usr/local/include"
   LIBCURL="-L/usr/local/lib -lcurl"

 else
   INCCURL=""
   LIBCURL="-lcurl"
@@ -1258,7 +1262,7 @@ extern "C" int main(void)
       elif [ $cc_maj -eq 4 -a $cc_min -eq 0 -a "$OS" = "darwin" ]; then
         log_success "found version $cc_ver"
       # gcc-4.0 is allowed for Darwin only
+      elif [ $cc_maj -eq 4 -a $cc_min -eq 2 -a "$OS" = "freebsd" ]; then
+        log_success "found version $cc_ver"
+      # gcc-4.2 is allowed for FreeBSD only
       elif [ $cc_maj -lt 4 \
              -o \( $cc_maj -eq 4 -a $cc_min -lt 4 -a "$OS" != "darwin" \) \
              -o \( $cc_maj -eq 4 -a $cc_min -lt 2 -a "$OS"  = "darwin" \) ]; then
@@ -1208,7 +1215,7 @@ extern "C" int main(void)
 #endif
 }
 EOF

     test_execute
   fi
 }
@@ -1563,9 +1567,7 @@ EOF
         if [ $? -eq 0 ]; then
           echo "(Qt5 from pkg-config)" >> $LOG
           FLGQT5=`pkg-config Qt5Core --cflags`
-          # gcc 4.8 is able to compile with C++11 (see also VBOX_GCC_std in Config.kmk)
-          [ $cc_maj -eq 4 -a $cc_min -eq 8 ] && FLGQT5="$FLGQT5 -std=c++11"
-          INCQT5=`strip_I "$FLGQT5"`
+          FLGQT5="$FLGQT5 -std=c++11"          INCQT5=`strip_I "$FLGQT5"`
           LIBDIR5=`pkg-config Qt5Core --variable=libdir`
           LIBQT5=`pkg-config Qt5Core --libs`
           LIBQT5="-L$LIBDIR5 $LIBQT5"
@@ -1703,7 +1705,7 @@ check_libopus()
       fi
       cat > $ODIR.tmp_src.cc << EOF
 #include <cstdio>

 extern "C" int main(void)
 {
   OpusEncoder *test;
@@ -2035,8 +2037,8 @@ EOF
         echo "compiling the following source file:" >> $LOG
         cat $ODIR.tmp_src.cc >> $LOG
         echo "using the following command line:" >> $LOG

         if [ $? -eq 0 ]; then
           found=1
           break
@@ -2512,7 +2514,7 @@ for option in "$@"; do
     --with-openssl-dir=*)
       OPENSSLDIR=`echo $option | cut -d'=' -f2`
       INCCRYPTO="-I${OPENSSLDIR}/include"

       ;;
     --with-ow-dir=*)
       WATCOM=`echo $option | cut -d'=' -f2`
@@ -2856,14 +2858,23 @@ if [ $ONLY_ADDITIONS -eq 0 ]; then
   check_ssl
   check_curl
   [ $WITH_LIBVPX -eq 1 ] && check_vpx
-  check_libopus
+  [ $OSE -eq 0 -a "$OS" != "win" ] && check_libopus
  [ "$OS" != "darwin"  ] && check_z
   [ "$OS" != "darwin"  ] && check_png
   [ $OSE -eq 0 -a "$OS" = "linux" ] && check_pam
@@ -2788,13 +2794,20 @@ if [ $ONLY_ADDITIONS -eq 0 ]; then
   [ $WITH_PYTHON -eq 1 ] && check_python
   [ $WITH_JAVA   -eq 1 ] && check_java
 
-  # PulseAudio
-  if [ $WITH_PULSE -eq 1 ]; then
-    check_pulse
-  elif [ $WITH_PULSE -eq 0 ]; then # Force disabling PulseAudio.
-    cnf_append "VBOX_WITH_AUDIO_PULSE" ""
-  elif [ $WITH_PULSE -eq 2 ]; then # --enable-pulse was passed, force PulseAudio.
-    cnf_append "VBOX_WITH_AUDIO_PULSE" "1"
-  fi
+  if [ "$OS" = "linux" -o "$OS" = "freebsd" -o "$OS" = "netbsd" ]; then
+    if [ $WITH_ALSA -eq 1 ]; then
+      check_alsa
+    else
+      cnf_append "VBOX_WITH_AUDIO_ALSA" ""
+    fi
+    if [ $WITH_PULSE -eq 1 ]; then
+      check_pulse
+    elif [ $WITH_PULSE -eq 0 ]; then # Force disabling PulseAudio.
+      cnf_append "VBOX_WITH_AUDIO_PULSE" ""
+    elif [ $WITH_PULSE -eq 2 ]; then # --enable-pulse was passed, force PulseAudio.
+      cnf_append "VBOX_WITH_AUDIO_PULSE" "1"
+    fi
+    if [ $WITH_DBUS -eq 0 ]; then
+      cnf_append "VBOX_WITH_DBUS" ""
+    fi
+  fi  
 fi
 
 # Linux-specific
@@ -2878,14 +2889,6 @@ if [ "$OS" = "linux" ]; then
     cnf_append "VBOX_WITHOUT_LINUX_TEST_BUILDS" "1"
   fi
   if [ $ONLY_ADDITIONS -eq 0 ]; then

Lines 1-11 Link Here

(-)emulators/virtualbox-ose/files/patch-include-VBox-vmm-cpumctx.h (-11 lines)
1	--- include/VBox/vmm/cpumctx.h.orig 2020-05-13 19:36:46 UTC
2	+++ include/VBox/vmm/cpumctx.h
3	@@ -88,7 +88,7 @@ AssertCompileSize(CPUMSELREG, 24);
4	# define CPUMSELREG_ARE_HIDDEN_PARTS_VALID(a_pVCpu, a_pSelReg) \
5	( ((a_pSelReg)->fFlags & CPUMSELREG_FLAGS_VALID) \
6	&& ( (a_pSelReg)->ValidSel == (a_pSelReg)->Sel \
7	- \|\| ( (a_pVCpu) /!= NULL/ \
8	+ \|\| ( ((a_pVCpu) != NULL) \
9	&& (a_pSelReg)->ValidSel == ((a_pSelReg)->Sel & X86_SEL_MASK_OFF_RPL) \
10	&& ((a_pSelReg)->Sel & X86_SEL_RPL) == 1 \
11	&& ((a_pSelReg)->ValidSel & X86_SEL_RPL) == 0 \

Lines 1-6 Link Here

(-)emulators/virtualbox-ose/files/patch-include-iprt-x86.h (-2 / +2 lines)
1	--- include/iprt/x86.h.orig 2020-05-13 19:36:52 UTC	1	--- include/iprt/x86.h.orig 2021-01-07 15:31:34 UTC
2	+++ include/iprt/x86.h	2	+++ include/iprt/x86.h
3	@@ -35,6 +35,16 @@	3	@@ -38,6 +38,16 @@
4	# pragma D depends_on library vbox-types.d	4	# pragma D depends_on library vbox-types.d
5	#endif	5	#endif
6		6




Fix build with Qt5 5.13, which defined GLsizeiptr already.

Obtained from:
	https://www.mail-archive.com/pld-cvs-commit@lists.pld-linux.org/msg436220.html

--- include/VBox/VBoxGL2D.h.orig	2019-09-29 14:31:16 UTC
+++ include/VBox/VBoxGL2D.h
@@ -107,7 +107,7 @@ typedef GLvoid (APIENTRY *PFNVBOXVHWA_UNIFORM3I)(GLint
 typedef GLvoid (APIENTRY *PFNVBOXVHWA_UNIFORM4I)(GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
 
 /* GL_ARB_pixel_buffer_object*/
-#ifndef Q_WS_MAC
+#if 0
 /* apears to be defined on mac */
 typedef ptrdiff_t GLsizeiptr;
 #endif




--- include/VBox/com/array.h.orig	2021-01-07 15:31:25 UTC
+++ include/VBox/com/array.h
@@ -171,7 +171,7 @@
 
 #include "VBox/com/defs.h"
 

 /** @def VBOX_WITH_TYPE_TRAITS
  * Type traits are a C++ 11 feature, so not available everywhere (yet).
  * Only GCC 4.6 or newer and MSVC++ 16.0 (Visual Studio 2010) or newer.
@@ -960,12 +960,12 @@ class SafeArray : public Traits (public)
      */
     T &operator[] (size_t aIdx)
     {
         /** @todo r=klaus should do this as a AssertCompile, but cannot find a way which works. */
         Assert(sizeof(T) <= sizeof(Zeroes));
-        AssertReturn(m.arr != NULL, *(T *)&Zeroes[0]);
-        AssertReturn(aIdx < size(), *(T *)&Zeroes[0]);
+        AssertReturn(m.arr != NULL,  *((T *)1));
+        AssertReturn(aIdx < size(), *((T *)1));
 #ifdef VBOX_WITH_XPCOM
         return m.arr[aIdx];
 #else
-        AssertReturn(m.raw != NULL, *(T *)&Zeroes[0]);
+        AssertReturn(m.raw != NULL,  *((T *)1));
         return m.raw[aIdx];
 #endif
     }
@@ -980,7 +980,7 @@ class SafeArray : public Traits (public)
 #ifdef VBOX_WITH_XPCOM
         return m.arr[aIdx];
 #else
-        AssertReturn(m.raw != NULL, *(const T *)&Zeroes[0]);
+         AssertReturn(m.raw != NULL,  *((T *)1));
         return m.raw[aIdx];
 #endif
     }




--- include/iprt/assertcompile.h.orig	2018-01-15 14:49:42 UTC
+++ include/iprt/assertcompile.h
@@ -104,7 +104,11 @@ RT_C_DECLS_END
  * @param   expr    Expression which should be true.
  */
 #ifdef RTASSERT_HAVE_STATIC_ASSERT
-# define AssertCompile(expr)    static_assert(!!(expr), #expr)
+#  ifdef __cplusplus
+#    define AssertCompile(expr) static_assert(!!(expr), #expr)
+#  else
+#    define AssertCompile(expr) _Static_assert(!!(expr), #expr)
+#  endif
 #else
 # define AssertCompile(expr)    AssertCompileNS(expr)
 #endif




--- include/iprt/cdefs.h.orig	2018-10-15 14:24:52 UTC
+++ include/iprt/cdefs.h
@@ -2611,28 +2611,28 @@
 
 /** @def RT_BYTE1
  * Gets the first byte of something. */
-#define RT_BYTE1(a)                             ( (a)         & 0xff )
+#define RT_BYTE1(a)                             ( (uint8_t)((a)         & 0xff) )
 /** @def RT_BYTE2
  * Gets the second byte of something. */
-#define RT_BYTE2(a)                             ( ((a) >>  8) & 0xff )
+#define RT_BYTE2(a)                             ( (uint8_t)(((a) >>  8) & 0xff) )
 /** @def RT_BYTE3
  * Gets the second byte of something. */
-#define RT_BYTE3(a)                             ( ((a) >> 16) & 0xff )
+#define RT_BYTE3(a)                             ( (uint8_t)(((a) >> 16) & 0xff) )
 /** @def RT_BYTE4
  * Gets the fourth byte of something. */
-#define RT_BYTE4(a)                             ( ((a) >> 24) & 0xff )
+#define RT_BYTE4(a)                             ( (uint8_t)(((a) >> 24) & 0xff) )
 /** @def RT_BYTE5
  * Gets the fifth byte of something. */
-#define RT_BYTE5(a)                             ( ((a) >> 32) & 0xff )
+#define RT_BYTE5(a)                             ( (uint8_t)(((a) >> 32) & 0xff) )
 /** @def RT_BYTE6
  * Gets the sixth byte of something. */
-#define RT_BYTE6(a)                             ( ((a) >> 40) & 0xff )
+#define RT_BYTE6(a)                             ( (uint8_t)(((a) >> 40) & 0xff) )
 /** @def RT_BYTE7
  * Gets the seventh byte of something. */
-#define RT_BYTE7(a)                             ( ((a) >> 48) & 0xff )
+#define RT_BYTE7(a)                             ( (uint8_t)(((a) >> 48) & 0xff) )
 /** @def RT_BYTE8
  * Gets the eight byte of something. */
-#define RT_BYTE8(a)                             ( ((a) >> 56) & 0xff )
+#define RT_BYTE8(a)                             ( (uint8_t)(((a) >> 56) & 0xff) )
 
 
 /** @def RT_LODWORD

Lines 1-6 Link Here

(-)emulators/virtualbox-ose/files/patch-include_iprt_string.h (-2 / +2 lines)
1	--- include/iprt/string.h.orig 2018-06-29 13:08:03 UTC	1	--- include/iprt/string.h.orig 2021-01-07 15:31:33 UTC
2	+++ include/iprt/string.h	2	+++ include/iprt/string.h
3	@@ -43,6 +43,11 @@	3	@@ -46,6 +46,11 @@
4	#elif defined(RT_OS_FREEBSD) && defined(_KERNEL)	4	#elif defined(RT_OS_FREEBSD) && defined(_KERNEL)
5	RT_C_DECLS_BEGIN	5	RT_C_DECLS_BEGIN
6	# include <sys/libkern.h>	6	# include <sys/libkern.h>




--- include/iprt/types.h.orig	2018-05-09 16:32:07 UTC
+++ include/iprt/types.h
@@ -56,22 +56,9 @@ RT_C_DECLS_END
 #  include <sys/types.h>
 
 # elif defined(RT_OS_FREEBSD) && defined(_KERNEL)
-    /*
-     * Kludge for the FreeBSD kernel:
-     *  stddef.h and sys/types.h have slightly different offsetof definitions
-     *  when compiling in kernel mode. This is just to make GCC shut up.
-     */
-#  ifndef _STDDEF_H_
-#   undef offsetof
-#  endif
+
 #  include <sys/stddef.h>
-#  ifndef _SYS_TYPES_H_
-#   undef offsetof
-#  endif
 #  include <sys/types.h>
-#  ifndef offsetof
-#   error "offsetof is not defined!"
-#  endif
 
 # elif defined(RT_OS_FREEBSD) && HC_ARCH_BITS == 64 && defined(RT_ARCH_X86)
     /*




--- src/VBox/Additions/common/VBoxGuest/VBoxGuest-freebsd.c.orig	2019-01-25 18:12:28 UTC
+++ src/VBox/Additions/common/VBoxGuest/VBoxGuest-freebsd.c
@@ -45,6 +45,7 @@
 #include <sys/uio.h>
 #include <sys/bus.h>
 #include <sys/poll.h>
+#include <sys/proc.h>
 #include <sys/selinfo.h>
 #include <sys/queue.h>
 #include <sys/lock.h>
@@ -61,6 +62,7 @@
 #include <VBox/version.h>
 #include <VBox/log.h>
 #include <iprt/assert.h>
+#include <iprt/err.h>
 #include <iprt/initterm.h>
 #include <iprt/process.h>
 #include <iprt/string.h>
@@ -102,8 +104,6 @@ struct VBoxGuestDeviceState
     struct resource   *pIrqRes;
     /** Pointer to the IRQ handler. */
     void              *pfnIrqHandler;

 };
 
 
@@ -113,8 +113,7 @@ struct VBoxGuestDeviceState
 /*
  * Character device file handlers.
  */

 static d_ioctl_t  vgdrvFreeBSDIOCtl;
 static int        vgdrvFreeBSDIOCtlSlow(PVBOXGUESTSESSION pSession, u_long ulCmd, caddr_t pvData, struct thread *pTd);
 static d_write_t  vgdrvFreeBSDWrite;
@@ -145,8 +144,7 @@ static struct cdevsw    g_vgdrvFreeBSDChrDevSW =
 {
     .d_version =        D_VERSION,
     .d_flags =          D_TRACKCLOSE | D_NEEDMINOR,

     .d_ioctl =          vgdrvFreeBSDIOCtl,
     .d_read =           vgdrvFreeBSDRead,
     .d_write =          vgdrvFreeBSDWrite,
@@ -154,81 +152,28 @@ static struct cdevsw    g_vgdrvFreeBSDChrDevSW =
     .d_name =           "vboxguest"
 };
 

 {
     int                 rc;
     PVBOXGUESTSESSION   pSession;
@@ -240,12 +185,6 @@ static int vgdrvFreeBSDOpen(struct cdev *pDev, int fOp
     LogFlow(("vgdrvFreeBSDOpen:\n"));
 
     /*

-    /*
      * Create a new session.
      */
     fRequestor = VMMDEV_REQUESTOR_USERMODE | VMMDEV_REQUESTOR_TRUST_NOT_GIVEN;
@@ -262,14 +201,13 @@ static int vgdrvFreeBSDOpen(struct cdev *pDev, int fOp
     rc = VGDrvCommonCreateUserSession(&g_DevExt, fRequestor, &pSession);
     if (RT_SUCCESS(rc))
     {
-        if (ASMAtomicCmpXchgPtr(&pDev->si_drv1, pSession, (void *)0x42))

     }
 
     LogRel(("vgdrvFreeBSDOpen: failed. rc=%d\n", rc));
@@ -277,33 +215,6 @@ static int vgdrvFreeBSDOpen(struct cdev *pDev, int fOp
 }
 
 /**

  * I/O control request.
  *
  * @returns depends...
@@ -316,8 +227,12 @@ static int vgdrvFreeBSDClose(struct cdev *pDev, int fF
 static int vgdrvFreeBSDIOCtl(struct cdev *pDev, u_long ulCmd, caddr_t pvData, int fFile, struct thread *pTd)
 {
     PVBOXGUESTSESSION pSession;

     /*
      * Deal with the fast ioctl path first.
      */
@@ -512,12 +427,14 @@ int VBOXCALL VBoxGuestIDC(void *pvSession, uintptr_t u
 
 static int vgdrvFreeBSDPoll(struct cdev *pDev, int fEvents, struct thread *td)
 {

         Log(("vgdrvFreeBSDPoll: no state data for %s\n", devtoname(pDev)));
         return (fEvents & (POLLHUP|POLLIN|POLLRDNORM|POLLOUT|POLLWRNORM));
     }
@@ -558,11 +475,8 @@ static int vgdrvFreeBSDDetach(device_t pDevice)
     /*
      * Reverse what we did in vgdrvFreeBSDAttach.
      */

     vgdrvFreeBSDRemoveIRQ(pDevice, pState);
 
     if (pState->pVMMDevMemRes)
@@ -727,18 +641,21 @@ static int vgdrvFreeBSDAttach(device_t pDevice)
                     VGDrvCommonProcessOptionsFromHost(&g_DevExt);
 
                     /*
-                     * Configure device cloning.
+                     * Configure device.




--- src/VBox/Additions/common/VBoxGuest/freebsd/Makefile.orig	2019-04-16 10:09:09 UTC
+++ src/VBox/Additions/common/VBoxGuest/freebsd/Makefile
@@ -25,7 +25,7 @@
 #
 KMOD = vboxguest
 
-CFLAGS += -DRT_OS_FREEBSD -DIN_RING0 -DIN_RT_R0 -DIN_SUP_R0 -DVBOX -DRT_WITH_VBOX -Iinclude -I. -Ir0drv -w -DVBGL_VBOXGUEST -DVBOX_WITH_HGCM -DVBOX_WITH_64_BITS_GUESTS
+CFLAGS += -DRT_OS_FREEBSD -DIN_RING0 -DIN_RT_R0 -DIN_GUEST -DIN_GUEST_R0 -DIN_SUP_R0 -DVBOX -DRT_WITH_VBOX -Iinclude -I. -Ir0drv -w -DVBGL_VBOXGUEST -DVBOX_WITH_HGCM -DVBOX_WITH_64_BITS_GUESTS
 
 .if (${MACHINE_ARCH} == "i386")
  CFLAGS += -DRT_ARCH_X86
@@ -80,6 +80,7 @@ SRCS += \
 	handletable.c \
 	handletablectx.c \

 	thread.c
 
 .PATH:	${.CURDIR}/common/string
@@ -147,6 +148,7 @@ SRCS += \
 
 .PATH:	${.CURDIR}/r0drv
 SRCS += \

Lines 1-6 Link Here

(-)emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-VBoxGuest-freebsd-files_vboxguest (-4 / +12 lines)
1	--- src/VBox/Additions/common/VBoxGuest/freebsd/files_vboxguest.orig 2020-05-13 19:37:01 UTC	1	--- src/VBox/Additions/common/VBoxGuest/freebsd/files_vboxguest.orig 2019-01-25 18:12:28 UTC
2	+++ src/VBox/Additions/common/VBoxGuest/freebsd/files_vboxguest	2	+++ src/VBox/Additions/common/VBoxGuest/freebsd/files_vboxguest
3	@@ -109,6 +109,7 @@ FILES_VBOXGUEST_NOBIN=" \	3	@@ -63,6 +63,7 @@ FILES_VBOXGUEST_NOBIN=" \
		4	${PATH_ROOT}/include/iprt/time.h=>include/iprt/time.h \
		5	${PATH_ROOT}/include/iprt/timer.h=>include/iprt/timer.h \
		6	${PATH_ROOT}/include/iprt/types.h=>include/iprt/types.h \
		7	+ ${PATH_ROOT}/include/iprt/uni.h=>include/iprt/uni.h \
		8	${PATH_ROOT}/include/iprt/utf16.h=>include/iprt/utf16.h \
		9	${PATH_ROOT}/include/iprt/uuid.h=>include/iprt/uuid.h \
		10	${PATH_ROOT}/include/iprt/crc.h=>include/iprt/crc.h \
		11	@@ -111,6 +112,7 @@ FILES_VBOXGUEST_NOBIN=" \
4	${PATH_ROOT}/src/VBox/Runtime/common/misc/handletable.h=>common/misc/handletable.h \	12	${PATH_ROOT}/src/VBox/Runtime/common/misc/handletable.h=>common/misc/handletable.h \
5	${PATH_ROOT}/src/VBox/Runtime/common/misc/handletablectx.cpp=>common/misc/handletablectx.c \	13	${PATH_ROOT}/src/VBox/Runtime/common/misc/handletablectx.cpp=>common/misc/handletablectx.c \
6	${PATH_ROOT}/src/VBox/Runtime/common/misc/once.cpp=>common/misc/once.c \	14	${PATH_ROOT}/src/VBox/Runtime/common/misc/once.cpp=>common/misc/once.c \
Lines 8-14 Link Here
8	${PATH_ROOT}/src/VBox/Runtime/common/misc/thread.cpp=>common/misc/thread.c \	16	${PATH_ROOT}/src/VBox/Runtime/common/misc/thread.cpp=>common/misc/thread.c \
9	${PATH_ROOT}/src/VBox/Runtime/common/misc/RTAssertMsg1Weak.cpp=>common/misc/RTAssertMsg1Weak.c \	17	${PATH_ROOT}/src/VBox/Runtime/common/misc/RTAssertMsg1Weak.cpp=>common/misc/RTAssertMsg1Weak.c \
10	${PATH_ROOT}/src/VBox/Runtime/common/misc/RTAssertMsg2.cpp=>common/misc/RTAssertMsg2.c \	18	${PATH_ROOT}/src/VBox/Runtime/common/misc/RTAssertMsg2.cpp=>common/misc/RTAssertMsg2.c \
11	@@ -171,6 +172,7 @@ FILES_VBOXGUEST_NOBIN=" \	19	@@ -181,6 +183,7 @@ FILES_VBOXGUEST_NOBIN=" \
12	${PATH_ROOT}/src/VBox/Runtime/generic/errvars-generic.cpp=>generic/errvars-generic.c \	20	${PATH_ROOT}/src/VBox/Runtime/generic/errvars-generic.cpp=>generic/errvars-generic.c \
13	${PATH_ROOT}/src/VBox/Runtime/generic/timer-generic.cpp=>generic/timer-generic.c \	21	${PATH_ROOT}/src/VBox/Runtime/generic/timer-generic.cpp=>generic/timer-generic.c \
14	${PATH_ROOT}/src/VBox/Runtime/generic/mppresent-generic.cpp=>generic/mppresent-generic.c \	22	${PATH_ROOT}/src/VBox/Runtime/generic/mppresent-generic.cpp=>generic/mppresent-generic.c \
Lines 16-22 Link Here
16	${PATH_ROOT}/src/VBox/Runtime/r0drv/alloc-r0drv.cpp=>r0drv/alloc-r0drv.c \	24	${PATH_ROOT}/src/VBox/Runtime/r0drv/alloc-r0drv.cpp=>r0drv/alloc-r0drv.c \
17	${PATH_ROOT}/src/VBox/Runtime/r0drv/alloc-r0drv.h=>r0drv/alloc-r0drv.h \	25	${PATH_ROOT}/src/VBox/Runtime/r0drv/alloc-r0drv.h=>r0drv/alloc-r0drv.h \
18	${PATH_ROOT}/src/VBox/Runtime/r0drv/initterm-r0drv.cpp=>r0drv/initterm-r0drv.c \	26	${PATH_ROOT}/src/VBox/Runtime/r0drv/initterm-r0drv.cpp=>r0drv/initterm-r0drv.c \
19	@@ -197,6 +199,7 @@ FILES_VBOXGUEST_NOBIN=" \	27	@@ -207,6 +210,7 @@ FILES_VBOXGUEST_NOBIN=" \
20	${PATH_ROOT}/src/VBox/Runtime/r0drv/freebsd/sleepqueue-r0drv-freebsd.h=>r0drv/freebsd/sleepqueue-r0drv-freebsd.h \	28	${PATH_ROOT}/src/VBox/Runtime/r0drv/freebsd/sleepqueue-r0drv-freebsd.h=>r0drv/freebsd/sleepqueue-r0drv-freebsd.h \
21	${PATH_ROOT}/src/VBox/Runtime/r0drv/generic/semspinmutex-r0drv-generic.c=>r0drv/generic/semspinmutex-r0drv-generic.c \	29	${PATH_ROOT}/src/VBox/Runtime/r0drv/generic/semspinmutex-r0drv-generic.c=>r0drv/generic/semspinmutex-r0drv-generic.c \
22	${PATH_ROOT}/src/VBox/Runtime/r0drv/generic/mpnotification-r0drv-generic.cpp=>r0drv/generic/mpnotification-r0drv-generic.c \	30	${PATH_ROOT}/src/VBox/Runtime/r0drv/generic/mpnotification-r0drv-generic.cpp=>r0drv/generic/mpnotification-r0drv-generic.c \




--- src/VBox/Additions/common/crOpenGL/FreeBSD_i386_exports.py.orig	2020-06-26 09:52:40 UTC
+++ src/VBox/Additions/common/crOpenGL/FreeBSD_i386_exports.py
@@ -0,0 +1,95 @@
+# Copyright (c) 2001, Stanford University
+# All rights reserved.
+#
+# See the file LICENSE.txt for information on redistributing this software.
+
+
+import sys
+
+import apiutil
+
+
+def GenerateEntrypoints():
+
+    #apiutil.CopyrightC()
+
+    # Get sorted list of dispatched functions.
+    # The order is very important - it must match cr_opcodes.h
+    # and spu_dispatch_table.h
+    print '%include "iprt/asmdefs.mac"'
+    print ""
+    print "%ifdef RT_ARCH_AMD64"
+    print "extern glim"
+    print "%else ; X86"
+    print "extern glim"
+    print "%endif"
+    print ""
+
+    keys = apiutil.GetDispatchedFunctions(sys.argv[1]+"/APIspec.txt")
+
+    for index in range(len(keys)):
+        func_name = keys[index]
+        if apiutil.Category(func_name) == "Chromium":
+            continue
+        if apiutil.Category(func_name) == "VBox":
+            continue
+
+        print "BEGINPROC_EXPORTED gl%s" % func_name
+        print "%ifdef RT_ARCH_AMD64"
+        print "\tmov \trax, qword glim+%d" % (8*index)
+        print "\tjmp \t[rax]"
+        print "%else ; X86"
+        print "\tmov \teax, dword glim+%d" % (4*index)
+        print "\tjmp \t[eax]"
+        print "%endif"
+        print "ENDPROC gl%s" % func_name
+        print ""
+
+
+    print ';'
+    print '; Aliases'
+    print ';'
+
+    # Now loop over all the functions and take care of any aliases
+    allkeys = apiutil.GetAllFunctions(sys.argv[1]+"/APIspec.txt")
+    for func_name in allkeys:
+        if "omit" in apiutil.ChromiumProps(func_name):
+            continue
+
+        if func_name in keys:
+            # we already processed this function earlier
+            continue
+
+        # alias is the function we're aliasing
+        alias = apiutil.Alias(func_name)
+        if alias:
+            # this dict lookup should never fail (raise an exception)!
+            index = keys.index(alias)
+            print "BEGINPROC_EXPORTED gl%s" % func_name
+            print "%ifdef RT_ARCH_AMD64"
+            print "\tmov \trax, qword glim+%d" % (8*index)
+            print "\tjmp \t[rax]"
+            print "%else ; X86"
+            print "\tmov \teax, dword glim+%d" % (4*index)
+            print "\tjmp \t[eax]"
+            print "%endif"
+            print "ENDPROC gl%s" % func_name
+            print ""
+
+
+    print ';'
+    print '; No-op stubs'
+    print ';'
+
+    # Now generate no-op stub functions
+    for func_name in allkeys:
+        if "stub" in apiutil.ChromiumProps(func_name):
+            print "BEGINPROC_EXPORTED gl%s" % func_name
+            print "\tleave"
+            print "\tret"
+            print "ENDPROC gl%s" % func_name
+            print ""
+
+
+GenerateEntrypoints()
+




--- src/VBox/Additions/common/crOpenGL/FreeBSD_i386_exports_dri.py.orig	2020-06-26 09:53:28 UTC
+++ src/VBox/Additions/common/crOpenGL/FreeBSD_i386_exports_dri.py
@@ -0,0 +1,95 @@
+# Copyright (c) 2001, Stanford University
+# All rights reserved.
+#
+# See the file LICENSE.txt for information on redistributing this software.
+
+
+import sys
+
+import apiutil
+
+
+def GenerateEntrypoints():
+
+    #apiutil.CopyrightC()
+
+    # Get sorted list of dispatched functions.
+    # The order is very important - it must match cr_opcodes.h
+    # and spu_dispatch_table.h
+    print '%include "iprt/asmdefs.mac"'
+    print ""
+    print "%ifdef RT_ARCH_AMD64"
+    print "extern glim"
+    print "%else ; X86"
+    print "extern glim"
+    print "%endif"
+    print ""
+
+    keys = apiutil.GetDispatchedFunctions(sys.argv[1]+"/APIspec.txt")
+
+    for index in range(len(keys)):
+        func_name = keys[index]
+        if apiutil.Category(func_name) == "Chromium":
+            continue
+        if apiutil.Category(func_name) == "VBox":
+            continue
+
+        print "BEGINPROC_EXPORTED cr_gl%s" % func_name
+        print "%ifdef RT_ARCH_AMD64"
+        print "\tmov \trax, qword glim+%d" % (8*index)
+        print "\tjmp \t[rax]"
+        print "%else ; X86"
+        print "\tmov \teax, dword glim+%d" % (4*index)
+        print "\tjmp \t[eax]"
+        print "%endif"
+        print "ENDPROC cr_gl%s" % func_name
+        print ""
+
+
+    print ';'
+    print '; Aliases'
+    print ';'
+
+    # Now loop over all the functions and take care of any aliases
+    allkeys = apiutil.GetAllFunctions(sys.argv[1]+"/APIspec.txt")
+    for func_name in allkeys:
+        if "omit" in apiutil.ChromiumProps(func_name):
+            continue
+
+        if func_name in keys:
+            # we already processed this function earlier
+            continue
+
+        # alias is the function we're aliasing
+        alias = apiutil.Alias(func_name)
+        if alias:
+            # this dict lookup should never fail (raise an exception)!
+            index = keys.index(alias)
+            print "BEGINPROC_EXPORTED cr_gl%s" % func_name
+            print "%ifdef RT_ARCH_AMD64"
+            print "\tmov \trax, qword glim+%d" % (8*index)
+            print "\tjmp \t[rax]"
+            print "%else ; X86"
+            print "\tmov \teax, dword glim+%d" % (4*index)
+            print "\tjmp \t[eax]"
+            print "%endif"
+            print "ENDPROC cr_gl%s" % func_name
+            print ""
+
+
+    print ';'
+    print '; No-op stubs'
+    print ';'
+
+    # Now generate no-op stub functions
+    for func_name in allkeys:
+        if "stub" in apiutil.ChromiumProps(func_name):
+            print "BEGINPROC_EXPORTED cr_gl%s" % func_name
+            print "\tleave"
+            print "\tret"
+            print "ENDPROC cr_gl%s" % func_name
+            print ""
+
+
+GenerateEntrypoints()
+




--- src/VBox/Additions/common/crOpenGL/FreeBSD_i386_glxapi_exports.py.orig	2020-06-26 09:53:39 UTC
+++ src/VBox/Additions/common/crOpenGL/FreeBSD_i386_glxapi_exports.py
@@ -0,0 +1,104 @@
+"""
+Copyright (C) 2009-2012 Oracle Corporation
+
+This file is part of VirtualBox Open Source Edition (OSE), as
+available from http://www.virtualbox.org. This file is free software;
+you can redistribute it and/or modify it under the terms of the GNU
+General Public License (GPL) as published by the Free Software
+Foundation, in version 2 as it comes in the "COPYING" file of the
+VirtualBox OSE distribution. VirtualBox OSE is distributed in the
+hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+"""
+
+import sys
+
+#Note, this should match the fakedri_glxfuncsList.h order
+glx_functions = [
+"CopyContext",
+"UseXFont",
+#"GetDriverConfig",
+"GetProcAddress",
+"QueryExtension",
+"IsDirect",
+"DestroyGLXPbufferSGIX",
+"QueryGLXPbufferSGIX",
+"CreateGLXPixmap",
+"CreateGLXPixmapWithConfigSGIX",
+"QueryContext",
+"CreateContextWithConfigSGIX",
+"SwapBuffers",
+"CreateNewContext",
+"SelectEventSGIX",
+"GetCurrentDrawable",
+"ChooseFBConfig",
+"WaitGL",
+"GetFBConfigs",
+"CreatePixmap",
+"GetSelectedEventSGIX",
+"GetCurrentReadDrawable",
+"GetCurrentDisplay",
+"QueryServerString",
+"CreateWindow",
+"SelectEvent",
+"GetVisualFromFBConfigSGIX",
+"GetFBConfigFromVisualSGIX",
+"QueryDrawable",
+"CreateContext",
+"GetConfig",
+"CreateGLXPbufferSGIX",
+"CreatePbuffer",
+"ChooseFBConfigSGIX",
+"WaitX",
+"GetVisualFromFBConfig",
+#"GetScreenDriver",
+"GetFBConfigAttrib",
+"GetCurrentContext",
+"GetClientString",
+"DestroyPixmap",
+"MakeCurrent",
+"DestroyContext",
+"GetProcAddressARB",
+"GetSelectedEvent",
+"DestroyPbuffer",
+"DestroyWindow",
+"DestroyGLXPixmap",
+"QueryVersion",
+"ChooseVisual",
+"MakeContextCurrent",
+"QueryExtensionsString",
+"GetFBConfigAttribSGIX",
+"FreeMemoryMESA",
+"QueryContextInfoEXT",
+"ImportContextEXT",
+"GetContextIDEXT",
+"MakeCurrentReadSGI",
+"AllocateMemoryMESA",
+"GetMemoryOffsetMESA",
+"CreateGLXPixmapMESA",
+"GetCurrentDisplayEXT",
+"FreeContextEXT"
+];
+
+print '%include "iprt/asmdefs.mac"'
+print ""
+print "%ifdef RT_ARCH_AMD64"
+print "extern glxim"
+print "%else ; X86"
+print "extern glxim"
+print "%endif"
+print ""
+
+for index in range(len(glx_functions)):
+    func_name = glx_functions[index]
+
+    print "BEGINPROC_EXPORTED vbox_glX%s" % func_name
+    print "%ifdef RT_ARCH_AMD64"
+    print "\tmov \trax, qword glxim+%d" % (8*index)
+    print "\tjmp \t[rax]"
+    print "%else ; X86"
+    print "\tmov \teax, dword glxim+%d" % (4*index)
+    print "\tjmp \t[eax]"
+    print "%endif"
+    print "ENDPROC vbox_glX%s" % func_name
+    print ""
+




--- src/VBox/Additions/common/crOpenGL/Makefile.kmk.orig	2020-05-13 19:37:03 UTC
+++ src/VBox/Additions/common/crOpenGL/Makefile.kmk
@@ -50,9 +50,7 @@ endif
 if1of ($(KBUILD_TARGET), linux solaris freebsd)
  #VBoxOGL_DRI = 1
  DLLS += VBoxEGL
- ifn1of ($(KBUILD_TARGET),linux solaris)   # No DRI on Solaris yet
-  VBoxOGL_FAKEDRI = 1
- endif
+ #VBoxOGL_FAKEDRI = 1
 
  # Only Solaris right now needs C stubs because I can't figure out how to
  # generate the GOT based relocation ASM yet.
@@ -188,10 +186,12 @@ VBoxOGL_CLEAN.linux        += \
 	$(VBOX_PATH_CROGL_GENFILES)/linux_exports.c
 VBoxOGL_CLEAN.solaris        += \
 	$(VBOX_PATH_CROGL_GENFILES)/solaris_exports.c
+VBoxOGL_CLEAN.freebsd  += \
+	$(VBOX_PATH_CROGL_GENFILES)/freebsd_exports.c
 VBoxOGL_CLEAN.win      = \
 	$(VBOX_PATH_CROGL_GENFILES)/windows_exports.asm \
 	$(VBOX_PATH_CROGL_GENFILES)/cropengl.def
-if1of ($(KBUILD_TARGET), linux solaris)
+if1of ($(KBUILD_TARGET), linux solaris freebsd)
  ifdef VBoxOGL_DRI
   VBoxOGL_CLEAN   += \
  	$(VBOX_PATH_CROGL_GENFILES)/cr_gl.h \
@@ -204,6 +204,8 @@ if1of ($(KBUILD_TARGET), linux solaris)
  	$(VBOX_PATH_CROGL_GENFILES)/linux_glxapi_exports.asm
   VBoxOGL_CLEAN.solaris   += \
  	$(VBOX_PATH_CROGL_GENFILES)/solaris_glxapi_exports.asm
+  VBoxOGL_CLEAN.freebsd += \
+ 	$(VBOX_PATH_CROGL_GENFILES)/freebsd_glxapi_exports.asm
  endif
 endif
 VBoxOGL_LIBS = \
@@ -244,6 +246,8 @@ if1of ($(KBUILD_TARGET), linux solaris freebsd)
  else
   VBoxOGL_SONAME.linux = libGL.so.1
   VBoxOGL_LDFLAGS.linux += -Wl,-e,LibMain
+  VBoxOGL_SONAME.freebsd = libGL.so.1
+  VBoxOGL_LDFLAGS.freebsd += -Wl,-e,LibMain
  endif
 endif
 ifdef VBOX_WITH_CRHGSMI
@@ -252,7 +256,7 @@ endif
 ifdef VBOX_WITH_WDDM
 VBoxOGL_DEFS.win   += VBOX_WITH_WDDM
 endif
-if1of ($(KBUILD_TARGET), linux)
+if1of ($(KBUILD_TARGET), linux freebsd)
 VBoxOGL_LDFLAGS += -Wl,-z,nodelete
 endif
 ifdef VBOX_WITH_WDDM
@@ -418,6 +422,16 @@ $(VBOX_PATH_CROGL_GENFILES)/solaris_exports_dri.asm: \
 $(VBOX_PATH_CROGL_GENFILES)/solaris_glxapi_exports.asm: $(PATH_SUB_CURRENT)/SunOS_i386_glxapi_exports.py | $$(dir $$@)
 	$(call MSG_GENERATE,python,$@,$<)
 	$(QUIET)$(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $<
+   else ifeq ($(KBUILD_TARGET),freebsd)
+$(VBOX_PATH_CROGL_GENFILES)/freebsd_exports_dri.asm: \
+		$(PATH_SUB_CURRENT)/FreeBSD_i386_exports_dri.py \
+		$(VBOX_CROGL_API_FILES) $(PATH_SUB_CURRENT)/entrypoints.py \
+		| $$(dir $$@)
+	$(call MSG_GENERATE,python,$@,$<)
+	$(QUIET)$(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $< $(VBOX_PATH_CROGL_GLAPI)
+$(VBOX_PATH_CROGL_GENFILES)/freebsd_glxapi_exports.asm: $(PATH_SUB_CURRENT)/FreeBSD_i386_glxapi_exports.py | $$(dir $$@)
+	$(call MSG_GENERATE,python,$@,$<)
+	$(QUIET)$(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $<
 
    else
 $(VBOX_PATH_CROGL_GENFILES)/linux_exports_dri.asm: \
@@ -656,6 +670,7 @@ ifndef VBOX_USE_SYSTEM_GL_HEADERS
 endif
 VBoxEGL_LIBS           = $(VBOX_LIB_OGL) # $(VBOX_LIB_IPRT_GUEST_R3_SHARED)
 VBoxEGL_SONAME.linux   = libEGL.so.1
+VBoxEGL_SONAME.freebsd = libEGL.so.1
 
 include $(FILE_KBUILD_SUB_FOOTER)
 




--- src/VBox/Additions/x11/Installer/98vboxadd-xclient.orig	2021-01-07 15:34:29 UTC
+++ src/VBox/Additions/x11/Installer/98vboxadd-xclient
@@ -30,9 +30,9 @@ elif test -z "${SSH_CONNECTION}"; then
    # This script can also be triggered by a connection over SSH, which is not
    # what we had in mind, so we do not start VBoxClient in that case.  We do
    # not use "exit" here as this script is "source"d, not executed.
-  /usr/bin/VBoxClient --clipboard
-  /usr/bin/VBoxClient --checkhostversion
-  /usr/bin/VBoxClient --display
-  /usr/bin/VBoxClient --seamless
-  /usr/bin/VBoxClient --draganddrop
-  /usr/bin/VBoxClient --vmsvga  # In case VMSVGA emulation is enabled
+  /usr/local/bin/VBoxClient --clipboard
+  /usr/localbin/VBoxClient --checkhostversion
+  /usr/localbin/VBoxClient --seamless
+  /usr/localbin/VBoxClient --draganddrop
+  /usr/localbin/VBoxClient --vmsvga  # In case VMSVGA emulation is enabled
   /usr/bin/VBoxClient --vmsvga-x11  # In case VMSVGA emulation is enabled
 fi

Lines 1-11 Link Here

(-)emulators/virtualbox-ose/files/patch-src-VBox-Devices-PC-ipxe-Makefile.kmk (-11 lines)
1	--- src/VBox/Devices/PC/ipxe/Makefile.kmk.orig 2020-05-13 19:42:27 UTC
2	+++ src/VBox/Devices/PC/ipxe/Makefile.kmk
3	@@ -35,7 +35,7 @@ iPxeBiosBin_SOURCES = $(iPxeBiosBin_0_OUTDIR)/iPxeBio
4	iPxeBiosBin_CLEAN = \
5	$(iPxeBiosBin_0_OUTDIR)/iPxeBiosBin.c \
6
7	-if1of ($(KBUILD_TARGET), darwin os2 solaris win)
8	+if1of ($(KBUILD_TARGET), darwin freebsd os2 solaris win)
9	$$(iPxeBiosBin_0_OUTDIR)/iPxeBiosBin.c: $(PATH_SUB_CURRENT)/iPxeBiosBin.rom $(VBOX_BIN2C) \| $$(dir $$@)
10	$(call MSG_TOOL,bin2c,iPxeBiosBin,$<,$@)
11	$(QUIET)$(VBOX_BIN2C) -min 32 -max 56 -mask 0x1ff -export NetBiosBinary $< $@

Lines 1-11 Link Here

(-)emulators/virtualbox-ose/files/patch-src-VBox-Devices-Storage-DrvHostBase-freebsd.cpp (-11 lines)
1	--- src/VBox/Devices/Storage/DrvHostBase-freebsd.cpp 2020-09-17 20:17:20 UTC
2	+++ src/VBox/Devices/Storage/DrvHostBase-freebsd.cpp
3	@@ -149,6 +149,8 @@
4	else
5	rc = RTErrConvertFromErrno(errno);
6	}
7	+
8	+ return rc;
9	}
10
11




--- 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
-if1of ($(KBUILD_TARGET), linux)
+if1of ($(KBUILD_TARGET), linux freebsd)
 VBoxOGLcrutil_LDFLAGS += -Wl,-z,nodelete
 endif
 
@@ -140,7 +140,7 @@ VBoxOGLhostcrutil_TEMPLATE = VBOXCROGLR3HOSTLIB
 if defined(VBOX_SIGNING_MODE) && defined(VBOX_WITH_WDDM)
  VBoxOGLhostcrutil_INSTTYPE.win = both
 endif
-if1of ($(KBUILD_TARGET), linux)
+if1of ($(KBUILD_TARGET), linux freebsd)
 VBoxOGLhostcrutil_LDFLAGS = $(NO_SUCH_VARIABLE)
 endif
 VBoxOGLhostcrutil_LIBS.win =  \




--- src/VBox/HostDrivers/Support/freebsd/Makefile.orig	2019-01-25 18:19:55 UTC
+++ src/VBox/HostDrivers/Support/freebsd/Makefile
@@ -82,6 +82,7 @@ SRCS += \
 	assert.c \

 	once.c \
 	term.c \
 	thread.c
@@ -94,14 +95,15 @@ SRCS += \
 	RTStrCopy.c \
 	RTStrCopyEx.c \
 	RTStrCopyP.c \
+	memchr.c \
 	strformat.c \
 	strformatnum.c \
 	strformatrt.c \
 	strformattype.c \
+	stringalloc.c \




--- src/VBox/HostDrivers/Support/freebsd/files_vboxdrv.orig	2019-01-25 18:19:55 UTC
+++ src/VBox/HostDrivers/Support/freebsd/files_vboxdrv
@@ -119,6 +119,7 @@ FILES_VBOXDRV_NOBIN=" \
     ${PATH_ROOT}/src/VBox/Runtime/common/misc/handletable.cpp=>common/misc/handletable.c \
     ${PATH_ROOT}/src/VBox/Runtime/common/misc/handletable.h=>common/misc/handletable.h \
     ${PATH_ROOT}/src/VBox/Runtime/common/misc/handletablectx.cpp=>common/misc/handletablectx.c \

     ${PATH_ROOT}/src/VBox/Runtime/common/misc/once.cpp=>common/misc/once.c \
     ${PATH_ROOT}/src/VBox/Runtime/common/misc/term.cpp=>common/misc/term.c \
     ${PATH_ROOT}/src/VBox/Runtime/common/misc/thread.cpp=>common/misc/thread.c \
@@ -128,14 +129,15 @@ FILES_VBOXDRV_NOBIN=" \
     ${PATH_ROOT}/src/VBox/Runtime/common/string/RTStrCopyEx.cpp=>common/string/RTStrCopyEx.c \
     ${PATH_ROOT}/src/VBox/Runtime/common/string/RTStrNCmp.cpp=>common/string/RTStrNCmp.c \
     ${PATH_ROOT}/src/VBox/Runtime/common/string/RTStrNLen.cpp=>common/string/RTStrNLen.c \
+    ${PATH_ROOT}/src/VBox/Runtime/common/string/memchr.cpp=>common/string/memchr.c \
     ${PATH_ROOT}/src/VBox/Runtime/common/string/strformat.cpp=>common/string/strformat.c \
     ${PATH_ROOT}/src/VBox/Runtime/common/string/strformatnum.cpp=>common/string/strformatnum.c \
     ${PATH_ROOT}/src/VBox/Runtime/common/string/strformatrt.cpp=>common/string/strformatrt.c \
     ${PATH_ROOT}/src/VBox/Runtime/common/string/strformattype.cpp=>common/string/strformattype.c \
+    ${PATH_ROOT}/src/VBox/Runtime/common/string/stringalloc.cpp=>common/string/stringalloc.c \




--- src/VBox/HostDrivers/VBoxNetAdp/Makefile.kmk.orig	2019-05-13 13:33:07 UTC

Submitted by:	Gleb Kurtsou <gleb@freebsd.org>
--- src/VBox/HostDrivers/VBoxNetAdp/Makefile.kmk.orig	2020-05-13 19:43:54 UTC
+++ src/VBox/HostDrivers/VBoxNetAdp/Makefile.kmk
@@ -206,10 +206,14 @@ $$(VBoxNetAdp-src_0_OUTDIR)/Makefile: \
 		$$(if $$(eq $$(VBoxNetAdp/freebsd/Makefile_VBOX_HARDENED),$$(VBOX_WITH_HARDENING)),,FORCE) \
 		| $$(dir $$@)
 	$(QUIET)$(RM) -f -- $@
- ifndef VBOX_WITH_HARDENING
-	$(QUIET)$(SED) -e "s;VBOX_WITH_HARDENING;;g" --output $@ $<
- else
 	$(QUIET)$(CP) -f $< $@
+ ifndef VBOX_WITH_HARDENING
+	$(QUIET)$(SED) -e "s;-DVBOX_WITH_HARDENING;;g" --output $@.tmp $@
+	$(QUIET)$(MV) -f $@.tmp $@
+ endif
-
+ ifndef VBOX_WITH_NETFLT_VIMAGE
+	$(QUIET)$(SED) -e "s;-DVIMAGE;;g" --output $@.tmp $@
+	$(QUIET)$(MV) -f $@.tmp $@
  endif
 
 endif # freebsd
 
 include $(FILE_KBUILD_SUB_FOOTER)




--- src/VBox/HostDrivers/VBoxNetAdp/freebsd/VBoxNetAdp-freebsd.c.orig	2020-05-13 19:43:54 UTC
+++ src/VBox/HostDrivers/VBoxNetAdp/freebsd/VBoxNetAdp-freebsd.c
@@ -235,7 +235,11 @@ static void VBoxNetAdpFreeBSDNetstart(struct ifnet *if
     ifp->if_drv_flags |= IFF_DRV_OACTIVE;
     while (!IFQ_DRV_IS_EMPTY(&ifp->if_snd))
     {
+#if __FreeBSD_version >= 1100036
+        if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
+#else
         ifp->if_opackets++;
+#endif
         IFQ_DRV_DEQUEUE(&ifp->if_snd, m);
         BPF_MTAP(ifp, m);
         m_freem(m);




--- src/VBox/HostDrivers/VBoxNetFlt/freebsd/VBoxNetFlt-freebsd.c.orig	2019-04-16 10:16:39 UTC
+++ src/VBox/HostDrivers/VBoxNetFlt/freebsd/VBoxNetFlt-freebsd.c
@@ -52,6 +52,7 @@
 #include <net/if_dl.h>

 
 static int vboxnetflt_modevent(struct module *, int, void *);
 static ng_constructor_t    ng_vboxnetflt_constructor;
@@ -436,6 +438,8 @@ static void vboxNetFltFreeBSDinput(void *arg, int pend
         mtx_lock_spin(&pThis->u.s.inq.ifq_mtx);
         _IF_ENQUEUE(&pThis->u.s.inq, m);
         mtx_unlock_spin(&pThis->u.s.inq.ifq_mtx);
+#if __FreeBSD_version >= 1100100
+        taskqueue_enqueue(taskqueue_fast, &pThis->u.s.tskin);
+#else
         taskqueue_enqueue_fast(taskqueue_fast, &pThis->u.s.tskin);
+#endif
     }
     /*
      * Handle mbufs on the outgoing hook, frames going to the interface
@@ -388,7 +394,11 @@ static int ng_vboxnetflt_rcvdata(hook_p hook, item_p i
         mtx_lock_spin(&pThis->u.s.outq.ifq_mtx);
         _IF_ENQUEUE(&pThis->u.s.outq, m);
         mtx_unlock_spin(&pThis->u.s.outq.ifq_mtx);
+#if __FreeBSD_version >= 1100100
+        taskqueue_enqueue(taskqueue_fast, &pThis->u.s.tskout);
+#else
         taskqueue_enqueue_fast(taskqueue_fast, &pThis->u.s.tskout);
+#endif
     }
     else
     {
@@ -428,6 +438,8 @@ static void vboxNetFltFreeBSDinput(void *arg, int pend
     struct ifnet *ifp = pThis->u.s.ifp;
     unsigned int cSegs = 0;
     bool fDropIt = false, fActive;

     PINTNETSG pSG;
 
     VBOXCURVNET_SET(ifp->if_vnet);
@@ -448,6 +452,19 @@ static void vboxNetFltFreeBSDinput(void *arg, int pend
         if (m == NULL)
             break;
 

         for (m0 = m; m0 != NULL; m0 = m0->m_next)
             if (m0->m_len > 0)
                 cSegs++;
@@ -462,6 +479,27 @@ static void vboxNetFltFreeBSDinput(void *arg, int pend
         vboxNetFltFreeBSDMBufToSG(pThis, m, pSG, cSegs, 0);
         fDropIt = pThis->pSwitchPort->pfnRecv(pThis->pSwitchPort, NULL /* pvIf */, pSG, INTNETTRUNKDIR_WIRE);
         RTMemTmpFree(pSG);

         if (fDropIt)
             m_freem(m);
         else
@@ -521,6 +559,7 @@ static void vboxNetFltFreeBSDoutput(void *arg, int pen
  */
 int vboxNetFltPortOsXmit(PVBOXNETFLTINS pThis, void *pvIfData, PINTNETSG pSG, uint32_t fDst)
 {

     NOREF(pvIfData);
 
     void (*input_f)(struct ifnet *, struct mbuf *);
@@ -537,10 +576,16 @@ int vboxNetFltPortOsXmit(PVBOXNETFLTINS pThis, void *p
     {
         m = vboxNetFltFreeBSDSGMBufFromSG(pThis, pSG);
         if (m == NULL)

 
         m->m_flags |= M_PKTHDR;
         ether_output_frame(ifp, m);
@@ -550,10 +595,16 @@ int vboxNetFltPortOsXmit(PVBOXNETFLTINS pThis, void *p
     {
         m = vboxNetFltFreeBSDSGMBufFromSG(pThis, pSG);
         if (m == NULL)

         /*
          * Delivering packets to the host will be captured by the
          * input hook. Tag the packet with a mbuf tag so that we
@@ -564,6 +615,7 @@ int vboxNetFltPortOsXmit(PVBOXNETFLTINS pThis, void *p
         if (mtag == NULL)
         {
             m_freem(m);

             return VERR_NO_MEMORY;
         }
 
@@ -574,6 +626,7 @@ int vboxNetFltPortOsXmit(PVBOXNETFLTINS pThis, void *p
         ifp->if_input(ifp, m);
     }
     VBOXCURVNET_RESTORE();

     return VINF_SUCCESS;
 }
 
@@ -586,6 +639,7 @@ static bool vboxNetFltFreeBsdIsPromiscuous(PVBOXNETFLT
 
 int vboxNetFltOsInitInstance(PVBOXNETFLTINS pThis, void *pvContext)
 {

     char nam[NG_NODESIZ];
     struct ifnet *ifp;
     node_p node;
@@ -594,7 +648,10 @@ int vboxNetFltOsInitInstance(PVBOXNETFLTINS pThis, voi
     NOREF(pvContext);
     ifp = ifunit(pThis->szName);
     if (ifp == NULL)

 
     /* Create a new netgraph node for this instance */
     if (ng_make_node_common(&ng_vboxnetflt_typestruct, &node) != 0)
@@ -638,12 +695,14 @@ int vboxNetFltOsInitInstance(PVBOXNETFLTINS pThis, voi
         vboxNetFltRelease(pThis, true /*fBusy*/);
     }
     VBOXCURVNET_RESTORE();

     struct ifnet *ifp, *ifp0;
 
     ifp = ASMAtomicUoReadPtrT(&pThis->u.s.ifp, struct ifnet *);
@@ -660,6 +719,7 @@ bool vboxNetFltOsMaybeRediscovered(PVBOXNETFLTINS pThi
         pThis->u.s.node = NULL;
     }
     VBOXCURVNET_RESTORE();

 
     if (ifp0 != NULL)
     {
@@ -672,6 +732,7 @@ bool vboxNetFltOsMaybeRediscovered(PVBOXNETFLTINS pThi
 
 void vboxNetFltOsDeleteInstance(PVBOXNETFLTINS pThis)
 {

 
     taskqueue_drain(taskqueue_fast, &pThis->u.s.tskin);
     taskqueue_drain(taskqueue_fast, &pThis->u.s.tskout);
@@ -684,6 +745,7 @@ void vboxNetFltOsDeleteInstance(PVBOXNETFLTINS pThis)
         ng_rmnode_self(pThis->u.s.node);
     VBOXCURVNET_RESTORE();
     pThis->u.s.node = NULL;

 }
 
 int vboxNetFltOsPreInitInstance(PVBOXNETFLTINS pThis)
@@ -697,6 +759,7 @@ int vboxNetFltOsPreInitInstance(PVBOXNETFLTINS pThis)
 
 void vboxNetFltPortOsSetActive(PVBOXNETFLTINS pThis, bool fActive)
 {

     struct ifnet *ifp;
     struct ifreq ifreq;
     int error;
@@ -730,7 +793,10 @@ void vboxNetFltPortOsSetActive(PVBOXNETFLTINS pThis, b
         NG_MKMESSAGE(msg, NGM_GENERIC_COOKIE, NGM_CONNECT,
             sizeof(struct ngm_connect), M_NOWAIT);
         if (msg == NULL)

         con = (struct ngm_connect *)msg->data;
         snprintf(con->path, NG_PATHSIZ, "vboxnetflt_%s:", ifp->if_xname);
         strlcpy(con->ourhook, "lower", NG_HOOKSIZ);
@@ -744,7 +810,10 @@ void vboxNetFltPortOsSetActive(PVBOXNETFLTINS pThis, b
         NG_MKMESSAGE(msg, NGM_GENERIC_COOKIE, NGM_CONNECT,
             sizeof(struct ngm_connect), M_NOWAIT);
         if (msg == NULL)

         con = (struct ngm_connect *)msg->data;
         snprintf(con->path, NG_PATHSIZ, "vboxnetflt_%s:",
             ifp->if_xname);
@@ -767,7 +836,10 @@ void vboxNetFltPortOsSetActive(PVBOXNETFLTINS pThis, b
         NG_MKMESSAGE(msg, NGM_GENERIC_COOKIE, NGM_RMHOOK,
             sizeof(struct ngm_rmhook), M_NOWAIT);
         if (msg == NULL)

         rm = (struct ngm_rmhook *)msg->data;
         strlcpy(rm->ourhook, "input", NG_HOOKSIZ);
         NG_SEND_MSG_PATH(error, node, msg, path, 0);
@@ -778,12 +850,16 @@ void vboxNetFltPortOsSetActive(PVBOXNETFLTINS pThis, b
         NG_MKMESSAGE(msg, NGM_GENERIC_COOKIE, NGM_RMHOOK,
             sizeof(struct ngm_rmhook), M_NOWAIT);
         if (msg == NULL)

Lines 1-6 Link Here

(-)emulators/virtualbox-ose/files/patch-src-VBox-HostDrivers-VBoxNetFlt-freebsd-files_vboxnetflt (-2 / +2 lines)
1	--- src/VBox/HostDrivers/VBoxNetFlt/freebsd/files_vboxnetflt.orig 2018-10-15 14:30:58 UTC	1	--- src/VBox/HostDrivers/VBoxNetFlt/freebsd/files_vboxnetflt.orig 2021-01-07 15:41:28 UTC
2	+++ src/VBox/HostDrivers/VBoxNetFlt/freebsd/files_vboxnetflt	2	+++ src/VBox/HostDrivers/VBoxNetFlt/freebsd/files_vboxnetflt
3	@@ -61,6 +61,7 @@ VBOX_VBOXNETFLT_SOURCES=" \	3	@@ -62,6 +62,7 @@ VBOX_VBOXNETFLT_SOURCES=" \
4	${PATH_ROOT}/include/iprt/uni.h=>include/iprt/uni.h \	4	${PATH_ROOT}/include/iprt/uni.h=>include/iprt/uni.h \
5	${PATH_ROOT}/include/iprt/utf16.h=>include/iprt/utf16.h \	5	${PATH_ROOT}/include/iprt/utf16.h=>include/iprt/utf16.h \
6	${PATH_ROOT}/include/iprt/uuid.h=>include/iprt/uuid.h \	6	${PATH_ROOT}/include/iprt/uuid.h=>include/iprt/uuid.h \

Lines 1-6 Link Here

(-)emulators/virtualbox-ose/files/patch-src-VBox-Installer-freebsd-VBox.sh (-1 / +4 lines)
1	--- src/VBox/Installer/freebsd/VBox.sh.orig 2016-08-27 05:10:34 UTC	1	--- src/VBox/Installer/freebsd/VBox.sh.orig 2016-08-27 05:10:34 UTC
2	+++ src/VBox/Installer/freebsd/VBox.sh	2	+++ src/VBox/Installer/freebsd/VBox.sh
3	@@ -0,0 +1,64 @@	3	@@ -0,0 +1,67 @@
4	+#!/bin/sh	4	+#!/bin/sh
5	+#	5	+#
6	+# Oracle VM VirtualBox startup script, FreeBSD hosts.	6	+# Oracle VM VirtualBox startup script, FreeBSD hosts.
Lines 38-43 Link Here
38	+ VirtualBox\|virtualbox)	38	+ VirtualBox\|virtualbox)
39	+ exec "$INSTALL_DIR/VirtualBox" "$@"	39	+ exec "$INSTALL_DIR/VirtualBox" "$@"
40	+ ;;	40	+ ;;
		41	+ VirtualBoxVM\|virtualboxvm)
		42	+ exec "$INSTALL_DIR/VirtualBoxVM" "$@"
		43	+ ;;
41	+ VBoxManage\|vboxmanage)	44	+ VBoxManage\|vboxmanage)
42	+ exec "$INSTALL_DIR/VBoxManage" "$@"	45	+ exec "$INSTALL_DIR/VBoxManage" "$@"
43	+ ;;	46	+ ;;

Lines 1-6 Link Here

(-)emulators/virtualbox-ose/files/patch-src-VBox-Main-src-server-VirtualBoxImpl.cpp (-2 / +2 lines)
1	--- src/VBox/Main/src-server/VirtualBoxImpl.cpp.orig 2020-05-13 19:44:10 UTC	1	--- src/VBox/Main/src-server/VirtualBoxImpl.cpp.orig 2021-01-07 15:41:43 UTC
2	+++ src/VBox/Main/src-server/VirtualBoxImpl.cpp	2	+++ src/VBox/Main/src-server/VirtualBoxImpl.cpp
3	@@ -2251,7 +2251,7 @@ int VirtualBox::i_encryptSettingBytes(const uint8_t *a	3	@@ -2663,7 +2663,7 @@ int VirtualBox::i_encryptSettingBytes(const uint8_t *a
4	if (aCiphertextSize < 32)	4	if (aCiphertextSize < 32)
5	return VERR_INVALID_PARAMETER;	5	return VERR_INVALID_PARAMETER;
6		6




--- src/VBox/Main/src-server/freebsd/HostHardwareFreeBSD.cpp.orig	2020-05-13 19:44:10 UTC
+++ src/VBox/Main/src-server/freebsd/HostHardwareFreeBSD.cpp
@@ -253,8 +253,9 @@ static int getDVDInfoFromCAM(DriveInfoList *pList, boo
                         PeriphMatchPattern.pattern.periph_pattern.path_id    = paMatches[i].result.device_result.path_id;
                         PeriphMatchPattern.pattern.periph_pattern.target_id  = paMatches[i].result.device_result.target_id;
                         PeriphMatchPattern.pattern.periph_pattern.target_lun = paMatches[i].result.device_result.target_lun;
-                        PeriphMatchPattern.pattern.periph_pattern.flags      = PERIPH_MATCH_PATH | PERIPH_MATCH_TARGET |
-                                                                               PERIPH_MATCH_LUN;
+                        PeriphMatchPattern.pattern.periph_pattern.flags      = static_cast<periph_pattern_flags>
+                                                                               (PERIPH_MATCH_PATH | PERIPH_MATCH_TARGET |
+                                                                               PERIPH_MATCH_LUN);
                         PeriphCCB.cdm.num_patterns    = 1;
                         PeriphCCB.cdm.pattern_buf_len = sizeof(struct dev_match_result);
                         PeriphCCB.cdm.patterns        = &PeriphMatchPattern;




--- src/VBox/Runtime/Makefile.kmk.orig	2021-01-07 15:41:50 UTC
+++ src/VBox/Runtime/Makefile.kmk
@@ -177,6 +177,11 @@ $(IPRT_OUT_DIR)/oiddb.h.ts +| $(IPRT_OUT_DIR)/oiddb.h:
 
 
 #

 # Unicode Specification reader used to regenerate unidata-*.cpp.
 #
 uniread_TEMPLATE = VBoxBldProg
@@ -1632,7 +1637,7 @@ VBoxRT_SOURCES.solaris        += \
 VBoxRT_SOURCES.darwin         += \
 	r3/posix/fileaio-posix.cpp
 VBoxRT_SOURCES.freebsd        += \
-	r3/freebsd/fileaio-freebsd.cpp
+	r3/posix/fileaio-posix.cpp
 VBoxRT_INCS                   := $(RuntimeR3_INCS)
 VBoxRT_INCS.$(KBUILD_TARGET)  := $(RuntimeR3_INCS.$(KBUILD_TARGET))
 VBoxRT_INCS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH) := $(RuntimeR3_INCS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH))

Lines 7-15 Link Here

(-)emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r0drv-freebsd-sleepqueue-r0drv-freebsd.h (-2 / +2 lines)
7	what tvtohz does.	7	what tvtohz does.
8		8
9	Submitted by: Andriy Gapon <avg@FreeBSD.org>	9	Submitted by: Andriy Gapon <avg@FreeBSD.org>
10	--- src/VBox/Runtime/r0drv/freebsd/sleepqueue-r0drv-freebsd.h.orig 2020-05-13 19:44:32 UTC	10	--- src/VBox/Runtime/r0drv/freebsd/sleepqueue-r0drv-freebsd.h.orig 2021-01-07 15:42:09 UTC
11	+++ src/VBox/Runtime/r0drv/freebsd/sleepqueue-r0drv-freebsd.h	11	+++ src/VBox/Runtime/r0drv/freebsd/sleepqueue-r0drv-freebsd.h
12	@@ -82,6 +82,8 @@ DECLINLINE(uint32_t) rtR0SemBsdWaitUpdateTimeout(PRTR0	12	@@ -84,6 +84,8 @@ DECLINLINE(uint32_t) rtR0SemBsdWaitUpdateTimeout(PRTR0
13	uint64_t cTicks = ASMMultU64ByU32DivByU32(uTimeout, hz, UINT32_C(1000000000));	13	uint64_t cTicks = ASMMultU64ByU32DivByU32(uTimeout, hz, UINT32_C(1000000000));
14	if (cTicks >= INT_MAX)	14	if (cTicks >= INT_MAX)
15	return RTSEMWAIT_FLAGS_INDEFINITE;	15	return RTSEMWAIT_FLAGS_INDEFINITE;

Lines 1-10 Link Here

(-)emulators/virtualbox-ose/files/patch-src-recompiler-Makefile.kmk (-10 lines)
1	--- src/recompiler/Makefile.kmk.orig 2020-05-13 19:46:49 UTC
2	+++ src/recompiler/Makefile.kmk
3	@@ -41,6 +41,7 @@ endif
4	#
5	ifneq ($(KBUILD_TARGET),win)
6	VBoxRemPrimary_TEMPLATE = VBOXR3NP
7	+ VBoxRemPrimary_TOOL.freebsd = VBoxGccFreeBSD
8	# workaround the regparm bug in gcc <= 3.3
9	VBoxRemPrimary_DEFS = $(if $(VBOX_GCC_BUGGY_REGPARM),GCC_WITH_BUGGY_REGPARM,)
10	else

Lines 1-22 Link Here

(-)emulators/virtualbox-ose/files/patch-src-recompiler-Sun-testmath.c (-22 lines)
1	--- src/recompiler/Sun/testmath.c.orig 2020-05-13 19:46:49 UTC
2	+++ src/recompiler/Sun/testmath.c
3	@@ -273,8 +273,6 @@ extern int testmath(void)
4	#endif
5	set_cw(0x27f);
6
7	- CHECK(logl(2.7182818284590452353602874713526625L), 1.0);
8	-
9	CHECK(remainderl(1.0L, 1.0L), 0.0);
10	CHECK(remainderl(1.0L, 1.5L), -0.5);
11	CHECK(remainderl(42.0L, 34.25L), 7.75);
12	@@ -341,10 +339,6 @@ extern int testmath(void)
13
14	CHECK(tanl(0.0L), 0.0);
15	CHECK(tanl(0.7853981633974483096156608458198757L), 1.0);
16	-
17	- CHECK(powl(0.0, 0.0), 1.0);
18	- CHECK(powl(2.0, 2.0), 4.0);
19	- CHECK(powl(3.0, 3.0), 27.0);
20
21	return cErrors;
22	}




--- src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp.orig	2021-01-07 15:34:20 UTC
+++ src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp
@@ -67,8 +67,8 @@
 # include <net/if.h>
 # include <pwd.h> /* getpwuid */
 # include <unistd.h>

 # endif
 # ifdef RT_OS_OS2
 #  include <net/if_dl.h>
@@ -528,7 +528,7 @@ static void vgsvcVMInfoWriteFixedProperties(void)
 }
 
 

 /*
  * Simple wrapper to work around compiler-specific va_list madness.
  */
@@ -555,12 +555,6 @@ static int vgsvcVMInfoWriteUsers(void)
 #ifdef RT_OS_WINDOWS
     rc = VGSvcVMInfoWinWriteUsers(&g_VMInfoPropCache, &pszUserList, &cUsersInList);
 
-#elif defined(RT_OS_FREEBSD)
-    /** @todo FreeBSD: Port logged on user info retrieval.

 #elif defined(RT_OS_HAIKU)
     /** @todo Haiku: Port logged on user info retrieval. */
     rc = VERR_NOT_IMPLEMENTED;
@@ -586,7 +580,7 @@ static int vgsvcVMInfoWriteUsers(void)
     while (   (ut_user = getutxent())
            && RT_SUCCESS(rc))
     {

         VGSvcVerbose(4, "Found entry '%s' (type: %d, PID: %RU32)\n", ut_user->ut_user, ut_user->ut_type, ut_user->ut_pid);
 # else
         VGSvcVerbose(4, "Found entry '%s' (type: %d, PID: %RU32, session: %RU32)\n",
@@ -621,7 +615,7 @@ static int vgsvcVMInfoWriteUsers(void)
     }
 
 # ifdef VBOX_WITH_DBUS

     DBusError dbErr;
     DBusConnection *pConnection = NULL;
     int rc2 = RTDBusLoadLib();
@@ -830,7 +824,7 @@ static int vgsvcVMInfoWriteUsers(void)
     if (   fHaveLibDbus
         && dbus_error_is_set(&dbErr))
         dbus_error_free(&dbErr);

 # endif /* VBOX_WITH_DBUS */
 
     /** @todo Fedora/others: Handle systemd-loginctl. */
@@ -867,7 +861,7 @@ static int vgsvcVMInfoWriteUsers(void)
     RTMemFree(papszUsers);
 
     endutxent(); /* Close utmpx file. */




--- src/VBox/Additions/common/crOpenGL/dri_glx.h.orig	2020-07-09 16:50:09 UTC
+++ src/VBox/Additions/common/crOpenGL/dri_glx.h
@@ -111,23 +111,23 @@ extern DECLEXPORT(const char *) VBOXGLXTAG(glXQueryExt
 extern DECLEXPORT(GLXPbufferSGIX) VBOXGLXTAG(glXCreateGLXPbufferSGIX)
 (Display *dpy, GLXFBConfigSGIX config, unsigned int width, unsigned int height, int *attrib_list);
 
-extern DECLEXPORT(int) VBOXGLXTAG(glXQueryGLXPbufferSGIX)
-(Display *dpy, GLXPbuffer pbuf, int attribute, unsigned int *value);
+extern DECLEXPORT(void) VBOXGLXTAG(glXQueryGLXPbufferSGIX)
+(Display *dpy, GLXPbufferSGIX pbuf, int attribute, unsigned int *value);
 
 extern DECLEXPORT(GLXFBConfigSGIX *) VBOXGLXTAG(glXChooseFBConfigSGIX)
 (Display *dpy, int screen, int *attrib_list, int *nelements);
 
-extern DECLEXPORT(void) VBOXGLXTAG(glXDestroyGLXPbufferSGIX)(Display *dpy, GLXPbuffer pbuf);
+extern DECLEXPORT(void) VBOXGLXTAG(glXDestroyGLXPbufferSGIX)(Display *dpy, GLXPbufferSGIX pbuf);
 extern DECLEXPORT(void) VBOXGLXTAG(glXSelectEventSGIX)(Display *dpy, GLXDrawable drawable, unsigned long mask);
 extern DECLEXPORT(void) VBOXGLXTAG(glXGetSelectedEventSGIX)(Display *dpy, GLXDrawable drawable, unsigned long *mask);
 
 extern DECLEXPORT(GLXFBConfigSGIX) VBOXGLXTAG(glXGetFBConfigFromVisualSGIX)(Display *dpy, XVisualInfo *vis);
-extern DECLEXPORT(XVisualInfo *) VBOXGLXTAG(glXGetVisualFromFBConfigSGIX)(Display *dpy, GLXFBConfig config);
+extern DECLEXPORT(XVisualInfo *) VBOXGLXTAG(glXGetVisualFromFBConfigSGIX)(Display *dpy, GLXFBConfigSGIX config);
 extern DECLEXPORT(GLXContext) VBOXGLXTAG(glXCreateContextWithConfigSGIX)
-(Display *dpy, GLXFBConfig config, int render_type, GLXContext share_list, Bool direct);
+(Display *dpy, GLXFBConfigSGIX config, int render_type, GLXContext share_list, Bool direct);
 
-extern DECLEXPORT(GLXPixmap) VBOXGLXTAG(glXCreateGLXPixmapWithConfigSGIX)(Display *dpy, GLXFBConfig config, Pixmap pixmap);
-extern DECLEXPORT(int) VBOXGLXTAG(glXGetFBConfigAttribSGIX)(Display *dpy, GLXFBConfig config, int attribute, int *value);
+extern DECLEXPORT(GLXPixmap) VBOXGLXTAG(glXCreateGLXPixmapWithConfigSGIX)(Display *dpy, GLXFBConfigSGIX config, Pixmap pixmap);
+extern DECLEXPORT(int) VBOXGLXTAG(glXGetFBConfigAttribSGIX)(Display *dpy, GLXFBConfigSGIX config, int attribute, int *value);
 
 /*
  * GLX 1.3 functions




--- src/VBox/Additions/common/crOpenGL/fakedri_drv.h.orig	2020-07-09 16:50:09 UTC
+++ src/VBox/Additions/common/crOpenGL/fakedri_drv.h
@@ -80,16 +80,16 @@ extern Bool VBOXGLXENTRYTAG(glXQueryVersion)(Display *
 extern XVisualInfo * VBOXGLXENTRYTAG(glXChooseVisual)(Display *dpy, int screen, int *attribList) ;
 extern const char * VBOXGLXENTRYTAG(glXQueryExtensionsString)(Display *dpy, int screen) ;
 extern GLXPbufferSGIX VBOXGLXENTRYTAG(glXCreateGLXPbufferSGIX)(Display *dpy, GLXFBConfigSGIX config, unsigned int width, unsigned int height, int *attrib_list);
-extern int VBOXGLXENTRYTAG(glXQueryGLXPbufferSGIX)(Display *dpy, GLXPbuffer pbuf, int attribute, unsigned int *value);
+extern void VBOXGLXENTRYTAG(glXQueryGLXPbufferSGIX)(Display *dpy, GLXPbufferSGIX pbuf, int attribute, unsigned int *value);
 extern GLXFBConfigSGIX * VBOXGLXENTRYTAG(glXChooseFBConfigSGIX)(Display *dpy, int screen, int *attrib_list, int *nelements);
-extern void VBOXGLXENTRYTAG(glXDestroyGLXPbufferSGIX)(Display *dpy, GLXPbuffer pbuf) ;
+extern void VBOXGLXENTRYTAG(glXDestroyGLXPbufferSGIX)(Display *dpy, GLXPbufferSGIX pbuf) ;
 extern void VBOXGLXENTRYTAG(glXSelectEventSGIX)(Display *dpy, GLXDrawable drawable, unsigned long mask) ;
 extern void VBOXGLXENTRYTAG(glXGetSelectedEventSGIX)(Display *dpy, GLXDrawable drawable, unsigned long *mask) ;
 extern GLXFBConfigSGIX VBOXGLXENTRYTAG(glXGetFBConfigFromVisualSGIX)(Display *dpy, XVisualInfo *vis) ;
-extern XVisualInfo * VBOXGLXENTRYTAG(glXGetVisualFromFBConfigSGIX)(Display *dpy, GLXFBConfig config) ;
-extern GLXContext VBOXGLXENTRYTAG(glXCreateContextWithConfigSGIX)(Display *dpy, GLXFBConfig config, int render_type, GLXContext share_list, Bool direct);
-extern GLXPixmap VBOXGLXENTRYTAG(glXCreateGLXPixmapWithConfigSGIX)(Display *dpy, GLXFBConfig config, Pixmap pixmap) ;
-extern int VBOXGLXENTRYTAG(glXGetFBConfigAttribSGIX)(Display *dpy, GLXFBConfig config, int attribute, int *value) ;
+extern XVisualInfo * VBOXGLXENTRYTAG(glXGetVisualFromFBConfigSGIX)(Display *dpy, GLXFBConfigSGIX config) ;
+extern GLXContext VBOXGLXENTRYTAG(glXCreateContextWithConfigSGIX)(Display *dpy, GLXFBConfigSGIX config, int render_type, GLXContext share_list, Bool direct);
+extern GLXPixmap VBOXGLXENTRYTAG(glXCreateGLXPixmapWithConfigSGIX)(Display *dpy, GLXFBConfigSGIX config, Pixmap pixmap) ;
+extern int VBOXGLXENTRYTAG(glXGetFBConfigAttribSGIX)(Display *dpy, GLXFBConfigSGIX config, int attribute, int *value) ;
 extern GLXFBConfig * VBOXGLXENTRYTAG(glXChooseFBConfig)(Display *dpy, int screen, ATTRIB_TYPE *attrib_list, int *nelements) ;
 extern GLXPbuffer VBOXGLXENTRYTAG(glXCreatePbuffer)(Display *dpy, GLXFBConfig config, ATTRIB_TYPE *attrib_list) ;
 extern GLXPixmap VBOXGLXENTRYTAG(glXCreatePixmap)(Display *dpy, GLXFBConfig config, Pixmap pixmap, const ATTRIB_TYPE *attrib_list) ;




--- src/VBox/Additions/common/crOpenGL/glx.c.orig	2020-07-09 16:50:09 UTC
+++ src/VBox/Additions/common/crOpenGL/glx.c
@@ -742,7 +742,7 @@ VBOXGLXTAG(glXCreateGLXPbufferSGIX)(Display *dpy, GLXF
     return 0;
 }
 
-DECLEXPORT(void) VBOXGLXTAG(glXDestroyGLXPbufferSGIX)(Display *dpy, GLXPbuffer pbuf)
+DECLEXPORT(void) VBOXGLXTAG(glXDestroyGLXPbufferSGIX)(Display *dpy, GLXPbufferSGIX pbuf)
 {
     (void) dpy;
     (void) pbuf;
@@ -763,7 +763,7 @@ DECLEXPORT(void) VBOXGLXTAG(glXGetSelectedEventSGIX)(D
     (void) mask;
 }
 
-DECLEXPORT(int) VBOXGLXTAG(glXQueryGLXPbufferSGIX)(Display *dpy, GLXPbuffer pbuf,
+DECLEXPORT(void) VBOXGLXTAG(glXQueryGLXPbufferSGIX)(Display *dpy, GLXPbufferSGIX pbuf,
                                                    int attribute, unsigned int *value)
 {
     (void) dpy;
@@ -771,10 +771,9 @@ DECLEXPORT(int) VBOXGLXTAG(glXQueryGLXPbufferSGIX)(Dis
     (void) attribute;
     (void) value;
     crWarning("glXQueryGLXPbufferSGIX not implemented by Chromium");
-    return 0;
 }
 
-DECLEXPORT(int) VBOXGLXTAG(glXGetFBConfigAttribSGIX)(Display *dpy, GLXFBConfig config,
+DECLEXPORT(int) VBOXGLXTAG(glXGetFBConfigAttribSGIX)(Display *dpy, GLXFBConfigSGIX config,
                                                      int attribute, int *value)
 {
     return VBOXGLXTAG(glXGetFBConfigAttrib)(dpy, config, attribute, value);
@@ -789,14 +788,14 @@ VBOXGLXTAG(glXChooseFBConfigSGIX)(Display *dpy, int sc
 
 DECLEXPORT(GLXPixmap)
 VBOXGLXTAG(glXCreateGLXPixmapWithConfigSGIX)(Display *dpy,
-                                             GLXFBConfig config,
+                                             GLXFBConfigSGIX config,
                                              Pixmap pixmap)
 {
     return VBOXGLXTAG(glXCreatePixmap)(dpy, config, pixmap, NULL);
 }
 
 DECLEXPORT(GLXContext)
-VBOXGLXTAG(glXCreateContextWithConfigSGIX)(Display *dpy, GLXFBConfig config,
+VBOXGLXTAG(glXCreateContextWithConfigSGIX)(Display *dpy, GLXFBConfigSGIX config,
                                            int render_type,
                                            GLXContext share_list,
                                            Bool direct)
@@ -812,7 +811,7 @@ VBOXGLXTAG(glXCreateContextWithConfigSGIX)(Display *dp
 
 DECLEXPORT(XVisualInfo *)
 VBOXGLXTAG(glXGetVisualFromFBConfigSGIX)(Display *dpy,
-                                         GLXFBConfig config)
+                                         GLXFBConfigSGIX config)
 {
     return visualInfoFromFBConfig(dpy, config);
 }




--- src/VBox/Additions/common/crOpenGL/glx_c_exports.c.orig	2020-10-25 11:52:00 UTC
+++ src/VBox/Additions/common/crOpenGL/glx_c_exports.c
@@ -213,8 +213,8 @@ DECLEXPORT(GLXPbufferSGIX) VBOXGLXENTRYTAG(glXCreateGL
     return glxim.CreateGLXPbufferSGIX(dpy, config, width, height, attrib_list);
 }
 
-DECLEXPORT(int) VBOXGLXENTRYTAG(glXQueryGLXPbufferSGIX)
-(Display *dpy, GLXPbuffer pbuf, int attribute, unsigned int *value)
+DECLEXPORT(void) VBOXGLXENTRYTAG(glXQueryGLXPbufferSGIX)
+(Display *dpy, GLXPbufferSGIX pbuf, int attribute, unsigned int *value)
 {
     return glxim.QueryGLXPbufferSGIX(dpy, pbuf, attribute, value);
 }
@@ -225,7 +225,7 @@ DECLEXPORT(GLXFBConfigSGIX *) VBOXGLXENTRYTAG(glXChoos
     return glxim.ChooseFBConfigSGIX(dpy, screen, attrib_list, nelements);
 }
 
-DECLEXPORT(void) VBOXGLXENTRYTAG(glXDestroyGLXPbufferSGIX)(Display *dpy, GLXPbuffer pbuf)
+DECLEXPORT(void) VBOXGLXENTRYTAG(glXDestroyGLXPbufferSGIX)(Display *dpy, GLXPbufferSGIX pbuf)
 {
     return glxim.DestroyGLXPbufferSGIX(dpy, pbuf);
 }
@@ -245,23 +245,23 @@ DECLEXPORT(GLXFBConfigSGIX) VBOXGLXENTRYTAG(glXGetFBCo
     return glxim.GetFBConfigFromVisualSGIX(dpy, vis);
 }
 
-DECLEXPORT(XVisualInfo *) VBOXGLXENTRYTAG(glXGetVisualFromFBConfigSGIX)(Display *dpy, GLXFBConfig config)
+DECLEXPORT(XVisualInfo *) VBOXGLXENTRYTAG(glXGetVisualFromFBConfigSGIX)(Display *dpy, GLXFBConfigSGIX config)
 {
     return glxim.GetVisualFromFBConfigSGIX(dpy, config);
 }
 
 DECLEXPORT(GLXContext) VBOXGLXENTRYTAG(glXCreateContextWithConfigSGIX)
-(Display *dpy, GLXFBConfig config, int render_type, GLXContext share_list, Bool direct)
+(Display *dpy, GLXFBConfigSGIX config, int render_type, GLXContext share_list, Bool direct)
 {
     return glxim.CreateContextWithConfigSGIX(dpy, config, render_type, share_list, direct);
 }
 
-DECLEXPORT(GLXPixmap) VBOXGLXENTRYTAG(glXCreateGLXPixmapWithConfigSGIX)(Display *dpy, GLXFBConfig config, Pixmap pixmap)
+DECLEXPORT(GLXPixmap) VBOXGLXENTRYTAG(glXCreateGLXPixmapWithConfigSGIX)(Display *dpy, GLXFBConfigSGIX config, Pixmap pixmap)
 {
     return glxim.CreateGLXPixmapWithConfigSGIX(dpy, config, pixmap);
 }
 
-DECLEXPORT(int) VBOXGLXENTRYTAG(glXGetFBConfigAttribSGIX)(Display *dpy, GLXFBConfig config, int attribute, int *value)
+DECLEXPORT(int) VBOXGLXENTRYTAG(glXGetFBConfigAttribSGIX)(Display *dpy, GLXFBConfigSGIX config, int attribute, int *value)
 {
     return glxim.GetFBConfigAttribSGIX(dpy, config, attribute, value);
 }




--- src/VBox/Additions/common/crOpenGL/glx_proto.h.orig	2020-07-09 16:50:09 UTC
+++ src/VBox/Additions/common/crOpenGL/glx_proto.h
@@ -95,23 +95,23 @@ typedef const char * (*PGLXFUNC_QueryExtensionsString)
 typedef GLXPbufferSGIX (*PGLXFUNC_CreateGLXPbufferSGIX)
 (Display *dpy, GLXFBConfigSGIX config, unsigned int width, unsigned int height, int *attrib_list);
 
-typedef int (*PGLXFUNC_QueryGLXPbufferSGIX)
-(Display *dpy, GLXPbuffer pbuf, int attribute, unsigned int *value);
+typedef void (*PGLXFUNC_QueryGLXPbufferSGIX)
+(Display *dpy, GLXPbufferSGIX pbuf, int attribute, unsigned int *value);
 
 typedef GLXFBConfigSGIX * (*PGLXFUNC_ChooseFBConfigSGIX)
 (Display *dpy, int screen, int *attrib_list, int *nelements);
 
-typedef void (*PGLXFUNC_DestroyGLXPbufferSGIX)(Display *dpy, GLXPbuffer pbuf);
+typedef void (*PGLXFUNC_DestroyGLXPbufferSGIX)(Display *dpy, GLXPbufferSGIX pbuf);
 typedef void (*PGLXFUNC_SelectEventSGIX)(Display *dpy, GLXDrawable drawable, unsigned long mask);
 typedef void (*PGLXFUNC_GetSelectedEventSGIX)(Display *dpy, GLXDrawable drawable, unsigned long *mask);
 
 typedef GLXFBConfigSGIX (*PGLXFUNC_GetFBConfigFromVisualSGIX)(Display *dpy, XVisualInfo *vis);
-typedef XVisualInfo * (*PGLXFUNC_GetVisualFromFBConfigSGIX)(Display *dpy, GLXFBConfig config);
+typedef XVisualInfo * (*PGLXFUNC_GetVisualFromFBConfigSGIX)(Display *dpy, GLXFBConfigSGIX config);
 typedef GLXContext (*PGLXFUNC_CreateContextWithConfigSGIX)
-(Display *dpy, GLXFBConfig config, int render_type, GLXContext share_list, Bool direct);
+(Display *dpy, GLXFBConfigSGIX config, int render_type, GLXContext share_list, Bool direct);
 
-typedef GLXPixmap (*PGLXFUNC_CreateGLXPixmapWithConfigSGIX)(Display *dpy, GLXFBConfig config, Pixmap pixmap);
-typedef int (*PGLXFUNC_GetFBConfigAttribSGIX)(Display *dpy, GLXFBConfig config, int attribute, int *value);
+typedef GLXPixmap (*PGLXFUNC_CreateGLXPixmapWithConfigSGIX)(Display *dpy, GLXFBConfigSGIX config, Pixmap pixmap);
+typedef int (*PGLXFUNC_GetFBConfigAttribSGIX)(Display *dpy, GLXFBConfigSGIX config, int attribute, int *value);
 
 /*
  * GLX 1.3 functions

Lines 1-11 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_Additions_common_crOpenGL_stub.h (-11 lines)
1	--- src/VBox/Additions/common/crOpenGL/stub.h.orig 2016-07-18 11:50:44 UTC
2	+++ src/VBox/Additions/common/crOpenGL/stub.h
3	@@ -47,7 +47,7 @@
4	#include <X11/extensions/Xfixes.h>
5	#endif
6
7	-#if defined(WINDOWS) \|\| defined(Linux) \|\| defined(SunOS)
8	+#if defined(WINDOWS) \|\| defined(Linux) \|\| defined(FreeBSD) \|\| defined(SunOS)
9	# define CR_NEWWINTRACK
10	#endif
11

Lines 1-6 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_Additions_common_pam_pam__vbox.cpp (-3 / +3 lines)
1	--- src/VBox/Additions/common/pam/pam_vbox.cpp.orig 2020-05-13 19:37:05 UTC	1	--- src/VBox/Additions/common/pam/pam_vbox.cpp.orig 2021-01-07 15:34:21 UTC
2	+++ src/VBox/Additions/common/pam/pam_vbox.cpp	2	+++ src/VBox/Additions/common/pam/pam_vbox.cpp
3	@@ -105,7 +105,7 @@ static void pam_vbox_writesyslog(char *pszBuf)	3	@@ -104,7 +104,7 @@ static void pam_vbox_writesyslog(char *pszBuf)
4	openlog("pam_vbox", LOG_PID, LOG_AUTHPRIV);	4	openlog("pam_vbox", LOG_PID, LOG_AUTHPRIV);
5	syslog(LOG_ERR, "%s", pszBuf);	5	syslog(LOG_ERR, "%s", pszBuf);
6	closelog();	6	closelog();
Lines 9-15 Link Here
9	syslog(LOG_ERR, "pam_vbox: %s\n", pszBuf);	9	syslog(LOG_ERR, "pam_vbox: %s\n", pszBuf);
10	#endif	10	#endif
11	}	11	}
12	@@ -184,7 +184,7 @@ static int vbox_set_msg(pam_handle_t *hPAM, int iStyle	12	@@ -183,7 +183,7 @@ static int vbox_set_msg(pam_handle_t *hPAM, int iStyle
13		13
14	pam_message msg;	14	pam_message msg;
15	msg.msg_style = iStyle;	15	msg.msg_style = iStyle;




--- src/VBox/Additions/freebsd/Makefile.kmk.orig	2021-01-07 15:34:22 UTC
+++ src/VBox/Additions/freebsd/Makefile.kmk
@@ -23,8 +23,9 @@ $(error "The FreeBSD guest additions installer can onl
 endif

 
 #
 # Globals
@@ -66,11 +67,14 @@ VBOX_FBSD_ADD_STRIP_BIN = \
 	vboxvideo_drv_14.so \
 	vboxvideo_drv_15.so \
 	vboxvideo_drv_16.so \
-	vboxvideo_drv_17.so
+	vboxvideo_drv_17.so \
+	$(if $(VBOX_WITH_PAM),pam_vbox.so,) \
+	VBoxOGL.so \
+	mount_vboxvfs

Lines 1-10 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_Makefile.kmk (-2 / +3 lines)
1	--- src/VBox/Additions/freebsd/vboxvfs/Makefile.kmk.orig 2020-05-13 19:37:06 UTC	1	--- src/VBox/Additions/freebsd/vboxvfs/Makefile.kmk.orig 2021-01-07 15:34:22 UTC
2	+++ src/VBox/Additions/freebsd/vboxvfs/Makefile.kmk	2	+++ src/VBox/Additions/freebsd/vboxvfs/Makefile.kmk
3	@@ -33,32 +33,36 @@ vboxvfs_INCS = \	3	@@ -33,32 +33,37 @@ vboxvfs_INCS = \
4	$(vboxvfs_0_OUTDIR)	4	$(vboxvfs_0_OUTDIR)
5	vboxvfs_SOURCES = \	5	vboxvfs_SOURCES = \
6	vboxvfs_vfsops.c \	6	vboxvfs_vfsops.c \
7	- vboxvfs_vnops.c	7	- vboxvfs_vnops.c
		8	+ bcmp.c \
8	+ vboxvfs_vnops.c \	9	+ vboxvfs_vnops.c \
9	+ vboxvfs_prov.c	10	+ vboxvfs_prov.c
10	vboxvfs_LIBS = \	11	vboxvfs_LIBS = \




--- src/VBox/Additions/freebsd/vboxvfs/bcmp.c.orig	2021-02-21 19:09:22 UTC
+++ src/VBox/Additions/freebsd/vboxvfs/bcmp.c
@@ -0,0 +1,9 @@
+#include <sys/types.h>
+
+int bcmp(const void *b1, const void *b2, size_t len);
+
+int
+bcmp(const void *b1, const void *b2, size_t len)
+{
+	return __builtin_memcmp((b1), (b2), (len));
+}




--- src/VBox/Additions/freebsd/vboxvfs/vboxvfs.h.orig	2021-01-07 15:34:22 UTC
+++ src/VBox/Additions/freebsd/vboxvfs/vboxvfs.h
@@ -1,8 +1,3 @@
-/* $Id: vboxvfs.h $ */

- */
-
 /*
  * Copyright (C) 2010-2020 Oracle Corporation
  *
@@ -24,72 +19,371 @@
 #define VBOXVFS_VFSNAME "vboxvfs"
 #define VBOXVFS_VERSION 1
 

+#include "../../../../../include/iprt/err.h"
+#include "../../../../../include/iprt/fs.h"
+#include "../../../../../include/iprt/log.h"
+#include "../../../../../include/iprt/mangling.h"
+#include "../../../../../include/iprt/mem.h"
+#include "../../../../../include/iprt/param.h"
+#include "../../../../../include/iprt/path.h"

+#include "../../../../../include/iprt/time.h"
+#include "../../../../../include/iprt/types.h"
+#include "../../../../../include/iprt/uni.h"
+#include "../../../../../include/iprt/nocrt/limits.h"
+#include "../../../../../include/iprt/alloc.h"
+#include "../../../../../include/iprt/asm.h"
+#include "../../../../../include/iprt/asm-amd64-x86.h"
+#include "../../../../../include/iprt/asm-math.h"
+#include "../../../../../include/iprt/assert.h"
+#include "../../../../../include/iprt/cdefs.h"
+#include "../../../../../include/iprt/err.h"
+#include "../../../../../include/iprt/fs.h"
+#include "../../../../../include/iprt/log.h"
+#include "../../../../../include/iprt/mangling.h"
+#include "../../../../../include/iprt/mem.h"
+#include "../../../../../include/iprt/param.h"
+#include "../../../../../include/iprt/path.h"
+#include "../../../../../include/iprt/semaphore.h"
+#include "../../../../../include/iprt/stdarg.h"
+#include "../../../../../include/iprt/stdint.h"
+#include "../../../../../include/iprt/string.h"
+#include "../../../../../include/iprt/time.h"
+#include "../../../../../include/iprt/types.h"
+#include "../../../../../include/iprt/uni.h"
 
-#include <VBox/VBoxGuestLibSharedFolders.h>
+#else

+#include "iprt/time.h"
+#include "iprt/types.h"
+#include "iprt/uni.h"
+#include "iprt/nocrt/limits.h"
+#include "iprt/alloc.h"
+#include "iprt/asm.h"
+#include "iprt/asm-amd64-x86.h"
+#include "iprt/asm-math.h"
+#include "iprt/assert.h"
+#include "iprt/cdefs.h"
+#include "iprt/err.h"
+#include "iprt/fs.h"
+#include "iprt/log.h"
+#include "iprt/mem.h"
+#include "iprt/param.h"
+#include "iprt/path.h"
+#include "iprt/semaphore.h"
+#include "iprt/stdarg.h"
+#include "iprt/stdint.h"
+#include "iprt/string.h"
+#include "iprt/time.h"
+#include "iprt/types.h"
+#include "iprt/uni.h"
+
+#include "common/VBoxGuestLib/SysHlp.h"
+

+
 #endif  /* KERNEL */
 
 #endif /* !GA_INCLUDED_SRC_freebsd_vboxvfs_vboxvfs_h */
-

Lines 1-4 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vfsops.c (-2 / +2 lines)
1	--- src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vfsops.c.orig 2020-07-09 16:50:11 UTC	1	--- src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vfsops.c.orig 2021-01-07 15:34:22 UTC
2	+++ src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vfsops.c	2	+++ src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vfsops.c
3	@@ -1,8 +1,3 @@	3	@@ -1,8 +1,3 @@
4	-/* $Id: vboxvfs_vfsops.c $ */	4	-/* $Id: vboxvfs_vfsops.c $ */
Lines 7-13 Link Here
7	- */	7	- */
8	-	8	-
9	/*	9	/*
10	* Copyright (C) 2008-2017 Oracle Corporation	10	* Copyright (C) 2008-2020 Oracle Corporation
11	*	11	*
12	@@ -14,245 +9,478 @@	12	@@ -14,245 +9,478 @@
13	* VirtualBox OSE distribution. VirtualBox OSE is distributed in the	13	* VirtualBox OSE distribution. VirtualBox OSE is distributed in the




--- src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vnops.c.orig	2021-01-07 15:34:22 UTC
+++ src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vnops.c
@@ -14,228 +14,1347 @@
-/* $Id: vboxvfs_vnops.c $ */
-/** @file
- * Description.
- */
-
 /*
  * Copyright (C) 2008-2017 Oracle Corporation
+ * Copyright (C) 2017 Mahdi Mokhtari
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -14,228 +10,1347 @@
  * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
  * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
  */

Line 0 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_Additions_x11_VBoxClient_logging.cpp (+10 lines)
	1	--- src/VBox/Additions/x11/VBoxClient/logging.cpp.orig 2021-01-07 15:34:30 UTC
	2	+++ src/VBox/Additions/x11/VBoxClient/logging.cpp
	3	@@ -17,6 +17,7 @@
	4
	5
	6	#include <stdlib.h>
	7	+#include <sys/wait.h>
	8	#include <iprt/buildconfig.h>
	9	#include <iprt/file.h>
	10	#include <iprt/process.h>




--- src/VBox/Additions/x11/x11include/xproto-7.0.18/X11/Xfuncproto.h.orig	2021-01-07 15:37:10 UTC
+++ src/VBox/Additions/x11/x11include/xproto-7.0.18/X11/Xfuncproto.h
@@ -48,6 +48,227 @@ in this Software without prior written authorization f
 #endif /* _Xconst */
 
 /* Function prototype configuration (see configure for more info) */
+#if !defined(NARROWPROTO) && \
+    (defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__))
+#define NARROWPROTO
+#endif
+#ifndef FUNCPROTO
+#define FUNCPROTO 15
+#endif
+
+#ifndef NeedWidePrototypes
+#ifdef NARROWPROTO
+#define NeedWidePrototypes 0
+#else
+#define NeedWidePrototypes 1		/* default to make interropt. easier */
+#endif
+#endif /* NeedWidePrototypes */
+
+#endif /* NeedFunctionPrototypes */
+
+#ifndef _XFUNCPROTOBEGIN
+#if defined(__cplusplus) || defined(c_plusplus) /* for C++ V2.0 */
+#define _XFUNCPROTOBEGIN extern "C" {	/* do not leave open across includes */
+#define _XFUNCPROTOEND }
+#else
+#define _XFUNCPROTOBEGIN
+#define _XFUNCPROTOEND
+#endif
+#endif /* _XFUNCPROTOBEGIN */
+
+/* http://clang.llvm.org/docs/LanguageExtensions.html#has-attribute */
+#ifndef __has_attribute
+# define __has_attribute(x) 0  /* Compatibility with non-clang compilers. */
+#endif
+#ifndef __has_feature
+# define __has_feature(x) 0    /* Compatibility with non-clang compilers. */
+#endif
+#ifndef __has_extension
+# define __has_extension(x) 0  /* Compatibility with non-clang compilers. */
+#endif
+
+/* Added in X11R6.9, so available in any version of modular xproto */
+#if __has_attribute(__sentinel__) || (defined(__GNUC__) && (__GNUC__ >= 4))
+# define _X_SENTINEL(x) __attribute__ ((__sentinel__(x)))
+#else
+# define _X_SENTINEL(x)
+#endif /* GNUC >= 4 */
+
+/* Added in X11R6.9, so available in any version of modular xproto */
+#if (__has_attribute(visibility) || (defined(__GNUC__) && (__GNUC__ >= 4))) \
+    && !defined(__CYGWIN__) && !defined(__MINGW32__)
+# define _X_EXPORT      __attribute__((visibility("default")))
+# define _X_HIDDEN      __attribute__((visibility("hidden")))
+# define _X_INTERNAL    __attribute__((visibility("internal")))
+#elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550)
+# define _X_EXPORT      __global
+# define _X_HIDDEN      __hidden
+# define _X_INTERNAL    __hidden
+#else /* not gcc >= 4 and not Sun Studio >= 8 */
+# define _X_EXPORT
+# define _X_HIDDEN
+# define _X_INTERNAL
+#endif /* GNUC >= 4 */
+
+/* Branch prediction hints for individual conditionals */
+/* requires xproto >= 7.0.9 */
+#if defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 303)
+# define _X_LIKELY(x)   __builtin_expect(!!(x), 1)
+# define _X_UNLIKELY(x) __builtin_expect(!!(x), 0)
+#else /* not gcc >= 3.3 */
+# define _X_LIKELY(x)   (x)
+# define _X_UNLIKELY(x) (x)
+#endif
+
+/* Bulk branch prediction hints via marking error path functions as "cold" */
+/* requires xproto >= 7.0.25 */
+#if __has_attribute(__cold__) || \
+    (defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 403)) /* 4.3+ */
+# define _X_COLD __attribute__((__cold__))
+#else
+# define _X_COLD /* nothing */
+#endif
+
+/* Added in X11R6.9, so available in any version of modular xproto */
+#if __has_attribute(deprecated) \
+    || (defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 301)) \
+    || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x5130))
+# define _X_DEPRECATED  __attribute__((deprecated))
+#else /* not gcc >= 3.1 */
+# define _X_DEPRECATED
+#endif
+
+/* requires xproto >= 7.0.30 */
+#if __has_extension(attribute_deprecated_with_message) || \
+                (defined(__GNUC__) && ((__GNUC__ >= 5) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 5))))
+# define _X_DEPRECATED_MSG(_msg) __attribute__((deprecated(_msg)))
+#else
+# define _X_DEPRECATED_MSG(_msg) _X_DEPRECATED
+#endif
+
+/* requires xproto >= 7.0.17 */
+#if __has_attribute(noreturn) \
+    || (defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 205)) \
+    || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))
+# define _X_NORETURN __attribute((noreturn))
+#else
+# define _X_NORETURN
+#endif /* GNUC  */
+
+/* Added in X11R6.9, so available in any version of modular xproto */
+#if __has_attribute(__format__) \
+    || defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 203)
+# define _X_ATTRIBUTE_PRINTF(x,y) __attribute__((__format__(__printf__,x,y)))
+#else /* not gcc >= 2.3 */
+# define _X_ATTRIBUTE_PRINTF(x,y)
+#endif
+
+/* requires xproto >= 7.0.22 - since this uses either gcc or C99 variable
+   argument macros, must be only used inside #ifdef _X_NONNULL guards, as
+   many legacy X clients are compiled in C89 mode still. */
+#if __has_attribute(nonnull) \
+    && defined(__STDC_VERSION__) && (__STDC_VERSION__ - 0 >= 199901L) /* C99 */
+#define _X_NONNULL(...)  __attribute__((nonnull(__VA_ARGS__)))
+#elif __has_attribute(nonnull) \
+    || defined(__GNUC__) &&  ((__GNUC__ * 100 + __GNUC_MINOR__) >= 303)
+#define _X_NONNULL(args...)  __attribute__((nonnull(args)))
+#elif defined(__STDC_VERSION__) && (__STDC_VERSION__ - 0 >= 199901L) /* C99 */
+#define _X_NONNULL(...)  /* */
+#endif
+
+/* requires xproto >= 7.0.22 */
+#if __has_attribute(__unused__) \
+    || defined(__GNUC__) &&  ((__GNUC__ * 100 + __GNUC_MINOR__) >= 205)
+#define _X_UNUSED  __attribute__((__unused__))
+#else
+#define _X_UNUSED  /* */
+#endif
+
+/* C99 keyword "inline" or equivalent extensions in pre-C99 compilers */
+/* requires xproto >= 7.0.9
+   (introduced in 7.0.8 but didn't support all compilers until 7.0.9) */
+#if defined(inline) /* assume autoconf set it correctly */ || \
+   (defined(__STDC_VERSION__) && (__STDC_VERSION__ - 0 >= 199901L)) /* C99 */ || \
+   (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550))
+# define _X_INLINE inline
+#elif defined(__GNUC__) && !defined(__STRICT_ANSI__) /* gcc w/C89+extensions */
+# define _X_INLINE __inline__
+#else
+# define _X_INLINE
+#endif
+
+/* C99 keyword "restrict" or equivalent extensions in pre-C99 compilers */
+/* requires xproto >= 7.0.21 */
+#ifndef _X_RESTRICT_KYWD
+# if defined(restrict) /* assume autoconf set it correctly */ || \
+    (defined(__STDC_VERSION__) && (__STDC_VERSION__ - 0 >= 199901L) /* C99 */ \
+     && !defined(__cplusplus)) /* Workaround g++ issue on Solaris */
+#  define _X_RESTRICT_KYWD  restrict
+# elif defined(__GNUC__) && !defined(__STRICT_ANSI__) /* gcc w/C89+extensions */
+#  define _X_RESTRICT_KYWD __restrict__
+# else
+#  define _X_RESTRICT_KYWD
+# endif
+#endif
+
+/* requires xproto >= 7.0.30 */
+#if __has_attribute(no_sanitize_thread)
+# define _X_NOTSAN __attribute__((no_sanitize_thread))
+#else
+# define _X_NOTSAN
+#endif
+
+#endif /* _XFUNCPROTO_H_ */
+/*
+ *
+Copyright 1989, 1991, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+ *
+ */
+
+/* Definitions to make function prototypes manageable */
+
+#ifndef _XFUNCPROTO_H_
+#define _XFUNCPROTO_H_
+
+#ifndef NeedFunctionPrototypes
+#define NeedFunctionPrototypes 1
+#endif /* NeedFunctionPrototypes */
+
+#ifndef NeedVarargsPrototypes
+#define NeedVarargsPrototypes 1
+#endif /* NeedVarargsPrototypes */
+
+#if NeedFunctionPrototypes
+
+#ifndef NeedNestedPrototypes
+#define NeedNestedPrototypes 1
+#endif /* NeedNestedPrototypes */
+
+#ifndef _Xconst
+#define _Xconst const
+#endif /* _Xconst */
+
+/* Function prototype configuration (see configure for more info) */
 #ifndef NARROWPROTO
 #undef NARROWPROTO
 #endif

Lines 1-6 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_Debugger_Makefile.kmk (-2 / +2 lines)
1	--- src/VBox/Debugger/Makefile.kmk.orig 2020-05-13 19:39:41 UTC	1	--- src/VBox/Debugger/Makefile.kmk.orig 2021-01-07 15:37:12 UTC
2	+++ src/VBox/Debugger/Makefile.kmk	2	+++ src/VBox/Debugger/Makefile.kmk
3	@@ -113,6 +113,7 @@ VBoxDbg_SOURCES = \	3	@@ -110,6 +110,7 @@ VBoxDbg_SOURCES = \
4	VBoxDbgBase.cpp \	4	VBoxDbgBase.cpp \
5	VBoxDbgConsole.cpp \	5	VBoxDbgConsole.cpp \
6	VBoxDbgStatsQt.cpp	6	VBoxDbgStatsQt.cpp

Lines 1-6 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_Devices_Audio_DrvHostALSAAudio.cpp (-3 / +3 lines)
1	--- src/VBox/Devices/Audio/DrvHostALSAAudio.cpp.orig 2020-05-13 19:39:41 UTC	1	--- src/VBox/Devices/Audio/DrvHostALSAAudio.cpp.orig 2021-01-07 15:37:12 UTC
2	+++ src/VBox/Devices/Audio/DrvHostALSAAudio.cpp	2	+++ src/VBox/Devices/Audio/DrvHostALSAAudio.cpp
3	@@ -819,6 +819,7 @@ static DECLCALLBACK(int) drvHostALSAAudioStreamPlay(PP	3	@@ -820,6 +820,7 @@ static DECLCALLBACK(int) drvHostAlsaAudioHA_StreamPlay
4	continue;	4	continue;
5	}	5	}
6		6
Lines 8-14 Link Here
8	case -ESTRPIPE:	8	case -ESTRPIPE:
9	{	9	{
10	/* Stream was suspended and waiting for a recovery. */	10	/* Stream was suspended and waiting for a recovery. */
11	@@ -832,6 +833,7 @@ static DECLCALLBACK(int) drvHostALSAAudioStreamPlay(PP	11	@@ -833,6 +834,7 @@ static DECLCALLBACK(int) drvHostAlsaAudioHA_StreamPlay
12	LogFlowFunc(("Resumed suspended output stream\n"));	12	LogFlowFunc(("Resumed suspended output stream\n"));
13	continue;	13	continue;
14	}	14	}




--- src/VBox/Devices/Audio/DrvHostOSSAudio.cpp.orig	2021-01-07 15:37:12 UTC
+++ src/VBox/Devices/Audio/DrvHostOSSAudio.cpp
@@ -253,10 +253,11 @@ static int ossStreamOpen(const char *pszDev, int fOpen
 
             default:
                 rc = VERR_AUDIO_STREAM_COULD_NOT_CREATE;
+                iFormat = -1;				
                 break;
         }
 
-        if (RT_FAILURE(rc))
+        if (RT_UNLIKELY(iFormat == -1))
             break;
 
         if (ioctl(fdFile, SNDCTL_DSP_SAMPLESIZE, &iFormat))
@@ -664,6 +665,7 @@ static int ossCreateStreamIn(POSSAUDIOSTREAM pStreamOS
 
                 pCfgAcq->Backend.cFramesPeriod     = PDMAUDIOSTREAMCFG_B2F(pCfgAcq, ossAcq.cbFragmentSize);
                 pCfgAcq->Backend.cFramesBufferSize = pCfgAcq->Backend.cFramesPeriod * 2; /* Use "double buffering". */
+                pCfgAcq->Backend.cFramesPreBuffering     = pCfgAcq->Backend.cFramesBufferSize;                
                 /** @todo Pre-buffering required? */
             }
         }
@@ -782,6 +784,7 @@ static int ossCreateStreamOut(POSSAUDIOSTREAM pStreamO
 #endif
             pCfgAcq->Backend.cFramesPeriod     = PDMAUDIOSTREAMCFG_B2F(pCfgAcq, obtStream.cbFragmentSize);
             pCfgAcq->Backend.cFramesBufferSize = pCfgAcq->Backend.cFramesPeriod * 2; /* Use "double buffering" */
+            pCfgAcq->Backend.cFramesPreBuffering     = pCfgAcq->Backend.cFramesBufferSize;            
         }
 
     } while (0);




--- src/VBox/Devices/Graphics/DevVGA-SVGA3d-glLdr.cpp.orig	2021-01-07 15:39:16 UTC
+++ src/VBox/Devices/Graphics/DevVGA-SVGA3d-glLdr.cpp
@@ -186,7 +186,7 @@ int glLdrInit(PPDMDEVINS pDevIns)
     pfn_wglDeleteContext = 0;
     pfn_wglMakeCurrent = 0;
     pfn_wglShareLists = 0;
-#elif defined(RT_OS_LINUX)
+#elif defined(RT_OS_FREEBSD) || defined(RT_OS_LINUX)
     pfn_XConfigureWindow = 0;
     pfn_XCloseDisplay = 0;
     pfn_XCreateColormap = 0;
@@ -296,7 +296,7 @@ int glLdrInit(PPDMDEVINS pDevIns)
     GLGETPROC_(wglDeleteContext, "");
     GLGETPROC_(wglMakeCurrent, "");
     GLGETPROC_(wglShareLists, "");
-#elif defined(RT_OS_LINUX)
+#elif defined(RT_OS_FREEBSD) || defined(RT_OS_LINUX)
     X11GETPROC_(XConfigureWindow);
     X11GETPROC_(XCloseDisplay);
     X11GETPROC_(XCreateColormap);
@@ -397,7 +397,7 @@ int glLdrInit(PPDMDEVINS pDevIns)
     GLGETPROC_(glVertexPointer, "");
     GLGETPROC_(glViewport, "");
 
-#ifdef RT_OS_LINUX
+#if defined(RT_OS_FREEBSD) || defined(RT_OS_LINUX)
     XInitThreads();
 #endif
     return VINF_SUCCESS;

Line 0 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_Devices_Graphics_DevVGA-SVGA3d-glLdr.h (+11 lines)
	1	--- src/VBox/Devices/Graphics/DevVGA-SVGA3d-glLdr.h.orig 2021-01-07 15:39:17 UTC
	2	+++ src/VBox/Devices/Graphics/DevVGA-SVGA3d-glLdr.h
	3	@@ -338,7 +338,7 @@ GLPFN BOOL (WINAPI *pfn_wglMakeCurrent)(HDC, HGLRC);
	4	GLPFN BOOL (WINAPI *pfn_wglShareLists)(HGLRC, HGLRC);
	5	#define wglShareLists pfn_wglShareLists
	6
	7	-#elif defined(RT_OS_LINUX)
	8	+#elif defined(RT_OS_FREEBSD) \|\| defined(RT_OS_LINUX)
	9	/*
	10	* GLX
	11	*/




--- src/VBox/Devices/Graphics/DevVGA-SVGA3d-ogl.cpp.orig	2021-01-07 15:39:17 UTC
+++ src/VBox/Devices/Graphics/DevVGA-SVGA3d-ogl.cpp
@@ -1189,7 +1189,7 @@ int vmsvga3dTerminate(PVGASTATECC pThisCC)
     RTSemEventDestroy(pState->WndRequestSem);
 #elif defined(RT_OS_DARWIN)
 
-#elif defined(RT_OS_LINUX)
+#elif defined(RT_OS_FREEBSD) || defined(RT_OS_LINUX)
     /* signal to the thread that it is supposed to exit */
     pState->bTerminate = true;
     /* wait for it to terminate */
@@ -3194,7 +3194,7 @@ int vmsvga3dGenerateMipmaps(PVGASTATECC pThisCC, uint3
 }
 
 
-#ifdef RT_OS_LINUX
+#if defined(RT_OS_FREEBSD) || defined(RT_OS_LINUX)
 /**
  * X11 event handling thread.
  *
@@ -3224,7 +3224,7 @@ DECLCALLBACK(int) vmsvga3dXEventThread(RTTHREAD hThrea
     }
     return VINF_SUCCESS;
 }
-#endif // RT_OS_LINUX
+#endif // RT_OS_FREEBSD || RT_OS_LINUX
 
 
 /**
@@ -4052,7 +4052,7 @@ static int vmsvga3dContextDestroyOgl(PVGASTATECC pThis
     AssertRC(rc);
 #elif defined(RT_OS_DARWIN)
     vmsvga3dCocoaDestroyViewAndContext(pContext->cocoaView, pContext->cocoaContext);
-#elif defined(RT_OS_LINUX)
+#elif defined(RT_OS_FREEBSD) || defined(RT_OS_LINUX)
     glXMakeCurrent(pState->display, None, NULL);
     glXDestroyContext(pState->display, pContext->glxContext);
     XDestroyWindow(pState->display, pContext->window);




--- src/VBox/Devices/Makefile.kmk.orig	2021-01-07 15:39:35 UTC
+++ src/VBox/Devices/Makefile.kmk
@@ -112,6 +112,7 @@ if !defined(VBOX_ONLY_EXTPACKS)
   VBoxDDU_LDFLAGS.darwin += -framework IOKit
  endif
 
+ VBoxDDU_LDFLAGS.freebsd  = $(VBOX_GCC_NO_UNDEFINED)
  VBoxDDU_LDFLAGS.linux    = $(VBOX_GCC_NO_UNDEFINED)
  $(call VBOX_SET_VER_INFO_DLL,VBoxDDU,VirtualBox VMM Devices and Drivers Utilities)
 
@@ -245,6 +246,7 @@ if !defined(VBOX_ONLY_EXTPACKS) && "$(intersects $(KBU
  	-framework SystemConfiguration \
  	-framework AVFoundation \
  	-framework Foundation
+ VBoxDD_LDFLAGS.freebsd  = $(VBOX_GCC_NO_UNDEFINED)
  VBoxDD_LDFLAGS.linux    = $(VBOX_GCC_NO_UNDEFINED)
 
  # --- Tracing bits. ---
@@ -287,7 +289,7 @@ if !defined(VBOX_ONLY_EXTPACKS) && "$(intersects $(KBU
   VBoxDD_SOURCES        += Graphics/DevVGA-SVGA.cpp
  endif
  ifdef VBOX_WITH_VMSVGA3D
-  if1of ($(KBUILD_TARGET), linux win)
+  if1of ($(KBUILD_TARGET), freebsd linux win)
 # Dynamically load 3D library (opengl32, libGL).
 # This is a temporary solution. In future the 3D backend will be in a separate library.
 VBOX_WITH_VMSVGA3D_DYNAMIC_LOAD = 1
@@ -329,6 +331,7 @@ VBOX_WITH_VMSVGA3D_DYNAMIC_LOAD = 1
    VBoxDD_SOURCES       += \
    	Graphics/DevVGA-SVGA3d-glLdr.cpp
    else
+   VBoxDD_LIBS.freebsd  += X11 GL
    VBoxDD_LIBS.linux    += X11 GL
    VBoxDD_LIBS.win      += $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/Opengl32.lib
    endif
@@ -1526,6 +1529,8 @@ if defined(VBOX_WITH_VMSVGA3D) && !defined(VBOX_ONLY_E
  VBoxSVGA3D_INCS = $(VBOX_GRAPHICS_INCS)
  VBoxSVGA3D_INCS.win    := \
  	Graphics/shaderlib/libWineStub/include
+ VBoxSVGA3D_INCS.freebsd := \
+	 Graphics/shaderlib/wine/include
  VBoxSVGA3D_INCS.linux  := \
  	Graphics/shaderlib/wine/include
  VBoxSVGA3D_INCS.darwin := \




--- src/VBox/Devices/PC/ipxe/Makefile.kmk.orig	2021-01-07 15:39:44 UTC
+++ src/VBox/Devices/PC/ipxe/Makefile.kmk
@@ -121,7 +121,7 @@ endif
 	-falign-loops=1 \
 	-Os \
 	-falign-functions=1 \
-	-mpreferred-stack-boundary=2 \
+	-mstack-alignment=2 \
 	-mregparm=3 \
 	-mrtd \
 	-freg-struct-return \
@@ -144,7 +144,7 @@ endif
 	-falign-jumps=1 \
 	-falign-loops=1 \
 	-falign-functions=1 \
-	-mpreferred-stack-boundary=2 \
+	-mstack-alignment=2 \
 	-mregparm=3 \
 	-mrtd \
 	-freg-struct-return \

Lines 1-11 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_Devices_PC_vbox-cpuhotplug.dsl (-11 lines)
1	--- src/VBox/Devices/PC/vbox-cpuhotplug.dsl.orig 2020-07-09 16:55:56 UTC
2	+++ src/VBox/Devices/PC/vbox-cpuhotplug.dsl
3	@@ -48,7 +48,7 @@ DefinitionBlock ("SSDT-cpuhotplug.aml", "SSDT", 1, "VB
4	Device (sck) \
5	{ \
6	Name (_HID, "ACPI0004") \
7	- Name (_UID, sckuid) \
8	+ Name (_UID, id) \
9	\
10	<NL> \
11	Processor (cpu, /* Name */ \

Lines 1-10 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_Devices_Storage_DrvHostBase-freebsd.cpp (-10 lines)
1	--- src/VBox/Devices/Storage/DrvHostBase-freebsd.cpp.orig 2017-10-18 07:11:48 UTC
2	+++ src/VBox/Devices/Storage/DrvHostBase-freebsd.cpp
3	@@ -24,6 +24,7 @@
4	#include <cam/scsi/scsi_message.h>
5	#include <cam/scsi/scsi_pass.h>
6	#include <VBox/scsi.h>
7	+#include <iprt/file.h>
8	#include <iprt/log.h>
9
10	/** Maximum buffer size supported by the CAM subsystem. */




--- src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp.orig	2021-01-07 15:40:48 UTC
+++ src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp
@@ -646,7 +646,7 @@ void printUsage(USAGECATEGORY enmCommand, uint64_t fSu
                      "                                             file <file>|\n"
                      "                                             <devicename>]\n"
                      "                            [--uarttype<1-N> 16450|16550A|16750]\n"
-#if defined(RT_OS_LINUX) || defined(RT_OS_WINDOWS)
+#if defined(RT_OS_FREEBSD) || defined(RT_OS_LINUX) || defined(RT_OS_WINDOWS)
                      "                            [--lpt<1-N> off|<I/O base> <IRQ>]\n"
                      "                            [--lptmode<1-N> <devicename>]\n"
 #endif
@@ -661,7 +661,7 @@ void printUsage(USAGECATEGORY enmCommand, uint64_t fSu
             RTStrmPrintf(pStrm, "|dsound");
 #endif
         }

         {
             RTStrmPrintf(pStrm, ""
 #ifdef VBOX_WITH_AUDIO_OSS
@@ -674,22 +674,6 @@ void printUsage(USAGECATEGORY enmCommand, uint64_t fSu
                                 "|pulse"
 #endif
                         );




--- src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp.orig	2021-01-07 15:40:49 UTC
+++ src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp
@@ -153,7 +153,7 @@ enum
     MODIFYVM_UARTMODE,
     MODIFYVM_UARTTYPE,
     MODIFYVM_UART,
-#if defined(RT_OS_LINUX) || defined(RT_OS_WINDOWS)
+#if defined(RT_OS_FREEBSD) || defined(RT_OS_LINUX) || defined(RT_OS_WINDOWS)
     MODIFYVM_LPTMODE,
     MODIFYVM_LPT,
 #endif
@@ -348,7 +348,7 @@ static const RTGETOPTDEF g_aModifyVMOptions[] =
     { "--uartmode",                 MODIFYVM_UARTMODE,                  RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX },
     { "--uarttype",                 MODIFYVM_UARTTYPE,                  RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX },
     { "--uart",                     MODIFYVM_UART,                      RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX },
-#if defined(RT_OS_LINUX) || defined(RT_OS_WINDOWS)
+#if defined(RT_OS_FREEBSD) || defined(RT_OS_LINUX) || defined(RT_OS_WINDOWS)
     { "--lptmode",                  MODIFYVM_LPTMODE,                   RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX },
     { "--lpt",                      MODIFYVM_LPT,                       RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX },
 #endif
@@ -2278,7 +2278,7 @@ RTEXITCODE handleModifyVM(HandlerArg *a)
                 break;
             }
 
-#if defined(RT_OS_LINUX) || defined(RT_OS_WINDOWS)
+#if defined(RT_OS_FREEBSD) || defined(RT_OS_LINUX) || defined(RT_OS_WINDOWS)
             case MODIFYVM_LPTMODE:
             {
                 ComPtr<IParallelPort> lpt;




--- src/VBox/Frontends/VirtualBox/Makefile.kmk.orig	2021-01-07 15:40:49 UTC
+++ src/VBox/Frontends/VirtualBox/Makefile.kmk
@@ -1186,6 +1186,7 @@ if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_GUI
 	src/VBox2DHelpers.cpp \
 	src/VBoxFBOverlay.cpp \
 	src/VBoxGLSupportInfo.cpp
+ VirtualBox_CXXFLAGS.freebsd += -std=c++11
 endif
 
 $(call VBOX_SET_VER_INFO_EXE,VirtualBox,VirtualBox Manager,$(VBOX_WINDOWS_ICON_FILE))
@@ -1862,6 +1863,7 @@ if defined(VBOX_WITH_VIDEOHWACCEL)
   VBoxOGL2D_SOURCES = \
 	src/VBoxGLSupportInfo.cpp
   VBoxOGL2D_INCS = include

Lines 1-10 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_Frontends_VirtualBox_src_globals_UIImageTools.cpp (-10 lines)
1	--- src/VBox/Frontends/VirtualBox/src/globals/UIImageTools.cpp.orig 2020-05-18 14:44:12 UTC
2	+++ src/VBox/Frontends/VirtualBox/src/globals/UIImageTools.cpp
3	@@ -24,6 +24,7 @@
4
5	/* Qt includes */
6	# include <QPainter>
7	+# include <QPainterPath>
8
9	#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
10

Lines 1-10 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_Frontends_VirtualBox_src_widgets_UIMenuToolBar.cpp (-10 lines)
1	--- src/VBox/Frontends/VirtualBox/src/widgets/UIMenuToolBar.cpp.orig 2020-05-18 15:10:10 UTC
2	+++ src/VBox/Frontends/VirtualBox/src/widgets/UIMenuToolBar.cpp
3	@@ -23,6 +23,7 @@
4	# include <QApplication>
5	# include <QHBoxLayout>
6	# include <QPainter>
7	+# include <QPainterPath>
8	# include <QStyle>
9	# include <QToolButton>
10

Lines 1-10 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_Frontends_VirtualBox_src_widgets_UIMiniToolBar.cpp (-10 lines)
1	--- src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp.orig 2020-05-18 15:15:26 UTC
2	+++ src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp
3	@@ -28,6 +28,7 @@
4	# include <QToolButton>
5	# include <QStateMachine>
6	# include <QPainter>
7	+# include <QPainterPath>
8	# include <QWindow>
9	# ifdef VBOX_WS_X11
10	# include <QWindowStateChangeEvent>

Lines 1-10 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_Frontends_VirtualBox_src_widgets_UIPopupBox.h (-10 lines)
1	--- src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h.orig 2020-05-18 14:53:03 UTC
2	+++ src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h
3	@@ -20,6 +20,7 @@
4
5	/* Global includes: */
6	#include <QIcon>
7	+#include <QPainterPath>
8	#include <QWidget>
9
10	/* Forward declarations: */

Lines 1-11 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_GuestHost_OpenGL_include_chromium.h (-11 lines)
1	--- src/VBox/GuestHost/OpenGL/include/chromium.h.orig 2018-05-09 16:38:12 UTC
2	+++ src/VBox/GuestHost/OpenGL/include/chromium.h
3	@@ -63,7 +63,7 @@
4	#include <GL/gl.h>
5	/* Quick fix so as not to update the version of glext.h we provide. */
6	#ifdef GL_GLEXT_PROTOTYPES
7	-# if defined(RT_OS_LINUX) \|\| defined(RT_OS_SOLARIS)
8	+# if defined(RT_OS_FREEBSD) \|\| defined(RT_OS_LINUX) \|\| defined(RT_OS_SOLARIS)
9	GLAPI void APIENTRY glBindFramebuffer (GLenum, GLuint);
10	GLAPI void APIENTRY glBlitFramebuffer (GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLbitfield, GLenum);
11	GLAPI GLenum APIENTRY glCheckFramebufferStatus (GLenum);

Lines 4-11 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_HostDrivers_Support_SUPDrv.cpp (-2 / +2 lines)
4	/** @def SUPDRV_CHECK_SMAP_CHECK	4	/** @def SUPDRV_CHECK_SMAP_CHECK
5	* Checks that the AC flag is set if SMAP is enabled. If AC is not set, it	5	* Checks that the AC flag is set if SMAP is enabled. If AC is not set, it
6	* will be logged and @a a_BadExpr is executed. */	6	* will be logged and @a a_BadExpr is executed. */
7	-#if defined(RT_OS_DARWIN) \|\| defined(RT_OS_LINUX)	7	-#if (defined(RT_OS_DARWIN) \|\| defined(RT_OS_LINUX)) && !defined(VBOX_WITHOUT_EFLAGS_AC_SET_IN_VBOXDRV)
8	+#if defined(RT_OS_DARWIN) \|\| defined(RT_OS_FREEBSD) \|\| defined(RT_OS_LINUX)	8	+#if (defined(RT_OS_DARWIN) \|\| defined(RT_OS_FREEBSD) \|\| defined(RT_OS_LINUX)) && !defined(VBOX_WITHOUT_EFLAGS_AC_SET_IN_VBOXDRV)
9	# define SUPDRV_CHECK_SMAP_SETUP() uint32_t const fKernelFeatures = SUPR0GetKernelFeatures()	9	# define SUPDRV_CHECK_SMAP_SETUP() uint32_t const fKernelFeatures = SUPR0GetKernelFeatures()
10	# define SUPDRV_CHECK_SMAP_CHECK(a_pDevExt, a_BadExpr) \	10	# define SUPDRV_CHECK_SMAP_CHECK(a_pDevExt, a_BadExpr) \
11	do { \	11	do { \

Lines 1-6 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_HostDrivers_Support_SUPDrvInternal.h (-2 / +2 lines)
1	--- src/VBox/HostDrivers/Support/SUPDrvInternal.h.orig 2020-05-13 19:43:52 UTC	1	--- src/VBox/HostDrivers/Support/SUPDrvInternal.h.orig 2021-01-07 15:41:25 UTC
2	+++ src/VBox/HostDrivers/Support/SUPDrvInternal.h	2	+++ src/VBox/HostDrivers/Support/SUPDrvInternal.h
3	@@ -208,7 +208,7 @@	3	@@ -217,7 +217,7 @@
4	# define SUPDRV_WITHOUT_MSR_PROBER	4	# define SUPDRV_WITHOUT_MSR_PROBER
5	#endif	5	#endif
6		6




--- src/VBox/HostDrivers/Support/freebsd/SUPDrv-freebsd.c.orig	2021-01-07 15:41:26 UTC
+++ src/VBox/HostDrivers/Support/freebsd/SUPDrv-freebsd.c
@@ -44,8 +44,10 @@
 #include <sys/fcntl.h>
 #include <sys/conf.h>
 #include <sys/uio.h>
+#include <sys/mutex.h>
 
 #include "../SUPDrvInternal.h"
+#include "freebsd/the-freebsd-kernel.h"

 #include <VBox/version.h>
 #include <iprt/initterm.h>
 #include <iprt/string.h>
@@ -57,7 +59,14 @@
 #include <iprt/alloc.h>
 #include <iprt/err.h>
 #include <iprt/asm.h>

 #ifdef VBOX_WITH_HARDENING
 # define VBOXDRV_PERM 0600
 #else
@@ -76,7 +85,9 @@ static d_open_t     VBoxDrvFreeBSDOpenUsr;
 static d_open_t     VBoxDrvFreeBSDOpenSys;
 static void         vboxdrvFreeBSDDtr(void *pvData);
 static d_ioctl_t    VBoxDrvFreeBSDIOCtl;

 
 
 /*********************************************************************************************************************************
@@ -182,6 +193,13 @@ static int VBoxDrvFreeBSDLoad(void)
         rc = supdrvInitDevExt(&g_VBoxDrvFreeBSDDevExt, sizeof(SUPDRVSESSION));
         if (RT_SUCCESS(rc))
         {

             /*
              * Configure character devices. Add symbolic links for compatibility.
              */
@@ -324,6 +342,45 @@ static int VBoxDrvFreeBSDIOCtl(struct cdev *pDev, u_lo
     PSUPDRVSESSION pSession;
     devfs_get_cdevpriv((void **)&pSession);
 
+#ifdef VBOX_WITH_EFLAGS_AC_SET_IN_VBOXDRV
     /*
+     * Refuse all I/O control calls if we've ever detected EFLAGS.AC being cleared.
+     *
+     * This isn't a problem, as there is absolutely nothing in the kernel context that
+     * depend on user context triggering cleanups.  That would be pretty wild, right?
+     */
+    if (RT_UNLIKELY(g_VBoxDrvFreeBSDDevExt.cBadContextCalls > 0))
+    {
+        SUPR0Printf("VBoxDrvFreBSDIOCtl: EFLAGS.AC=0 detected %u times, refusing all I/O controls!\n", g_VBoxDrvFreeBSDDevExt.cBadContextCalls);
+        return ESPIPE;
+    }
+#endif
+
+    /*
      * Deal with the fast ioctl path first.
      */
     if (   (   ulCmd == SUP_IOCTL_FAST_DO_RAW_RUN
@@ -325,6 +356,45 @@ static int VBoxDrvFreeBSDIOCtl(struct cdev *pDev, u_lo
 
 
 /**
+ * Alternative Device I/O Control entry point on hosts with SMAP support.
+ *

  * Deal with the 'slow' I/O control requests.
  *
  * @returns 0 on success, appropriate errno on failure.
@@ -372,11 +429,10 @@ static int VBoxDrvFreeBSDIOCtlSlow(PSUPDRVSESSION pSes
          */
         SUPREQHDR Hdr;
         pvUser = *(void **)pvData;

         }
         if (RT_UNLIKELY((Hdr.fFlags & SUPREQHDR_FLAGS_MAGIC_MASK) != SUPREQHDR_FLAGS_MAGIC))
         {
@@ -401,13 +457,12 @@ static int VBoxDrvFreeBSDIOCtlSlow(PSUPDRVSESSION pSes
             OSDBGPRINT(("VBoxDrvFreeBSDIOCtlSlow: failed to allocate buffer of %d bytes; ulCmd=%#lx\n", cbReq, ulCmd));
             return ENOMEM;
         }

         }
         if (Hdr.cbIn < cbReq)
             RT_BZERO((uint8_t *)pHdr + Hdr.cbIn, cbReq - Hdr.cbIn);
@@ -435,9 +490,8 @@ static int VBoxDrvFreeBSDIOCtlSlow(PSUPDRVSESSION pSes
                 OSDBGPRINT(("VBoxDrvFreeBSDIOCtlSlow: too much output! %#x > %#x; uCmd=%#lx!\n", cbOut, cbReq, ulCmd));
                 cbOut = cbReq;
             }

 
             Log(("VBoxDrvFreeBSDIOCtlSlow: returns %d / %d ulCmd=%lx\n", 0, pHdr->rc, ulCmd));
 
@@ -540,8 +594,7 @@ bool VBOXCALL  supdrvOSGetForcedAsyncTscMode(PSUPDRVDE
 
 bool VBOXCALL  supdrvOSAreCpusOfflinedOnSuspend(void)
 {

 }
 
 
@@ -624,11 +677,25 @@ int VBOXCALL    supdrvOSMsrProberModify(RTCPUID idCpu,
 #endif /* SUPDRV_WITH_MSR_PROBER */
 
 

 
     va_start(va, pszFormat);
     cch = RTStrPrintfV(szMsg, sizeof(szMsg), pszFormat, va);
@@ -636,12 +703,19 @@ SUPR0DECL(int) SUPR0Printf(const char *pszFormat, ...)
 
     printf("%s", szMsg);
 

Line 0 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_HostDrivers_VBoxNetAdp_freebsd_Makefile (+11 lines)
	1	--- src/VBox/HostDrivers/VBoxNetAdp/freebsd/Makefile.orig 2019-05-13 13:33:07 UTC
	2	+++ src/VBox/HostDrivers/VBoxNetAdp/freebsd/Makefile
	3	@@ -26,7 +26,7 @@
	4
	5	KMOD = vboxnetadp
	6
	7	-CFLAGS += -DRT_OS_FREEBSD -DIN_RING0 -DIN_RT_R0 -DIN_SUP_R0 -DVBOX -DRT_WITH_VBOX -Iinclude -I. -Ir0drv -w -DVBOX_WITH_HARDENING -DVIMAGE
	8	+CFLAGS += -DRT_OS_FREEBSD -DIN_RING0 -DIN_RT_R0 -DIN_SUP_R0 -DVBOX -DRT_WITH_VBOX -DVBOX_WITH_HARDENING -DVBOX_WITH_64_BITS_GUESTS -DVIMAGE -Iinclude -I. -Ir0drv -w
	9
	10	.if (${MACHINE_ARCH} == "i386")
	11	CFLAGS += -DRT_ARCH_X86

Line 0 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_HostDrivers_VBoxNetFlt_Makefile.kmk (+11 lines)
	1	--- src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk.orig 2019-05-13 13:33:07 UTC
	2	+++ src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk
	3	@@ -565,7 +565,7 @@ $(PATH_OUT)/opt_netgraph.h:
	4	$(QUIET)$(RM) -f -- $@
	5	$(QUIET)$(CP) -f $< $@
	6	ifndef VBOX_WITH_HARDENING
	7	- $(QUIET)$(SED) -e "s;VBOX_WITH_HARDENING;;g" --output $@.tmp $@
	8	+ $(QUIET)$(SED) -e "s;-DVBOX_WITH_HARDENING;;g" --output $@.tmp $@
	9	${QUIET}$(MV) -f $@.tmp $@
	10	endif
	11	ifndef VBOX_WITH_NETFLT_VIMAGE

Line 0 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_HostDrivers_VBoxNetFlt_freebsd_Makefile (+11 lines)
	1	--- src/VBox/HostDrivers/VBoxNetFlt/freebsd/Makefile.orig 2019-05-13 13:33:07 UTC
	2	+++ src/VBox/HostDrivers/VBoxNetFlt/freebsd/Makefile
	3	@@ -26,7 +26,7 @@
	4
	5	KMOD = vboxnetflt
	6
	7	-CFLAGS += -DRT_OS_FREEBSD -DIN_RING0 -DIN_RT_R0 -DIN_SUP_R0 -DVBOX -DRT_WITH_VBOX -Iinclude -I. -Ir0drv -w -DVBOX_WITH_HARDENING -DVIMAGE
	8	+CFLAGS += -DRT_OS_FREEBSD -DIN_RING0 -DIN_RT_R0 -DIN_SUP_R0 -DVBOX -DRT_WITH_VBOX -DVBOX_WITH_HARDENING -DVBOX_WITH_64_BITS_GUESTS -DVIMAGE -Iinclude -I. -Ir0drv -w
	9
	10	.if (${MACHINE_ARCH} == "i386")
	11	CFLAGS += -DRT_ARCH_X86




--- src/VBox/HostDrivers/VBoxNetFlt/freebsd/VBoxNetFlt-freebsd.c.orig	2020-07-28 21:59:30.107638000 -0700
+++ src/VBox/HostDrivers/VBoxNetFlt/freebsd/VBoxNetFlt-freebsd.c	2020-07-28 22:00:37.858885000 -0700
@@ -361,7 +361,14 @@
     {
         if (mtag != NULL || !fActive)
         {
+#if __FreeBSD_version >= 1300049
+            struct epoch_tracker et;
+            NET_EPOCH_ENTER(et);
+#endif
             ether_demux(ifp, m);
+#if __FreeBSD_version >= 1300049
+            NET_EPOCH_EXIT(et);
+#endif
             if (fActive)
                 vboxNetFltRelease(pThis, true /*fBusy*/);
             VBOXCURVNET_RESTORE();
@@ -457,7 +464,16 @@
         if (fDropIt)
             m_freem(m);
         else
+        {
+#if __FreeBSD_version >= 1300049
+            struct epoch_tracker et;
+            NET_EPOCH_ENTER(et);
+#endif
             ether_demux(ifp, m);
+#if __FreeBSD_version >= 1300049
+            NET_EPOCH_EXIT(et);
+#endif
+        }
     }
     vboxNetFltRelease(pThis, true /* fBusy */);
     VBOXCURVNET_RESTORE();

Lines 1-10 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_HostServices_SharedOpenGL_Makefile.kmk (-10 lines)
1	--- src/VBox/HostServices/SharedOpenGL/Makefile.kmk.orig 2020-05-13 19:43:59 UTC
2	+++ src/VBox/HostServices/SharedOpenGL/Makefile.kmk
3	@@ -335,6 +335,7 @@ if ( defined(VBOX_WITH_QTGUI) \
4	$(if $(VBOX_WITH_CROGL), VBOX_WITH_CROGL,) \
5	$(if $(VBOX_WITH_VIDEOHWACCEL), VBOX_WITH_VIDEOHWACCEL,)
6	ifdef VBOX_WITH_VIDEOHWACCEL
7	+ VBoxTestOGL_CXXFLAGS.freebsd += -std=c++11
8	VBoxTestOGL_QT_MODULES += Core Gui OpenGL Widgets
9	VBoxTestOGL_LIBS.linux += xcb
10	VBoxTestOGL_LIBS.solaris += xcb

Lines 1-6 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_Main_Makefile.kmk (-2 / +2 lines)
1	--- src/VBox/Main/Makefile.kmk.orig 2020-05-13 19:44:04 UTC	1	--- src/VBox/Main/Makefile.kmk.orig 2021-01-07 15:41:36 UTC
2	+++ src/VBox/Main/Makefile.kmk	2	+++ src/VBox/Main/Makefile.kmk
3	@@ -526,6 +526,7 @@ VBoxSVC_SOURCES.os2 = \	3	@@ -646,6 +646,7 @@ VBoxSVC_SOURCES.os2 = \
4		4
5	VBoxSVC_SOURCES.freebsd = \	5	VBoxSVC_SOURCES.freebsd = \
6	src-server/freebsd/HostHardwareFreeBSD.cpp \	6	src-server/freebsd/HostHardwareFreeBSD.cpp \

Lines 1-6 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_Main_include_HostPower.h (-3 / +3 lines)
1	--- src/VBox/Main/include/HostPower.h.orig 2017-10-18 07:12:54 UTC	1	--- src/VBox/Main/include/HostPower.h.orig 2021-01-07 15:41:38 UTC
2	+++ src/VBox/Main/include/HostPower.h	2	+++ src/VBox/Main/include/HostPower.h
3	@@ -28,7 +28,7 @@	3	@@ -31,7 +31,7 @@
4		4
5	#include <vector>	5	#include <vector>
6		6
Lines 9-15 Link Here
9	# include <VBox/dbus.h>	9	# include <VBox/dbus.h>
10	#endif	10	#endif
11		11
12	@@ -64,7 +64,7 @@ class HostPowerServiceWin : public HostPowerService (p	12	@@ -67,7 +67,7 @@ class HostPowerServiceWin : public HostPowerService (p
13	RTTHREAD mThread;	13	RTTHREAD mThread;
14	};	14	};
15	# endif	15	# endif




--- src/VBox/Main/include/USBProxyBackend.h.orig	2020-05-13 19:44:06 UTC
+++ src/VBox/Main/include/USBProxyBackend.h
@@ -365,13 +365,10 @@ class USBProxyBackendFreeBSD : public USBProxyBackend 
     virtual int releaseDevice(HostUSBDevice *aDevice);
 
 protected:
-    int initUsbfs(void);
-    int initSysfs(void);
     virtual int wait(RTMSINTERVAL aMillies);
     virtual int interruptWait(void);
     virtual PUSBDEVICE getDevices(void);
-    int addDeviceToChain(PUSBDEVICE pDev, PUSBDEVICE *ppFirst, PUSBDEVICE **pppNext, int rc);
-    virtual void deviceAdded(ComObjPtr<HostUSBDevice> &aDevice, SessionMachinesList &llOpenedMachines, PUSBDEVICE aUSBDevice);
+    virtual bool isFakeUpdateRequired();
 
 private:
     RTSEMEVENT mNotifyEventSem;




--- src/VBox/Main/src-client/ConsoleImpl2.cpp.orig	2020-05-13 19:44:07 UTC
+++ src/VBox/Main/src-client/ConsoleImpl2.cpp
@@ -5265,7 +5265,7 @@ int Console::i_configNetwork(const char *pszDevice,
                 {
                     switch (hrc)
                     {
-                        case VERR_ACCESS_DENIED:
+                        case (HRESULT)VERR_ACCESS_DENIED:
                             return VMSetError(VMR3GetVM(mpUVM), VERR_HOSTIF_INIT_FAILED, RT_SRC_POS,  N_(
                                             "Failed to open '/dev/net/tun' for read/write access. Please check the "
                                             "permissions of that node. Either run 'chmod 0666 /dev/net/tun' or "
@@ -5467,7 +5467,7 @@ int Console::i_configNetwork(const char *pszDevice,
                     {
                         switch (hrc)
                         {
-                            case VERR_ACCESS_DENIED:
+                            case (HRESULT)VERR_ACCESS_DENIED:
                                 return VMSetError(VMR3GetVM(mpUVM), VERR_HOSTIF_INIT_FAILED, RT_SRC_POS,  N_(
                                                 "Failed to open '/dev/%s' for read/write access.  Please check the "
                                                 "permissions of that node, and that the net.link.tap.user_open "

Lines 1-6 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_Main_src-server_HostImpl.cpp (-2 / +2 lines)
1	--- src/VBox/Main/src-server/HostImpl.cpp.orig 2020-05-13 19:44:09 UTC	1	--- src/VBox/Main/src-server/HostImpl.cpp.orig 2021-01-07 15:41:42 UTC
2	+++ src/VBox/Main/src-server/HostImpl.cpp	2	+++ src/VBox/Main/src-server/HostImpl.cpp
3	@@ -284,7 +284,7 @@ HRESULT Host::init(VirtualBox *aParent)	3	@@ -286,7 +286,7 @@ HRESULT Host::init(VirtualBox *aParent)
4		4
5	#if defined(RT_OS_WINDOWS)	5	#if defined(RT_OS_WINDOWS)
6	m->pHostPowerService = new HostPowerServiceWin(m->pParent);	6	m->pHostPowerService = new HostPowerServiceWin(m->pParent);




--- src/VBox/Main/src-server/freebsd/NetIf-freebsd.cpp.orig	2017-10-18 07:12:58 UTC
+++ src/VBox/Main/src-server/freebsd/NetIf-freebsd.cpp
@@ -43,6 +43,7 @@
 
 #include <net/if_dl.h>
 #include <netinet/in.h>
+#include <net80211/ieee80211_ioctl.h>
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -311,7 +312,7 @@ int NetIfList(std::list <ComObjPtr<HostNetworkInterfac
             else
                 enmType = HostNetworkInterfaceType_HostOnly;
 
-            pNew->wireless = isWireless(pNew->szName);
+            pNew->fWireless = isWireless(pNew->szName);
 
             ComObjPtr<HostNetworkInterface> IfObj;
             IfObj.createObject();

Lines 1-10 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_RDP-client-1.8.4-Makefile.kmk (-10 lines)
1	--- src/VBox/RDP/client-1.8.4/Makefile.kmk.orig 2019-10-10 18:14:11 UTC
2	+++ src/VBox/RDP/client-1.8.4/Makefile.kmk
3	@@ -117,7 +117,6 @@ rdesktop-vrdp_SOURCES.solaris = \
4	rdesktop-vrdp_SOURCES.freebsd = \
5	rdpsnd_oss.c
6	rdesktop-vrdp_LIBPATH = \
7	- /usr/lib \
8	$(VBOX_LIBPATH_X11)
9	rdesktop-vrdp_LIBS = \
10	X11 \

Lines 1-11 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_Runtime_common_err_RTErrConvertFromErrno.cpp (-11 lines)
1	--- src/VBox/Runtime/common/err/RTErrConvertFromErrno.cpp.orig 2018-01-15 14:56:07 UTC
2	+++ src/VBox/Runtime/common/err/RTErrConvertFromErrno.cpp
3	@@ -302,7 +302,7 @@ RTDECL(int) RTErrConvertFromErrno(unsigned uNativeCod
4	case EILSEQ: return VERR_NO_TRANSLATION;
5	#endif
6	#ifdef ERESTART
7	- case ERESTART: return VERR_INTERRUPTED;/** @todo fix duplicate error?*/
8	+ case (unsigned)ERESTART: return VERR_INTERRUPTED;/** @todo fix duplicate error?*/
9	#endif
10	#ifdef ESTRPIPE
11	//case ESTRPIPE 86 /* Streams pipe error */




--- src/VBox/Runtime/r0drv/freebsd/alloc-r0drv-freebsd.c.orig	2021-01-07 15:42:08 UTC
+++ src/VBox/Runtime/r0drv/freebsd/alloc-r0drv-freebsd.c
@@ -78,6 +78,7 @@ MALLOC_DEFINE(M_IPRTCONT, "iprtcont", "IPRT - contiguo
 
 DECLHIDDEN(int) rtR0MemAllocEx(size_t cb, uint32_t fFlags, PRTMEMHDR *ppHdr)
 {

     size_t      cbAllocated = cb;
     PRTMEMHDR   pHdr        = NULL;
 
@@ -100,8 +101,10 @@ DECLHIDDEN(int) rtR0MemAllocEx(size_t cb, uint32_t fFl
         cbAllocated = RT_ALIGN_Z(cb + sizeof(*pHdr), PAGE_SIZE);
 
         pVmObject = vm_object_allocate(OBJT_DEFAULT, cbAllocated >> PAGE_SHIFT);

 
         /* Addr contains a start address vm_map_find will start searching for suitable space at. */
 #if __FreeBSD_version >= 1000055
@@ -138,6 +141,8 @@ DECLHIDDEN(int) rtR0MemAllocEx(size_t cb, uint32_t fFl
                                  fFlags & RTMEMHDR_FLAG_ZEROED ? M_NOWAIT | M_ZERO : M_NOWAIT);
     }
 

     if (RT_UNLIKELY(!pHdr))
         return VERR_NO_MEMORY;
 
@@ -153,6 +158,8 @@ DECLHIDDEN(int) rtR0MemAllocEx(size_t cb, uint32_t fFl
 
 DECLHIDDEN(void) rtR0MemFree(PRTMEMHDR pHdr)
 {

     pHdr->u32Magic += 1;
 
 #ifdef RT_ARCH_AMD64
@@ -165,11 +172,14 @@ DECLHIDDEN(void) rtR0MemFree(PRTMEMHDR pHdr)
     else
 #endif
         free(pHdr, M_IPRTHEAP);

     void *pv;
 
     /*
@@ -194,6 +204,7 @@ RTR0DECL(void *) RTMemContAlloc(PRTCCPHYS pPhys, size_
         *pPhys = vtophys(pv);
         Assert(!(*pPhys & PAGE_OFFSET_MASK));
     }

     return pv;
 }
 
@@ -203,7 +214,9 @@ RTR0DECL(void) RTMemContFree(void *pv, size_t cb)
     if (pv)
     {
         AssertMsg(!((uintptr_t)pv & PAGE_OFFSET_MASK), ("pv=%p\n", pv));

Lines 1-6 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_Runtime_r0drv_freebsd_assert-r0drv-freebsd.c (-3 / +3 lines)
1	--- src/VBox/Runtime/r0drv/freebsd/assert-r0drv-freebsd.c.orig 2018-10-15 14:31:31 UTC	1	--- src/VBox/Runtime/r0drv/freebsd/assert-r0drv-freebsd.c.orig 2021-01-07 15:42:08 UTC
2	+++ src/VBox/Runtime/r0drv/freebsd/assert-r0drv-freebsd.c	2	+++ src/VBox/Runtime/r0drv/freebsd/assert-r0drv-freebsd.c
3	@@ -44,15 +44,18 @@	3	@@ -68,15 +68,18 @@
4		4
5	DECLHIDDEN(void) rtR0AssertNativeMsg1(const char pszExpr, unsigned uLine, const char pszFile, const char *pszFunction)	5	DECLHIDDEN(void) rtR0AssertNativeMsg1(const char pszExpr, unsigned uLine, const char pszFile, const char *pszFunction)
6	{	6	{
Lines 19-25 Link Here
19	char szMsg[256];	19	char szMsg[256];
20		20
21	RTStrPrintfV(szMsg, sizeof(szMsg) - 1, pszFormat, va);	21	RTStrPrintfV(szMsg, sizeof(szMsg) - 1, pszFormat, va);
22	@@ -60,6 +63,7 @@ DECLHIDDEN(void) rtR0AssertNativeMsg2V(bool fInitial,	22	@@ -84,6 +87,7 @@ DECLHIDDEN(void) rtR0AssertNativeMsg2V(bool fInitial,
23	printf("%s", szMsg);	23	printf("%s", szMsg);
24		24
25	NOREF(fInitial);	25	NOREF(fInitial);




--- src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c.orig	2020-10-16 16:38:10 UTC
+++ src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c
@@ -129,6 +129,7 @@ static vm_map_t rtR0MemObjFreeBSDGetMap(PRTR0MEMOBJINT
 
 DECLHIDDEN(int) rtR0MemObjNativeFree(RTR0MEMOBJ pMem)
 {

     PRTR0MEMOBJFREEBSD pMemFreeBSD = (PRTR0MEMOBJFREEBSD)pMem;
     int rc;
 
@@ -145,16 +146,15 @@ DECLHIDDEN(int) rtR0MemObjNativeFree(RTR0MEMOBJ pMem)
 
         case RTR0MEMOBJTYPE_LOCK:
         {

             break;
         }
 
@@ -210,6 +210,7 @@ DECLHIDDEN(int) rtR0MemObjNativeFree(RTR0MEMOBJ pMem)
             return VERR_INTERNAL_ERROR;
     }
 

     return VINF_SUCCESS;
 }
 
@@ -320,7 +321,8 @@ static int rtR0MemObjFreeBSDAllocHelper(PRTR0MEMOBJFRE
 #else
         VM_OBJECT_UNLOCK(pObject);
 #endif
-        if (pPages)
+        if (pPages || cTries >= 1)
             break;
+#if __FreeBSD_version >= 1100092
+        if (!vm_page_reclaim_contig(fFlags, cPages, 0, VmPhysAddrHigh, uAlignment, 0))
+             break;
+#elif __FreeBSD_version >= 1000015
         vm_pageout_grow_cache(cTries, 0, VmPhysAddrHigh);
+#else
+        vm_contig_grow_cache(cTries, 0, VmPhysAddrHigh);
+#endif
         cTries++;
     }
-
-    return pPages;
 #else
-    while (cTries <= 1)
+    while (1)
     {
         pPages = vm_phys_alloc_contig(cPages, 0, VmPhysAddrHigh, uAlignment, 0);
-        if (pPages)
+        if (pPages || cTries >= 1)
             break;
         vm_contig_grow_cache(cTries, 0, VmPhysAddrHigh);
         cTries++;
@@ -243,11 +249,8 @@ static vm_page_t rtR0MemObjFreeBSDContigPhysAllocHelpe
 
     if (!pPages)
         return pPages;
-#if __FreeBSD_version >= 1000030
-    VM_OBJECT_WLOCK(pObject);
-#else
+
     VM_OBJECT_LOCK(pObject);
-#endif
     for (vm_pindex_t iPage = 0; iPage < cPages; iPage++)
     {
         vm_page_t pPage = pPages + iPage;
@@ -259,13 +262,9 @@ static vm_page_t rtR0MemObjFreeBSDContigPhysAllocHelpe
             atomic_add_int(&cnt.v_wire_count, 1);
         }
     }
-#if __FreeBSD_version >= 1000030
-    VM_OBJECT_WUNLOCK(pObject);
-#else
     VM_OBJECT_UNLOCK(pObject);
 #endif
     return pPages;
-#endif
 }
 
 static int rtR0MemObjFreeBSDPhysAllocHelper(vm_object_t pObject, u_long cPages,
@@ -292,16 +291,17 @@ static int rtR0MemObjFreeBSDPhysAllocHelper(vm_object_
 #else
             VM_OBJECT_LOCK(pObject);
 #endif
+
             while (iPage-- > 0)
             {
                 pPage = vm_page_lookup(pObject, iPage);
-#if __FreeBSD_version < 1000000
+#if __FreeBSD_version < 900000
                 vm_page_lock_queues();
 #endif
                 if (fWire)
                     vm_page_unwire(pPage, 0);
                 vm_page_free(pPage);
-#if __FreeBSD_version < 1000000
+#if __FreeBSD_version < 900000
                 vm_page_unlock_queues();
 #endif
             }
@@ -323,7 +323,8 @@ static int rtR0MemObjFreeBSDAllocHelper(PRTR0MEMOBJFRE
     size_t      cPages = atop(pMemFreeBSD->Core.cb);
     int         rc;
 
-    pMemFreeBSD->pObject = vm_object_allocate(OBJT_PHYS, cPages);
+    pMemFreeBSD->pObject = vm_pager_allocate(OBJT_PHYS, NULL,
+            pMemFreeBSD->Core.cb, VM_PROT_ALL, 0, curthread->td_ucred);
 
     /* No additional object reference for auto-deallocation upon unmapping. */
 #if __FreeBSD_version >= 1000055
@@ -361,58 +363,77 @@ static int rtR0MemObjFreeBSDAllocHelper(PRTR0MEMOBJFRE
 }
 DECLHIDDEN(int) rtR0MemObjNativeAllocPage(PPRTR0MEMOBJINTERNAL ppMem, size_t cb, bool fExecutable)
 {

     return rc;
 }
 
@@ -422,6 +443,7 @@ static int rtR0MemObjFreeBSDAllocPhysPages(PPRTR0MEMOB
                                            RTHCPHYS PhysHighest, size_t uAlignment,
                                            bool fContiguous, int rcNoMem)
 {

     uint32_t   cPages = atop(cb);
     vm_paddr_t VmPhysAddrHigh;
 
@@ -429,9 +451,13 @@ static int rtR0MemObjFreeBSDAllocPhysPages(PPRTR0MEMOB
     PRTR0MEMOBJFREEBSD pMemFreeBSD = (PRTR0MEMOBJFREEBSD)rtR0MemObjNew(sizeof(*pMemFreeBSD),
                                                                        enmType, NULL, cb);
     if (!pMemFreeBSD)

 
-    pMemFreeBSD->pObject = vm_object_allocate(OBJT_PHYS, atop(cb));
+    pMemFreeBSD->pObject = vm_pager_allocate(OBJT_PHYS, NULL,
+            pMemFreeBSD->Core.cb, VM_PROT_ALL, 0, curthread->td_ucred);
 
     if (PhysHighest != NIL_RTHCPHYS)
         VmPhysAddrHigh = PhysHighest;
@@ -459,6 +485,7 @@ static int rtR0MemObjFreeBSDAllocPhysPages(PPRTR0MEMOB
         rtR0MemObjDelete(&pMemFreeBSD->Core);
     }
 

     return rc;
 }
 
@@ -478,17 +505,22 @@ DECLHIDDEN(int) rtR0MemObjNativeAllocPhysNC(PPRTR0MEMO
 DECLHIDDEN(int) rtR0MemObjNativeEnterPhys(PPRTR0MEMOBJINTERNAL ppMem, RTHCPHYS Phys, size_t cb, uint32_t uCachePolicy)
 {
     AssertReturn(uCachePolicy == RTMEM_CACHE_POLICY_DONT_CARE, VERR_NOT_SUPPORTED);

     return VINF_SUCCESS;
 }
 
@@ -500,6 +532,7 @@ static int rtR0MemObjNativeLockInMap(PPRTR0MEMOBJINTER
                                      vm_offset_t AddrStart, size_t cb, uint32_t fAccess,
                                      RTR0PROCESS R0Process, int fFlags)
 {

     int rc;
     NOREF(fAccess);
 
@@ -508,21 +541,28 @@ static int rtR0MemObjNativeLockInMap(PPRTR0MEMOBJINTER
     if (!pMemFreeBSD)
         return VERR_NO_MEMORY;
 

     return VERR_NO_MEMORY;/** @todo fix mach -> vbox error conversion for freebsd. */
 }
 
@@ -558,6 +598,7 @@ DECLHIDDEN(int) rtR0MemObjNativeLockKernel(PPRTR0MEMOB
  */
 static int rtR0MemObjNativeReserveInMap(PPRTR0MEMOBJINTERNAL ppMem, void *pvFixed, size_t cb, size_t uAlignment, RTR0PROCESS R0Process, vm_map_t pMap)
 {

     int rc;
 
     /*
@@ -615,11 +656,13 @@ static int rtR0MemObjNativeReserveInMap(PPRTR0MEMOBJIN
         pMemFreeBSD->Core.pv = (void *)MapAddress;
         pMemFreeBSD->Core.u.ResVirt.R0Process = R0Process;
         *ppMem = &pMemFreeBSD->Core;

     return rc;
 
 }
@@ -641,6 +684,8 @@ DECLHIDDEN(int) rtR0MemObjNativeReserveUser(PPRTR0MEMO
 DECLHIDDEN(int) rtR0MemObjNativeMapKernel(PPRTR0MEMOBJINTERNAL ppMem, RTR0MEMOBJ pMemToMap, void *pvFixed, size_t uAlignment,
                                           unsigned fProt, size_t offSub, size_t cbSub)
 {

 //  AssertMsgReturn(!offSub && !cbSub, ("%#x %#x\n", offSub, cbSub), VERR_NOT_SUPPORTED);
     AssertMsgReturn(pvFixed == (void *)-1, ("%p\n", pvFixed), VERR_NOT_SUPPORTED);
 
@@ -697,6 +742,7 @@ DECLHIDDEN(int) rtR0MemObjNativeMapKernel(PPRTR0MEMOBJ
             Assert((vm_offset_t)pMemFreeBSD->Core.pv == Addr);
             pMemFreeBSD->Core.u.Mapping.R0Process = NIL_RTR0PROCESS;
             *ppMem = &pMemFreeBSD->Core;

             return VINF_SUCCESS;
         }
         rc = vm_map_remove(kernel_map, Addr, Addr + cbSub);
@@ -705,6 +751,7 @@ DECLHIDDEN(int) rtR0MemObjNativeMapKernel(PPRTR0MEMOBJ
     else
         vm_object_deallocate(pMemToMapFreeBSD->pObject);
 

     return VERR_NO_MEMORY;
 }
 
@@ -712,6 +759,8 @@ DECLHIDDEN(int) rtR0MemObjNativeMapKernel(PPRTR0MEMOBJ
 DECLHIDDEN(int) rtR0MemObjNativeMapUser(PPRTR0MEMOBJINTERNAL ppMem, RTR0MEMOBJ pMemToMap, RTR3PTR R3PtrFixed, size_t uAlignment,
                                         unsigned fProt, RTR0PROCESS R0Process, size_t offSub, size_t cbSub)
 {
+    IPRT_FREEBSD_SAVE_EFL_AC();
+

     /*
      * Check for unsupported stuff.
      */
@@ -768,47 +817,53 @@ DECLHIDDEN(int) rtR0MemObjNativeMapUser(PPRTR0MEMOBJIN
     {
         /** @todo is this needed?. */
         PROC_LOCK(pProc);
-        AddrR3 = round_page((vm_offset_t)pProc->p_vmspace->vm_daddr + lim_max(pProc, RLIMIT_DATA));
+        AddrR3 = round_page((vm_offset_t)pProc->p_vmspace->vm_daddr +
+#if __FreeBSD_version >= 1100077
+                            lim_max_proc(pProc, RLIMIT_DATA));
+#else
+                            lim_max(pProc, RLIMIT_DATA));
+#endif
         PROC_UNLOCK(pProc);
     }
     else
@@ -774,10 +827,9 @@ DECLHIDDEN(int) rtR0MemObjNativeMapUser(PPRTR0MEMOBJIN
                      0);                    /* copy-on-write and similar flags */
 
     if (rc == KERN_SUCCESS)
+        rc = vm_map_wire(pProcMap, AddrR3, AddrR3 + cbSub, VM_MAP_WIRE_USER|VM_MAP_WIRE_NOHOLES);
         rc = vm_map_wire(pProcMap, AddrR3, AddrR3 + pMemToMap->cb, VM_MAP_WIRE_USER|VM_MAP_WIRE_NOHOLES);
-        AssertMsg(rc == KERN_SUCCESS, ("%#x\n", rc));
-
+    if (rc == KERN_SUCCESS)
     {
-        rc = vm_map_wire(pProcMap, AddrR3, AddrR3 + pMemToMap->cb, VM_MAP_WIRE_USER|VM_MAP_WIRE_NOHOLES);
+        rc = vm_map_inherit(pProcMap, AddrR3, AddrR3 + cbSub, VM_INHERIT_SHARE);
         AssertMsg(rc == KERN_SUCCESS, ("%#x\n", rc));
 
-        rc = vm_map_inherit(pProcMap, AddrR3, AddrR3 + pMemToMap->cb, VM_INHERIT_SHARE);
-        AssertMsg(rc == KERN_SUCCESS, ("%#x\n", rc));
-
         /*
          * Create a mapping object for it.
          */
         PRTR0MEMOBJFREEBSD pMemFreeBSD = (PRTR0MEMOBJFREEBSD)rtR0MemObjNew(sizeof(RTR0MEMOBJFREEBSD),
                                                                            RTR0MEMOBJTYPE_MAPPING,
                                                                            (void *)AddrR3,
-                                                                           pMemToMap->cb);
+                                                                           cbSub);
         if (pMemFreeBSD)
         {
             Assert((vm_offset_t)pMemFreeBSD->Core.pv == AddrR3);
             pMemFreeBSD->Core.u.Mapping.R0Process = R0Process;
             *ppMem = &pMemFreeBSD->Core;

             return VINF_SUCCESS;
         }
 
-        rc = vm_map_remove(pProcMap, AddrR3, AddrR3 + pMemToMap->cb);
+        rc = vm_map_remove(pProcMap, AddrR3, AddrR3 + cbSub /* XXX pMemToMap->cb*/ );
         AssertMsg(rc == KERN_SUCCESS, ("Deleting mapping failed\n"));
     }
     else
         vm_object_deallocate(pMemToMapFreeBSD->pObject);
 

 
     if ((fProt & RTMEM_PROT_NONE) == RTMEM_PROT_NONE)
         ProtectionFlags = VM_PROT_NONE;
@@ -819,7 +874,12 @@ DECLHIDDEN(int) rtR0MemObjNativeProtect(PRTR0MEMOBJINT
     if ((fProt & RTMEM_PROT_EXEC) == RTMEM_PROT_EXEC)
         ProtectionFlags |= VM_PROT_EXECUTE;
 

     if (krc == KERN_SUCCESS)
         return VINF_SUCCESS;
 
@@ -844,11 +904,19 @@ DECLHIDDEN(RTHCPHYS) rtR0MemObjNativeGetPagePhysAddr(P
 
             vm_offset_t pb = (vm_offset_t)pMemFreeBSD->Core.pv + ptoa(iPage);
 

         }
 
         case RTR0MEMOBJTYPE_MAPPING:
@@ -857,11 +925,15 @@ DECLHIDDEN(RTHCPHYS) rtR0MemObjNativeGetPagePhysAddr(P
 
             if (pMemFreeBSD->Core.u.Mapping.R0Process != NIL_RTR0PROCESS)
             {

             }
             return vtophys(pb);
         }
@@ -872,9 +944,11 @@ DECLHIDDEN(RTHCPHYS) rtR0MemObjNativeGetPagePhysAddr(P
         case RTR0MEMOBJTYPE_PHYS_NC:
         {
             RTHCPHYS addr;
 
+            IPRT_FREEBSD_SAVE_EFL_AC();
 #if __FreeBSD_version >= 1000030
             VM_OBJECT_WLOCK(pMemFreeBSD->pObject);
             addr = VM_PAGE_TO_PHYS(vm_page_lookup(pMemFreeBSD->pObject, iPage));
             VM_OBJECT_WUNLOCK(pMemFreeBSD->pObject);
 #else
             VM_OBJECT_UNLOCK(pMemFreeBSD->pObject);
 #endif
+            IPRT_FREEBSD_RESTORE_EFL_AC();
             return addr;
         }




--- src/VBox/Runtime/r0drv/freebsd/mp-r0drv-freebsd.c.orig	2019-04-16 10:17:21 UTC
+++ src/VBox/Runtime/r0drv/freebsd/mp-r0drv-freebsd.c
@@ -147,7 +147,9 @@ RTDECL(RTCPUID) RTMpGetOnlineCount(void)
 #include <iprt/cpuset.h>
 #include "r0drv/mp-r0drv.h"
 
+#if __FreeBSD_version >= 700000 && __FreeBSD_version < 900000
+#define cpuset_t            cpumask_t
+#define all_cpus            (~(cpumask_t)0)
+#define CPU_CLR(n, p)       do { *(p) &= ~((cpumask_t)1 << (n)); } while (0)
+#define CPU_SETOF(n, p)     do { *(p) = (cpumask_t)1 << (n); } while (0)
+#endif
+#if __FreeBSD_version < 1200028
+#define smp_no_rendezvous_barrier   smp_no_rendevous_barrier
+#endif
 
 RTDECL(RTCPUID) RTMpCpuId(void)
 {
@@ -143,7 +152,9 @@ RTDECL(RTCPUID) RTMpGetOnlineCount(void)
 static void rtmpOnAllFreeBSDWrapper(void *pvArg)
 {
     PRTMPARGS pArgs = (PRTMPARGS)pvArg;

 }
 
 
@@ -159,7 +161,9 @@ RTDECL(int) RTMpOnAll(PFNRTMPWORKER pfnWorker, void *p
     Args.pvUser2 = pvUser2;
     Args.idCpu = NIL_RTCPUID;
     Args.cHits = 0;
-    smp_rendezvous(NULL, rtmpOnAllFreeBSDWrapper, smp_no_rendevous_barrier, &Args);
+    IPRT_FREEBSD_SAVE_EFL_AC();
     smp_rendezvous(NULL, rtmpOnAllFreeBSDWrapper, smp_no_rendezvous_barrier, &Args);
+    IPRT_FREEBSD_RESTORE_EFL_AC();
     return VINF_SUCCESS;
 }
 
@@ -175,7 +179,11 @@ static void rtmpOnOthersFreeBSDWrapper(void *pvArg)
     PRTMPARGS pArgs = (PRTMPARGS)pvArg;
     RTCPUID idCpu = curcpu;
     if (pArgs->idCpu != idCpu)

 }
 
 
@@ -196,6 +204,7 @@ RTDECL(int) RTMpOnOthers(PFNRTMPWORKER pfnWorker, void
     /* Will panic if no rendezvousing cpus, so check up front. */
     if (RTMpGetOnlineCount() > 1)
     {
-#if __FreeBSD_version >= 900000
-        cpuset_t    Mask;
-#elif  __FreeBSD_version >= 700000
-        cpumask_t   Mask;
+#if __FreeBSD_version >= 700000
+        cpuset_t    Cpus;
 #endif
         RTMPARGS    Args;
 
@@ -192,17 +207,15 @@ RTDECL(int) RTMpOnOthers(PFNRTMPWORKER pfnWorker, void
         Args.pvUser2 = pvUser2;
         Args.idCpu = RTMpCpuId();
         Args.cHits = 0;
+        IPRT_FREEBSD_SAVE_EFL_AC();
 #if __FreeBSD_version >= 700000
 # if __FreeBSD_version >= 900000
         Mask = all_cpus;
@@ -207,6 +216,7 @@ RTDECL(int) RTMpOnOthers(PFNRTMPWORKER pfnWorker, void
-# else
-    Mask = ~(cpumask_t)curcpu;
-# endif
-        smp_rendezvous_cpus(Mask, NULL, rtmpOnOthersFreeBSDWrapper, smp_no_rendevous_barrier, &Args);
+        Cpus = all_cpus;
+        CPU_CLR(curcpu, &Cpus);
+        smp_rendezvous_cpus(Cpus, NULL, rtmpOnOthersFreeBSDWrapper, smp_no_rendezvous_barrier, &Args);
 #else
         smp_rendezvous(NULL, rtmpOnOthersFreeBSDWrapper, NULL, &Args);
 #endif

     }
     return VINF_SUCCESS;
 }
@@ -224,8 +234,10 @@ static void rtmpOnSpecificFreeBSDWrapper(void *pvArg)
     RTCPUID     idCpu = curcpu;
     if (pArgs->idCpu == idCpu)
     {

     }
 }
 
@@ -248,6 +260,7 @@ RTDECL(int) RTMpOnSpecific(RTCPUID idCpu, PFNRTMPWORKE
 RTDECL(int) RTMpOnSpecific(RTCPUID idCpu, PFNRTMPWORKER pfnWorker, void *pvUser1, void *pvUser2)
 {
-#if __FreeBSD_version >= 900000
-    cpuset_t    Mask;
-#elif  __FreeBSD_version >= 700000
-    cpumask_t   Mask;
+#if __FreeBSD_version >= 700000
+    cpuset_t    Cpus;
 #endif
     RTMPARGS    Args;
 
@@ -244,16 +257,14 @@ RTDECL(int) RTMpOnSpecific(RTCPUID idCpu, PFNRTMPWORKE
     Args.pvUser2 = pvUser2;
     Args.idCpu = idCpu;
     Args.cHits = 0;
+    IPRT_FREEBSD_SAVE_EFL_AC();
 #if __FreeBSD_version >= 700000
 # if __FreeBSD_version >= 900000
     CPU_SETOF(idCpu, &Mask);
@@ -258,6 +271,7 @@ RTDECL(int) RTMpOnSpecific(RTCPUID idCpu, PFNRTMPWORKE
-    Mask = (cpumask_t)1 << idCpu;
-# endif
-    smp_rendezvous_cpus(Mask, NULL, rtmpOnSpecificFreeBSDWrapper, smp_no_rendevous_barrier, &Args);
+    CPU_SETOF(idCpu, &Cpus);
+    smp_rendezvous_cpus(Cpus, NULL, rtmpOnSpecificFreeBSDWrapper, smp_no_rendezvous_barrier, &Args);
 #else
     smp_rendezvous(NULL, rtmpOnSpecificFreeBSDWrapper, NULL, &Args);
 #endif

     return Args.cHits == 1
          ? VINF_SUCCESS
          : VERR_CPU_NOT_FOUND;
@@ -287,12 +301,14 @@ RTDECL(int) RTMpPokeCpu(RTCPUID idCpu)
 
 RTDECL(int) RTMpPokeCpu(RTCPUID idCpu)
 {
-#if __FreeBSD_version >= 900000
-    cpuset_t    Mask;
-#elif  __FreeBSD_version >= 700000
-    cpumask_t   Mask;
-#endif
+    cpuset_t    Cpus;
 
     /* Will panic if no rendezvousing cpus, so make sure the cpu is online. */
     if (!RTMpIsCpuOnline(idCpu))
         return VERR_CPU_NOT_FOUND;
 
-# if __FreeBSD_version >= 900000
-    CPU_SETOF(idCpu, &Mask);
-# else
-    Mask = (cpumask_t)1 << idCpu;
-# endif
-    smp_rendezvous_cpus(Mask, NULL, rtmpFreeBSDPokeCallback, smp_no_rendevous_barrier, NULL);
+    IPRT_FREEBSD_SAVE_EFL_AC();
 # if __FreeBSD_version >= 900000
     CPU_SETOF(idCpu, &Mask);
 # else
     Mask = (cpumask_t)1 << idCpu;
 # endif
     smp_rendezvous_cpus(Mask, NULL, rtmpFreeBSDPokeCallback, smp_no_rendezvous_barrier, NULL);
+    IPRT_FREEBSD_RESTORE_EFL_AC();
 
     return VINF_SUCCESS;




--- src/VBox/Runtime/r0drv/freebsd/semevent-r0drv-freebsd.c.orig	2021-01-07 15:42:08 UTC
+++ src/VBox/Runtime/r0drv/freebsd/semevent-r0drv-freebsd.c
@@ -101,7 +101,9 @@ RTDECL(int)  RTSemEventCreateEx(PRTSEMEVENT phEventSem
     Assert(!(fFlags & RTSEMEVENT_FLAGS_BOOTSTRAP_HACK) || (fFlags & RTSEMEVENT_FLAGS_NO_LOCK_VAL));
     AssertPtrReturn(phEventSem, VERR_INVALID_POINTER);
 

     if (!pThis)
         return VERR_NO_MEMORY;
 
@@ -152,10 +154,12 @@ RTDECL(int)  RTSemEventDestroy(RTSEMEVENT hEventSem)
     /*
      * Invalidate it and signal the object just in case.
      */

     return VINF_SUCCESS;
 }
 
@@ -173,9 +177,11 @@ RTDECL(int)  RTSemEventSignal(RTSEMEVENT hEventSem)
     /*
      * Signal the event object.
      */

     return VINF_SUCCESS;
 }
 
@@ -199,6 +205,7 @@ static int rtR0SemEventWait(PRTSEMEVENTINTERNAL pThis,
     AssertPtrReturn(pThis, VERR_INVALID_PARAMETER);
     AssertMsgReturn(pThis->u32Magic == RTSEMEVENT_MAGIC, ("%p u32Magic=%RX32\n", pThis, pThis->u32Magic), VERR_INVALID_PARAMETER);
     AssertReturn(RTSEMWAIT_FLAGS_ARE_VALID(fFlags), VERR_INVALID_PARAMETER);

     rtR0SemEventBsdRetain(pThis);
 
     /*
@@ -248,6 +255,7 @@ static int rtR0SemEventWait(PRTSEMEVENTINTERNAL pThis,
     }
 
     rtR0SemEventBsdRelease(pThis);




--- src/VBox/Runtime/r0drv/freebsd/semeventmulti-r0drv-freebsd.c.orig	2021-01-07 15:42:08 UTC
+++ src/VBox/Runtime/r0drv/freebsd/semeventmulti-r0drv-freebsd.c
@@ -120,7 +120,9 @@ RTDECL(int)  RTSemEventMultiCreateEx(PRTSEMEVENTMULTI 
     PRTSEMEVENTMULTIINTERNAL pThis;
 
     AssertReturn(!(fFlags & ~RTSEMEVENTMULTI_FLAGS_NO_LOCK_VAL), VERR_INVALID_PARAMETER);

     if (pThis)
     {
         pThis->u32Magic     = RTSEMEVENTMULTI_MAGIC;
@@ -176,10 +178,12 @@ RTDECL(int)  RTSemEventMultiDestroy(RTSEMEVENTMULTI hE
     /*
      * Invalidate it and signal the object just in case.
      */

     return VINF_SUCCESS;
 }
 
@@ -188,6 +192,7 @@ RTDECL(int)  RTSemEventMultiSignal(RTSEMEVENTMULTI hEv
 {
     uint32_t fNew;
     uint32_t fOld;

 
     /*
      * Validate input.
@@ -214,12 +219,15 @@ RTDECL(int)  RTSemEventMultiSignal(RTSEMEVENTMULTI hEv
 
     rtR0SemBsdBroadcast(pThis);
     rtR0SemEventMultiBsdRelease(pThis);

     /*
      * Validate input.
      */
@@ -236,6 +244,7 @@ RTDECL(int)  RTSemEventMultiReset(RTSEMEVENTMULTI hEve
     ASMAtomicAndU32(&pThis->fStateAndGen, ~RTSEMEVENTMULTIBSD_STATE_MASK);
 
     rtR0SemEventMultiBsdRelease(pThis);

     return VINF_SUCCESS;
 }
 
@@ -252,6 +261,7 @@ RTDECL(int)  RTSemEventMultiReset(RTSEMEVENTMULTI hEve
 static int rtR0SemEventMultiBsdWait(PRTSEMEVENTMULTIINTERNAL pThis, uint32_t fFlags, uint64_t uTimeout,
                                     PCRTLOCKVALSRCPOS pSrcPos)
 {

     uint32_t    fOrgStateAndGen;
     int         rc;
 
@@ -311,6 +321,7 @@ static int rtR0SemEventMultiBsdWait(PRTSEMEVENTMULTIIN
     }
 
     rtR0SemEventMultiBsdRelease(pThis);




--- src/VBox/Runtime/r0drv/freebsd/semfastmutex-r0drv-freebsd.c.orig	2021-01-07 15:42:08 UTC
+++ src/VBox/Runtime/r0drv/freebsd/semfastmutex-r0drv-freebsd.c
@@ -86,6 +86,7 @@ RTDECL(int)  RTSemFastMutexCreate(PRTSEMFASTMUTEX phFa
 {
     AssertCompile(sizeof(RTSEMFASTMUTEXINTERNAL) > sizeof(void *));
     AssertPtrReturn(phFastMtx, VERR_INVALID_POINTER);

 
     PRTSEMFASTMUTEXINTERNAL pThis = (PRTSEMFASTMUTEXINTERNAL)RTMemAllocZ(sizeof(*pThis));
     if (pThis)
@@ -94,8 +95,10 @@ RTDECL(int)  RTSemFastMutexCreate(PRTSEMFASTMUTEX phFa
         sx_init_flags(&pThis->SxLock, "IPRT Fast Mutex Semaphore", SX_DUPOK);
 
         *phFastMtx = pThis;

     return VERR_NO_MEMORY;
 }
 
@@ -107,11 +110,13 @@ RTDECL(int)  RTSemFastMutexDestroy(RTSEMFASTMUTEX hFas
         return VINF_SUCCESS;
     AssertPtrReturn(pThis, VERR_INVALID_HANDLE);
     AssertMsgReturn(pThis->u32Magic == RTSEMFASTMUTEX_MAGIC, ("%p: u32Magic=%RX32\n", pThis, pThis->u32Magic), VERR_INVALID_HANDLE);

     return VINF_SUCCESS;
 }
 
@@ -121,8 +126,11 @@ RTDECL(int)  RTSemFastMutexRequest(RTSEMFASTMUTEX hFas
     PRTSEMFASTMUTEXINTERNAL pThis = hFastMtx;
     AssertPtrReturn(pThis, VERR_INVALID_HANDLE);
     AssertMsgReturn(pThis->u32Magic == RTSEMFASTMUTEX_MAGIC, ("%p: u32Magic=%RX32\n", pThis, pThis->u32Magic), VERR_INVALID_HANDLE);

     return VINF_SUCCESS;
 }
 
@@ -132,8 +140,11 @@ RTDECL(int)  RTSemFastMutexRelease(RTSEMFASTMUTEX hFas
     PRTSEMFASTMUTEXINTERNAL pThis = hFastMtx;
     AssertPtrReturn(pThis, VERR_INVALID_HANDLE);
     AssertMsgReturn(pThis->u32Magic == RTSEMFASTMUTEX_MAGIC, ("%p: u32Magic=%RX32\n", pThis, pThis->u32Magic), VERR_INVALID_HANDLE);




--- src/VBox/Runtime/r0drv/freebsd/spinlock-r0drv-freebsd.c.orig	2021-01-07 15:42:09 UTC
+++ src/VBox/Runtime/r0drv/freebsd/spinlock-r0drv-freebsd.c
@@ -106,7 +106,9 @@ RTDECL(int)  RTSpinlockCreate(PRTSPINLOCK pSpinlock, u
      * Allocate.
      */
     AssertCompile(sizeof(RTSPINLOCKINTERNAL) > sizeof(void *));

     if (!pThis)
         return VERR_NO_MEMORY;
 
@@ -140,7 +142,9 @@ RTDECL(int)  RTSpinlockDestroy(RTSPINLOCK Spinlock)
      * Make the lock invalid and release the memory.
      */
     ASMAtomicIncU32(&pThis->u32Magic);

     return VINF_SUCCESS;
 }
 
@@ -166,6 +170,7 @@ RTDECL(void) RTSpinlockAcquire(RTSPINLOCK Spinlock)
                 {
                     RT_ASSERT_PREEMPT_CPUID_SPIN_ACQUIRED(pThis);
                     pThis->fIntSaved = fIntSaved;




--- src/VBox/Runtime/r0drv/freebsd/the-freebsd-kernel.h.orig	2021-01-07 15:42:09 UTC
+++ src/VBox/Runtime/r0drv/freebsd/the-freebsd-kernel.h
@@ -87,6 +87,7 @@
 #include <sys/smp.h>
 #include <sys/sleepqueue.h>
 #include <sys/sx.h>

 #include <vm/vm.h>
 #include <vm/pmap.h>            /* for vtophys */
 #include <vm/vm_map.h>
@@ -94,10 +95,10 @@
 #include <vm/vm_kern.h>
 #include <vm/vm_param.h>        /* KERN_SUCCESS ++ */
 #include <vm/vm_page.h>

 #include <sys/resourcevar.h>
 #include <machine/cpu.h>
 
@@ -155,6 +156,24 @@
  */
 #if 0 /** @todo Not available yet. */
 # define USE_KMEM_ALLOC_PROT

+# define IPRT_FREEBSD_RESTORE_EFL_ONLY_AC_EX(f) do { } while (0)
 #endif
 
 #endif /* !IPRT_INCLUDED_SRC_r0drv_freebsd_the_freebsd_kernel_h */




--- src/VBox/Runtime/r0drv/freebsd/thread2-r0drv-freebsd.c.orig	2021-01-07 15:42:09 UTC
+++ src/VBox/Runtime/r0drv/freebsd/thread2-r0drv-freebsd.c
@@ -94,6 +94,8 @@ DECLHIDDEN(int) rtThreadNativeSetPriority(PRTTHREADINT
             return VERR_INVALID_PARAMETER;
     }
 

 #if __FreeBSD_version < 700000
     /* Do like they're doing in subr_ntoskrnl.c... */
     mtx_lock_spin(&sched_lock);
@@ -110,6 +112,7 @@ DECLHIDDEN(int) rtThreadNativeSetPriority(PRTTHREADINT
     thread_unlock(curthread);
 #endif
 

     return VINF_SUCCESS;
 }
 
@@ -159,6 +162,7 @@ static void rtThreadNativeMain(void *pvThreadInt)
 
 DECLHIDDEN(int) rtThreadNativeCreate(PRTTHREADINT pThreadInt, PRTNATIVETHREAD pNativeThread)
 {

     int rc;
     struct proc *pProc;
 
@@ -174,6 +178,7 @@ DECLHIDDEN(int) rtThreadNativeCreate(PRTTHREADINT pThr
     }
     else
         rc = RTErrConvertFromErrno(rc);

Lines 1-6 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_Runtime_r0drv_freebsd_time-r0drv-freebsd.c (-3 / +3 lines)
1	--- src/VBox/Runtime/r0drv/freebsd/time-r0drv-freebsd.c.orig 2016-07-18 11:56:55 UTC	1	--- src/VBox/Runtime/r0drv/freebsd/time-r0drv-freebsd.c.orig 2021-01-07 15:42:09 UTC
2	+++ src/VBox/Runtime/r0drv/freebsd/time-r0drv-freebsd.c	2	+++ src/VBox/Runtime/r0drv/freebsd/time-r0drv-freebsd.c
3	@@ -40,16 +40,23 @@	3	@@ -64,16 +64,23 @@
4		4
5	RTDECL(uint64_t) RTTimeNanoTS(void)	5	RTDECL(uint64_t) RTTimeNanoTS(void)
6	{	6	{
Lines 29-35 Link Here
29	}	29	}
30		30
31		31
32	@@ -67,8 +74,7 @@ RTDECL(uint64_t) RTTimeSystemMilliTS(voi	32	@@ -91,8 +98,7 @@ RTDECL(uint64_t) RTTimeSystemMilliTS(void)
33		33
34	RTDECL(PRTTIMESPEC) RTTimeNow(PRTTIMESPEC pTime)	34	RTDECL(PRTTIMESPEC) RTTimeNow(PRTTIMESPEC pTime)
35	{	35	{




--- src/VBox/Runtime/r0drv/freebsd/timer-r0drv-freebsd.c.orig	2021-01-07 15:42:09 UTC
+++ src/VBox/Runtime/r0drv/freebsd/timer-r0drv-freebsd.c
@@ -116,6 +116,7 @@ static void rtTimerFreeBSDCallback(void *pvTimer);
 RTDECL(int) RTTimerCreateEx(PRTTIMER *ppTimer, uint64_t u64NanoInterval, uint32_t fFlags, PFNRTTIMER pfnTimer, void *pvUser)
 {
     *ppTimer = NULL;

 
     /*
      * Validate flags.
@@ -145,6 +146,7 @@ RTDECL(int) RTTimerCreateEx(PRTTIMER *ppTimer, uint64_
     callout_init(&pTimer->Callout, CALLOUT_MPSAFE);
 
     *ppTimer = pTimer;

     return VINF_SUCCESS;
 }
 
@@ -165,6 +167,8 @@ DECLINLINE(bool) rtTimerIsValid(PRTTIMER pTimer)
 
 RTDECL(int) RTTimerDestroy(PRTTIMER pTimer)
 {

     /* It's ok to pass NULL pointer. */
     if (pTimer == /*NIL_RTTIMER*/ NULL)
         return VINF_SUCCESS;
@@ -177,6 +181,8 @@ RTDECL(int) RTTimerDestroy(PRTTIMER pTimer)
     pTimer->u32Magic++;
     callout_stop(&pTimer->Callout);
     RTMemFree(pTimer);

     return VINF_SUCCESS;
 }
 
@@ -184,6 +190,7 @@ RTDECL(int) RTTimerDestroy(PRTTIMER pTimer)
 RTDECL(int) RTTimerStart(PRTTIMER pTimer, uint64_t u64First)
 {
     struct timeval tv;

 
     if (!rtTimerIsValid(pTimer))
         return VERR_INVALID_HANDLE;
@@ -207,12 +214,15 @@ RTDECL(int) RTTimerStart(PRTTIMER pTimer, uint64_t u64
     tv.tv_usec = (u64First % 1000000000) / 1000;
     callout_reset(&pTimer->Callout, tvtohz(&tv), rtTimerFreeBSDCallback, pTimer);
 

     if (!rtTimerIsValid(pTimer))
         return VERR_INVALID_HANDLE;
     if (pTimer->fSuspended)
@@ -224,6 +234,7 @@ RTDECL(int) RTTimerStop(PRTTIMER pTimer)
     pTimer->fSuspended = true;
     callout_stop(&pTimer->Callout);
 




--- src/VBox/Runtime/r3/posix/process-creation-posix.cpp.orig	2021-01-07 15:42:15 UTC
+++ src/VBox/Runtime/r3/posix/process-creation-posix.cpp
@@ -30,7 +30,7 @@
 *********************************************************************************************************************************/
 #define LOG_GROUP RTLOGGROUP_PROCESS
 #include <iprt/cdefs.h>
-#ifdef RT_OS_LINUX
+#if defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD)
 # define IPRT_WITH_DYNAMIC_CRYPT_R
 #endif
 #if (defined(RT_OS_LINUX) || defined(RT_OS_OS2)) && !defined(_GNU_SOURCE)
@@ -64,7 +64,7 @@
 # include <shadow.h>
 #endif
 
-#if defined(RT_OS_LINUX) || defined(RT_OS_OS2)
+#if defined(RT_OS_LINUX) || defined(RT_OS_OS2) || defined(RT_OS_FREEBSD)
 /* While Solaris has posix_spawn() of course we don't want to use it as
  * we need to have the child in a different process contract, no matter
  * whether it is started detached or not. */
@@ -372,7 +372,7 @@ static int rtCheckCredentials(const char *pszUser, con
     if (pPwd->pw_passwd && *pPwd->pw_passwd)
 # endif
     {
-# if defined(RT_OS_LINUX) || defined(RT_OS_OS2)
+# if defined(RT_OS_LINUX) || defined(RT_OS_OS2) || defined(RT_OS_FREEBSD)
 #  ifdef IPRT_WITH_DYNAMIC_CRYPT_R
         size_t const       cbCryptData = RT_MAX(sizeof(struct crypt_data) * 2, _256K);
 #  else

Lines 1-11 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_VMM_VMMR0_GVMMR0.cpp (-11 lines)
1	--- src/VBox/VMM/VMMR0/GVMMR0.cpp.orig 2020-05-13 19:44:47 UTC
2	+++ src/VBox/VMM/VMMR0/GVMMR0.cpp
3	@@ -1243,7 +1243,7 @@ static void gvmmR0CleanupVM(PGVM pGVM)
4
5	GMMR0CleanupVM(pGVM);
6
7	- AssertCompile((uintptr_t)NIL_RTTHREADCTXHOOK == 0); /* Depends on zero initialized memory working for NIL at the moment. */
8	+ AssertCompile(NIL_RTTHREADCTXHOOK == (RTTHREADCTXHOOK)0); /* Depends on zero initialized memory working for NIL at the moment. */
9	for (VMCPUID idCpu = 0; idCpu < pGVM->cCpus; idCpu++)
10	{
11	/** @todo Can we busy wait here for all thread-context hooks to be

Lines 1-11 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_VMM_VMMR3_VMReq.cpp (-11 lines)
1	--- src/VBox/VMM/VMMR3/VMReq.cpp.orig 2018-01-15 14:56:37 UTC
2	+++ src/VBox/VMM/VMMR3/VMReq.cpp
3	@@ -669,7 +669,7 @@ VMMR3DECL(int) VMR3ReqAlloc(PUVM pUVM, PVMREQ *ppReq,
4	Assert(pReq->enmType == VMREQTYPE_INVALID);
5	Assert(pReq->enmState == VMREQSTATE_FREE);
6	Assert(pReq->pUVM == pUVM);
7	- ASMAtomicXchgSize(&pReq->pNext, NULL);
8	+ ASMAtomicXchgSize(&pReq->pNext, (uintptr_t)NULL);
9	pReq->enmState = VMREQSTATE_ALLOCATED;
10	pReq->iStatus = VERR_VM_REQUEST_STATUS_STILL_PENDING;
11	pReq->fFlags = VMREQFLAGS_VBOX_STATUS;

Lines 1-11 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_VMM_include_IEMInternal.h (-11 lines)
1	--- src/VBox/VMM/include/IEMInternal.h.orig 2020-04-14 19:58:48 UTC
2	+++ src/VBox/VMM/include/IEMInternal.h
3	@@ -1082,7 +1082,7 @@ typedef enum IEMACCESSCRX
4
5	#if defined(__GNUC__) && defined(RT_ARCH_X86)
6	# define IEM_DECL_IMPL_TYPE(a_RetType, a_Name, a_ArgList) \
7	- __attribute__((__fastcall__)) a_RetType (a_Name) a_ArgList
8	+ __attribute__((__fastcall__, __nothrow__)) a_RetType (a_Name) a_ArgList
9	# define IEM_DECL_IMPL_DEF(a_RetType, a_Name, a_ArgList) \
10	__attribute__((__fastcall__, __nothrow__)) a_RetType a_Name a_ArgList
11

Lines 1-6 Link Here

(-)emulators/virtualbox-ose/files/patch-src_libs_xpcom18a4_Makefile.kmk (-2 / +2 lines)
1	--- src/libs/xpcom18a4/Makefile.kmk.orig 2019-01-25 18:32:58 UTC	1	--- src/libs/xpcom18a4/Makefile.kmk.orig 2021-01-07 15:44:04 UTC
2	+++ src/libs/xpcom18a4/Makefile.kmk	2	+++ src/libs/xpcom18a4/Makefile.kmk
3	@@ -980,6 +980,8 @@ VBoxXPCOM_LIBS = \	3	@@ -985,6 +985,8 @@ VBoxXPCOM_LIBS = \
4	$(VBox-xpcom-proxy_1_TARGET) \	4	$(VBox-xpcom-proxy_1_TARGET) \
5	$(VBox-xpcom-nspr_1_TARGET) \	5	$(VBox-xpcom-nspr_1_TARGET) \
6	$(VBoxXPCOMGlue_s_1_TARGET)	6	$(VBoxXPCOMGlue_s_1_TARGET)




--- src/libs/xpcom18a4/nsprpub/pr/src/pthreads/ptsynch.c.orig	2019-04-16 10:18:41 UTC
+++ src/libs/xpcom18a4/nsprpub/pr/src/pthreads/ptsynch.c
@@ -49,6 +49,9 @@
 #include <string.h>

 
 static pthread_mutexattr_t _pt_mattr;
 static pthread_condattr_t _pt_cvar_attr;
@@ -798,6 +801,7 @@ PR_IMPLEMENT(PRStatus) PR_DeleteSemaphore(const char *
  * From the semctl(2) man page in glibc 2.0
  */
 #if (defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED)) \
-    || defined(FREEBSD) || defined(OPENBSD) || defined(BSDI)
+    || (defined(FREEBSD) && __FreeBSD_version < 1200059) \
     || defined(OPENBSD) || defined(BSDI)
 /* union semun is defined by including <sys/sem.h> */
 #else
 /* according to X/OPEN we have to define it ourselves */




--- src/libs/xpcom18a4/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_x86_64_linux.cpp.orig	2019-10-10 18:15:53 UTC
+++ src/libs/xpcom18a4/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_x86_64_linux.cpp
@@ -143,11 +143,22 @@ XPTC_InvokeByIndex(nsISupports * that, PRUint32 method
     if (nr_stack)
         nr_stack = (nr_stack + 1) & ~1;
 
+#if !defined(VBOX_WITH_GCC_SANITIZER) && !defined(__clang__)
     // Load parameters to stack, if necessary
     PRUint64 *stack = (PRUint64 *) __builtin_alloca(nr_stack * 8);
+#else
+    typedef struct { PRUint64 stack[20]; } methodStack;
+    if (nr_stack > 20)
+        return NS_ERROR_CALL_FAILED;
+    methodStack stack;
+#endif
     PRUint64 gpregs[GPR_COUNT];
     double fpregs[FPR_COUNT];
+#if !defined(VBOX_WITH_GCC_SANITIZER) && !defined(__clang__)
     invoke_copy_to_stack(stack, paramCount, params, gpregs, fpregs);
+#else
+    invoke_copy_to_stack(stack.stack, paramCount, params, gpregs, fpregs);
+#endif
 
     // Load FPR registers from fpregs[]
     register double d0 asm("xmm0");
@@ -205,7 +216,12 @@ XPTC_InvokeByIndex(nsISupports * that, PRUint32 method
     methodAddress += 8 * methodIndex;
     methodAddress = *((PRUint64 *)methodAddress);
     
+#if !defined(VBOX_WITH_GCC_SANITIZER) && !defined(__clang__)
     typedef PRUint32 (*Method)(PRUint64, PRUint64, PRUint64, PRUint64, PRUint64, PRUint64);
     PRUint32 result = ((Method)methodAddress)(a0, a1, a2, a3, a4, a5);
+#else
+    typedef PRUint32 (*Method)(PRUint64, PRUint64, PRUint64, PRUint64, PRUint64, PRUint64, methodStack);
+    PRUint32 result = ((Method)methodAddress)(a0, a1, a2, a3, a4, a5, stack);
+#endif
     return result;
 }




--- src/recompiler/Makefile.kmk.orig	2019-01-25 18:33:40 UTC
+++ src/recompiler/Makefile.kmk
@@ -63,6 +63,9 @@ else
  # Missing fpclassify. Is there a better define or flag for this?
  VBoxRemPrimary_DEFS.solaris  += __C99FEATURES__
 endif # win
+# XXX Work around a linker issue with GCC 8.x & LLD:
+# ld: error: translate.c:(.debug_loc+0xA40FD): has non-ABS relocation R_386_GOTOFF against symbol 'cpu_regs'
+VBoxRemPrimary_CFLAGS.freebsd.x86 += -g0
 VBoxRemPrimary_DEFS           += IN_REM_R3 REM_INCLUDE_CPU_H NEED_CPU_H
 #VBoxRemPrimary_DEFS           += REM_PHYS_ADDR_IN_TLB
 #VBoxRemPrimary_DEFS           += DEBUG_ALL_LOGGING DEBUG_DISAS DEBUG_PCALL CONFIG_DEBUG_EXEC DEBUG_FLUSH DEBUG_IOPORT DEBUG_SIGNAL DEBUG_TLB_CHECK DEBUG_TB_INVALIDATE DEBUG_TLB  # Enables huge amounts of debug logging.




%%X11%%bin/VBoxSDL
bin/VBoxVRDP
%%QT%%bin/VirtualBox
%%QT%%bin/VirtualBoxVM
bin/vboxautostart
bin/vboxballoonctrl
bin/vboxbugreport

%%X11%%bin/vboxsdl
%%WEBSERVICE%%bin/vboxwebsrv
%%QT%%bin/virtualbox
%%QT%%bin/virtualboxvm
include/virtualbox/VirtualBox_XPCOM.h
include/virtualbox/ipcIClientObserver.h
include/virtualbox/ipcIDConnectService.h

lib/virtualbox/VBoxDD.so
lib/virtualbox/VBoxDD2.so
lib/virtualbox/VBoxDDR0.r0
lib/virtualbox/VBoxDDRC.rc
lib/virtualbox/VBoxDDU.so
%%QT%%lib/virtualbox/UICommon.so
%%QT%%lib/virtualbox/VBoxDbg.so
%%QT%%lib/virtualbox/VBoxDragAndDropSvc.so
lib/virtualbox/VBoxEFI32.fd

lib/virtualbox/VBoxNetNAT.so
%%PYTHON%%lib/virtualbox/VBoxPython.so
%%PYTHON%%lib/virtualbox/VBoxPython%%PYTHON_VERU%%.so
lib/virtualbox/VBoxREM.so
%%I386%%lib/virtualbox/VBoxREM32.so
%%I386%%lib/virtualbox/VBoxREM64.so
lib/virtualbox/VBoxRT.so

%%X11%%@(root,%%VBOXGROUP%%,4510) lib/virtualbox/VBoxSDL
%%X11%%lib/virtualbox/VBoxSDL.so
lib/virtualbox/VBoxSVC
%%X11%%lib/virtualbox/VBoxSVGA3D.so
%%X11%%lib/virtualbox/VBoxSharedClipboard.so
%%X11%%lib/virtualbox/VBoxSharedCrOpenGL.so
lib/virtualbox/VBoxSharedFolders.so
%%QT%%lib/virtualbox/VBoxTestOGL
lib/virtualbox/VBoxVMM.so

lib/virtualbox/VBoxXPCOMC.so
lib/virtualbox/VBoxXPCOMIPCD
lib/virtualbox/VMMR0.r0
%%QT%%lib/virtualbox/VirtualBox
%%QT%%@(root,%%VBOXGROUP%%,4510) lib/virtualbox/VirtualBoxVM
%%QT%%lib/virtualbox/VirtualBoxVM.so
%%SDK%%lib/virtualbox/sdk
%%WEBSERVICE%%lib/virtualbox/vboxwebsrv
%%WEBSERVICE%%lib/virtualbox/webtest




# $FreeBSD$

PORTNAME=	virtualbox-ose
PORTVERSION=	6.1.18
PORTREVISION=	3
CATEGORIES=	emulators
MASTER_SITES=	https://download.virtualbox.com/virtualbox/${PORTVERSION}/
PKGNAMESUFFIX?=	-additions
DISTNAME=	VirtualBox-${PORTVERSION}


CPE_VENDOR=	oracle
CPE_PRODUCT=	vm_virtualbox

PATCHDIR=	${.CURDIR}/../${PORTNAME}/fileo
WRKSRC=		${WRKDIR}/VirtualBox-${PORTVERSION}
#MAKE_JOBS_UNSAFE=	yes

HAS_CONFIGURE=	yes
CONFIGURE_ARGS+=	--disable-alsa \


.include <bsd.port.pre.mk>

.if ${COMPILER_TYPE} == clang
.if ${COMPILER_FEATURES:Mlibc++}
EXTRA_PATCHES+=	${PATCHDIR}/extrapatch-src-VBox-Additions-x11-VBoxClient-Makefile.kmk
.endif
.endif

post-patch:
	@${ECHO_CMD} 'VBOX_ONLY_ADDITIONS = 1' > ${WRKSRC}/LocalConfig.kmk
	@${ECHO_CMD} 'VBOX_WITH_DRAG_AND_DROP = ${VBOX_WITH_X11}' >> \

	    -e 's| -fno-merge-constants||' \
	    -e 's| -mpreferred-stack-boundary=2||' ${WRKSRC}/Config.kmk
.endif
	@${REINPLACE_CMD} -e 's|/usr/X11|${LOCALBASE}|g' \
	    ${WRKSRC}/src/VBox/Additions/x11/VBoxClient/display.cpp
	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
	    ${WRKSRC}/Config.kmk ${WRKSRC}/configure \
	    ${WRKSRC}/kBuild/header.kmk ${WRKSRC}/kBuild/units/qt4.kmk \
	    ${WRKSRC}/kBuild/units/qt5.kmk ${WRKSRC}/kBuild/sdks/LIBSDL.kmk \
	    ${WRKSRC}/src/VBox/Additions/common/crOpenGL/load.c \
	    ${WRKSRC}/src/VBox/Additions/x11/Installer/98vboxadd-xclient \
	    ${WRKSRC}/src/VBox/Additions/x11/Installer/vboxclient.desktop \
	    ${WRKSRC}/src/VBox/Additions/x11/vboxmouse/Makefile.kmk \

Lines 1-3 Link Here

(-)emulators/virtualbox-ose-additions/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1594821235	1	TIMESTAMP = 1613903085
2	SHA256 (VirtualBox-5.2.44.tar.bz2) = ad83b11cfae2734f7d6f619dd2f8bdada7d33492cd7682fab98cb4053122295e	2	SHA256 (VirtualBox-6.1.18.tar.bz2) = 108d42b9b391b7a332a33df1662cf7b0e9d9a80f3079d16288d8b9487f427d40
3	SIZE (VirtualBox-5.2.44.tar.bz2) = 124016934	3	SIZE (VirtualBox-6.1.18.tar.bz2) = 165507486




# $FreeBSD$

PORTNAME=	virtualbox-ose
PORTVERSION=	6.1.18
PORTREVISION=	4
CATEGORIES=	emulators
MASTER_SITES=	https://download.virtualbox.org/virtualbox/${PORTVERSION}/
PKGNAMESUFFIX=	-kmod
DISTNAME=	VirtualBox-${PORTVERSION}


.if ${PORT_OPTIONS:MDEBUG}
KMK_FLAGS+=	BUILD_TYPE=debug
KMK_BUILDTYPE=	debug
EXTRA_PATCHES+=	${PATCHDIR}/extrapatch-Config.kmk \
		${PATCHDIR}/extrapatch-src-VBox-HostDrivers-Support-freebsd-Makefile
MAKE_ARGS+=	DEBUG_FLAGS="-O1 -g"
.endif


Lines 1-3 Link Here

(-)emulators/virtualbox-ose-kmod/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1594821147	1	TIMESTAMP = 1613865409
2	SHA256 (VirtualBox-5.2.44.tar.bz2) = ad83b11cfae2734f7d6f619dd2f8bdada7d33492cd7682fab98cb4053122295e	2	SHA256 (VirtualBox-6.1.18.tar.bz2) = 108d42b9b391b7a332a33df1662cf7b0e9d9a80f3079d16288d8b9487f427d40
3	SIZE (VirtualBox-5.2.44.tar.bz2) = 124016934	3	SIZE (VirtualBox-6.1.18.tar.bz2) = 165507486

Return to bug 234878

Lines 2-11 Link Here

(-)emulators/virtualbox-ose/Makefile (-15 / +30 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= virtualbox-ose	4	PORTNAME= virtualbox-ose
5	PORTVERSION= 5.2.44	5	PORTVERSION= 6.1.18
6	PORTREVISION= 4
7	CATEGORIES= emulators	6	CATEGORIES= emulators
8	MASTER_SITES= https://download.oracle.com/virtualbox/${PORTVERSION}/	7	MASTER_SITES= https://download.virtualbox.org/virtualbox/${PORTVERSION}/
9	DISTFILES= VirtualBox-${PORTVERSION}${EXTRACT_SUFX} ${GUESTADDITIONS}	8	DISTFILES= VirtualBox-${PORTVERSION}${EXTRACT_SUFX} ${GUESTADDITIONS}
10	EXTRACT_ONLY= VirtualBox-${PORTVERSION}${EXTRACT_SUFX}	9	EXTRACT_ONLY= VirtualBox-${PORTVERSION}${EXTRACT_SUFX}
11		10
Lines 15-21 Link Here
15	LICENSE= GPLv2	14	LICENSE= GPLv2
16	LICENSE_FILE= ${WRKSRC}/COPYING	15	LICENSE_FILE= ${WRKSRC}/COPYING
17		16
18	PATCH_DEPENDS+= ${LOCALBASE}/share/kBuild/tools/GXX3.kmk:devel/kBuild
19	BUILD_DEPENDS= yasm:devel/yasm \	17	BUILD_DEPENDS= yasm:devel/yasm \
20	xsltproc:textproc/libxslt \	18	xsltproc:textproc/libxslt \
21	kmk:devel/kBuild \	19	kmk:devel/kBuild \
Lines 42-49 Link Here
42	virtualbox-ose-legacy-[0-9]* \	40	virtualbox-ose-legacy-[0-9]* \
43	virtualbox-ose-lite-[0-9]*	41	virtualbox-ose-lite-[0-9]*
44		42
45	LDFLAGS= -lpthread
46
47	VBOXUSER?= vboxusers	43	VBOXUSER?= vboxusers
48	VBOXWSUSER?= vboxusers	44	VBOXWSUSER?= vboxusers
49	VBOXGROUP?= vboxusers	45	VBOXGROUP?= vboxusers
Lines 57-63 Link Here
57	VBOX_UTILS= VBoxExtPackHelperApp VBoxNetAdpCtl VBoxNetDHCP VBoxNetNAT \	53	VBOX_UTILS= VBoxExtPackHelperApp VBoxNetAdpCtl VBoxNetDHCP VBoxNetNAT \
58	VBoxSVC VBoxXPCOMIPCD	54	VBoxSVC VBoxXPCOMIPCD
59		55
60	OPTIONS_DEFINE= ALSA DBUS DEBUG GUESTADDITIONS MANUAL NLS PULSEAUDIO \	56	OPTIONS_DEFINE= ALSA DBUS DEBUG GUESTADDITIONS MANUAL NLS OPUS PULSEAUDIO \
61	PYTHON QT5 R0LOGGING UDPTUNNEL VDE VNC WEBSERVICE VPX X11	57	PYTHON QT5 R0LOGGING UDPTUNNEL VDE VNC WEBSERVICE VPX X11
62	OPTIONS_DEFAULT= DBUS QT5 UDPTUNNEL VNC WEBSERVICE X11	58	OPTIONS_DEFAULT= DBUS QT5 UDPTUNNEL VNC WEBSERVICE X11
63	OPTIONS_SUB= yes	59	OPTIONS_SUB= yes
Lines 66-71 Link Here
66	GUESTADDITIONS_DESC= Build with Guest Additions	62	GUESTADDITIONS_DESC= Build with Guest Additions
67	MANUAL_DESC= Build with user manual	63	MANUAL_DESC= Build with user manual
68	NLS_DESC= Native language support (requires QT5)	64	NLS_DESC= Native language support (requires QT5)
		65	OPUS_DESC= Use libvpx for audio recording (requires VPX)
69	QT5_DESC= Build with QT5 frontend (requires X11)	66	QT5_DESC= Build with QT5 frontend (requires X11)
70	R0LOGGING_DESC= Enable R0 logging (requires DEBUG)	67	R0LOGGING_DESC= Enable R0 logging (requires DEBUG)
71	UDPTUNNEL_DESC= Build with UDP tunnel support	68	UDPTUNNEL_DESC= Build with UDP tunnel support
Lines 82-87 Link Here
82	MANUAL_BUILD_DEPENDS= ${LOCALBASE}/share/xml/docbook/4.4/docbookx.dtd:textproc/docbook-xml	79	MANUAL_BUILD_DEPENDS= ${LOCALBASE}/share/xml/docbook/4.4/docbookx.dtd:textproc/docbook-xml
83	MANUAL_CONFIGURE_OFF= --disable-docs	80	MANUAL_CONFIGURE_OFF= --disable-docs
84	NLS_IMPLIES= QT5	81	NLS_IMPLIES= QT5
		82	OPUS_CONFIGURE_OFF= --disable-libopus
		83	OPUS_LIB_DEPENDS= libopus.so:audio/opus
		84	OPUS_IMPLIES= VPX
85	PULSEAUDIO_CONFIGURE_OFF= --disable-pulse	85	PULSEAUDIO_CONFIGURE_OFF= --disable-pulse
86	PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio	86	PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio
87	PYTHON_CONFIGURE_OFF= --disable-python	87	PYTHON_CONFIGURE_OFF= --disable-python
Lines 152-164 Link Here
152	.if ${PORT_OPTIONS:MQT5}	152	.if ${PORT_OPTIONS:MQT5}
153	CONFIGURE_ARGS+= --enable-qt5	153	CONFIGURE_ARGS+= --enable-qt5
154	PLIST_SUB+= QT=""	154	PLIST_SUB+= QT=""
155	USES+= gl qmake:no_env qt:5 xorg	155	USES+= gl qmake:no_env qt:5
156	USE_GL= gl glu	156	USE_GL= gl glu
157	USE_QT= buildtools_build core dbus gui linguisttools_build opengl	157	USE_QT= buildtools_build core dbus gui linguisttools_build opengl
158	USE_QT+= printsupport widgets x11extras	158	USE_QT+= printsupport widgets x11extras
159	USE_XORG= xcb	159	USE_XORG= xcb
160	INSTALLS_ICONS= yes	160	INSTALLS_ICONS= yes
161	VBOX_PROGS+= VirtualBox	161	VBOX_PROGS+= VirtualBox VirtualBoxVM
162	VBOX_UTILS+= VBoxTestOGL	162	VBOX_UTILS+= VBoxTestOGL
163	VBOX_WITH_QT= 1	163	VBOX_WITH_QT= 1
164	.else	164	.else
Lines 202-207 Link Here
202		202
203	.include <bsd.port.pre.mk>	203	.include <bsd.port.pre.mk>
204		204
		205	.if ${COMPILER_TYPE} == clang
		206	.if ${COMPILER_VERSION} == 80
		207	# XXX PR236616: Clang 8.0 caused runtime problems.
		208	BUILD_DEPENDS+= ${LOCALBASE}/bin/clang${VBOX_LLVM_VER}:devel/llvm${VBOX_LLVM_VER}
		209	CC= ${LOCALBASE}/bin/clang${VBOX_LLVM_VER}
		210	CXX= ${LOCALBASE}/bin/clang++${VBOX_LLVM_VER}
		211	VBOX_LLVM_VER?= 80
		212	.endif
		213	PATCH_DEPENDS+= ${LOCALBASE}/share/kBuild/tools/GXX3.kmk:devel/kBuild
		214	EXTRA_PATCHES+= ${PATCHDIR}/extrapatch-src-VBox-Devices-PC-ipxe-Makefile.kmk
		215	#EXTRA_PATCHES+= ${PATCHDIR}/extrapatch-Config.kmk \
		216	${PATCHDIR}/extrapatch-src-VBox-Devices-PC-ipxe-Makefile.kmk
		217	.endif
		218
205	.if ${PYTHON_MAJOR_VER} >= 3	219	.if ${PYTHON_MAJOR_VER} >= 3
206	PLIST_SUB+= PYTHON_PYCDIR=/__pycache__/ \	220	PLIST_SUB+= PYTHON_PYCDIR=/__pycache__/ \
207	PYTHON_PYCEXT=.cpython-${PYTHON_SUFFIX}.pyc	221	PYTHON_PYCEXT=.cpython-${PYTHON_SUFFIX}.pyc
Lines 274-286 Link Here
274	${WRKSRC}/LocalConfig.kmk	288	${WRKSRC}/LocalConfig.kmk
275	@${ECHO_CMD} 'VBOX_GCC_PEDANTIC_CXX = -Wshadow $$(VBOX_GCC_WARN) -Wno-long-long' >> \	289	@${ECHO_CMD} 'VBOX_GCC_PEDANTIC_CXX = -Wshadow $$(VBOX_GCC_WARN) -Wno-long-long' >> \
276	${WRKSRC}/LocalConfig.kmk	290	${WRKSRC}/LocalConfig.kmk
277	@${REINPLACE_CMD} -E -e '/soap_socket_errno\(/s/(soap_socket_errno)(\([^)]+\))/\1/' \
278	${WRKSRC}/src/VBox/Main/webservice/vboxweb.cpp
279	.endif	291	.endif
		292	.if empty(PORT_OPTIONS:MX11)
		293	@${ECHO} 'VBOX_WITH_VMSVGA3D =' >> ${WRKSRC}/LocalConfig.kmk
		294	.endif
		295	.if ${COMPILER_TYPE} == clang
280	@${REINPLACE_CMD} -e 's\| -finline-limit=8000\|\|' \	296	@${REINPLACE_CMD} -e 's\| -finline-limit=8000\|\|' \
281	-e 's\| -mpreferred-stack-boundary=2\|\|' \	297	-e 's\| -mpreferred-stack-boundary=2\|\|' ${WRKSRC}/Config.kmk
282	-e 's\|%%PYTHON_VERSION%%\|${PYTHON_VERSION}\|' \
283	${WRKSRC}/Config.kmk
284	@${REINPLACE_CMD} -e 's\| -fpermissive\|\|' ${WRKSRC}/Config.kmk \	298	@${REINPLACE_CMD} -e 's\| -fpermissive\|\|' ${WRKSRC}/Config.kmk \
285	${WRKSRC}/src/VBox/Main/webservice/Makefile.kmk	299	${WRKSRC}/src/VBox/Main/webservice/Makefile.kmk
286	@${ECHO_CMD} 'TOOL_VBoxGccFreeBSD_LD = ${CXX}' >> ${WRKSRC}/LocalConfig.kmk	300	@${ECHO_CMD} 'TOOL_VBoxGccFreeBSD_LD = ${CXX}' >> ${WRKSRC}/LocalConfig.kmk
Lines 287-292 Link Here
287	@${SED} -e 's\|GXX3\|VBoxGccFreeBSD\|g' \	301	@${SED} -e 's\|GXX3\|VBoxGccFreeBSD\|g' \
288	${LOCALBASE}/share/kBuild/tools/GXX3.kmk > \	302	${LOCALBASE}/share/kBuild/tools/GXX3.kmk > \
289	${WRKSRC}/tools/kBuildTools/VBoxGccFreeBSD.kmk	303	${WRKSRC}/tools/kBuildTools/VBoxGccFreeBSD.kmk
		304	.endif
290	@${REINPLACE_CMD} -e 's\|/usr/local\|${LOCALBASE}\|g' \	305	@${REINPLACE_CMD} -e 's\|/usr/local\|${LOCALBASE}\|g' \
291	${WRKSRC}/Config.kmk ${WRKSRC}/configure \	306	${WRKSRC}/Config.kmk ${WRKSRC}/configure \
292	${WRKSRC}/kBuild/header.kmk ${WRKSRC}/kBuild/units/qt4.kmk \	307	${WRKSRC}/kBuild/header.kmk ${WRKSRC}/kBuild/units/qt4.kmk \
Lines 329-335 Link Here
329		344
330	${MKDIR} ${STAGEDIR}${VBOX_DIR}	345	${MKDIR} ${STAGEDIR}${VBOX_DIR}
331	cd ${KMK_BUILDDIR}/bin && ${COPYTREE_SHARE} \	346	cd ${KMK_BUILDDIR}/bin && ${COPYTREE_SHARE} \
332	".fd .r0 .rc .so components" ${STAGEDIR}${VBOX_DIR}	347	".fd .r0 *.so components" ${STAGEDIR}${VBOX_DIR}
333	.if ${PORT_OPTIONS:MPYTHON} \|\| ${PORT_OPTIONS:MWEBSERVICE}	348	.if ${PORT_OPTIONS:MPYTHON} \|\| ${PORT_OPTIONS:MWEBSERVICE}
334	${RLN} ${STAGEDIR}${DATADIR}/sdk ${STAGEDIR}${VBOX_DIR}	349	${RLN} ${STAGEDIR}${DATADIR}/sdk ${STAGEDIR}${VBOX_DIR}
335	.endif	350	.endif

Lines 1-6 Link Here

(-)emulators/virtualbox-ose/files/patch-Config.kmk (-129 / +124 lines)
1	--- Config.kmk.orig 2020-07-09 16:49:46 UTC	1	--- Config.kmk.orig 2021-01-07 15:31:21 UTC
2	+++ Config.kmk	2	+++ Config.kmk
3	@@ -445,11 +445,11 @@ ifn1of ($(KBUILD_TARGET), win darwin)	3	@@ -469,11 +469,11 @@ ifn1of ($(KBUILD_TARGET), win darwin)
4	# Enable OSS audio support.	4	# Enable OSS audio support.
5	VBOX_WITH_AUDIO_OSS = 1	5	VBOX_WITH_AUDIO_OSS = 1
6	endif	6	endif
Lines 14-22 Link Here
14	# Enable PulseAudio audio support.	14	# Enable PulseAudio audio support.
15	VBOX_WITH_AUDIO_PULSE = 1	15	VBOX_WITH_AUDIO_PULSE = 1
16	endif	16	endif
17	@@ -464,11 +464,11 @@ VBOX_WITH_AUDIO_MMNOTIFICATION_CLIENT = 1	17	@@ -489,11 +489,11 @@ VBOX_WITH_AUDIO_MMNOTIFICATION_CLIENT = 1
18	# Enable PCI passthrough support.	18	# (disabled with 6.1, since it's not complete/useful enough)
19	VBOX_WITH_PCI_PASSTHROUGH = 1	19	VBOX_WITH_PCI_PASSTHROUGH =
20	# Enable statically linked dbus support.	20	# Enable statically linked dbus support.
21	-if1of ($(KBUILD_TARGET), linux solaris)	21	-if1of ($(KBUILD_TARGET), linux solaris)
22	+if1of ($(KBUILD_TARGET), freebsd linux solaris)	22	+if1of ($(KBUILD_TARGET), freebsd linux solaris)
Lines 28-43 Link Here
28	VBOX_WITH_PAM = 1	28	VBOX_WITH_PAM = 1
29	endif	29	endif
30	# Enable internal networking.	30	# Enable internal networking.
31	@@ -664,7 +664,7 @@ VBOX_WITH_TESTCASES = 1	31	@@ -501,7 +501,7 @@ VBOX_WITH_INTERNAL_NETWORKING = 1
32	VBOX_WITH_VDITOOL =	32	# Enable vmsvga (svga2) graphics device variant, 2D part
33	# Enable this to build vbox-img even if VBOX_WITH_TESTCASES is disabled	33	VBOX_WITH_VMSVGA = 1
34	VBOX_WITH_VBOX_IMG =	34	# Enable vmsvga (svga2) graphics device variant, 3D part
35	-if1of ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH), darwin.x86 darwin.amd64 linux.x86 linux.amd64 solaris.amd64 win.x86 win.amd64)	35	-if1of ($(KBUILD_TARGET), darwin linux win)
36	+if1of ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH), darwin.x86 darwin.amd64 freebsd.x86 freebsd.amd64 linux.x86 linux.amd64 solaris.amd64 win.x86 win.amd64)	36	+if1of ($(KBUILD_TARGET), darwin freebsd linux win)
37	# Enables the video capturing support.	37	VBOX_WITH_VMSVGA3D = 1
38	VBOX_WITH_VIDEOREC = 1	38	endif
39	# Enable VPX (VP8 / VP9 codec), used for video capturing.	39	# Enable the generic 3D settings support if at least one 3D capable solution is enabled
40	@@ -992,10 +992,6 @@ ifeq ($(KBUILD_TARGET),darwin)	40	@@ -647,7 +647,7 @@ VBOX_WITH_MAIN_USB_ID_DATABASE = 1
		41	#endif
		42	# Set this to prefix all C symbols in XPCOM, to avoid dynamic linking problems
		43	# caused by our XPCOM library polluting the symbol namespace for system libs.
		44	-if1of ($(KBUILD_TARGET), linux solaris)
		45	+if1of ($(KBUILD_TARGET), freebsd linux solaris)
		46	VBOX_WITH_XPCOM_NAMESPACE_CLEANUP = 1
		47	endif
		48	# The webservices api.
		49	@@ -1064,10 +1064,6 @@ ifeq ($(KBUILD_TARGET),darwin)
41	VBOX_WITH_VBOXSDL=	50	VBOX_WITH_VBOXSDL=
42	endif	51	endif
43		52
Lines 48-54 Link Here
48	ifeq ($(KBUILD_TARGET),haiku)	57	ifeq ($(KBUILD_TARGET),haiku)
49	# Don't bother with SDL ttf for now.	58	# Don't bother with SDL ttf for now.
50	VBOX_WITH_SECURELABEL=	59	VBOX_WITH_SECURELABEL=
51	@@ -1155,7 +1151,7 @@ ifdef VBOX_OSE	60	@@ -1228,7 +1224,7 @@ ifdef VBOX_OSE
52	VBOX_WITH_KCHMVIEWER=	61	VBOX_WITH_KCHMVIEWER=
53	VBOX_WITH_PLUGIN_CRYPT=	62	VBOX_WITH_PLUGIN_CRYPT=
54	VBOX_WITH_DRAG_AND_DROP_PROMISES=	63	VBOX_WITH_DRAG_AND_DROP_PROMISES=
Lines 57-149 Link Here
57	VBOX_WITH_DOCS=	66	VBOX_WITH_DOCS=
58	VBOX_WITH_DOCS_PACKING=	67	VBOX_WITH_DOCS_PACKING=
59	endif	68	endif
60	@@ -1176,14 +1172,14 @@ ifdef VBOX_OSE	69	@@ -4928,7 +4924,7 @@ define TOOL_FREEBSDKMODLD_LINK_SYSMOD_CMDS
61	ifn1of ($(KBUILD_TARGET), darwin linux solaris win)
62	VBOX_WITH_INSTALLER=
63	endif
64	- if1of ($(KBUILD_TARGET), win)
65	+ # if1of ($(KBUILD_TARGET), win)
66	# Undefine codec libraries which are not needed.
67	VBOX_WITH_LIBVPX=
68	VBOX_WITH_LIBOPUS=
69	# Disable video recording (with audio support).
70	VBOX_WITH_VIDEOREC=
71	VBOX_WITH_AUDIO_VIDEOREC=
72	- endif
73	+ # endif
74	# branding
75	VBOX_BRAND_LICENSE_HTML := $(PATH_ROOT)/doc/License-gpl-2.0.html
76	VBOX_BRAND_LICENSE_RTF := $(PATH_ROOT)/doc/License-gpl-2.0.rtf
77	@@ -1810,6 +1806,7 @@ ifndef VBOX_BLD_PYTHON
78	else
79	VBOX_BLD_PYTHON := $(firstword $(which python2.7$(HOSTSUFF_EXE)) $(which python2.6$(HOSTSUFF_EXE)) \
80	$(which python$(HOSTSUFF_EXE)) $(which python3$(HOSTSUFF_EXE)) \
81	+ $(which %%PYTHON_VERSION%%) \
82	python-not-found)
83	endif
84	endif
85	@@ -2550,6 +2547,10 @@ ifeq ($(KBUILD_HOST),win) ## @todo can drop this now,
86	# This isn't important (yet) on windows, so cook the result until
87	# cygwin is feeling better.
88	VBOX_GCC_VERSION := $(int-add $(int-mul 10000, 3), $(int-mul 100, 3), 3)
89	+else ifeq($(KBUILD_HOST,freebsd))
90	+ # At a minimum, we'll be building with GCC 4.2 on FreeBSD. LLVM will always
91	+ # pose as GCC 4.2 anyways, so this seems safe.
92	+ VBOX_GCC_VERSION := $(int-add $(int-mul 10000, 4), $(int-mul 100, 2), 0)
93	else
94	# This is kind of bad, the returned string needs to be re-evaluated before use.
95	# The reason for this hack is that the windows kmk_ash cannot deal with $((1+1)).
96	@@ -4218,6 +4219,7 @@ ifdef VBOX_WITH_RAW_MODE
97	TEMPLATE_VBoxRc_TOOL = $(VBOX_GCC32_TOOL)
98	TEMPLATE_VBoxRc_CXXFLAGS = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC32_Wno-variadic-macros) -fno-exceptions $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-strict-aliasing $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_fvisibility-inlines-hidden) -fno-rtti $(VBOX_GCC_IPRT_FMT_CHECK)
99	TEMPLATE_VBoxRc_CFLAGS = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C) $(VBOX_GCC32_Wno-variadic-macros) -fno-exceptions $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-strict-aliasing $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_IPRT_FMT_CHECK)
100	+ TEMPLATE_VBoxRc_CXXFLAGS.freebsd = -fno-builtin
101	ifeq ($(KBUILD_TARGET),solaris)
102	TEMPLATE_VBoxRc_LDFLAGS = -r
103	else
104	@@ -4359,6 +4361,7 @@ ifeq ($(VBOX_LDR_FMT),elf)
105	TEMPLATE_VBoxR0_TOOL = $(VBOX_GCC_TOOL)
106	TEMPLATE_VBoxR0_CFLAGS = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C) $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions $(VBOX_GCC_fno-stack-protector) -fno-common $(VBOX_GCC_fvisibility-hidden) -std=gnu99 $(VBOX_GCC_IPRT_FMT_CHECK)
107	TEMPLATE_VBoxR0_CXXFLAGS = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions $(VBOX_GCC_fno-stack-protector) -fno-common $(VBOX_GCC_fvisibility-inlines-hidden) $(VBOX_GCC_fvisibility-hidden) -fno-rtti $(VBOX_GCC_IPRT_FMT_CHECK)
108	+TEMPLATE_VBoxR0_CXXFLAGS.freebsd = -fno-builtin
109	TEMPLATE_VBoxR0_CFLAGS.amd64 = -m64 -mno-red-zone -mcmodel=kernel -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-asynchronous-unwind-tables -ffreestanding
110	TEMPLATE_VBoxR0_CXXFLAGS.amd64 = -m64 -mno-red-zone -mcmodel=kernel -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-asynchronous-unwind-tables
111	ifeq ($(KBUILD_TARGET),solaris)
112	@@ -4683,13 +4686,13 @@ TEMPLATE_VBOXR0DRV_CFLAGS = \
113	-O2 -ffreestanding -fno-strict-aliasing -fno-common -finline-limit=8000 \
114	$(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \
115	-nostdinc -std=c99
116	-TEMPLATE_VBOXR0DRV_CFLAGS.x86 = -m32 -mno-align-long-strings -mpreferred-stack-boundary=2 -mno-mmx -mno-3dnow -mno-sse -mno-sse2
117	+TEMPLATE_VBOXR0DRV_CFLAGS.x86 = -m32 -mpreferred-stack-boundary=2 -mno-mmx -mno-3dnow -mno-sse -mno-sse2
118	TEMPLATE_VBOXR0DRV_CFLAGS.amd64 = -m64 --param inline-unit-growth=100 --param large-function-growth=1000 \
119	-fno-omit-frame-pointer -mcmodel=kernel -mno-red-zone -mfpmath=387 -mno-sse -mno-sse2 -mno-mmx \
120	-mno-3dnow -msoft-float -fno-asynchronous-unwind-tables -Wundef
121	TEMPLATE_VBOXR0DRV_CXXFLAGS = -fno-exceptions -fno-rtti \
122	$(VBOX_GCC_WARN) -Wpointer-arith -Winline \
123	- -O2 -fno-strict-aliasing -fno-common -finline-limit=8000 \
124	+ -O2 -fno-builtin -fno-strict-aliasing -fno-common -finline-limit=8000 \
125	$(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \
126	-nostdinc
127	TEMPLATE_VBOXR0DRV_CXXFLAGS.x86 = $(TEMPLATE_VBOXR0DRV_CFLAGS.x86)
128	@@ -4716,7 +4719,7 @@ define TOOL_FREEBSDKMODLD_LINK_SYSMOD_CMDS
129	\| xargs -J% objcopy % $(out)
130
131	## Strip debug info (comment out if debugging or something).
132	- objcopy --strip-debug $(out)
133	+# objcopy --strip-debug $(out)
134	endef
135	else # x86
136	TOOL_FREEBSDKMODLD_LINK_SYSMOD_OUTPUT = $(outbase).kld
137	@@ -4730,7 +4733,7 @@ define TOOL_FREEBSDKMODLD_LINK_SYSMOD_CMDS
138	\| xargs -J% objcopy % $(outbase).kld	70	\| xargs -J% objcopy % $(outbase).kld
139		71
140	# Link the final .ko (a shared object).	72	# Link the final .ko (a shared object).
141	- ld $(flags) -Bshareable -o $(out) $(outbase).kld	73	- ld $(flags) -Bshareable -o $(out) $(outbase).kld
142	+ ld $(flags) -Bshareable -znotext -o $(out) $(outbase).kld	74	+ ld $(flags) -Bshareable -znotext -o $(out) $(outbase).kld
143	endef	75	endef
144	endif # x86	76	endif # x86
145		77
146	@@ -5016,10 +5019,18 @@ TEMPLATE_VBOXR3EXE_LIBPATH += \	78	@@ -5205,6 +5201,7 @@ TEMPLATE_VBOXR3EXE_LDFLAGS.x86 = -m32
		79	TEMPLATE_VBOXR3EXE_LDFLAGS.amd64 = -m64
		80	TEMPLATE_VBOXR3EXE_LDFLAGS.sparc32 = -m32
		81	TEMPLATE_VBOXR3EXE_LDFLAGS.sparc64 = -m64
		82	+TEMPLATE_VBOXR3EXE_LDFLAGS.freebsd = -Wl,-z,noexecstack,-z,relro $(VBOX_LD_as_needed)
		83	TEMPLATE_VBOXR3EXE_LDFLAGS.linux = -Wl,-z,noexecstack,-z,relro $(VBOX_LD_as_needed)
		84	TEMPLATE_VBOXR3EXE_LDFLAGS.solaris = -Wl,-z,ignore # same as VBOX_LD_as_needed
		85	TEMPLATE_VBOXR3EXE_LDFLAGS.debug = $(VBOX_GCC_SANITIZER_FLAGS) $(VBOX_GCC_SANITIZER_LDFLAGS)
		86	@@ -5238,10 +5235,18 @@ TEMPLATE_VBOXR3EXE_LIBPATH += \
147	TEMPLATE_VBOXR3EXE_CFLAGS += -fno-pic	87	TEMPLATE_VBOXR3EXE_CFLAGS += -fno-pic
148	TEMPLATE_VBOXR3EXE_CXXFLAGS += -fno-pic	88	TEMPLATE_VBOXR3EXE_CXXFLAGS += -fno-pic
149	TEMPLATE_VBOXR3EXE_LDFLAGS += -fno-pic	89	TEMPLATE_VBOXR3EXE_LDFLAGS += -fno-pic
Lines 163-178 Link Here
163	/usr/include \	103	/usr/include \
164	/usr/X11R6/include \	104	/usr/X11R6/include \
165	/usr/local/include	105	/usr/local/include
166	@@ -5310,7 +5321,7 @@ ifeq ($(KBUILD_TARGET),win) # No CRT!	106	@@ -5273,6 +5278,7 @@ TEMPLATE_VBOXR3EXE_CXXFLAGS.kprofile = $(TEMPLATE_VB
167	TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS.win.amd64 = $(TEMPLATE_VBOXR3EXE_LDFLAGS.win.amd64) /entry:suplibHardenedWindowsMain	107	TEMPLATE_VBOXR3EXE_LDFLAGS += '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)'
168	TEMPLATE_VBOXR3HARDENEDEXE_LIBS.x86 = $(NOT_SUCH_VARIABLE)	108	endif
169	TEMPLATE_VBOXR3HARDENEDEXE_LIBS.amd64 = $(NOT_SUCH_VARIABLE)	109	ifdef VBOX_WITH_ORIGIN
170	-else ifn1of ($(KBUILD_TARGET), os2 solaris)	110	+ TEMPLATE_VBOXR3EXE_LDFLAGS.freebsd += $(VBOX_GCC_ORIGIN_OPT)
171	+else ifn1of ($(KBUILD_TARGET), freebsd os2 solaris)	111	TEMPLATE_VBOXR3EXE_LDFLAGS.linux += $(VBOX_GCC_ORIGIN_OPT)
		112	endif
		113	endif
		114	@@ -5412,7 +5418,7 @@ ifeq ($(KBUILD_TARGET),win)
		115	$(PATH_TOOL_$(TEMPLATE_VBOXR3STATIC_TOOL.win.amd64)_LIB)/libcmt$(VBOX_VCC_CRT_TYPE).lib \
		116	$(PATH_TOOL_$(TEMPLATE_VBOXR3STATIC_TOOL.win.amd64)_LIB)/libcpmt$(VBOX_VCC_CRT_TYPE).lib \
		117	$(PATH_TOOL_$(TEMPLATE_VBOXR3STATIC_TOOL.win.amd64)_LIB)/oldnames.lib
		118	-else ifn1of ($(KBUILD_TARGET), darwin linux solaris)
		119	+else ifn1of ($(KBUILD_TARGET), darwin freebsd linux solaris)
		120	# The gcc guys sans darwin, linux and solaris (don't depend on statically compiled system libs there)
		121	TEMPLATE_VBOXR3STATIC_CFLAGS = $(TEMPLATE_VBOXR3EXE_CFLAGS) -static
		122	TEMPLATE_VBOXR3STATIC_CXXFLAGS = $(TEMPLATE_VBOXR3EXE_CXXFLAGS) -static
		123	@@ -5557,6 +5563,7 @@ ifeq ($(KBUILD_TARGET),win) # No CRT!
		124	else ifn1of ($(KBUILD_TARGET), os2 solaris)
172	# We want to keep the RPATH on Solaris to be able to find libgcc_1/libstdc++ within $(VBOX_WITH_RUNPATH)	125	# We want to keep the RPATH on Solaris to be able to find libgcc_1/libstdc++ within $(VBOX_WITH_RUNPATH)
173	TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS = $(filter-out '$(VBOX_GCC_RPATH_OPT)%,$(TEMPLATE_VBOXR3EXE_LDFLAGS))	126	TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS = $(filter-out '$(VBOX_GCC_RPATH_OPT)%,$(TEMPLATE_VBOXR3EXE_LDFLAGS))
		127	+ TEMPLATE_VBoxR3HardenedTstDll_LDFLAGS.freebsd = $(filter-out $(VBOX_GCC_ORIGIN_OPT),$(TEMPLATE_VBoxR3TstDll_LDFLAGS.freebsd))
174	TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS.linux = $(filter-out $(VBOX_GCC_ORIGIN_OPT),$(TEMPLATE_VBOXR3EXE_LDFLAGS.linux))	128	TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS.linux = $(filter-out $(VBOX_GCC_ORIGIN_OPT),$(TEMPLATE_VBOXR3EXE_LDFLAGS.linux))
175	@@ -5837,10 +5848,18 @@ TEMPLATE_VBOXMAINEXE_LIBS = $(LIB_RUNTI	129	endif
		130
		131	@@ -5584,6 +5591,7 @@ TEMPLATE_VBoxR3HardenedTstDll_INST = $(INST_TESTCASE)
		132	TEMPLATE_VBoxR3HardenedTstDll_LDFLAGS.win = $(TEMPLATE_VBoxR3TstDll_LDFLAGS.win) -IntegrityCheck
		133	ifn1of ($(KBUILD_TARGET), win os2)
		134	TEMPLATE_VBoxR3HardenedTstDll_LDFLAGS = $(filter-out '$(VBOX_GCC_RPATH_OPT)%,$(TEMPLATE_VBoxR3TstDll_LDFLAGS))
		135	+ TEMPLATE_VBoxR3HardenedTstDll_LDFLAGS.freebsd = $(filter-out $(VBOX_GCC_ORIGIN_OPT),$(TEMPLATE_VBoxR3TstDll_LDFLAGS.freebsd))
		136	TEMPLATE_VBoxR3HardenedTstDll_LDFLAGS.linux = $(filter-out $(VBOX_GCC_ORIGIN_OPT),$(TEMPLATE_VBoxR3TstDll_LDFLAGS.linux))
		137	endif
		138
		139	@@ -5606,6 +5614,7 @@ ifndef VBOX_WITH_HARDENING
		140	TEMPLATE_VBoxR3SetUidToRoot_LDFLAGS += '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)'
		141	endif
		142	ifdef VBOX_WITH_ORIGIN
		143	+ TEMPLATE_VBoxR3SetUidToRoot_LDFLAGS.freebsd += $(VBOX_GCC_ORIGIN_OPT)
		144	TEMPLATE_VBoxR3SetUidToRoot_LDFLAGS.linux += $(VBOX_GCC_ORIGIN_OPT)
		145	endif
		146	endif
		147	@@ -6132,10 +6141,19 @@ TEMPLATE_VBOXMAINEXE_LIBS = $(LIB_RUNTI
176	else ifeq ($(KBUILD_TARGET),haiku)	148	else ifeq ($(KBUILD_TARGET),haiku)
177	TEMPLATE_VBOXMAINEXE_TOOL = GXX3	149	TEMPLATE_VBOXMAINEXE_TOOL = GXX3
178	TEMPLATE_VBOXMAINEXE_LIBS = $(LIB_RUNTIME) network stdc++ supc++	150	TEMPLATE_VBOXMAINEXE_LIBS = $(LIB_RUNTIME) network stdc++ supc++
Lines 180-185 Link Here
180	+ else ifeq ($(KBUILD_TARGET),freebsd)	152	+ else ifeq ($(KBUILD_TARGET),freebsd)
181	TEMPLATE_VBOXMAINEXE_TOOL = GXX3	153	TEMPLATE_VBOXMAINEXE_TOOL = GXX3
182	TEMPLATE_VBOXMAINEXE_LIBS = $(LIB_RUNTIME)	154	TEMPLATE_VBOXMAINEXE_LIBS = $(LIB_RUNTIME)
		155	+TEMPLATE_VBOXMAINEXE_LDFLAGS.freebsd = -Wl,-z,noexecstack,-z,relro $(VBOX_LD_as_needed)
183	+TEMPLATE_VBOXMAINEXE_LDFLAGS.freebsd.x86 = -Wl,-z,notext	156	+TEMPLATE_VBOXMAINEXE_LDFLAGS.freebsd.x86 = -Wl,-z,notext
184	TEMPLATE_VBOXMAINEXE_INCS += \	157	TEMPLATE_VBOXMAINEXE_INCS += \
185	+ /usr/local/include	158	+ /usr/local/include
Lines 192-201 Link Here
192	/usr/include \	165	/usr/include \
193	/usr/X11R6/include \	166	/usr/X11R6/include \
194	/usr/local/include	167	/usr/local/include
195	@@ -6382,13 +6401,10 @@ ifdef VBOX_WITH_QTGUI	168	@@ -6167,6 +6185,7 @@ TEMPLATE_VBOXMAINEXE_LDFLAGS += '$(VBOX_GCC
		169	TEMPLATE_VBOXMAINEXE_LDFLAGS += '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)'
		170	endif
		171	ifdef VBOX_WITH_ORIGIN
		172	+TEMPLATE_VBOXMAINEXE_LDFLAGS.freebsd += $(VBOX_GCC_ORIGIN_OPT)
		173	TEMPLATE_VBOXMAINEXE_LDFLAGS.linux += $(VBOX_GCC_ORIGIN_OPT)
		174	endif
		175
		176	@@ -6735,13 +6754,11 @@ ifdef VBOX_WITH_QTGUI
196	TEMPLATE_VBOXQTGUIEXE_LIBPATH += \	177	TEMPLATE_VBOXQTGUIEXE_LIBPATH += \
197	$(VBOX_LIBPATH_X11)	178	$(VBOX_LIBPATH_X11)
198	ifeq ($(KBUILD_TARGET),freebsd)	179	ifeq ($(KBUILD_TARGET),freebsd)
		180	+ TEMPLATE_VBOXQTGUIEXE_LDFLAGS += -Wl,-z,noexecstack,-z,relro $(VBOX_LD_as_needed)
199	+ TEMPLATE_VBOXQTGUIEXE_LDFLAGS.freebsd.x86 = -Wl,-z,notext	181	+ TEMPLATE_VBOXQTGUIEXE_LDFLAGS.freebsd.x86 = -Wl,-z,notext
200	TEMPLATE_VBOXQTGUIEXE_INCS += \	182	TEMPLATE_VBOXQTGUIEXE_INCS += \
201	- /usr/include \	183	- /usr/include \
Lines 207-239 Link Here
207	/usr/local/lib	189	/usr/local/lib
208	endif	190	endif
209	ifeq ($(KBUILD_TARGET),solaris)	191	ifeq ($(KBUILD_TARGET),solaris)
210	@@ -6617,12 +6633,8 @@ TEMPLATE_VBoxBldProg_LIBPATH += \	192	@@ -6988,10 +7005,17 @@ TEMPLATE_VBoxBldProg_TOOL = GXX3
		193	TEMPLATE_VBoxBldProg_LIBS = network iconv
		194	TEMPLATE_VBoxBldProg_LIBPATH += \
		195	/boot/common/lib
		196	- else if1of ($(KBUILD_HOST), freebsd openbsd)
		197	+ else ifeq ($(KBUILD_HOST),freebsd)
211	TEMPLATE_VBoxBldProg_TOOL = GXX3	198	TEMPLATE_VBoxBldProg_TOOL = GXX3
212	TEMPLATE_VBoxBldProg_LIBS = pthread	199	TEMPLATE_VBoxBldProg_LIBS = pthread
213	TEMPLATE_VBoxBldProg_INCS += \	200	TEMPLATE_VBoxBldProg_INCS += \
214	- /usr/include \	201	+ /usr/local/include
215	- /usr/X11R6/include \	202	+TEMPLATE_VBoxBldProg_LIBPATH += \
		203	+ /usr/local/lib
		204	+ else ifeq ($(KBUILD_HOST),openbsd)
		205	+TEMPLATE_VBoxBldProg_TOOL = GXX3
		206	+TEMPLATE_VBoxBldProg_LIBS = pthread
		207	+TEMPLATE_VBoxBldProg_INCS += \
		208	/usr/include \
		209	/usr/X11R6/include \
216	/usr/local/include	210	/usr/local/include
217	TEMPLATE_VBoxBldProg_LIBPATH += \	211	@@ -7115,6 +7139,7 @@ else # the gcc guys
218	- /usr/lib \	212	# Do not inherit sanitizer flags from VBOXR3EXE in guest executables. Deal with them separately.
219	- /usr/X11R6/lib \	213	TEMPLATE_VBOXGUESTR3EXE_CXXFLAGS.debug = $(NO_SUCH_VARIABLE)
220	/usr/local/lib	214	TEMPLATE_VBOXGUESTR3EXE_CFLAGS.debug = $(NO_SUCH_VARIABLE)
221	else ifeq ($(KBUILD_HOST),netbsd)	215	+ TEMPLATE_VBOXGUESTR3EXE_LDFLAGS.freebsd = $(filter-out $(VBOX_GCC_ORIGIN_OPT),$(TEMPLATE_VBOXR3EXE_LDFLAGS.freebsd))
222	TEMPLATE_VBoxBldProg_TOOL = GXX3	216	TEMPLATE_VBOXGUESTR3EXE_LDFLAGS.linux = $(filter-out $(VBOX_GCC_ORIGIN_OPT),$(TEMPLATE_VBOXR3EXE_LDFLAGS.linux))
223	@@ -7008,7 +7020,7 @@	217	TEMPLATE_VBOXGUESTR3EXE_LDFLAGS.debug = $(NO_SUCH_VARIABLE)
		218	TEMPLATE_VBOXGUESTR3EXE_LDFLAGS = $(filter-out '$(VBOX_GCC_RPATH_OPT)%,$(TEMPLATE_VBOXR3EXE_LDFLAGS))
		219	@@ -7138,6 +7163,7 @@ TEMPLATE_VBOXGUESTR3EXE_CXXFLAGS.linux = \
		220	$(VBOX_GCC_fno-stack-protector)
		221	TEMPLATE_VBOXGUESTR3EXE_CFLAGS.linux = $(TEMPLATE_VBOXGUESTR3EXE_CXXFLAGS.linux)
		222	# The GNU_HASH ELF tag is not supported by older systems.
		223	+TEMPLATE_VBOXGUESTR3EXE_LDFLAGS.freebsd += $(VBOX_LD_hash_style_sysv)
		224	TEMPLATE_VBOXGUESTR3EXE_LDFLAGS.linux += $(VBOX_LD_hash_style_sysv)
		225
224	#	226	#
225	TEMPLATE_VBOXCROGLR3HOSTDLL = VBox OpenGL Host DLLs	227	@@ -7345,6 +7371,7 @@ TEMPLATE_VBOXGUESTR3XF86MOD_LIBS.$(KBUILD_TYPE) =
226	TEMPLATE_VBOXCROGLR3HOSTDLL_EXTENDS := $(if-expr "$(KBUILD_TARGET)" == "win",VBOXR3,VBOXR3NP)	228	TEMPLATE_VBOXGUESTR3XF86MOD_LIBS.$(KBUILD_TARGET) = $(NO_SUCH_VARIABLE)
227	-TEMPLATE_VBOXCROGLR3HOSTDLL_EXTENDS_BY = prepending	229	TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.$(KBUILD_TARGET) = $(NO_SUCH_VARIABLE)
228	+TEMPLATE_VBOXCROGLR3HOSTDLL_EXTENDS_BY = appending	230	# The GNU_HASH ELF tag is not supported by older glibc dynamic linkers.
229	TEMPLATE_VBOXCROGLR3HOSTDLL_DEFS = VBOX_WITH_HGCM UNPACKS	231	+TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.freebsd = $(subst -Wl$(COMMA),,$(VBOX_LD_hash_style_sysv))
230	TEMPLATE_VBOXCROGLR3HOSTDLL_DEFS.win = _WIN32_WINNT=0x0500 WINDOWS=1	232	TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.linux = $(subst -Wl$(COMMA),,$(VBOX_LD_hash_style_sysv))
231	TEMPLATE_VBOXCROGLR3HOSTDLL_DEFS.linux = Linux=1 _GNU_SOURCE	233	TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.$(KBUILD_TYPE) = $(NO_SUCH_VARIABLE)
232	@@ -7023,6 +7035,7 @@ TEMPLATE_VBOXCROGLR3HOSTDLL_LDFLAGS.darwin += \	234	TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS = -r
233	-current_version $(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD) \
234	-compatibility_version $(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)
235	TEMPLATE_VBOXCROGLR3HOSTDLL_LDFLAGS.linux = -Wl,--no-as-needed
236	+TEMPLATE_VBOXCROGLR3HOSTDLL_LDFLAGS.freebsd = -Wl,--no-as-needed
237	TEMPLATE_VBOXCROGLR3HOSTDLL_BLDDIRS = $(VBOX_PATH_CROGL_GENFILES)/
238	ifeq ($(KBUILD_TARGET),darwin)
239	TEMPLATE_VBOXCROGLR3HOSTDLL_CFLAGS = $(TEMPLATE_VBOXR3NP_CFLAGS) -Wno-deprecated-declarations

Lines 1-6 Link Here

(-)emulators/virtualbox-ose/files/patch-configure (-37 / +29 lines)
1	--- configure.orig 2020-05-13 19:36:41 UTC	1	--- configure.orig 2021-01-07 15:31:21 UTC
2	+++ configure	2	+++ configure
3	@@ -138,10 +138,14 @@ CXX_FLAGS=""	3	@@ -140,10 +140,14 @@ CXX_FLAGS=""
4	if [ "$OS" = "freebsd" ]; then	4	if [ "$OS" = "freebsd" ]; then
5	INCCURL="-I/usr/local/include"	5	INCCURL="-I/usr/local/include"
6	LIBCURL="-L/usr/local/lib -lcurl"	6	LIBCURL="-L/usr/local/lib -lcurl"
Lines 15-31 Link Here
15	else	15	else
16	INCCURL=""	16	INCCURL=""
17	LIBCURL="-lcurl"	17	LIBCURL="-lcurl"
18	@@ -441,6 +445,9 @@ check_gcc()	18	@@ -1258,7 +1262,7 @@ extern "C" int main(void)
19	elif [ $cc_maj -eq 4 -a $cc_min -eq 0 -a "$OS" = "darwin" ]; then
20	log_success "found version $cc_ver"
21	# gcc-4.0 is allowed for Darwin only
22	+ elif [ $cc_maj -eq 4 -a $cc_min -eq 2 -a "$OS" = "freebsd" ]; then
23	+ log_success "found version $cc_ver"
24	+ # gcc-4.2 is allowed for FreeBSD only
25	elif [ $cc_maj -lt 4 \
26	-o \( $cc_maj -eq 4 -a $cc_min -lt 4 -a "$OS" != "darwin" \) \
27	-o \( $cc_maj -eq 4 -a $cc_min -lt 2 -a "$OS" = "darwin" \) ]; then
28	@@ -1208,7 +1215,7 @@ extern "C" int main(void)
29	#endif	19	#endif
30	}	20	}
31	EOF	21	EOF
Lines 34-50 Link Here
34	test_execute	24	test_execute
35	fi	25	fi
36	}	26	}
37	@@ -1508,8 +1515,7 @@ EOF	27	@@ -1563,9 +1567,7 @@ EOF
38	if [ $? -eq 0 ]; then	28	if [ $? -eq 0 ]; then
39	echo "(Qt5 from pkg-config)" >> $LOG	29	echo "(Qt5 from pkg-config)" >> $LOG
40	FLGQT5=`pkg-config Qt5Core --cflags`	30	FLGQT5=`pkg-config Qt5Core --cflags`
41	- # gcc 4.8 is able to compile with C++11 (see also VBOX_GCC_std in Config.kmk)	31	- # gcc 4.8 is able to compile with C++11 (see also VBOX_GCC_std in Config.kmk)
42	- [ $cc_maj -eq 4 -a $cc_min -eq 8 ] && FLGQT5="$FLGQT5 -std=c++11"	32	- [ $cc_maj -eq 4 -a $cc_min -eq 8 ] && FLGQT5="$FLGQT5 -std=c++11"
43	+ FLGQT5="$FLGQT5 -std=c++11"	33	- INCQT5=`strip_I "$FLGQT5"`
44	INCQT5=`strip_I "$FLGQT5"`	34	+ FLGQT5="$FLGQT5 -std=c++11" INCQT5=`strip_I "$FLGQT5"`
45	LIBDIR5=`pkg-config Qt5Core --variable=libdir`	35	LIBDIR5=`pkg-config Qt5Core --variable=libdir`
46	LIBQT5=`pkg-config Qt5Core --libs`	36	LIBQT5=`pkg-config Qt5Core --libs`
47	@@ -1648,7 +1654,7 @@ check_libopus()	37	LIBQT5="-L$LIBDIR5 $LIBQT5"
		38	@@ -1703,7 +1705,7 @@ check_libopus()
48	fi	39	fi
49	cat > $ODIR.tmp_src.cc << EOF	40	cat > $ODIR.tmp_src.cc << EOF
50	#include <cstdio>	41	#include <cstdio>
Lines 53-59 Link Here
53	extern "C" int main(void)	44	extern "C" int main(void)
54	{	45	{
55	OpusEncoder *test;	46	OpusEncoder *test;
56	@@ -1980,8 +1986,8 @@ EOF	47	@@ -2035,8 +2037,8 @@ EOF
57	echo "compiling the following source file:" >> $LOG	48	echo "compiling the following source file:" >> $LOG
58	cat $ODIR.tmp_src.cc >> $LOG	49	cat $ODIR.tmp_src.cc >> $LOG
59	echo "using the following command line:" >> $LOG	50	echo "using the following command line:" >> $LOG
Lines 64-70 Link Here
64	if [ $? -eq 0 ]; then	55	if [ $? -eq 0 ]; then
65	found=1	56	found=1
66	break	57	break
67	@@ -2453,7 +2459,7 @@ for option in "$@"; do	58	@@ -2512,7 +2514,7 @@ for option in "$@"; do
68	--with-openssl-dir=*)	59	--with-openssl-dir=*)
69	OPENSSLDIR=`echo $option \| cut -d'=' -f2`	60	OPENSSLDIR=`echo $option \| cut -d'=' -f2`
70	INCCRYPTO="-I${OPENSSLDIR}/include"	61	INCCRYPTO="-I${OPENSSLDIR}/include"
Lines 73-110 Link Here
73	;;	64	;;
74	--with-ow-dir=*)	65	--with-ow-dir=*)
75	WATCOM=`echo $option \| cut -d'=' -f2`	66	WATCOM=`echo $option \| cut -d'=' -f2`
76	@@ -2767,7 +2773,7 @@ if [ $ONLY_ADDITIONS -eq 0 ]; then	67	@@ -2856,14 +2858,23 @@ if [ $ONLY_ADDITIONS -eq 0 ]; then
77	check_ssl
78	check_curl
79	[ $WITH_LIBVPX -eq 1 ] && check_vpx
80	- check_libopus
81	+ [ $OSE -eq 0 -a "$OS" != "win" ] && check_libopus
82	[ "$OS" != "darwin" ] && check_z
83	[ "$OS" != "darwin" ] && check_png
84	[ $OSE -eq 0 -a "$OS" = "linux" ] && check_pam
85	@@ -2788,13 +2794,20 @@ if [ $ONLY_ADDITIONS -eq 0 ]; then
86	[ $WITH_PYTHON -eq 1 ] && check_python	68	[ $WITH_PYTHON -eq 1 ] && check_python
87	[ $WITH_JAVA -eq 1 ] && check_java	69	[ $WITH_JAVA -eq 1 ] && check_java
88		70
89	- # PulseAudio	71	- # PulseAudio
90	if [ "$OS" = "linux" -o "$OS" = "freebsd" -o "$OS" = "netbsd" ]; then	72	- if [ $WITH_PULSE -eq 1 ]; then
		73	- check_pulse
		74	- elif [ $WITH_PULSE -eq 0 ]; then # Force disabling PulseAudio.
		75	- cnf_append "VBOX_WITH_AUDIO_PULSE" ""
		76	- elif [ $WITH_PULSE -eq 2 ]; then # --enable-pulse was passed, force PulseAudio.
		77	- cnf_append "VBOX_WITH_AUDIO_PULSE" "1"
		78	- fi
		79	+ if [ "$OS" = "linux" -o "$OS" = "freebsd" -o "$OS" = "netbsd" ]; then
91	+ if [ $WITH_ALSA -eq 1 ]; then	80	+ if [ $WITH_ALSA -eq 1 ]; then
92	+ check_alsa	81	+ check_alsa
93	+ else	82	+ else
94	+ cnf_append "VBOX_WITH_AUDIO_ALSA" ""	83	+ cnf_append "VBOX_WITH_AUDIO_ALSA" ""
95	+ fi	84	+ fi
96	if [ $WITH_PULSE -eq 1 ]; then	85	+ if [ $WITH_PULSE -eq 1 ]; then
97	check_pulse	86	+ check_pulse
98	elif [ $WITH_PULSE -eq 0 ]; then	87	+ elif [ $WITH_PULSE -eq 0 ]; then # Force disabling PulseAudio.
99	cnf_append "VBOX_WITH_AUDIO_PULSE" ""	88	+ cnf_append "VBOX_WITH_AUDIO_PULSE" ""
100	fi	89	+ elif [ $WITH_PULSE -eq 2 ]; then # --enable-pulse was passed, force PulseAudio.
		90	+ cnf_append "VBOX_WITH_AUDIO_PULSE" "1"
		91	+ fi
101	+ if [ $WITH_DBUS -eq 0 ]; then	92	+ if [ $WITH_DBUS -eq 0 ]; then
102	+ cnf_append "VBOX_WITH_DBUS" ""	93	+ cnf_append "VBOX_WITH_DBUS" ""
103	+ fi	94	+ fi
104	fi	95	+ fi
105	fi	96	fi
106		97
107	@@ -2810,14 +2823,6 @@ if [ "$OS" = "linux" ]; then	98	# Linux-specific
		99	@@ -2878,14 +2889,6 @@ if [ "$OS" = "linux" ]; then
108	cnf_append "VBOX_WITHOUT_LINUX_TEST_BUILDS" "1"	100	cnf_append "VBOX_WITHOUT_LINUX_TEST_BUILDS" "1"
109	fi	101	fi
110	if [ $ONLY_ADDITIONS -eq 0 ]; then	102	if [ $ONLY_ADDITIONS -eq 0 ]; then

Lines 1-16 Link Here

(-)emulators/virtualbox-ose/files/patch-include_VBox_VBoxGL2D.h (-16 lines)
1	Fix build with Qt5 5.13, which defined GLsizeiptr already.
2
3	Obtained from:
4	https://www.mail-archive.com/pld-cvs-commit@lists.pld-linux.org/msg436220.html
5
6	--- include/VBox/VBoxGL2D.h.orig 2019-09-29 14:31:16 UTC
7	+++ include/VBox/VBoxGL2D.h
8	@@ -107,7 +107,7 @@ typedef GLvoid (APIENTRY *PFNVBOXVHWA_UNIFORM3I)(GLint
9	typedef GLvoid (APIENTRY *PFNVBOXVHWA_UNIFORM4I)(GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
10
11	/* GL_ARB_pixel_buffer_object*/
12	-#ifndef Q_WS_MAC
13	+#if 0
14	/* apears to be defined on mac */
15	typedef ptrdiff_t GLsizeiptr;
16	#endif

Lines 1-6 Link Here

(-)emulators/virtualbox-ose/files/patch-include_VBox_com_array.h (-11 / +11 lines)
1	--- include/VBox/com/array.h.orig 2019-04-12 15:47:42 UTC	1	--- include/VBox/com/array.h.orig 2021-01-07 15:31:25 UTC
2	+++ include/VBox/com/array.h	2	+++ include/VBox/com/array.h
3	@@ -168,7 +168,7 @@	3	@@ -171,7 +171,7 @@
4		4
5	#include "VBox/com/defs.h"	5	#include "VBox/com/defs.h"
6		6
Lines 9-36 Link Here
9	/** @def VBOX_WITH_TYPE_TRAITS	9	/** @def VBOX_WITH_TYPE_TRAITS
10	* Type traits are a C++ 11 feature, so not available everywhere (yet).	10	* Type traits are a C++ 11 feature, so not available everywhere (yet).
11	* Only GCC 4.6 or newer and MSVC++ 16.0 (Visual Studio 2010) or newer.	11	* Only GCC 4.6 or newer and MSVC++ 16.0 (Visual Studio 2010) or newer.
12	@@ -940,12 +940,12 @@ class SafeArray : public Traits (public)	12	@@ -960,12 +960,12 @@ class SafeArray : public Traits (public)
13	*/
14	T &operator[] (size_t aIdx)
15	{	13	{
16	- AssertReturn(m.arr != NULL, ((T )NULL));	14	/** @todo r=klaus should do this as a AssertCompile, but cannot find a way which works. */
17	- AssertReturn(aIdx < size(), ((T )NULL));	15	Assert(sizeof(T) <= sizeof(Zeroes));
		16	- AssertReturn(m.arr != NULL, (T )&Zeroes[0]);
		17	- AssertReturn(aIdx < size(), (T )&Zeroes[0]);
18	+ AssertReturn(m.arr != NULL, ((T )1));	18	+ AssertReturn(m.arr != NULL, ((T )1));
19	+ AssertReturn(aIdx < size(), ((T )1));	19	+ AssertReturn(aIdx < size(), ((T )1));
20	#ifdef VBOX_WITH_XPCOM	20	#ifdef VBOX_WITH_XPCOM
21	return m.arr[aIdx];	21	return m.arr[aIdx];
22	#else	22	#else
23	- AssertReturn(m.raw != NULL, ((T )NULL));	23	- AssertReturn(m.raw != NULL, (T )&Zeroes[0]);
24	+ AssertReturn(m.raw != NULL, ((T )1));	24	+ AssertReturn(m.raw != NULL, ((T )1));
25	return m.raw[aIdx];	25	return m.raw[aIdx];
26	#endif	26	#endif
27	}	27	}
28	@@ -960,7 +960,7 @@ class SafeArray : public Traits (public)	28	@@ -980,7 +980,7 @@ class SafeArray : public Traits (public)
29	#ifdef VBOX_WITH_XPCOM	29	#ifdef VBOX_WITH_XPCOM
30	return m.arr[aIdx];	30	return m.arr[aIdx];
31	#else	31	#else
32	- AssertReturn(m.raw != NULL, ((T )NULL));	32	- AssertReturn(m.raw != NULL, (const T )&Zeroes[0]);
33	+ AssertReturn(m.raw != NULL, ((T )1));	33	+ AssertReturn(m.raw != NULL, ((T )1));
34	return m.raw[aIdx];	34	return m.raw[aIdx];
35	#endif	35	#endif
36	}	36	}

Lines 1-15 Link Here

(-)emulators/virtualbox-ose/files/patch-include_iprt_assertcompile.h (-15 lines)
1	--- include/iprt/assertcompile.h.orig 2018-01-15 14:49:42 UTC
2	+++ include/iprt/assertcompile.h
3	@@ -104,7 +104,11 @@ RT_C_DECLS_END
4	* @param expr Expression which should be true.
5	*/
6	#ifdef RTASSERT_HAVE_STATIC_ASSERT
7	-# define AssertCompile(expr) static_assert(!!(expr), #expr)
8	+# ifdef __cplusplus
9	+# define AssertCompile(expr) static_assert(!!(expr), #expr)
10	+# else
11	+# define AssertCompile(expr) _Static_assert(!!(expr), #expr)
12	+# endif
13	#else
14	# define AssertCompile(expr) AssertCompileNS(expr)
15	#endif

Lines 1-39 Link Here

(-)emulators/virtualbox-ose/files/patch-include_iprt_cdefs.h (-39 lines)
1	--- include/iprt/cdefs.h.orig 2018-10-15 14:24:52 UTC
2	+++ include/iprt/cdefs.h
3	@@ -2611,28 +2611,28 @@
4
5	/** @def RT_BYTE1
6	* Gets the first byte of something. */
7	-#define RT_BYTE1(a) ( (a) & 0xff )
8	+#define RT_BYTE1(a) ( (uint8_t)((a) & 0xff) )
9	/** @def RT_BYTE2
10	* Gets the second byte of something. */
11	-#define RT_BYTE2(a) ( ((a) >> 8) & 0xff )
12	+#define RT_BYTE2(a) ( (uint8_t)(((a) >> 8) & 0xff) )
13	/** @def RT_BYTE3
14	* Gets the second byte of something. */
15	-#define RT_BYTE3(a) ( ((a) >> 16) & 0xff )
16	+#define RT_BYTE3(a) ( (uint8_t)(((a) >> 16) & 0xff) )
17	/** @def RT_BYTE4
18	* Gets the fourth byte of something. */
19	-#define RT_BYTE4(a) ( ((a) >> 24) & 0xff )
20	+#define RT_BYTE4(a) ( (uint8_t)(((a) >> 24) & 0xff) )
21	/** @def RT_BYTE5
22	* Gets the fifth byte of something. */
23	-#define RT_BYTE5(a) ( ((a) >> 32) & 0xff )
24	+#define RT_BYTE5(a) ( (uint8_t)(((a) >> 32) & 0xff) )
25	/** @def RT_BYTE6
26	* Gets the sixth byte of something. */
27	-#define RT_BYTE6(a) ( ((a) >> 40) & 0xff )
28	+#define RT_BYTE6(a) ( (uint8_t)(((a) >> 40) & 0xff) )
29	/** @def RT_BYTE7
30	* Gets the seventh byte of something. */
31	-#define RT_BYTE7(a) ( ((a) >> 48) & 0xff )
32	+#define RT_BYTE7(a) ( (uint8_t)(((a) >> 48) & 0xff) )
33	/** @def RT_BYTE8
34	* Gets the eight byte of something. */
35	-#define RT_BYTE8(a) ( ((a) >> 56) & 0xff )
36	+#define RT_BYTE8(a) ( (uint8_t)(((a) >> 56) & 0xff) )
37
38
39	/** @def RT_LODWORD

Lines 1-26 Link Here

(-)emulators/virtualbox-ose/files/patch-include_iprt_types.h (-26 lines)
1	--- include/iprt/types.h.orig 2018-05-09 16:32:07 UTC
2	+++ include/iprt/types.h
3	@@ -56,22 +56,9 @@ RT_C_DECLS_END
4	# include <sys/types.h>
5
6	# elif defined(RT_OS_FREEBSD) && defined(_KERNEL)
7	- /*
8	- * Kludge for the FreeBSD kernel:
9	- * stddef.h and sys/types.h have slightly different offsetof definitions
10	- * when compiling in kernel mode. This is just to make GCC shut up.
11	- */
12	-# ifndef _STDDEF_H_
13	-# undef offsetof
14	-# endif
15	+
16	# include <sys/stddef.h>
17	-# ifndef _SYS_TYPES_H_
18	-# undef offsetof
19	-# endif
20	# include <sys/types.h>
21	-# ifndef offsetof
22	-# error "offsetof is not defined!"
23	-# endif
24
25	# elif defined(RT_OS_FREEBSD) && HC_ARCH_BITS == 64 && defined(RT_ARCH_X86)
26	/*

Lines 1-98 Link Here

(-)emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-crOpenGL-FreeBSD_i386_exports.py (-98 lines)
1	--- src/VBox/Additions/common/crOpenGL/FreeBSD_i386_exports.py.orig 2020-06-26 09:52:40 UTC
2	+++ src/VBox/Additions/common/crOpenGL/FreeBSD_i386_exports.py
3	@@ -0,0 +1,95 @@
4	+# Copyright (c) 2001, Stanford University
5	+# All rights reserved.
6	+#
7	+# See the file LICENSE.txt for information on redistributing this software.
8	+
9	+
10	+import sys
11	+
12	+import apiutil
13	+
14	+
15	+def GenerateEntrypoints():
16	+
17	+ #apiutil.CopyrightC()
18	+
19	+ # Get sorted list of dispatched functions.
20	+ # The order is very important - it must match cr_opcodes.h
21	+ # and spu_dispatch_table.h
22	+ print '%include "iprt/asmdefs.mac"'
23	+ print ""
24	+ print "%ifdef RT_ARCH_AMD64"
25	+ print "extern glim"
26	+ print "%else ; X86"
27	+ print "extern glim"
28	+ print "%endif"
29	+ print ""
30	+
31	+ keys = apiutil.GetDispatchedFunctions(sys.argv[1]+"/APIspec.txt")
32	+
33	+ for index in range(len(keys)):
34	+ func_name = keys[index]
35	+ if apiutil.Category(func_name) == "Chromium":
36	+ continue
37	+ if apiutil.Category(func_name) == "VBox":
38	+ continue
39	+
40	+ print "BEGINPROC_EXPORTED gl%s" % func_name
41	+ print "%ifdef RT_ARCH_AMD64"
42	+ print "\tmov \trax, qword glim+%d" % (8*index)
43	+ print "\tjmp \t[rax]"
44	+ print "%else ; X86"
45	+ print "\tmov \teax, dword glim+%d" % (4*index)
46	+ print "\tjmp \t[eax]"
47	+ print "%endif"
48	+ print "ENDPROC gl%s" % func_name
49	+ print ""
50	+
51	+
52	+ print ';'
53	+ print '; Aliases'
54	+ print ';'
55	+
56	+ # Now loop over all the functions and take care of any aliases
57	+ allkeys = apiutil.GetAllFunctions(sys.argv[1]+"/APIspec.txt")
58	+ for func_name in allkeys:
59	+ if "omit" in apiutil.ChromiumProps(func_name):
60	+ continue
61	+
62	+ if func_name in keys:
63	+ # we already processed this function earlier
64	+ continue
65	+
66	+ # alias is the function we're aliasing
67	+ alias = apiutil.Alias(func_name)
68	+ if alias:
69	+ # this dict lookup should never fail (raise an exception)!
70	+ index = keys.index(alias)
71	+ print "BEGINPROC_EXPORTED gl%s" % func_name
72	+ print "%ifdef RT_ARCH_AMD64"
73	+ print "\tmov \trax, qword glim+%d" % (8*index)
74	+ print "\tjmp \t[rax]"
75	+ print "%else ; X86"
76	+ print "\tmov \teax, dword glim+%d" % (4*index)
77	+ print "\tjmp \t[eax]"
78	+ print "%endif"
79	+ print "ENDPROC gl%s" % func_name
80	+ print ""
81	+
82	+
83	+ print ';'
84	+ print '; No-op stubs'
85	+ print ';'
86	+
87	+ # Now generate no-op stub functions
88	+ for func_name in allkeys:
89	+ if "stub" in apiutil.ChromiumProps(func_name):
90	+ print "BEGINPROC_EXPORTED gl%s" % func_name
91	+ print "\tleave"
92	+ print "\tret"
93	+ print "ENDPROC gl%s" % func_name
94	+ print ""
95	+
96	+
97	+GenerateEntrypoints()
98	+

Lines 1-79 Link Here

(-)emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-crOpenGL-Makefile.kmk (-79 lines)
1	--- src/VBox/Additions/common/crOpenGL/Makefile.kmk.orig 2020-05-13 19:37:03 UTC
2	+++ src/VBox/Additions/common/crOpenGL/Makefile.kmk
3	@@ -50,9 +50,7 @@ endif
4	if1of ($(KBUILD_TARGET), linux solaris freebsd)
5	#VBoxOGL_DRI = 1
6	DLLS += VBoxEGL
7	- ifn1of ($(KBUILD_TARGET),linux solaris) # No DRI on Solaris yet
8	- VBoxOGL_FAKEDRI = 1
9	- endif
10	+ #VBoxOGL_FAKEDRI = 1
11
12	# Only Solaris right now needs C stubs because I can't figure out how to
13	# generate the GOT based relocation ASM yet.
14	@@ -188,10 +186,12 @@ VBoxOGL_CLEAN.linux += \
15	$(VBOX_PATH_CROGL_GENFILES)/linux_exports.c
16	VBoxOGL_CLEAN.solaris += \
17	$(VBOX_PATH_CROGL_GENFILES)/solaris_exports.c
18	+VBoxOGL_CLEAN.freebsd += \
19	+ $(VBOX_PATH_CROGL_GENFILES)/freebsd_exports.c
20	VBoxOGL_CLEAN.win = \
21	$(VBOX_PATH_CROGL_GENFILES)/windows_exports.asm \
22	$(VBOX_PATH_CROGL_GENFILES)/cropengl.def
23	-if1of ($(KBUILD_TARGET), linux solaris)
24	+if1of ($(KBUILD_TARGET), linux solaris freebsd)
25	ifdef VBoxOGL_DRI
26	VBoxOGL_CLEAN += \
27	$(VBOX_PATH_CROGL_GENFILES)/cr_gl.h \
28	@@ -204,6 +204,8 @@ if1of ($(KBUILD_TARGET), linux solaris)
29	$(VBOX_PATH_CROGL_GENFILES)/linux_glxapi_exports.asm
30	VBoxOGL_CLEAN.solaris += \
31	$(VBOX_PATH_CROGL_GENFILES)/solaris_glxapi_exports.asm
32	+ VBoxOGL_CLEAN.freebsd += \
33	+ $(VBOX_PATH_CROGL_GENFILES)/freebsd_glxapi_exports.asm
34	endif
35	endif
36	VBoxOGL_LIBS = \
37	@@ -244,6 +246,8 @@ if1of ($(KBUILD_TARGET), linux solaris freebsd)
38	else
39	VBoxOGL_SONAME.linux = libGL.so.1
40	VBoxOGL_LDFLAGS.linux += -Wl,-e,LibMain
41	+ VBoxOGL_SONAME.freebsd = libGL.so.1
42	+ VBoxOGL_LDFLAGS.freebsd += -Wl,-e,LibMain
43	endif
44	endif
45	ifdef VBOX_WITH_CRHGSMI
46	@@ -252,7 +256,7 @@ endif
47	ifdef VBOX_WITH_WDDM
48	VBoxOGL_DEFS.win += VBOX_WITH_WDDM
49	endif
50	-if1of ($(KBUILD_TARGET), linux)
51	+if1of ($(KBUILD_TARGET), linux freebsd)
52	VBoxOGL_LDFLAGS += -Wl,-z,nodelete
53	endif
54	ifdef VBOX_WITH_WDDM
55	@@ -418,6 +422,16 @@ $(VBOX_PATH_CROGL_GENFILES)/solaris_exports_dri.asm: \
56	$(VBOX_PATH_CROGL_GENFILES)/solaris_glxapi_exports.asm: $(PATH_SUB_CURRENT)/SunOS_i386_glxapi_exports.py \| $$(dir $$@)
57	$(call MSG_GENERATE,python,$@,$<)
58	$(QUIET)$(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $<
59	+ else ifeq ($(KBUILD_TARGET),freebsd)
60	+$(VBOX_PATH_CROGL_GENFILES)/freebsd_exports_dri.asm: \
61	+ $(PATH_SUB_CURRENT)/FreeBSD_i386_exports_dri.py \
62	+ $(VBOX_CROGL_API_FILES) $(PATH_SUB_CURRENT)/entrypoints.py \
63	+ \| $$(dir $$@)
64	+ $(call MSG_GENERATE,python,$@,$<)
65	+ $(QUIET)$(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $< $(VBOX_PATH_CROGL_GLAPI)
66	+$(VBOX_PATH_CROGL_GENFILES)/freebsd_glxapi_exports.asm: $(PATH_SUB_CURRENT)/FreeBSD_i386_glxapi_exports.py \| $$(dir $$@)
67	+ $(call MSG_GENERATE,python,$@,$<)
68	+ $(QUIET)$(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $<
69
70	else
71	$(VBOX_PATH_CROGL_GENFILES)/linux_exports_dri.asm: \
72	@@ -656,6 +670,7 @@ ifndef VBOX_USE_SYSTEM_GL_HEADERS
73	endif
74	VBoxEGL_LIBS = $(VBOX_LIB_OGL) # $(VBOX_LIB_IPRT_GUEST_R3_SHARED)
75	VBoxEGL_SONAME.linux = libEGL.so.1
76	+VBoxEGL_SONAME.freebsd = libEGL.so.1
77
78	include $(FILE_KBUILD_SUB_FOOTER)
79

Lines 1-4 Link Here

(-)emulators/virtualbox-ose/files/patch-src-VBox-Main-webservice-Makefile.kmk (-3 / +3 lines)
1	--- src/VBox/Main/webservice/Makefile.kmk.orig 2020-05-13 19:44:11 UTC	1	--- src/VBox/Main/webservice/Makefile.kmk.orig 2021-01-07 15:41:45 UTC
2	+++ src/VBox/Main/webservice/Makefile.kmk	2	+++ src/VBox/Main/webservice/Makefile.kmk
3	@@ -158,7 +158,6 @@ VBOX_PATH_IDL := $(abspath $(PATH_SUB_	3	@@ -158,7 +158,6 @@ VBOX_PATH_IDL := $(abspath $(PATH_SUB_
4	RECOMPILE_ON_MAKEFILE_CURRENT := $(MAKEFILE_CURRENT)	4	RECOMPILE_ON_MAKEFILE_CURRENT := $(MAKEFILE_CURRENT)
Lines 8-14 Link Here
8	PATH_TARGET_SOAPDEMONSMAPS := $(VBOXWEB_OUT_DIR)/demo_namespacemaps	8	PATH_TARGET_SOAPDEMONSMAPS := $(VBOXWEB_OUT_DIR)/demo_namespacemaps
9	PATH_TARGET_WEBTEST := $(VBOXWEB_OUT_DIR)/webtest	9	PATH_TARGET_WEBTEST := $(VBOXWEB_OUT_DIR)/webtest
10		10
11	@@ -553,8 +552,6 @@ $$(VBOX_JWSSRC_JAR): $$(VBOX_JWS_JAR) \| $$(dir $$@)	11	@@ -565,8 +564,6 @@ $$(VBOX_JWSSRC_JAR): $$(VBOX_JWS_JAR) \| $$(dir $$@)
12	$(VBOXWEB_OUT_DIR)/gsoap_copy_all_ts \	12	$(VBOXWEB_OUT_DIR)/gsoap_copy_all_ts \
13	$(wildcard $(PATH_TARGET_SOAPDEMOXML)/*) \	13	$(wildcard $(PATH_TARGET_SOAPDEMOXML)/*) \
14	$(PATH_TARGET_SOAPDEMOXML)/dummy_file \	14	$(PATH_TARGET_SOAPDEMOXML)/dummy_file \
Lines 17-23 Link Here
17	$(wildcard $(PATH_TARGET_SOAPDEMONSMAPS)/*) \	17	$(wildcard $(PATH_TARGET_SOAPDEMONSMAPS)/*) \
18	$(PATH_TARGET_SOAPDEMONSMAPS)/dummy_file	18	$(PATH_TARGET_SOAPDEMONSMAPS)/dummy_file
19		19
20	@@ -774,17 +771,14 @@ endif	20	@@ -786,17 +783,14 @@ endif
21	# any more. Ignoring the exit code is the simple solution, accepting the error.	21	# any more. Ignoring the exit code is the simple solution, accepting the error.
22	$(VBOXWEB_OUT_DIR)/gsoap_copy_all_ts: $(VBOXWEB_OUT_DIR)/gsoap_generate_all_ts \| $$(dir $$@)	22	$(VBOXWEB_OUT_DIR)/gsoap_copy_all_ts: $(VBOXWEB_OUT_DIR)/gsoap_generate_all_ts \| $$(dir $$@)
23	$(RM) -f $@	23	$(RM) -f $@

Lines 1-18 Link Here

(-)emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-Installer-98vboxadd-xclient (-8 / +7 lines)
1	--- src/VBox/Additions/x11/Installer/98vboxadd-xclient.orig 2020-05-13 19:37:09 UTC	1	--- src/VBox/Additions/x11/Installer/98vboxadd-xclient.orig 2021-01-07 15:34:29 UTC
2	+++ src/VBox/Additions/x11/Installer/98vboxadd-xclient	2	+++ src/VBox/Additions/x11/Installer/98vboxadd-xclient
3	@@ -30,10 +30,10 @@ elif test -z "${SSH_CONNECTION}"; then	3	@@ -30,9 +30,9 @@ elif test -z "${SSH_CONNECTION}"; then
4	# This script can also be triggered by a connection over SSH, which is not	4	# This script can also be triggered by a connection over SSH, which is not
5	# what we had in mind, so we do not start VBoxClient in that case. We do	5	# what we had in mind, so we do not start VBoxClient in that case. We do
6	# not use "exit" here as this script is "source"d, not executed.	6	# not use "exit" here as this script is "source"d, not executed.
7	- /usr/bin/VBoxClient --clipboard	7	- /usr/bin/VBoxClient --clipboard
8	- /usr/bin/VBoxClient --checkhostversion	8	- /usr/bin/VBoxClient --checkhostversion
9	- /usr/bin/VBoxClient --display
10	- /usr/bin/VBoxClient --seamless	9	- /usr/bin/VBoxClient --seamless
11	- /usr/bin/VBoxClient --draganddrop	10	- /usr/bin/VBoxClient --draganddrop
		11	- /usr/bin/VBoxClient --vmsvga # In case VMSVGA emulation is enabled
12	+ /usr/local/bin/VBoxClient --clipboard	12	+ /usr/local/bin/VBoxClient --clipboard
13	+ /usr/local/bin/VBoxClient --checkhostversion	13	+ /usr/localbin/VBoxClient --checkhostversion
14	+ /usr/local/bin/VBoxClient --display	14	+ /usr/localbin/VBoxClient --seamless
15	+ /usr/local/bin/VBoxClient --seamless	15	+ /usr/localbin/VBoxClient --draganddrop
16	+ /usr/local/bin/VBoxClient --draganddrop	16	+ /usr/localbin/VBoxClient --vmsvga # In case VMSVGA emulation is enabled
17	/usr/bin/VBoxClient --vmsvga-x11 # In case VMSVGA emulation is enabled
18	fi	17	fi

Lines 1-20 Link Here

(-)emulators/virtualbox-ose/files/patch-src-VBox-GuestHost-OpenGL-Makefile.kmk (-20 lines)
1	--- src/VBox/GuestHost/OpenGL/Makefile.kmk.orig 2019-07-12 08:49:27 UTC
2	+++ src/VBox/GuestHost/OpenGL/Makefile.kmk
3	@@ -94,7 +94,7 @@ VBoxOGLcrutil_DEFS.win += CR_DEBUG_BACKDOOR_ENABLE
4	VBoxOGLcrutil_INCS.win += $(PATH_ROOT)/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm
5	VBoxOGLcrutil_LIBS.win += $(VBOX_PATH_ADDITIONS_LIB)/VBoxDispMpLogger$(VBOX_SUFF_LIB)
6	endif
7	-if1of ($(KBUILD_TARGET), linux)
8	+if1of ($(KBUILD_TARGET), linux freebsd)
9	VBoxOGLcrutil_LDFLAGS += -Wl,-z,nodelete
10	endif
11
12	@@ -140,7 +140,7 @@ VBoxOGLhostcrutil_TEMPLATE = VBOXCROGLR3HOSTLIB
13	if defined(VBOX_SIGNING_MODE) && defined(VBOX_WITH_WDDM)
14	VBoxOGLhostcrutil_INSTTYPE.win = both
15	endif
16	-if1of ($(KBUILD_TARGET), linux)
17	+if1of ($(KBUILD_TARGET), linux freebsd)
18	VBoxOGLhostcrutil_LDFLAGS = $(NO_SUCH_VARIABLE)
19	endif
20	VBoxOGLhostcrutil_LIBS.win = \

Lines 1-4 Link Here

(-)emulators/virtualbox-ose/files/patch-src-VBox-HostDrivers-Support-freebsd-Makefile (-2 / +3 lines)
1	--- src/VBox/HostDrivers/Support/freebsd/Makefile.orig 2020-05-13 19:43:53 UTC	1	--- src/VBox/HostDrivers/Support/freebsd/Makefile.orig 2019-01-25 18:19:55 UTC
2	+++ src/VBox/HostDrivers/Support/freebsd/Makefile	2	+++ src/VBox/HostDrivers/Support/freebsd/Makefile
3	@@ -82,6 +82,7 @@ SRCS += \	3	@@ -82,6 +82,7 @@ SRCS += \
4	assert.c \	4	assert.c \
Lines 8-19 Link Here
8	once.c \	8	once.c \
9	term.c \	9	term.c \
10	thread.c	10	thread.c
11	@@ -94,13 +95,14 @@ SRCS += \	11	@@ -94,14 +95,15 @@ SRCS += \
12	RTStrCopy.c \	12	RTStrCopy.c \
13	RTStrCopyEx.c \	13	RTStrCopyEx.c \
14	RTStrCopyP.c \	14	RTStrCopyP.c \
15	+ memchr.c \	15	+ memchr.c \
16	strformat.c \	16	strformat.c \
		17	strformatnum.c \
17	strformatrt.c \	18	strformatrt.c \
18	strformattype.c \	19	strformattype.c \
19	+ stringalloc.c \	20	+ stringalloc.c \

Lines 1-25 Link Here

(-)emulators/virtualbox-ose/files/patch-src-VBox-HostDrivers-VBoxNetAdp-Makefile.kmk (-13 / +8 lines)
1	Fix kmod panic when VIMAGE is disabled in the kernel and port	1	--- src/VBox/HostDrivers/VBoxNetAdp/Makefile.kmk.orig 2019-05-13 13:33:07 UTC
2
3	Submitted by: Gleb Kurtsou <gleb@freebsd.org>
4	--- src/VBox/HostDrivers/VBoxNetAdp/Makefile.kmk.orig 2020-05-13 19:43:54 UTC
5	+++ src/VBox/HostDrivers/VBoxNetAdp/Makefile.kmk	2	+++ src/VBox/HostDrivers/VBoxNetAdp/Makefile.kmk
6	@@ -203,12 +203,15 @@ $$(VBoxNetAdp-src_0_OUTDIR)/Makefile: \	3	@@ -206,10 +206,14 @@ $$(VBoxNetAdp-src_0_OUTDIR)/Makefile: \
7	$$(if $$(eq $$(VBoxNetAdp/freebsd/Makefile_VBOX_HARDENED),$$(VBOX_WITH_HARDENING)),,FORCE) \	4	$$(if $$(eq $$(VBoxNetAdp/freebsd/Makefile_VBOX_HARDENED),$$(VBOX_WITH_HARDENING)),,FORCE) \
8	\| $$(dir $$@)	5	\| $$(dir $$@)
9	$(QUIET)$(RM) -f -- $@	6	$(QUIET)$(RM) -f -- $@
10	- ifndef VBOX_WITH_HARDENING	7	- ifndef VBOX_WITH_HARDENING
11	- $(QUIET)$(SED) -e "s;-DVBOX_WITH_HARDENING;;g" --output $@ $<	8	- $(QUIET)$(SED) -e "s;VBOX_WITH_HARDENING;;g" --output $@ $<
12	- else	9	- else
13	$(QUIET)$(CP) -f $< $@	10	$(QUIET)$(CP) -f $< $@
14	+ ifndef VBOX_WITH_HARDENING	11	+ ifndef VBOX_WITH_HARDENING
15	+ $(QUIET)$(SED) -e "s;-DVBOX_WITH_HARDENING;;g" --output $@.tmp $@	12	+ $(QUIET)$(SED) -e "s;-DVBOX_WITH_HARDENING;;g" --output $@.tmp $@
16	+ ${QUIET}$(MV) -f $@.tmp $@	13	+ $(QUIET)$(MV) -f $@.tmp $@
17	endif	14	+ endif
18	-
19	+ ifndef VBOX_WITH_NETFLT_VIMAGE	15	+ ifndef VBOX_WITH_NETFLT_VIMAGE
20	+ $(QUIET)$(SED) -e "s;-DVIMAGE;;g" --output $@.tmp $@	16	+ $(QUIET)$(SED) -e "s;-DVIMAGE;;g" --output $@.tmp $@
21	+ ${QUIET}$(MV) -f $@.tmp $@	17	+ $(QUIET)$(MV) -f $@.tmp $@
22	+ endif	18	endif
		19
23	endif # freebsd	20	endif # freebsd
24
25	include $(FILE_KBUILD_SUB_FOOTER)

Lines 1-14 Link Here

(-)emulators/virtualbox-ose/files/patch-src-VBox-Main-src-server-freebsd-HostHardwareFreeBSD.cpp (-14 lines)
1	--- src/VBox/Main/src-server/freebsd/HostHardwareFreeBSD.cpp.orig 2020-05-13 19:44:10 UTC
2	+++ src/VBox/Main/src-server/freebsd/HostHardwareFreeBSD.cpp
3	@@ -253,8 +253,9 @@ static int getDVDInfoFromCAM(DriveInfoList *pList, boo
4	PeriphMatchPattern.pattern.periph_pattern.path_id = paMatches[i].result.device_result.path_id;
5	PeriphMatchPattern.pattern.periph_pattern.target_id = paMatches[i].result.device_result.target_id;
6	PeriphMatchPattern.pattern.periph_pattern.target_lun = paMatches[i].result.device_result.target_lun;
7	- PeriphMatchPattern.pattern.periph_pattern.flags = PERIPH_MATCH_PATH \| PERIPH_MATCH_TARGET \|
8	- PERIPH_MATCH_LUN;
9	+ PeriphMatchPattern.pattern.periph_pattern.flags = static_cast<periph_pattern_flags>
10	+ (PERIPH_MATCH_PATH \| PERIPH_MATCH_TARGET \|
11	+ PERIPH_MATCH_LUN);
12	PeriphCCB.cdm.num_patterns = 1;
13	PeriphCCB.cdm.pattern_buf_len = sizeof(struct dev_match_result);
14	PeriphCCB.cdm.patterns = &PeriphMatchPattern;

Lines 1-6 Link Here

(-)emulators/virtualbox-ose/files/patch-src-VBox-Runtime-Makefile.kmk (-11 / +2 lines)
1	--- src/VBox/Runtime/Makefile.kmk.orig 2020-07-09 16:57:23 UTC	1	--- src/VBox/Runtime/Makefile.kmk.orig 2021-01-07 15:41:50 UTC
2	+++ src/VBox/Runtime/Makefile.kmk	2	+++ src/VBox/Runtime/Makefile.kmk
3	@@ -173,6 +173,11 @@ $(IPRT_OUT_DIR)/oiddb.h.ts +\| $(IPRT_OUT_DIR)/oiddb.h:	3	@@ -177,6 +177,11 @@ $(IPRT_OUT_DIR)/oiddb.h.ts +\| $(IPRT_OUT_DIR)/oiddb.h:
4		4
5		5
6	#	6	#
Lines 12-23 Link Here
12	# Unicode Specification reader used to regenerate unidata-*.cpp.	12	# Unicode Specification reader used to regenerate unidata-*.cpp.
13	#	13	#
14	uniread_TEMPLATE = VBoxBldProg	14	uniread_TEMPLATE = VBoxBldProg
15	@@ -1632,7 +1637,7 @@ VBoxRT_SOURCES.solaris += \
16	VBoxRT_SOURCES.darwin += \
17	r3/posix/fileaio-posix.cpp
18	VBoxRT_SOURCES.freebsd += \
19	- r3/freebsd/fileaio-freebsd.cpp
20	+ r3/posix/fileaio-posix.cpp
21	VBoxRT_INCS := $(RuntimeR3_INCS)
22	VBoxRT_INCS.$(KBUILD_TARGET) := $(RuntimeR3_INCS.$(KBUILD_TARGET))
23	VBoxRT_INCS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH) := $(RuntimeR3_INCS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH))

Lines 1-6 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_Additions_common_VBoxService_VBoxServiceVMInfo.cpp (-10 / +10 lines)
1	--- src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp.orig 2017-03-08 17:15:20 UTC	1	--- src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp.orig 2021-01-07 15:34:20 UTC
2	+++ src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp	2	+++ src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp
3	@@ -71,8 +71,8 @@	3	@@ -67,8 +67,8 @@
4	# include <net/if.h>	4	# include <net/if.h>
5	# include <pwd.h> /* getpwuid */	5	# include <pwd.h> /* getpwuid */
6	# include <unistd.h>	6	# include <unistd.h>
Lines 11-17 Link Here
11	# endif	11	# endif
12	# ifdef RT_OS_OS2	12	# ifdef RT_OS_OS2
13	# include <net/if_dl.h>	13	# include <net/if_dl.h>
14	@@ -531,7 +531,7 @@ static void vgsvcVMInfoWriteFixedPropert	14	@@ -528,7 +528,7 @@ static void vgsvcVMInfoWriteFixedProperties(void)
15	}	15	}
16		16
17		17
Lines 20-28 Link Here
20	/*	20	/*
21	* Simple wrapper to work around compiler-specific va_list madness.	21	* Simple wrapper to work around compiler-specific va_list madness.
22	*/	22	*/
23	@@ -562,12 +562,6 @@ static int vgsvcVMInfoWriteUsers(void)	23	@@ -555,12 +555,6 @@ static int vgsvcVMInfoWriteUsers(void)
24	rc = VERR_NOT_IMPLEMENTED;	24	#ifdef RT_OS_WINDOWS
25	# endif	25	rc = VGSvcVMInfoWinWriteUsers(&g_VMInfoPropCache, &pszUserList, &cUsersInList);
26		26
27	-#elif defined(RT_OS_FREEBSD)	27	-#elif defined(RT_OS_FREEBSD)
28	- /** @todo FreeBSD: Port logged on user info retrieval.	28	- /** @todo FreeBSD: Port logged on user info retrieval.
Lines 33-39 Link Here
33	#elif defined(RT_OS_HAIKU)	33	#elif defined(RT_OS_HAIKU)
34	/** @todo Haiku: Port logged on user info retrieval. */	34	/** @todo Haiku: Port logged on user info retrieval. */
35	rc = VERR_NOT_IMPLEMENTED;	35	rc = VERR_NOT_IMPLEMENTED;
36	@@ -593,7 +587,7 @@ static int vgsvcVMInfoWriteUsers(void)	36	@@ -586,7 +580,7 @@ static int vgsvcVMInfoWriteUsers(void)
37	while ( (ut_user = getutxent())	37	while ( (ut_user = getutxent())
38	&& RT_SUCCESS(rc))	38	&& RT_SUCCESS(rc))
39	{	39	{
Lines 42-48 Link Here
42	VGSvcVerbose(4, "Found entry '%s' (type: %d, PID: %RU32)\n", ut_user->ut_user, ut_user->ut_type, ut_user->ut_pid);	42	VGSvcVerbose(4, "Found entry '%s' (type: %d, PID: %RU32)\n", ut_user->ut_user, ut_user->ut_type, ut_user->ut_pid);
43	# else	43	# else
44	VGSvcVerbose(4, "Found entry '%s' (type: %d, PID: %RU32, session: %RU32)\n",	44	VGSvcVerbose(4, "Found entry '%s' (type: %d, PID: %RU32, session: %RU32)\n",
45	@@ -628,7 +622,7 @@ static int vgsvcVMInfoWriteUsers(void)	45	@@ -621,7 +615,7 @@ static int vgsvcVMInfoWriteUsers(void)
46	}	46	}
47		47
48	# ifdef VBOX_WITH_DBUS	48	# ifdef VBOX_WITH_DBUS
Lines 51-57 Link Here
51	DBusError dbErr;	51	DBusError dbErr;
52	DBusConnection *pConnection = NULL;	52	DBusConnection *pConnection = NULL;
53	int rc2 = RTDBusLoadLib();	53	int rc2 = RTDBusLoadLib();
54	@@ -837,7 +831,7 @@ static int vgsvcVMInfoWriteUsers(void)	54	@@ -830,7 +824,7 @@ static int vgsvcVMInfoWriteUsers(void)
55	if ( fHaveLibDbus	55	if ( fHaveLibDbus
56	&& dbus_error_is_set(&dbErr))	56	&& dbus_error_is_set(&dbErr))
57	dbus_error_free(&dbErr);	57	dbus_error_free(&dbErr);
Lines 60-66 Link Here
60	# endif /* VBOX_WITH_DBUS */	60	# endif /* VBOX_WITH_DBUS */
61		61
62	/** @todo Fedora/others: Handle systemd-loginctl. */	62	/** @todo Fedora/others: Handle systemd-loginctl. */
63	@@ -874,7 +868,7 @@ static int vgsvcVMInfoWriteUsers(void)	63	@@ -867,7 +861,7 @@ static int vgsvcVMInfoWriteUsers(void)
64	RTMemFree(papszUsers);	64	RTMemFree(papszUsers);
65		65
66	endutxent(); /* Close utmpx file. */	66	endutxent(); /* Close utmpx file. */

Lines 1-33 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_Additions_common_crOpenGL_dri__glx.h (-33 lines)
1	--- src/VBox/Additions/common/crOpenGL/dri_glx.h.orig 2020-07-09 16:50:09 UTC
2	+++ src/VBox/Additions/common/crOpenGL/dri_glx.h
3	@@ -111,23 +111,23 @@ extern DECLEXPORT(const char *) VBOXGLXTAG(glXQueryExt
4	extern DECLEXPORT(GLXPbufferSGIX) VBOXGLXTAG(glXCreateGLXPbufferSGIX)
5	(Display dpy, GLXFBConfigSGIX config, unsigned int width, unsigned int height, int attrib_list);
6
7	-extern DECLEXPORT(int) VBOXGLXTAG(glXQueryGLXPbufferSGIX)
8	-(Display dpy, GLXPbuffer pbuf, int attribute, unsigned int value);
9	+extern DECLEXPORT(void) VBOXGLXTAG(glXQueryGLXPbufferSGIX)
10	+(Display dpy, GLXPbufferSGIX pbuf, int attribute, unsigned int value);
11
12	extern DECLEXPORT(GLXFBConfigSGIX *) VBOXGLXTAG(glXChooseFBConfigSGIX)
13	(Display dpy, int screen, int attrib_list, int *nelements);
14
15	-extern DECLEXPORT(void) VBOXGLXTAG(glXDestroyGLXPbufferSGIX)(Display *dpy, GLXPbuffer pbuf);
16	+extern DECLEXPORT(void) VBOXGLXTAG(glXDestroyGLXPbufferSGIX)(Display *dpy, GLXPbufferSGIX pbuf);
17	extern DECLEXPORT(void) VBOXGLXTAG(glXSelectEventSGIX)(Display *dpy, GLXDrawable drawable, unsigned long mask);
18	extern DECLEXPORT(void) VBOXGLXTAG(glXGetSelectedEventSGIX)(Display dpy, GLXDrawable drawable, unsigned long mask);
19
20	extern DECLEXPORT(GLXFBConfigSGIX) VBOXGLXTAG(glXGetFBConfigFromVisualSGIX)(Display dpy, XVisualInfo vis);
21	-extern DECLEXPORT(XVisualInfo ) VBOXGLXTAG(glXGetVisualFromFBConfigSGIX)(Display dpy, GLXFBConfig config);
22	+extern DECLEXPORT(XVisualInfo ) VBOXGLXTAG(glXGetVisualFromFBConfigSGIX)(Display dpy, GLXFBConfigSGIX config);
23	extern DECLEXPORT(GLXContext) VBOXGLXTAG(glXCreateContextWithConfigSGIX)
24	-(Display *dpy, GLXFBConfig config, int render_type, GLXContext share_list, Bool direct);
25	+(Display *dpy, GLXFBConfigSGIX config, int render_type, GLXContext share_list, Bool direct);
26
27	-extern DECLEXPORT(GLXPixmap) VBOXGLXTAG(glXCreateGLXPixmapWithConfigSGIX)(Display *dpy, GLXFBConfig config, Pixmap pixmap);
28	-extern DECLEXPORT(int) VBOXGLXTAG(glXGetFBConfigAttribSGIX)(Display dpy, GLXFBConfig config, int attribute, int value);
29	+extern DECLEXPORT(GLXPixmap) VBOXGLXTAG(glXCreateGLXPixmapWithConfigSGIX)(Display *dpy, GLXFBConfigSGIX config, Pixmap pixmap);
30	+extern DECLEXPORT(int) VBOXGLXTAG(glXGetFBConfigAttribSGIX)(Display dpy, GLXFBConfigSGIX config, int attribute, int value);
31
32	/*
33	* GLX 1.3 functions

Lines 1-58 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_Additions_common_crOpenGL_glx.c (-58 lines)
1	--- src/VBox/Additions/common/crOpenGL/glx.c.orig 2020-07-09 16:50:09 UTC
2	+++ src/VBox/Additions/common/crOpenGL/glx.c
3	@@ -742,7 +742,7 @@ VBOXGLXTAG(glXCreateGLXPbufferSGIX)(Display *dpy, GLXF
4	return 0;
5	}
6
7	-DECLEXPORT(void) VBOXGLXTAG(glXDestroyGLXPbufferSGIX)(Display *dpy, GLXPbuffer pbuf)
8	+DECLEXPORT(void) VBOXGLXTAG(glXDestroyGLXPbufferSGIX)(Display *dpy, GLXPbufferSGIX pbuf)
9	{
10	(void) dpy;
11	(void) pbuf;
12	@@ -763,7 +763,7 @@ DECLEXPORT(void) VBOXGLXTAG(glXGetSelectedEventSGIX)(D
13	(void) mask;
14	}
15
16	-DECLEXPORT(int) VBOXGLXTAG(glXQueryGLXPbufferSGIX)(Display *dpy, GLXPbuffer pbuf,
17	+DECLEXPORT(void) VBOXGLXTAG(glXQueryGLXPbufferSGIX)(Display *dpy, GLXPbufferSGIX pbuf,
18	int attribute, unsigned int *value)
19	{
20	(void) dpy;
21	@@ -771,10 +771,9 @@ DECLEXPORT(int) VBOXGLXTAG(glXQueryGLXPbufferSGIX)(Dis
22	(void) attribute;
23	(void) value;
24	crWarning("glXQueryGLXPbufferSGIX not implemented by Chromium");
25	- return 0;
26	}
27
28	-DECLEXPORT(int) VBOXGLXTAG(glXGetFBConfigAttribSGIX)(Display *dpy, GLXFBConfig config,
29	+DECLEXPORT(int) VBOXGLXTAG(glXGetFBConfigAttribSGIX)(Display *dpy, GLXFBConfigSGIX config,
30	int attribute, int *value)
31	{
32	return VBOXGLXTAG(glXGetFBConfigAttrib)(dpy, config, attribute, value);
33	@@ -789,14 +788,14 @@ VBOXGLXTAG(glXChooseFBConfigSGIX)(Display *dpy, int sc
34
35	DECLEXPORT(GLXPixmap)
36	VBOXGLXTAG(glXCreateGLXPixmapWithConfigSGIX)(Display *dpy,
37	- GLXFBConfig config,
38	+ GLXFBConfigSGIX config,
39	Pixmap pixmap)
40	{
41	return VBOXGLXTAG(glXCreatePixmap)(dpy, config, pixmap, NULL);
42	}
43
44	DECLEXPORT(GLXContext)
45	-VBOXGLXTAG(glXCreateContextWithConfigSGIX)(Display *dpy, GLXFBConfig config,
46	+VBOXGLXTAG(glXCreateContextWithConfigSGIX)(Display *dpy, GLXFBConfigSGIX config,
47	int render_type,
48	GLXContext share_list,
49	Bool direct)
50	@@ -812,7 +811,7 @@ VBOXGLXTAG(glXCreateContextWithConfigSGIX)(Display *dp
51
52	DECLEXPORT(XVisualInfo *)
53	VBOXGLXTAG(glXGetVisualFromFBConfigSGIX)(Display *dpy,
54	- GLXFBConfig config)
55	+ GLXFBConfigSGIX config)
56	{
57	return visualInfoFromFBConfig(dpy, config);
58	}

Lines 1-4 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_Makefile.kmk (-4 / +5 lines)
1	--- src/VBox/Additions/freebsd/Makefile.kmk.orig 2019-07-12 08:42:35 UTC	1	--- src/VBox/Additions/freebsd/Makefile.kmk.orig 2021-01-07 15:34:22 UTC
2	+++ src/VBox/Additions/freebsd/Makefile.kmk	2	+++ src/VBox/Additions/freebsd/Makefile.kmk
3	@@ -23,8 +23,9 @@ $(error "The FreeBSD guest additions installer can onl	3	@@ -23,8 +23,9 @@ $(error "The FreeBSD guest additions installer can onl
4	endif	4	endif
Lines 12-22 Link Here
12		12
13	#	13	#
14	# Globals	14	# Globals
15	@@ -67,11 +68,13 @@ VBOX_FBSD_ADD_STRIP_BIN = \	15	@@ -66,11 +67,14 @@ VBOX_FBSD_ADD_STRIP_BIN = \
		16	vboxvideo_drv_14.so \
16	vboxvideo_drv_15.so \	17	vboxvideo_drv_15.so \
17	vboxvideo_drv_16.so \	18	vboxvideo_drv_16.so \
18	vboxvideo_drv_17.so \	19	- vboxvideo_drv_17.so
19	- VBoxOGL.so	20	+ vboxvideo_drv_17.so \
20	+ $(if $(VBOX_WITH_PAM),pam_vbox.so,) \	21	+ $(if $(VBOX_WITH_PAM),pam_vbox.so,) \
21	+ VBoxOGL.so \	22	+ VBoxOGL.so \
22	+ mount_vboxvfs	23	+ mount_vboxvfs

Line 0 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_bcmp.c (+12 lines)
	1	--- src/VBox/Additions/freebsd/vboxvfs/bcmp.c.orig 2021-02-21 19:09:22 UTC
	2	+++ src/VBox/Additions/freebsd/vboxvfs/bcmp.c
	3	@@ -0,0 +1,9 @@
	4	+#include <sys/types.h>
	5	+
	6	+int bcmp(const void b1, const void b2, size_t len);
	7	+
	8	+int
	9	+bcmp(const void b1, const void b2, size_t len)
	10	+{
	11	+ return __builtin_memcmp((b1), (b2), (len));
	12	+}

Line 0 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_Additions_x11_x11include_xproto-7.0.18_X11_Xfuncproto.h (+230 lines)
		1	--- src/VBox/Additions/x11/x11include/xproto-7.0.18/X11/Xfuncproto.h.orig 2021-01-07 15:37:10 UTC
		2	+++ src/VBox/Additions/x11/x11include/xproto-7.0.18/X11/Xfuncproto.h
		3	@@ -48,6 +48,227 @@ in this Software without prior written authorization f
		4	#endif /* _Xconst */
		5
		6	/* Function prototype configuration (see configure for more info) */
		7	+#if !defined(NARROWPROTO) && \
		8	+ (defined(__linux__) \|\| defined(__FreeBSD__) \|\| defined(__NetBSD__) \|\| defined(__OpenBSD__))
		9	+#define NARROWPROTO
		10	+#endif
		11	+#ifndef FUNCPROTO
		12	+#define FUNCPROTO 15
		13	+#endif
		14	+
		15	+#ifndef NeedWidePrototypes
		16	+#ifdef NARROWPROTO
		17	+#define NeedWidePrototypes 0
		18	+#else
		19	+#define NeedWidePrototypes 1 /* default to make interropt. easier */
		20	+#endif
		21	+#endif /* NeedWidePrototypes */
		22	+
		23	+#endif /* NeedFunctionPrototypes */
		24	+
		25	+#ifndef _XFUNCPROTOBEGIN
		26	+#if defined(__cplusplus) \|\| defined(c_plusplus) /* for C++ V2.0 */
		27	+#define _XFUNCPROTOBEGIN extern "C" { /* do not leave open across includes */
		28	+#define _XFUNCPROTOEND }
		29	+#else
		30	+#define _XFUNCPROTOBEGIN
		31	+#define _XFUNCPROTOEND
		32	+#endif
		33	+#endif /* _XFUNCPROTOBEGIN */
		34	+
		35	+/* http://clang.llvm.org/docs/LanguageExtensions.html#has-attribute */
		36	+#ifndef __has_attribute
		37	+# define __has_attribute(x) 0 /* Compatibility with non-clang compilers. */
		38	+#endif
		39	+#ifndef __has_feature
		40	+# define __has_feature(x) 0 /* Compatibility with non-clang compilers. */
		41	+#endif
		42	+#ifndef __has_extension
		43	+# define __has_extension(x) 0 /* Compatibility with non-clang compilers. */
		44	+#endif
		45	+
		46	+/* Added in X11R6.9, so available in any version of modular xproto */
		47	+#if __has_attribute(__sentinel__) \|\| (defined(__GNUC__) && (__GNUC__ >= 4))
		48	+# define _X_SENTINEL(x) __attribute__ ((__sentinel__(x)))
		49	+#else
		50	+# define _X_SENTINEL(x)
		51	+#endif /* GNUC >= 4 */
		52	+
		53	+/* Added in X11R6.9, so available in any version of modular xproto */
		54	+#if (__has_attribute(visibility) \|\| (defined(__GNUC__) && (__GNUC__ >= 4))) \
		55	+ && !defined(__CYGWIN__) && !defined(__MINGW32__)
		56	+# define _X_EXPORT __attribute__((visibility("default")))
		57	+# define _X_HIDDEN __attribute__((visibility("hidden")))
		58	+# define _X_INTERNAL __attribute__((visibility("internal")))
		59	+#elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550)
		60	+# define _X_EXPORT __global
		61	+# define _X_HIDDEN __hidden
		62	+# define _X_INTERNAL __hidden
		63	+#else /* not gcc >= 4 and not Sun Studio >= 8 */
		64	+# define _X_EXPORT
65	+# define _X_HIDDEN
66	+# define _X_INTERNAL
67	+#endif /* GNUC >= 4 */
68	+
69	+/* Branch prediction hints for individual conditionals */
70	+/* requires xproto >= 7.0.9 */
71	+#if defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 303)
72	+# define _X_LIKELY(x) __builtin_expect(!!(x), 1)
73	+# define _X_UNLIKELY(x) __builtin_expect(!!(x), 0)
74	+#else /* not gcc >= 3.3 */
75	+# define _X_LIKELY(x) (x)
76	+# define _X_UNLIKELY(x) (x)
77	+#endif
78	+
79	+/* Bulk branch prediction hints via marking error path functions as "cold" */
80	+/* requires xproto >= 7.0.25 */
81	+#if __has_attribute(__cold__) \|\| \
82	+ (defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 403)) /* 4.3+ */
83	+# define _X_COLD __attribute__((__cold__))
84	+#else
85	+# define _X_COLD /* nothing */
86	+#endif
87	+
88	+/* Added in X11R6.9, so available in any version of modular xproto */
89	+#if __has_attribute(deprecated) \
90	+ \|\| (defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 301)) \
91	+ \|\| (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x5130))
92	+# define _X_DEPRECATED __attribute__((deprecated))
93	+#else /* not gcc >= 3.1 */
94	+# define _X_DEPRECATED
95	+#endif
96	+
97	+/* requires xproto >= 7.0.30 */
98	+#if __has_extension(attribute_deprecated_with_message) \|\| \
99	+ (defined(__GNUC__) && ((__GNUC__ >= 5) \|\| ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 5))))
100	+# define _X_DEPRECATED_MSG(_msg) __attribute__((deprecated(_msg)))
101	+#else
102	+# define _X_DEPRECATED_MSG(_msg) _X_DEPRECATED
103	+#endif
104	+
105	+/* requires xproto >= 7.0.17 */
106	+#if __has_attribute(noreturn) \
107	+ \|\| (defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 205)) \
108	+ \|\| (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))
109	+# define _X_NORETURN __attribute((noreturn))
110	+#else
111	+# define _X_NORETURN
112	+#endif /* GNUC */
113	+
114	+/* Added in X11R6.9, so available in any version of modular xproto */
115	+#if __has_attribute(__format__) \
116	+ \|\| defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 203)
117	+# define _X_ATTRIBUTE_PRINTF(x,y) __attribute__((__format__(__printf__,x,y)))
118	+#else /* not gcc >= 2.3 */
119	+# define _X_ATTRIBUTE_PRINTF(x,y)
120	+#endif
121	+
122	+/* requires xproto >= 7.0.22 - since this uses either gcc or C99 variable
123	+ argument macros, must be only used inside #ifdef _X_NONNULL guards, as
124	+ many legacy X clients are compiled in C89 mode still. */
125	+#if __has_attribute(nonnull) \
126	+ && defined(__STDC_VERSION__) && (__STDC_VERSION__ - 0 >= 199901L) /* C99 */
127	+#define _X_NONNULL(...) __attribute__((nonnull(__VA_ARGS__)))
128	+#elif __has_attribute(nonnull) \
129	+ \|\| defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 303)
130	+#define _X_NONNULL(args...) __attribute__((nonnull(args)))
131	+#elif defined(__STDC_VERSION__) && (__STDC_VERSION__ - 0 >= 199901L) /* C99 */
132	+#define _X_NONNULL(...) /* */
133	+#endif
134	+
135	+/* requires xproto >= 7.0.22 */
136	+#if __has_attribute(__unused__) \
137	+ \|\| defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 205)
138	+#define _X_UNUSED __attribute__((__unused__))
139	+#else
140	+#define _X_UNUSED /* */
141	+#endif
142	+
143	+/* C99 keyword "inline" or equivalent extensions in pre-C99 compilers */
144	+/* requires xproto >= 7.0.9
145	+ (introduced in 7.0.8 but didn't support all compilers until 7.0.9) */
146	+#if defined(inline) /* assume autoconf set it correctly */ \|\| \
147	+ (defined(__STDC_VERSION__) && (__STDC_VERSION__ - 0 >= 199901L)) /* C99 */ \|\| \
148	+ (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550))
149	+# define _X_INLINE inline
150	+#elif defined(__GNUC__) && !defined(__STRICT_ANSI__) /* gcc w/C89+extensions */
151	+# define _X_INLINE __inline__
152	+#else
153	+# define _X_INLINE
154	+#endif
155	+
156	+/* C99 keyword "restrict" or equivalent extensions in pre-C99 compilers */
157	+/* requires xproto >= 7.0.21 */
158	+#ifndef _X_RESTRICT_KYWD
159	+# if defined(restrict) /* assume autoconf set it correctly */ \|\| \
160	+ (defined(__STDC_VERSION__) && (__STDC_VERSION__ - 0 >= 199901L) /* C99 */ \
161	+ && !defined(__cplusplus)) /* Workaround g++ issue on Solaris */
162	+# define _X_RESTRICT_KYWD restrict
163	+# elif defined(__GNUC__) && !defined(__STRICT_ANSI__) /* gcc w/C89+extensions */
164	+# define _X_RESTRICT_KYWD __restrict__
165	+# else
166	+# define _X_RESTRICT_KYWD
167	+# endif
168	+#endif
169	+
170	+/* requires xproto >= 7.0.30 */
171	+#if __has_attribute(no_sanitize_thread)
172	+# define _X_NOTSAN __attribute__((no_sanitize_thread))
173	+#else
174	+# define _X_NOTSAN
175	+#endif
176	+
177	+#endif /* _XFUNCPROTO_H_ */
178	+/*
179	+ *
180	+Copyright 1989, 1991, 1998 The Open Group
181	+
182	+Permission to use, copy, modify, distribute, and sell this software and its
183	+documentation for any purpose is hereby granted without fee, provided that
184	+the above copyright notice appear in all copies and that both that
185	+copyright notice and this permission notice appear in supporting
186	+documentation.
187	+
188	+The above copyright notice and this permission notice shall be included in
189	+all copies or substantial portions of the Software.
190	+
191	+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
192	+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
193	+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
194	+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
195	+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
196	+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
197	+
198	+Except as contained in this notice, the name of The Open Group shall not be
199	+used in advertising or otherwise to promote the sale, use or other dealings
200	+in this Software without prior written authorization from The Open Group.
201	+ *
202	+ */
203	+
204	+/* Definitions to make function prototypes manageable */
205	+
206	+#ifndef _XFUNCPROTO_H_
207	+#define _XFUNCPROTO_H_
208	+
209	+#ifndef NeedFunctionPrototypes
210	+#define NeedFunctionPrototypes 1
211	+#endif /* NeedFunctionPrototypes */
212	+
213	+#ifndef NeedVarargsPrototypes
214	+#define NeedVarargsPrototypes 1
215	+#endif /* NeedVarargsPrototypes */
216	+
217	+#if NeedFunctionPrototypes
218	+
219	+#ifndef NeedNestedPrototypes
220	+#define NeedNestedPrototypes 1
221	+#endif /* NeedNestedPrototypes */
222	+
223	+#ifndef _Xconst
224	+#define _Xconst const
225	+#endif /* _Xconst */
226	+
227	+/* Function prototype configuration (see configure for more info) */
228	#ifndef NARROWPROTO
229	#undef NARROWPROTO
230	#endif

Line 0 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_Devices_Audio_DrvHostOSSAudio.cpp (+31 lines)
	1	--- src/VBox/Devices/Audio/DrvHostOSSAudio.cpp.orig 2021-01-07 15:37:12 UTC
	2	+++ src/VBox/Devices/Audio/DrvHostOSSAudio.cpp
	3	@@ -253,10 +253,11 @@ static int ossStreamOpen(const char *pszDev, int fOpen
	4
	5	default:
	6	rc = VERR_AUDIO_STREAM_COULD_NOT_CREATE;
	7	+ iFormat = -1;
	8	break;
	9	}
	10
	11	- if (RT_FAILURE(rc))
	12	+ if (RT_UNLIKELY(iFormat == -1))
	13	break;
	14
	15	if (ioctl(fdFile, SNDCTL_DSP_SAMPLESIZE, &iFormat))
	16	@@ -664,6 +665,7 @@ static int ossCreateStreamIn(POSSAUDIOSTREAM pStreamOS
	17
	18	pCfgAcq->Backend.cFramesPeriod = PDMAUDIOSTREAMCFG_B2F(pCfgAcq, ossAcq.cbFragmentSize);
	19	pCfgAcq->Backend.cFramesBufferSize = pCfgAcq->Backend.cFramesPeriod * 2; /* Use "double buffering". */
	20	+ pCfgAcq->Backend.cFramesPreBuffering = pCfgAcq->Backend.cFramesBufferSize;
	21	/** @todo Pre-buffering required? */
	22	}
	23	}
	24	@@ -782,6 +784,7 @@ static int ossCreateStreamOut(POSSAUDIOSTREAM pStreamO
	25	#endif
	26	pCfgAcq->Backend.cFramesPeriod = PDMAUDIOSTREAMCFG_B2F(pCfgAcq, obtStream.cbFragmentSize);
	27	pCfgAcq->Backend.cFramesBufferSize = pCfgAcq->Backend.cFramesPeriod * 2; /* Use "double buffering" */
	28	+ pCfgAcq->Backend.cFramesPreBuffering = pCfgAcq->Backend.cFramesBufferSize;
	29	}
	30
	31	} while (0);

Line 0 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_Devices_Makefile.kmk (+44 lines)
	1	--- src/VBox/Devices/Makefile.kmk.orig 2021-01-07 15:39:35 UTC
	2	+++ src/VBox/Devices/Makefile.kmk
	3	@@ -112,6 +112,7 @@ if !defined(VBOX_ONLY_EXTPACKS)
	4	VBoxDDU_LDFLAGS.darwin += -framework IOKit
	5	endif
	6
	7	+ VBoxDDU_LDFLAGS.freebsd = $(VBOX_GCC_NO_UNDEFINED)
	8	VBoxDDU_LDFLAGS.linux = $(VBOX_GCC_NO_UNDEFINED)
	9	$(call VBOX_SET_VER_INFO_DLL,VBoxDDU,VirtualBox VMM Devices and Drivers Utilities)
	10
	11	@@ -245,6 +246,7 @@ if !defined(VBOX_ONLY_EXTPACKS) && "$(intersects $(KBU
	12	-framework SystemConfiguration \
	13	-framework AVFoundation \
	14	-framework Foundation
	15	+ VBoxDD_LDFLAGS.freebsd = $(VBOX_GCC_NO_UNDEFINED)
	16	VBoxDD_LDFLAGS.linux = $(VBOX_GCC_NO_UNDEFINED)
	17
	18	# --- Tracing bits. ---
	19	@@ -287,7 +289,7 @@ if !defined(VBOX_ONLY_EXTPACKS) && "$(intersects $(KBU
	20	VBoxDD_SOURCES += Graphics/DevVGA-SVGA.cpp
	21	endif
	22	ifdef VBOX_WITH_VMSVGA3D
	23	- if1of ($(KBUILD_TARGET), linux win)
	24	+ if1of ($(KBUILD_TARGET), freebsd linux win)
	25	# Dynamically load 3D library (opengl32, libGL).
	26	# This is a temporary solution. In future the 3D backend will be in a separate library.
	27	VBOX_WITH_VMSVGA3D_DYNAMIC_LOAD = 1
	28	@@ -329,6 +331,7 @@ VBOX_WITH_VMSVGA3D_DYNAMIC_LOAD = 1
	29	VBoxDD_SOURCES += \
	30	Graphics/DevVGA-SVGA3d-glLdr.cpp
	31	else
	32	+ VBoxDD_LIBS.freebsd += X11 GL
	33	VBoxDD_LIBS.linux += X11 GL
	34	VBoxDD_LIBS.win += $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/Opengl32.lib
	35	endif
	36	@@ -1526,6 +1529,8 @@ if defined(VBOX_WITH_VMSVGA3D) && !defined(VBOX_ONLY_E
	37	VBoxSVGA3D_INCS = $(VBOX_GRAPHICS_INCS)
	38	VBoxSVGA3D_INCS.win := \
	39	Graphics/shaderlib/libWineStub/include
	40	+ VBoxSVGA3D_INCS.freebsd := \
	41	+ Graphics/shaderlib/wine/include
	42	VBoxSVGA3D_INCS.linux := \
	43	Graphics/shaderlib/wine/include
	44	VBoxSVGA3D_INCS.darwin := \

Lines 1-6 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_Frontends_VBoxManage_VBoxManageHelp.cpp (-3 / +12 lines)
1	--- src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp.orig 2020-05-13 19:43:27 UTC	1	--- src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp.orig 2021-01-07 15:40:48 UTC
2	+++ src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp	2	+++ src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp
3	@@ -622,7 +622,7 @@ void printUsage(USAGECATEGORY fCategory, uint32_t fSub	3	@@ -646,7 +646,7 @@ void printUsage(USAGECATEGORY enmCommand, uint64_t fSu
		4	" file <file>\|\n"
		5	" <devicename>]\n"
		6	" [--uarttype<1-N> 16450\|16550A\|16750]\n"
		7	-#if defined(RT_OS_LINUX) \|\| defined(RT_OS_WINDOWS)
		8	+#if defined(RT_OS_FREEBSD) \|\| defined(RT_OS_LINUX) \|\| defined(RT_OS_WINDOWS)
		9	" [--lpt<1-N> off\|<I/O base> <IRQ>]\n"
		10	" [--lptmode<1-N> <devicename>]\n"
		11	#endif
		12	@@ -661,7 +661,7 @@ void printUsage(USAGECATEGORY enmCommand, uint64_t fSu
4	RTStrmPrintf(pStrm, "\|dsound");	13	RTStrmPrintf(pStrm, "\|dsound");
5	#endif	14	#endif
6	}	15	}
Lines 9-15 Link Here
9	{	18	{
10	RTStrmPrintf(pStrm, ""	19	RTStrmPrintf(pStrm, ""
11	#ifdef VBOX_WITH_AUDIO_OSS	20	#ifdef VBOX_WITH_AUDIO_OSS
12	@@ -635,22 +635,6 @@ void printUsage(USAGECATEGORY fCategory, uint32_t fSub	21	@@ -674,22 +674,6 @@ void printUsage(USAGECATEGORY enmCommand, uint64_t fSu
13	"\|pulse"	22	"\|pulse"
14	#endif	23	#endif
15	);	24	);

Lines 1-14 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_Frontends_VirtualBox_Makefile.kmk (-5 / +5 lines)
1	--- src/VBox/Frontends/VirtualBox/Makefile.kmk.orig 2020-05-13 19:43:28 UTC	1	--- src/VBox/Frontends/VirtualBox/Makefile.kmk.orig 2021-01-07 15:40:49 UTC
2	+++ src/VBox/Frontends/VirtualBox/Makefile.kmk	2	+++ src/VBox/Frontends/VirtualBox/Makefile.kmk
3	@@ -897,6 +897,7 @@ if defined(VBOX_WITH_VIDEOHWACCEL) \|\| defined(VBOX_GUI	3	@@ -1186,6 +1186,7 @@ if defined(VBOX_WITH_VIDEOHWACCEL) \|\| defined(VBOX_GUI
4	VirtualBox_SOURCES += \	4	src/VBox2DHelpers.cpp \
5	src/VBoxFBOverlay.cpp \	5	src/VBoxFBOverlay.cpp \
6	src/VBoxGLSupportInfo.cpp	6	src/VBoxGLSupportInfo.cpp
7	+ VirtualBox_CXXFLAGS.freebsd += -std=c++11	7	+ VirtualBox_CXXFLAGS.freebsd += -std=c++11
8	endif	8	endif
9		9
10	#	10	$(call VBOX_SET_VER_INFO_EXE,VirtualBox,VirtualBox Manager,$(VBOX_WINDOWS_ICON_FILE))
11	@@ -1220,6 +1221,7 @@ if defined(VBOX_WITH_VIDEOHWACCEL)	11	@@ -1862,6 +1863,7 @@ if defined(VBOX_WITH_VIDEOHWACCEL)
12	VBoxOGL2D_SOURCES = \	12	VBoxOGL2D_SOURCES = \
13	src/VBoxGLSupportInfo.cpp	13	src/VBoxGLSupportInfo.cpp
14	VBoxOGL2D_INCS = include	14	VBoxOGL2D_INCS = include

Lines 1-17 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_Main_include_USBProxyBackend.h (-17 lines)
1	--- src/VBox/Main/include/USBProxyBackend.h.orig 2020-05-13 19:44:06 UTC
2	+++ src/VBox/Main/include/USBProxyBackend.h
3	@@ -365,13 +365,10 @@ class USBProxyBackendFreeBSD : public USBProxyBackend
4	virtual int releaseDevice(HostUSBDevice *aDevice);
5
6	protected:
7	- int initUsbfs(void);
8	- int initSysfs(void);
9	virtual int wait(RTMSINTERVAL aMillies);
10	virtual int interruptWait(void);
11	virtual PUSBDEVICE getDevices(void);
12	- int addDeviceToChain(PUSBDEVICE pDev, PUSBDEVICE ppFirst, PUSBDEVICE *pppNext, int rc);
13	- virtual void deviceAdded(ComObjPtr<HostUSBDevice> &aDevice, SessionMachinesList &llOpenedMachines, PUSBDEVICE aUSBDevice);
14	+ virtual bool isFakeUpdateRequired();
15
16	private:
17	RTSEMEVENT mNotifyEventSem;

Lines 1-20 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_Main_src-client_ConsoleImpl2.cpp (-20 lines)
1	--- src/VBox/Main/src-client/ConsoleImpl2.cpp.orig 2020-05-13 19:44:07 UTC
2	+++ src/VBox/Main/src-client/ConsoleImpl2.cpp
3	@@ -5265,7 +5265,7 @@ int Console::i_configNetwork(const char *pszDevice,
4	{
5	switch (hrc)
6	{
7	- case VERR_ACCESS_DENIED:
8	+ case (HRESULT)VERR_ACCESS_DENIED:
9	return VMSetError(VMR3GetVM(mpUVM), VERR_HOSTIF_INIT_FAILED, RT_SRC_POS, N_(
10	"Failed to open '/dev/net/tun' for read/write access. Please check the "
11	"permissions of that node. Either run 'chmod 0666 /dev/net/tun' or "
12	@@ -5467,7 +5467,7 @@ int Console::i_configNetwork(const char *pszDevice,
13	{
14	switch (hrc)
15	{
16	- case VERR_ACCESS_DENIED:
17	+ case (HRESULT)VERR_ACCESS_DENIED:
18	return VMSetError(VMR3GetVM(mpUVM), VERR_HOSTIF_INIT_FAILED, RT_SRC_POS, N_(
19	"Failed to open '/dev/%s' for read/write access. Please check the "
20	"permissions of that node, and that the net.link.tap.user_open "

Lines 1-19 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_Main_src-server_freebsd_NetIf-freebsd.cpp (-19 lines)
1	--- src/VBox/Main/src-server/freebsd/NetIf-freebsd.cpp.orig 2017-10-18 07:12:58 UTC
2	+++ src/VBox/Main/src-server/freebsd/NetIf-freebsd.cpp
3	@@ -43,6 +43,7 @@
4
5	#include <net/if_dl.h>
6	#include <netinet/in.h>
7	+#include <net80211/ieee80211_ioctl.h>
8
9	#include <stdlib.h>
10	#include <stdio.h>
11	@@ -311,7 +312,7 @@ int NetIfList(std::list <ComObjPtr<HostNetworkInterfac
12	else
13	enmType = HostNetworkInterfaceType_HostOnly;
14
15	- pNew->wireless = isWireless(pNew->szName);
16	+ pNew->fWireless = isWireless(pNew->szName);
17
18	ComObjPtr<HostNetworkInterface> IfObj;
19	IfObj.createObject();

Lines 1-6 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_Runtime_r0drv_freebsd_alloc-r0drv-freebsd.c (-8 / +8 lines)
1	--- src/VBox/Runtime/r0drv/freebsd/alloc-r0drv-freebsd.c.orig 2018-10-15 14:31:31 UTC	1	--- src/VBox/Runtime/r0drv/freebsd/alloc-r0drv-freebsd.c.orig 2021-01-07 15:42:08 UTC
2	+++ src/VBox/Runtime/r0drv/freebsd/alloc-r0drv-freebsd.c	2	+++ src/VBox/Runtime/r0drv/freebsd/alloc-r0drv-freebsd.c
3	@@ -54,6 +54,7 @@ MALLOC_DEFINE(M_IPRTCONT, "iprtcont", "IPRT - contiguo	3	@@ -78,6 +78,7 @@ MALLOC_DEFINE(M_IPRTCONT, "iprtcont", "IPRT - contiguo
4		4
5	DECLHIDDEN(int) rtR0MemAllocEx(size_t cb, uint32_t fFlags, PRTMEMHDR *ppHdr)	5	DECLHIDDEN(int) rtR0MemAllocEx(size_t cb, uint32_t fFlags, PRTMEMHDR *ppHdr)
6	{	6	{
Lines 8-14 Link Here
8	size_t cbAllocated = cb;	8	size_t cbAllocated = cb;
9	PRTMEMHDR pHdr = NULL;	9	PRTMEMHDR pHdr = NULL;
10		10
11	@@ -76,8 +77,10 @@ DECLHIDDEN(int) rtR0MemAllocEx(size_t cb, uint32_t fFl	11	@@ -100,8 +101,10 @@ DECLHIDDEN(int) rtR0MemAllocEx(size_t cb, uint32_t fFl
12	cbAllocated = RT_ALIGN_Z(cb + sizeof(*pHdr), PAGE_SIZE);	12	cbAllocated = RT_ALIGN_Z(cb + sizeof(*pHdr), PAGE_SIZE);
13		13
14	pVmObject = vm_object_allocate(OBJT_DEFAULT, cbAllocated >> PAGE_SHIFT);	14	pVmObject = vm_object_allocate(OBJT_DEFAULT, cbAllocated >> PAGE_SHIFT);
Lines 20-26 Link Here
20		20
21	/* Addr contains a start address vm_map_find will start searching for suitable space at. */	21	/* Addr contains a start address vm_map_find will start searching for suitable space at. */
22	#if __FreeBSD_version >= 1000055	22	#if __FreeBSD_version >= 1000055
23	@@ -114,6 +117,8 @@ DECLHIDDEN(int) rtR0MemAllocEx(size_t cb, uint32_t fFl	23	@@ -138,6 +141,8 @@ DECLHIDDEN(int) rtR0MemAllocEx(size_t cb, uint32_t fFl
24	fFlags & RTMEMHDR_FLAG_ZEROED ? M_NOWAIT \| M_ZERO : M_NOWAIT);	24	fFlags & RTMEMHDR_FLAG_ZEROED ? M_NOWAIT \| M_ZERO : M_NOWAIT);
25	}	25	}
26		26
Lines 29-35 Link Here
29	if (RT_UNLIKELY(!pHdr))	29	if (RT_UNLIKELY(!pHdr))
30	return VERR_NO_MEMORY;	30	return VERR_NO_MEMORY;
31		31
32	@@ -129,6 +134,8 @@ DECLHIDDEN(int) rtR0MemAllocEx(size_t cb, uint32_t fFl	32	@@ -153,6 +158,8 @@ DECLHIDDEN(int) rtR0MemAllocEx(size_t cb, uint32_t fFl
33		33
34	DECLHIDDEN(void) rtR0MemFree(PRTMEMHDR pHdr)	34	DECLHIDDEN(void) rtR0MemFree(PRTMEMHDR pHdr)
35	{	35	{
Lines 38-44 Link Here
38	pHdr->u32Magic += 1;	38	pHdr->u32Magic += 1;
39		39
40	#ifdef RT_ARCH_AMD64	40	#ifdef RT_ARCH_AMD64
41	@@ -141,11 +148,14 @@ DECLHIDDEN(void) rtR0MemFree(PRTMEMHDR pHdr)	41	@@ -165,11 +172,14 @@ DECLHIDDEN(void) rtR0MemFree(PRTMEMHDR pHdr)
42	else	42	else
43	#endif	43	#endif
44	free(pHdr, M_IPRTHEAP);	44	free(pHdr, M_IPRTHEAP);
Lines 53-59 Link Here
53	void *pv;	53	void *pv;
54		54
55	/*	55	/*
56	@@ -170,6 +180,7 @@ RTR0DECL(void *) RTMemContAlloc(PRTCCPHYS pPhys, size_	56	@@ -194,6 +204,7 @@ RTR0DECL(void *) RTMemContAlloc(PRTCCPHYS pPhys, size_
57	*pPhys = vtophys(pv);	57	*pPhys = vtophys(pv);
58	Assert(!(*pPhys & PAGE_OFFSET_MASK));	58	Assert(!(*pPhys & PAGE_OFFSET_MASK));
59	}	59	}
Lines 61-67 Link Here
61	return pv;	61	return pv;
62	}	62	}
63		63
64	@@ -179,7 +190,9 @@ RTR0DECL(void) RTMemContFree(void *pv, size_t cb)	64	@@ -203,7 +214,9 @@ RTR0DECL(void) RTMemContFree(void *pv, size_t cb)
65	if (pv)	65	if (pv)
66	{	66	{
67	AssertMsg(!((uintptr_t)pv & PAGE_OFFSET_MASK), ("pv=%p\n", pv));	67	AssertMsg(!((uintptr_t)pv & PAGE_OFFSET_MASK), ("pv=%p\n", pv));