Index: emulators/virtualbox-ose/Makefile =================================================================== --- emulators/virtualbox-ose/Makefile (revision 391665) +++ emulators/virtualbox-ose/Makefile (working copy) @@ -2,15 +2,11 @@ # $FreeBSD$ PORTNAME= virtualbox-ose -DISTVERSION= 4.3.28 -PORTREVISION= 1 +PORTVERSION= 5.0.0 CATEGORIES= emulators -MASTER_SITES= http://download.virtualbox.org/virtualbox/${DISTVERSION}/ \ - http://tmp.chruetertee.ch/ \ - http://disasterarea.chruetertee.ch/ \ - http://download.virtualbox.org/virtualbox/${VBOX_GUEST_VER}/:guestadditions -DISTFILES= VirtualBox-${DISTVERSION}${EXTRACT_SUFX} ${GADISTFILES} -EXTRACT_ONLY= VirtualBox-${DISTVERSION}${EXTRACT_SUFX} +MASTER_SITES= http://download.virtualbox.org/virtualbox/${PORTVERSION}/ +DISTFILES= VirtualBox-${PORTVERSION}${EXTRACT_SUFX} ${GUESTADDITIONS} +EXTRACT_ONLY= VirtualBox-${PORTVERSION}${EXTRACT_SUFX} MAINTAINER= vbox@FreeBSD.org COMMENT= General-purpose full virtualizer for x86 hardware @@ -36,7 +32,6 @@ WRKSRC= ${WRKDIR}/VirtualBox-${PORTVERSION} ONLY_FOR_ARCHS= i386 amd64 USES= compiler cpe iconv pkgconfig tar:bzip2 USE_GNOME= libidl -USE_LDCONFIG= ${VBOX_DIR} USE_OPENSSL= yes HAS_CONFIGURE= yes @@ -43,10 +38,10 @@ HAS_CONFIGURE= yes CONFIGURE_ARGS+= --disable-java --passive-mesa CONFIGURE_ARGS+= --with-gcc="${CC}" --with-g++="${CXX}" -CONFLICTS_INSTALL= virtualbox-ose-additions-4* \ - virtualbox-ose-additions-devel-4* \ - virtualbox-ose-devel-4* \ - virtualbox-ose-legacy-4* +CONFLICTS_INSTALL= virtualbox-ose-additions-[4-5]* \ + virtualbox-ose-additions-devel-[4-5]* \ + virtualbox-ose-devel-[4-5]* \ + virtualbox-ose-legacy-[4-5]* VBOXUSER?= vboxusers VBOXWSUSER?= vboxusers @@ -59,10 +54,8 @@ VBOX_PROGS= VBoxAutostart VBoxBalloonCtrl VBoxHead VBOX_UTILS= VBoxExtPackHelperApp VBoxNetAdpCtl VBoxNetDHCP VBoxSVC \ VBoxXPCOMIPCD -VBOX_GUEST_VER= ${PORTVERSION} - -OPTIONS_DEFINE= DBUS DEBUG GUESTADDITIONS MANUAL NLS PULSEAUDIO PYTHON \ - QT4 UDPTUNNEL VDE VNC VPX WEBSERVICE X11 +OPTIONS_DEFINE= ALSA DBUS DEBUG GUESTADDITIONS MANUAL NLS PULSEAUDIO \ + PYTHON QT4 UDPTUNNEL VDE VNC VPX WEBSERVICE X11 OPTIONS_DEFAULT= DBUS PYTHON QT4 UDPTUNNEL VNC WEBSERVICE X11 OPTIONS_SUB= yes @@ -76,6 +69,7 @@ VNC_DESC= Build with VNC support VPX_DESC= Use vpx for video capturing WEBSERVICE_DESC= Build Webservice +ALSA_LIB_DEPENDS= libasound.so:${PORTSDIR}/audio/alsa-lib DBUS_LIB_DEPENDS= libdbus-1.so:${PORTSDIR}/devel/dbus PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PORTSDIR}/audio/pulseaudio VNC_LIB_DEPENDS= libvncserver.so:${PORTSDIR}/net/libvncserver @@ -83,6 +77,7 @@ VPX_LIB_DEPENDS= libvpx.so:${PORTSDIR}/multimedia/ VDE_RUN_DEPENDS= vde_switch:${PORTSDIR}/net/vde2 +ALSA_CONFIGURE_OFF= --disable-alsa DBUS_CONFIGURE_OFF= --disable-dbus DEBUG_CONFIGURE_ON= --build-debug MANUAL_CONFIGURE_OFF= --disable-docs @@ -103,7 +98,7 @@ ENV= .SHELL: path="/bin/sh" unsetenv=true .endif -PLIST_SUB+= GUEST_VER=${VBOX_GUEST_VER} \ +PLIST_SUB+= GUEST_VER=${PORTVERSION} \ PYTHON_VER=${PYTHON_VER} \ PYTHON_VERU=${PYTHON_VER:S/./_/} \ VBOXGROUP=${VBOXGROUP} @@ -130,13 +125,14 @@ KMK_BUILDTYPE= release .endif .if ${PORT_OPTIONS:MGUESTADDITIONS} -GUESTADDITIONS= VBoxGuestAdditions_${VBOX_GUEST_VER}.iso -GADISTFILES= ${GUESTADDITIONS}:guestadditions +GUESTADDITIONS= VBoxGuestAdditions_${PORTVERSION}.iso RESTRICTED= for personal use only RESTRICTED_FILES= ${GUESTADDITIONS} .endif .if ${PORT_OPTIONS:MMANUAL} +DBKXMLDIR= ${LOCALBASE}/share/xml/docbook/4.3 +DBKXSLDIR= ${LOCALBASE}/share/xsl/docbook USE_TEX= dvipsk:build formats:build .endif @@ -224,6 +220,10 @@ pre-everything:: post-patch: @${ECHO} 'VBOX_PATH_APP_PRIVATE_ARCH = ${VBOX_DIR}' > \ ${WRKSRC}/LocalConfig.kmk + @${ECHO} 'VBOX_PATH_DOCBOOK = ${DBKXSLDIR}' >> \ + ${WRKSRC}/LocalConfig.kmk + @${ECHO} 'VBOX_PATH_DOCBOOK_DTD = ${DBKXMLDIR}' >> \ + ${WRKSRC}/LocalConfig.kmk @${ECHO} 'VBOX_PATH_SHARED_LIBS = ${VBOX_DIR}' >> \ ${WRKSRC}/LocalConfig.kmk @${ECHO} 'VBOX_WITH_RUNPATH = ${VBOX_DIR}' >> \ @@ -230,6 +230,7 @@ post-patch: ${WRKSRC}/LocalConfig.kmk @${ECHO} 'VBOX_PATH_APP_PRIVATE = ${DATADIR}' >> ${WRKSRC}/LocalConfig.kmk @${ECHO} 'VBOX_PATH_APP_DOCS = ${DOCSDIR}' >> ${WRKSRC}/LocalConfig.kmk + @${ECHO} 'VBOX_WITH_EXTPACK_VBOXDTRACE =' >> ${WRKSRC}/LocalConfig.kmk @${ECHO} 'VBOX_WITH_INSTALLER = 1' >> ${WRKSRC}/LocalConfig.kmk @${ECHO} 'VBOX_WITH_VBOXDRV =' >> ${WRKSRC}/LocalConfig.kmk @${ECHO} 'VBOX_WITH_TESTCASES =' >> ${WRKSRC}/LocalConfig.kmk @@ -237,6 +238,8 @@ post-patch: @${ECHO} 'SDK_VBOX_LIBPNG_LIBS = png' >> ${WRKSRC}/LocalConfig.kmk @${ECHO} 'VBOX_WITH_ADDITIONS =' >> ${WRKSRC}/LocalConfig.kmk @${ECHO} 'VBOX_WITH_DRAG_AND_DROP = ${VBOX_WITH_QT4}' >> ${WRKSRC}/LocalConfig.kmk + @${ECHO} 'VBOX_WITH_DRAG_AND_DROP_GH = ${VBOX_WITH_QT4}' >> ${WRKSRC}/LocalConfig.kmk + @${ECHO} 'VBOX_WITH_VALIDATIONKIT =' >> ${WRKSRC}/LocalConfig.kmk @${ECHO} 'VBOX_WITH_X11_ADDITIONS =' >> ${WRKSRC}/LocalConfig.kmk .if ${PORT_OPTIONS:MWEBSERVICE} @${ECHO} 'VBOX_WITH_WEBSERVICES = 1' >> ${WRKSRC}/LocalConfig.kmk @@ -261,7 +264,8 @@ post-patch: ${WRKSRC}/src/libs/xpcom18a4/python/gen_python_deps.py @${REINPLACE_CMD} -e 's|\$$KBUILDDIR_BIN/kmk_sed|${LOCALBASE}/bin/kmk_sed|g' ${WRKSRC}/configure .if empty(ICONV_LIB) - @${REINPLACE_CMD} -e 's|iconv||' ${WRKSRC}/Config.kmk ${WRKSRC}/src/VBox/Runtime/Makefile.kmk + @${REINPLACE_CMD} -e 's|iconv||' ${WRKSRC}/Config.kmk \ + ${WRKSRC}/src/VBox/Runtime/Makefile.kmk @${ECHO} 'VBOX_ICONV_DEFS = LIBICONV_PLUG' >> ${WRKSRC}/LocalConfig.kmk .endif @${REINPLACE_CMD} -e 's|/usr/local/lib/virtualbox|${VBOX_DIR}|' \ @@ -284,7 +288,7 @@ do-install: ${MKDIR} ${STAGEDIR}${VBOX_DIR} cd ${KMK_BUILDDIR}/bin && ${COPYTREE_SHARE} \ - "*.so *.gc *.r0 *.fd components" ${STAGEDIR}${VBOX_DIR} + "*.fd *.r0 *.rc *.so components" ${STAGEDIR}${VBOX_DIR} ${LN} -sf ${DATADIR}/sdk ${STAGEDIR}${VBOX_DIR} ${INSTALL_SCRIPT} ${WRKSRC}/src/VBox/Installer/freebsd/VBox.sh \ Index: emulators/virtualbox-ose/distinfo =================================================================== --- emulators/virtualbox-ose/distinfo (revision 391665) +++ emulators/virtualbox-ose/distinfo (working copy) @@ -1,4 +1,4 @@ -SHA256 (VirtualBox-4.3.28.tar.bz2) = e157ab76d1958ae2c56b2a3875194fbff3de82486ad0e30032fd5bd772297c31 -SIZE (VirtualBox-4.3.28.tar.bz2) = 100092002 -SHA256 (VBoxGuestAdditions_4.3.28.iso) = 9f52e186d6c9407b2676d4b2ed1cdf96940ec129cc2bd92e54b24526271a9733 -SIZE (VBoxGuestAdditions_4.3.28.iso) = 58241024 +SHA256 (VirtualBox-5.0.0.tar.bz2) = bb71356c8f82012c9b5ae16e12302eb111c71ae7b063ada7688fbfa8aa10c2f7 +SIZE (VirtualBox-5.0.0.tar.bz2) = 109816664 +SHA256 (VBoxGuestAdditions_5.0.0.iso) = 7b61f523db7ba75aebc4c7bb0cae2da92674fa72299e4a006c5c67517f7d786b +SIZE (VBoxGuestAdditions_5.0.0.iso) = 58601472 Index: emulators/virtualbox-ose/files/extrapatch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk =================================================================== --- emulators/virtualbox-ose/files/extrapatch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk (revision 391665) +++ emulators/virtualbox-ose/files/extrapatch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk (working copy) @@ -1,6 +1,6 @@ ---- src/VBox/Additions/x11/vboxvideo/Makefile.kmk.orig 2015-03-16 13:00:34.000000000 -0400 -+++ src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2015-03-30 02:29:37.842678000 -0400 -@@ -20,6 +20,9 @@ +--- src/VBox/Additions/x11/vboxvideo/Makefile.kmk.orig 2013-11-29 14:20:43.000000000 -0500 ++++ src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2013-12-16 13:47:34.000000000 -0500 +@@ -27,6 +27,9 @@ vboxvideo_70_DEFS := \ IN_MODULE XORG_7X RENDER=1 IN_RT_STATIC Index: emulators/virtualbox-ose/files/patch-Config.kmk =================================================================== --- emulators/virtualbox-ose/files/patch-Config.kmk (revision 391665) +++ emulators/virtualbox-ose/files/patch-Config.kmk (working copy) @@ -1,5 +1,5 @@ ---- Config.kmk.orig 2014-07-16 16:59:27.000000000 -0400 -+++ Config.kmk 2014-07-16 17:12:48.000000000 -0400 +--- Config.kmk.orig 2015-04-14 15:37:48.000000000 -0400 ++++ Config.kmk 2015-04-28 18:40:02.772354000 -0400 @@ -339,7 +339,7 @@ # Include documentation in the package VBOX_WITH_DOCS_PACKING = 1 @@ -9,7 +9,21 @@ VBOX_WITH_DOCS_CHM = 1 endif # By default only include translations in documentation-only builds -@@ -602,7 +602,7 @@ +@@ -423,11 +423,11 @@ + # Enable PDM based audio driver + VBOX_WITH_PDM_AUDIO_DRIVER = 1 + # Enable statically linked dbus support. +-if1of ($(KBUILD_TARGET), linux solaris) ++if1of ($(KBUILD_TARGET), freebsd linux solaris) + VBOX_WITH_DBUS = 1 + endif + # Enable building PAM modules. +-if1of ($(KBUILD_TARGET), linux solaris) ++if1of ($(KBUILD_TARGET), freebsd linux solaris) + VBOX_WITH_PAM = 1 + endif + # Disable WINMM support for Windows (not implemented). +@@ -613,7 +613,7 @@ # Enable this to build vbox-img even if VBOX_WITH_TESTCASES is disabled VBOX_WITH_VBOX_IMG = # Enables the VPX module for VM video capturing @@ -18,7 +32,7 @@ VBOX_WITH_VPX = 1 endif # Enable shared folders -@@ -891,10 +891,6 @@ +@@ -907,10 +907,6 @@ VBOX_WITH_VBOXSDL= endif @@ -29,7 +43,7 @@ ifeq ($(KBUILD_TARGET),haiku) # Don't bother with SDL ttf for now. VBOX_WITH_SECURELABEL= -@@ -1050,7 +1046,7 @@ +@@ -1067,7 +1063,7 @@ VBOX_WITH_SECURELABEL= VBOX_WITH_KCHMVIEWER= VBOX_WITH_PLUGIN_CRYPT= @@ -38,12 +52,8 @@ VBOX_WITH_DOCS= VBOX_WITH_DOCS_PACKING= endif -@@ -3476,16 +3472,16 @@ - $(VBOX_GCC_WARN) -Wpointer-arith -Winline $(VBOX_GCC_Wno-pointer-sign) $(VBOX_GCC_fdiagnostics-show-option) \ - -Wstrict-prototypes -Wmissing-prototypes -Wstrict-prototypes \ - -Wimplicit-function-declaration -Werror-implicit-function-declaration \ -- -O2 -fformat-extensions -ffreestanding -fno-strict-aliasing -fno-common -finline-limit=8000 \ -+ -O2 -ffreestanding -fno-strict-aliasing -fno-common -finline-limit=8000 \ +@@ -3701,7 +3697,7 @@ + -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 @@ -51,14 +61,7 @@ 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-format-extensions -fno-strict-aliasing -fno-common -finline-limit=8000 \ -+ -O2 -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) -@@ -3719,12 +3715,8 @@ +@@ -3942,12 +3938,8 @@ TEMPLATE_VBOXR3EXE_TOOL = GXX3 TEMPLATE_VBOXR3EXE_LIBS = pthread TEMPLATE_VBOXR3EXE_INCS += \ @@ -71,7 +74,7 @@ /usr/local/lib else ifeq ($(KBUILD_TARGET),solaris) TEMPLATE_VBOXR3EXE_TOOL = GXX3PLAIN -@@ -3982,7 +3974,7 @@ +@@ -4204,7 +4196,7 @@ TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS.win.amd64 = $(TEMPLATE_VBOXR3EXE_LDFLAGS.win.amd64) /entry:suplibHardenedWindowsMain TEMPLATE_VBOXR3HARDENEDEXE_LIBS.x86 = $(NOT_SUCH_VARIABLE) TEMPLATE_VBOXR3HARDENEDEXE_LIBS.amd64 = $(NOT_SUCH_VARIABLE) @@ -80,7 +83,7 @@ TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS = $(filter-out '$(VBOX_GCC_RPATH_OPT)%,$(TEMPLATE_VBOXR3EXE_LDFLAGS)) TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS.linux = $(filter-out $(VBOX_GCC_ORIGIN_OPT),$(TEMPLATE_VBOXR3EXE_LDFLAGS.linux)) endif -@@ -4370,12 +4362,8 @@ +@@ -4633,12 +4625,8 @@ TEMPLATE_VBOXMAINEXE_TOOL = GXX3 TEMPLATE_VBOXMAINEXE_LIBS = $(LIB_RUNTIME) TEMPLATE_VBOXMAINEXE_INCS += \ @@ -93,7 +96,7 @@ /usr/local/lib else ifeq ($(KBUILD_TARGET),solaris) TEMPLATE_VBOXMAINEXE_TOOL = GXX3PLAIN -@@ -4838,12 +4826,8 @@ +@@ -5103,12 +5091,8 @@ $(VBOX_LIBPATH_X11) ifeq ($(KBUILD_TARGET),freebsd) TEMPLATE_VBOXQT4GUIEXE_INCS += \ @@ -106,7 +109,7 @@ /usr/local/lib endif ifeq ($(KBUILD_TARGET),solaris) -@@ -5035,12 +5019,8 @@ +@@ -5319,12 +5303,8 @@ TEMPLATE_VBoxBldProg_TOOL = GXX3 TEMPLATE_VBoxBldProg_LIBS = pthread TEMPLATE_VBoxBldProg_INCS += \ @@ -119,7 +122,7 @@ /usr/local/lib else ifeq ($(KBUILD_HOST),solaris) TEMPLATE_VBoxBldProg_TOOL = GXX3PLAIN -@@ -5427,6 +5407,7 @@ +@@ -5683,6 +5663,7 @@ -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 Index: emulators/virtualbox-ose/files/patch-configure =================================================================== --- emulators/virtualbox-ose/files/patch-configure (revision 391665) +++ emulators/virtualbox-ose/files/patch-configure (working copy) @@ -1,6 +1,12 @@ ---- configure.orig 2015-05-13 11:08:57.000000000 -0400 -+++ configure 2015-05-15 14:16:05.988372000 -0400 -@@ -140,6 +140,8 @@ +--- configure.orig 2015-06-01 13:50:10.000000000 -0400 ++++ configure 2015-06-10 19:40:14.170742000 -0400 +@@ -137,10 +137,14 @@ + if [ "$OS" = "freebsd" ]; then + INCCURL="-I/usr/local/include" + LIBCURL="-L/usr/local/lib -lcurl" ++ INCALSA="-I/usr/local/include" ++ LIBALSA="-L/usr/local/lib" + INCPULSE="-I/usr/local/include" LIBPULSE="-L/usr/local/lib" INCPNG="-I/usr/local/include" LIBPNG="-L/usr/local/lib -lpng" @@ -9,7 +15,16 @@ else INCCURL="" LIBCURL="-lcurl" -@@ -1947,8 +1949,8 @@ +@@ -1200,7 +1204,7 @@ + #endif + } + EOF +- if test_compile "-lasound" asound asound; then ++ if test_compile "$INCALSA $LIBALSA -lasound" asound asound; then + test_execute + fi + } +@@ -1949,8 +1953,8 @@ echo "compiling the following source file:" >> $LOG cat $ODIR.tmp_src.cc >> $LOG echo "using the following command line:" >> $LOG @@ -20,12 +35,35 @@ if [ $? -eq 0 ]; then found=1 break -@@ -2357,7 +2359,7 @@ - --with-openssl-dir=*) - OPENSSLDIR=`echo $option | cut -d'=' -f2` - INCCRYPTO="-I${OPENSSLDIR}/include" -- LIBCRYPTO="${OPENSSLDIR}/lib/libcrypto.a ${OPENSSLDIR}/lib/libssl.a" -+ LIBCRYPTO="-L${OPENSSLDIR}/lib -lcrypto -lssl" - ;; - --with-ow-dir=*) - WATCOM=`echo $option | cut -d'=' -f2` +@@ -2733,8 +2737,15 @@ + [ $WITH_PYTHON -eq 1 ] && check_python + [ $WITH_JAVA -eq 1 ] && check_java + +- # PulseAudio + if [ "$OS" = "linux" -o "$OS" = "freebsd" ]; then ++ if [ $WITH_DBUS -eq 0 ]; then ++ cnf_append "VBOX_WITH_DBUS" "" ++ fi ++ if [ $WITH_ALSA -eq 1 ]; then ++ check_alsa ++ else ++ cnf_append "VBOX_WITH_ALSA" "" ++ fi + if [ $WITH_PULSE -eq 1 ]; then + check_pulse + elif [ $WITH_PULSE -eq 0 ]; then +@@ -2756,14 +2767,6 @@ + cnf_append "VBOX_WITH_ADDITION_DRIVERS" "" + fi + if [ $ONLY_ADDITIONS -eq 0 ]; then +- if [ $WITH_ALSA -eq 1 ]; then +- check_alsa +- else +- cnf_append "VBOX_WITH_ALSA" "" +- fi +- if [ $WITH_DBUS -eq 0 ]; then +- cnf_append "VBOX_WITH_DBUS" "" +- fi + if [ $WITH_DEVMAPPER -eq 1 ]; then + check_libdevmapper + else Index: emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-VBoxGuest-VBoxGuest-freebsd.c =================================================================== --- emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-VBoxGuest-VBoxGuest-freebsd.c (revision 391665) +++ emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-VBoxGuest-VBoxGuest-freebsd.c (working copy) @@ -1,5 +1,5 @@ ---- src/VBox/Additions/common/VBoxGuest/VBoxGuest-freebsd.c.orig 2015-03-02 10:06:54.000000000 -0500 -+++ src/VBox/Additions/common/VBoxGuest/VBoxGuest-freebsd.c 2015-03-09 18:02:36.502945000 -0400 +--- src/VBox/Additions/common/VBoxGuest/VBoxGuest-freebsd.c.orig 2015-04-14 15:38:05.000000000 -0400 ++++ src/VBox/Additions/common/VBoxGuest/VBoxGuest-freebsd.c 2015-04-28 17:53:52.447432000 -0400 @@ -80,8 +80,6 @@ struct resource *pIrqRes; /** Pointer to the IRQ handler. */ @@ -113,7 +113,7 @@ - else - Log(("VBoxGuestFreeBSDClone: Existing *ppDev=%p iUnit=%d si_drv1=%p si_drv2=%p\n", - *ppDev, iUnit, (*ppDev)->si_drv1, (*ppDev)->si_drv2)); -+ VBoxGuestCloseSession(&g_DevExt, pSession); ++ VbgdCommonCloseSession(&g_DevExt, pSession); + ASMAtomicDecU32(&cUsers); } @@ -144,7 +144,7 @@ - /* * Create a new session. */ - rc = VBoxGuestCreateUserSession(&g_DevExt, &pSession); + rc = VbgdCommonCreateUserSession(&g_DevExt, &pSession); if (RT_SUCCESS(rc)) { - if (ASMAtomicCmpXchgPtr(&pDev->si_drv1, pSession, (void *)0x42)) @@ -153,13 +153,13 @@ + Log((DEVICE_NAME ":VBoxGuestFreeBSDOpen success: g_DevExt=%p pSession=%p rc=%d pid=%d\n", &g_DevExt, pSession, rc, (int)RTProcSelf())); + rc = devfs_set_cdevpriv(pSession, VBoxGuestFreeBSDDtr); + if (rc) -+ VBoxGuestCloseSession(&g_DevExt, pSession); ++ VbgdCommonCloseSession(&g_DevExt, pSession); + else ASMAtomicIncU32(&cUsers); - return 0; - } - -- VBoxGuestCloseSession(&g_DevExt, pSession); +- VbgdCommonCloseSession(&g_DevExt, pSession); + return rc; } @@ -181,7 +181,7 @@ - */ - if (VALID_PTR(pSession)) - { -- VBoxGuestCloseSession(&g_DevExt, pSession); +- VbgdCommonCloseSession(&g_DevExt, pSession); - if (!ASMAtomicCmpXchgPtr(&pDev->si_drv1, NULL, pSession)) - Log(("VBoxGuestFreeBSDClose: si_drv1=%p expected %p!\n", pDev->si_drv1, pSession)); - ASMAtomicDecU32(&cUsers); @@ -284,12 +284,15 @@ */ - size_t cbDataReturned; + size_t cbDataReturned = 0; - rc = VBoxGuestCommonIOCtl(ulCmd, &g_DevExt, pSession, pvBuf, ReqWrap->cbData, &cbDataReturned); + rc = VbgdCommonIoCtl(ulCmd, &g_DevExt, pSession, pvBuf, ReqWrap->cbData, &cbDataReturned); if (RT_SUCCESS(rc)) { -@@ -355,18 +258,21 @@ - Log((DEVICE_NAME ":VBoxGuestFreeBSDIOCtl: VBoxGuestCommonIOCtl failed. rc=%d\n", rc)); - rc = EFAULT; +@@ -353,20 +256,23 @@ + else + { + Log((DEVICE_NAME ":VBoxGuestFreeBSDIOCtl: VbgdCommonIoCtl failed. rc=%d\n", rc)); +- rc = EFAULT; ++ rc = RTErrConvertToErrno(rc); } - RTMemTmpFree(pvBuf); + if (pvBuf) Index: emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-VBoxGuest-freebsd-Makefile =================================================================== --- emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-VBoxGuest-freebsd-Makefile (revision 391665) +++ emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-VBoxGuest-freebsd-Makefile (working copy) @@ -1,6 +1,6 @@ ---- src/VBox/Additions/common/VBoxGuest/freebsd/Makefile.orig 2014-09-18 22:18:11.602040183 +0400 -+++ src/VBox/Additions/common/VBoxGuest/freebsd/Makefile 2014-09-18 22:18:29.900039743 +0400 -@@ -72,6 +72,7 @@ +--- src/VBox/Additions/common/VBoxGuest/freebsd/Makefile.orig 2015-04-14 15:38:06.000000000 -0400 ++++ src/VBox/Additions/common/VBoxGuest/freebsd/Makefile 2015-04-14 18:25:23.090523000 -0400 +@@ -71,6 +71,7 @@ handletable.c \ handletablectx.c \ once.c \ @@ -8,3 +8,13 @@ thread.c .PATH: ${.CURDIR}/common/string +@@ -149,8 +150,7 @@ + spinlock-r0drv-freebsd.c \ + thread-r0drv-freebsd.c \ + thread2-r0drv-freebsd.c \ +- time-r0drv-freebsd.c \ +- timer-r0drv-freebsd.c ++ time-r0drv-freebsd.c + + .PATH: ${.CURDIR}/r0drv/generic + SRCS += \ Index: emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-pam-pam_vbox.cpp =================================================================== --- emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-pam-pam_vbox.cpp (revision 0) +++ emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-pam-pam_vbox.cpp (working copy) @@ -0,0 +1,20 @@ +--- src/VBox/Additions/common/pam/pam_vbox.cpp.orig 2015-04-14 15:38:08.000000000 -0400 ++++ src/VBox/Additions/common/pam/pam_vbox.cpp 2015-04-28 18:50:50.923476000 -0400 +@@ -104,7 +104,7 @@ + openlog("pam_vbox", LOG_PID, LOG_AUTHPRIV); + syslog(LOG_ERR, "%s", pszBuf); + closelog(); +-#elif defined(RT_OS_SOLARIS) ++#elif defined(RT_OS_FREEBSD) || defined(RT_OS_SOLARIS) + syslog(LOG_ERR, "pam_vbox: %s\n", pszBuf); + #endif + } +@@ -179,7 +179,7 @@ + + pam_message msg; + msg.msg_style = iStyle; +-#ifdef RT_OS_SOLARIS ++#if defined(RT_OS_FREEBSD) || defined(RT_OS_SOLARIS) + msg.msg = (char*)pszText; + #else + msg.msg = pszText; Property changes on: emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-pam-pam_vbox.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: emulators/virtualbox-ose/files/patch-src-VBox-Additions-freebsd-Makefile.kmk =================================================================== --- emulators/virtualbox-ose/files/patch-src-VBox-Additions-freebsd-Makefile.kmk (revision 0) +++ emulators/virtualbox-ose/files/patch-src-VBox-Additions-freebsd-Makefile.kmk (working copy) @@ -0,0 +1,10 @@ +--- src/VBox/Additions/freebsd/Makefile.kmk.orig 2015-04-14 15:38:08.000000000 -0400 ++++ src/VBox/Additions/freebsd/Makefile.kmk 2015-04-28 18:38:42.600405000 -0400 +@@ -67,6 +67,7 @@ + vboxvideo_drv_15.so \ + vboxvideo_drv_16.so \ + vboxvideo_drv_17.so \ ++ $(if $(VBOX_WITH_PAM),pam_vbox.so,) \ + VBoxOGLarrayspu.so \ + VBoxOGLcrutil.so \ + VBoxOGLerrorspu.so \ Property changes on: emulators/virtualbox-ose/files/patch-src-VBox-Additions-freebsd-Makefile.kmk ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: emulators/virtualbox-ose/files/patch-src-VBox-Devices-Audio-DrvHostALSAAudio.cpp =================================================================== --- emulators/virtualbox-ose/files/patch-src-VBox-Devices-Audio-DrvHostALSAAudio.cpp (revision 0) +++ emulators/virtualbox-ose/files/patch-src-VBox-Devices-Audio-DrvHostALSAAudio.cpp (working copy) @@ -0,0 +1,18 @@ +--- src/VBox/Devices/Audio/DrvHostALSAAudio.cpp.orig 2015-06-01 13:52:31.000000000 -0400 ++++ src/VBox/Devices/Audio/DrvHostALSAAudio.cpp 2015-06-04 13:01:34.480911000 -0400 +@@ -974,6 +974,7 @@ + continue; + } + ++#if EPIPE != ESTRPIPE + case -ESTRPIPE: + { + /* Stream was suspended and waiting for a recovery. */ +@@ -987,6 +988,7 @@ + LogFlowFunc(("Resumed suspended output stream\n")); + continue; + } ++#endif + + default: + LogFlowFunc(("Failed to write %RI32 output frames, rc=%Rrc\n", Property changes on: emulators/virtualbox-ose/files/patch-src-VBox-Devices-Audio-DrvHostALSAAudio.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: emulators/virtualbox-ose/files/patch-src-VBox-Devices-Audio-ossaudio.c =================================================================== --- emulators/virtualbox-ose/files/patch-src-VBox-Devices-Audio-ossaudio.c (revision 391665) +++ emulators/virtualbox-ose/files/patch-src-VBox-Devices-Audio-ossaudio.c (working copy) @@ -1,19 +0,0 @@ -Fix recording with OSS Audio backend to record at a proper volume - -Obtained from: https://www.virtualbox.org/ticket/10695 ---- src/VBox/Devices/Audio/ossaudio.c.orig 2012-12-19 19:26:32.000000000 +0100 -+++ src/VBox/Devices/Audio/ossaudio.c 2012-12-20 12:23:18.476851732 +0100 -@@ -795,13 +795,8 @@ - hw->info.align + 1); - } - read_samples += nread >> hwshift; --#ifndef VBOX - hw->conv (hw->conv_buf + bufs[i].add, p, nread >> hwshift, - &nominal_volume); --#else -- hw->conv (hw->conv_buf + bufs[i].add, p, nread >> hwshift, -- &pcm_in_volume); --#endif - } - - if (bufs[i].len - nread) { Index: emulators/virtualbox-ose/files/patch-src-VBox-Devices-Input-PS2M.cpp =================================================================== --- emulators/virtualbox-ose/files/patch-src-VBox-Devices-Input-PS2M.cpp (revision 391665) +++ emulators/virtualbox-ose/files/patch-src-VBox-Devices-Input-PS2M.cpp (working copy) @@ -1,11 +0,0 @@ ---- src/VBox/Devices/Input/PS2M.cpp.orig 2015-03-02 10:09:15.000000000 -0500 -+++ src/VBox/Devices/Input/PS2M.cpp 2015-03-16 13:38:03.324517000 -0400 -@@ -709,7 +709,7 @@ - static void ps2mReportAccumulatedEvents(PPS2M pThis) - { - uint8_t val; -- int8_t dX, dY, dZ; -+ int dX, dY, dZ; - - /* Clamp the accumulated delta values to the allowed range. */ - dX = RT_MIN(RT_MAX(pThis->iAccumX, -256), 255); Index: emulators/virtualbox-ose/files/patch-src-VBox-Devices-Makefile.kmk =================================================================== --- emulators/virtualbox-ose/files/patch-src-VBox-Devices-Makefile.kmk (revision 0) +++ emulators/virtualbox-ose/files/patch-src-VBox-Devices-Makefile.kmk (working copy) @@ -0,0 +1,23 @@ +--- src/VBox/Devices/Makefile.kmk.orig 2015-06-01 13:54:08.000000000 -0400 ++++ src/VBox/Devices/Makefile.kmk 2015-06-04 12:39:13.903173000 -0400 +@@ -560,12 +560,20 @@ + ifeq ($(KBUILD_TARGET),freebsd) + VBoxDD_SOURCES += \ + Audio/DrvHostOSSAudio.cpp ++ + ifdef VBOX_WITH_PULSE + VBoxDD_DEFS += VBOX_WITH_PULSE + VBoxDD_SOURCES += \ + Audio/DrvHostPulseAudio.cpp \ + Audio/pulse_stubs.c + endif ++ ++ ifdef VBOX_WITH_ALSA ++ VBoxDD_DEFS += VBOX_WITH_ALSA ++ VBoxDD_SOURCES += \ ++ Audio/DrvHostALSAAudio.cpp \ ++ Audio/alsa_stubs.c ++ endif + endif + + ifeq ($(KBUILD_TARGET),solaris) Property changes on: emulators/virtualbox-ose/files/patch-src-VBox-Devices-Makefile.kmk ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: emulators/virtualbox-ose/files/patch-src-VBox-Devices-Network-slirp-resolv_conf_parser.c =================================================================== --- emulators/virtualbox-ose/files/patch-src-VBox-Devices-Network-slirp-resolv_conf_parser.c (revision 391665) +++ emulators/virtualbox-ose/files/patch-src-VBox-Devices-Network-slirp-resolv_conf_parser.c (working copy) @@ -1,11 +0,0 @@ ---- src/VBox/Devices/Network/slirp/resolv_conf_parser.c.orig 2014-01-30 22:19:47.429683181 +0400 -+++ src/VBox/Devices/Network/slirp/resolv_conf_parser.c 2014-01-30 22:22:08.149672985 +0400 -@@ -15,6 +15,8 @@ - * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. - */ - -+#include -+ - #include - #include - #include Index: emulators/virtualbox-ose/files/patch-src-VBox-Devices-USB-DevOHCI.cpp =================================================================== --- emulators/virtualbox-ose/files/patch-src-VBox-Devices-USB-DevOHCI.cpp (revision 391665) +++ emulators/virtualbox-ose/files/patch-src-VBox-Devices-USB-DevOHCI.cpp (working copy) @@ -1,11 +0,0 @@ ---- src/VBox/Devices/USB/DevOHCI.cpp.orig 2015-03-02 10:09:35.000000000 -0500 -+++ src/VBox/Devices/USB/DevOHCI.cpp 2015-03-12 16:15:51.519656000 -0400 -@@ -3717,7 +3717,7 @@ - pUrb = pThis->aInFlight[i].pUrb; - if (pThis->aInFlight[i].fInactive - && pUrb->enmState == VUSBURBSTATE_IN_FLIGHT -- && !pUrb->enmType == VUSBXFERTYPE_CTRL) -+ && pUrb->enmType != VUSBXFERTYPE_CTRL) - pThis->RootHub.pIRhConn->pfnCancelUrbsEp(pThis->RootHub.pIRhConn, pUrb); - } - } Index: emulators/virtualbox-ose/files/patch-src-VBox-Devices-USB-freebsd-USBProxyDevice-freebsd.cpp =================================================================== --- emulators/virtualbox-ose/files/patch-src-VBox-Devices-USB-freebsd-USBProxyDevice-freebsd.cpp (revision 391665) +++ emulators/virtualbox-ose/files/patch-src-VBox-Devices-USB-freebsd-USBProxyDevice-freebsd.cpp (working copy) @@ -1,175 +0,0 @@ ---- src/VBox/Devices/USB/freebsd/USBProxyDevice-freebsd.cpp.orig 2014-11-21 16:22:08.000000000 +0100 -+++ src/VBox/Devices/USB/freebsd/USBProxyDevice-freebsd.cpp 2014-11-28 17:25:16.000000000 +0100 -@@ -52,6 +52,7 @@ - #include - #include - #include -+#include - #include "../USBProxyDevice.h" - - /** Maximum endpoints supported. */ -@@ -95,12 +96,16 @@ - { - /** The open file. */ - RTFILE hFile; -- /** Software endpoint structures */ -- USBENDPOINTFBSD aSwEndpoint[USBFBSD_MAXENDPOINTS]; - /** Flag whether an URB is cancelling. */ - bool fCancelling; - /** Flag whether initialised or not */ - bool fInit; -+ /** Pipe handle for waking up - writing end. */ -+ RTPIPE hPipeWakeupW; -+ /** Pipe handle for waking up - reading end. */ -+ RTPIPE hPipeWakeupR; -+ /** Software endpoint structures */ -+ USBENDPOINTFBSD aSwEndpoint[USBFBSD_MAXENDPOINTS]; - /** Kernel endpoint structures */ - struct usb_fs_endpoint aHwEndpoint[USBFBSD_MAXENDPOINTS]; - } USBPROXYDEVFBSD, *PUSBPROXYDEVFBSD; -@@ -383,10 +388,17 @@ - rc = usbProxyFreeBSDFsInit(pProxyDev); - if (RT_SUCCESS(rc)) - { -- LogFlow(("usbProxyFreeBSDOpen(%p, %s): returns successfully hFile=%RTfile iActiveCfg=%d\n", -- pProxyDev, pszAddress, pDevFBSD->hFile, pProxyDev->iActiveCfg)); -+ /* -+ * Create wakeup pipe. -+ */ -+ rc = RTPipeCreate(&pDevFBSD->hPipeWakeupR, &pDevFBSD->hPipeWakeupW, 0); -+ if (RT_SUCCESS(rc)) -+ { -+ LogFlow(("usbProxyFreeBSDOpen(%p, %s): returns successfully hFile=%RTfile iActiveCfg=%d\n", -+ pProxyDev, pszAddress, pDevFBSD->hFile, pProxyDev->iActiveCfg)); - -- return VINF_SUCCESS; -+ return VINF_SUCCESS; -+ } - } - - RTFileClose(hFile); -@@ -449,12 +461,12 @@ - - usbProxyFreeBSDFsUnInit(pProxyDev); - -+ RTPipeClose(pDevFBSD->hPipeWakeupR); -+ RTPipeClose(pDevFBSD->hPipeWakeupW); -+ - RTFileClose(pDevFBSD->hFile); - pDevFBSD->hFile = NIL_RTFILE; - -- RTMemFree(pDevFBSD); -- pProxyDev->Backend.pv = NULL; -- - LogFlow(("usbProxyFreeBSDClose: returns\n")); - } - -@@ -688,9 +700,10 @@ - pUrb, (unsigned)pUrb->EndPt, (unsigned)pUrb->enmDir)); - - ep_num = pUrb->EndPt; -- -- if ((pUrb->enmType != VUSBXFERTYPE_MSG) && (pUrb->enmDir == VUSBDIRECTION_IN)) -+ if ((pUrb->enmType != VUSBXFERTYPE_MSG) && (pUrb->enmDir == VUSBDIRECTION_IN)) { -+ /* set IN-direction bit */ - ep_num |= 0x80; -+ } - - index = 0; - -@@ -822,7 +835,7 @@ - PUSBENDPOINTFBSD pEndpointFBSD; - PVUSBURB pUrb; - struct usb_fs_complete UsbFsComplete; -- struct pollfd PollFd; -+ struct pollfd pfd[2]; - int rc; - - LogFlow(("usbProxyFreeBSDUrbReap: pProxyDev=%p, cMillies=%u\n", -@@ -946,23 +959,38 @@ - (unsigned)pEndpointFBSD->acbData[1])); - - } -- else if (cMillies && rc == VERR_RESOURCE_BUSY) -+ else if (cMillies != 0 && rc == VERR_RESOURCE_BUSY) - { -- /* Poll for finished transfers */ -- PollFd.fd = RTFileToNative(pDevFBSD->hFile); -- PollFd.events = POLLIN | POLLRDNORM; -- PollFd.revents = 0; -- -- rc = poll(&PollFd, 1, (cMillies == RT_INDEFINITE_WAIT) ? INFTIM : cMillies); -- if (rc >= 1) -- { -- goto repeat; -- } -- else -+ for (;;) - { -- LogFlow(("usbProxyFreeBSDUrbReap: " -- "poll returned rc=%d\n", rc)); -+ pfd[0].fd = RTFileToNative(pDevFBSD->hFile); -+ pfd[0].events = POLLIN | POLLRDNORM; -+ pfd[0].revents = 0; -+ -+ pfd[1].fd = RTPipeToNative(pDevFBSD->hPipeWakeupR); -+ pfd[1].events = POLLIN | POLLRDNORM; -+ pfd[1].revents = 0; -+ -+ rc = poll(pfd, 2, (cMillies == RT_INDEFINITE_WAIT) ? INFTIM : cMillies); -+ if (rc > 0) -+ { -+ if (pfd[1].revents & POLLIN) -+ { -+ /* Got woken up, drain pipe. */ -+ uint8_t bRead; -+ size_t cbIgnored = 0; -+ RTPipeRead(pDevFBSD->hPipeWakeupR, &bRead, 1, &cbIgnored); -+ /* Make sure we return from this function */ -+ cMillies = 0; -+ } -+ break; -+ } -+ if (rc == 0) -+ return NULL; -+ if (errno != EAGAIN) -+ return NULL; - } -+ goto repeat; - } - return pUrb; - } -@@ -984,6 +1012,16 @@ - return usbProxyFreeBSDEndpointClose(pProxyDev, index); - } - -+static DECLCALLBACK(int) usbProxyFreeBSDWakeup(PUSBPROXYDEV pProxyDev) -+{ -+ PUSBPROXYDEVFBSD pDevFBSD = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVFBSD); -+ size_t cbIgnored; -+ -+ LogFlowFunc(("pProxyDev=%p\n", pProxyDev)); -+ -+ return RTPipeWrite(pDevFBSD->hPipeWakeupW, "", 1, &cbIgnored); -+} -+ - /** - * The FreeBSD USB Proxy Backend. - */ -@@ -992,7 +1030,7 @@ - /* pszName */ - "host", - /* cbBackend */ -- sizeof(PUSBPROXYDEVFBSD), -+ sizeof(USBPROXYDEVFBSD), - usbProxyFreeBSDOpen, - usbProxyFreeBSDInit, - usbProxyFreeBSDClose, -@@ -1005,6 +1043,7 @@ - usbProxyFreeBSDUrbQueue, - usbProxyFreeBSDUrbCancel, - usbProxyFreeBSDUrbReap, -+ usbProxyFreeBSDWakeup, - 0 - }; - Index: emulators/virtualbox-ose/files/patch-src-VBox-Devices-build-VBoxDD.cpp =================================================================== --- emulators/virtualbox-ose/files/patch-src-VBox-Devices-build-VBoxDD.cpp (revision 0) +++ emulators/virtualbox-ose/files/patch-src-VBox-Devices-build-VBoxDD.cpp (working copy) @@ -0,0 +1,25 @@ +--- src/VBox/Devices/build/VBoxDD.cpp.orig 2015-06-01 13:54:34.000000000 -0400 ++++ src/VBox/Devices/build/VBoxDD.cpp 2015-06-04 14:59:08.925853000 -0400 +@@ -281,7 +281,7 @@ + if (RT_FAILURE(rc)) + return rc; + #endif +-#if defined(RT_OS_LINUX) ++#if defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD) + # ifdef VBOX_WITH_PULSE + rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvHostPulseAudio); + if (RT_FAILURE(rc)) +@@ -295,12 +295,7 @@ + rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvHostOSSAudio); + if (RT_FAILURE(rc)) + return rc; +-#endif /* RT_OS_LINUX */ +-#if defined(RT_OS_FREEBSD) +- rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvHostOSSAudio); +- if (RT_FAILURE(rc)) +- return rc; +-#endif ++#endif /* RT_OS_LINUX || RT_OS_FREEBSD */ + #if defined(RT_OS_DARWIN) + rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvHostCoreAudio); + if (RT_FAILURE(rc)) Property changes on: emulators/virtualbox-ose/files/patch-src-VBox-Devices-build-VBoxDD.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: emulators/virtualbox-ose/files/patch-src-VBox-Devices-build-VBoxDD.h =================================================================== --- emulators/virtualbox-ose/files/patch-src-VBox-Devices-build-VBoxDD.h (revision 0) +++ emulators/virtualbox-ose/files/patch-src-VBox-Devices-build-VBoxDD.h (working copy) @@ -0,0 +1,21 @@ +--- src/VBox/Devices/build/VBoxDD.h.orig 2015-06-01 13:54:34.000000000 -0400 ++++ src/VBox/Devices/build/VBoxDD.h 2015-06-04 15:33:33.261856000 -0400 +@@ -118,7 +118,7 @@ + #if defined(RT_OS_WINDOWS) + extern const PDMDRVREG g_DrvHostDSound; + #endif +-#if defined(RT_OS_LINUX) ++#if defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD) + extern const PDMDRVREG g_DrvHostPulseAudio; + extern const PDMDRVREG g_DrvHostALSAAudio; + extern const PDMDRVREG g_DrvHostOSSAudio; +@@ -130,9 +130,6 @@ + extern const PDMDRVREG g_DrvHostOSSAudio; + extern const PDMDRVREG g_DrvHostSolAudio; + #endif +-#if defined(RT_OS_FREEBSD) +-extern const PDMDRVREG g_DrvHostOSSAudio; +-#endif + extern const PDMDRVREG g_DrvACPI; + extern const PDMDRVREG g_DrvAcpiCpu; + extern const PDMDRVREG g_DrvVUSBRootHub; Property changes on: emulators/virtualbox-ose/files/patch-src-VBox-Devices-build-VBoxDD.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: emulators/virtualbox-ose/files/patch-src-VBox-Frontends-VBoxManage-VBoxManageHelp.cpp =================================================================== --- emulators/virtualbox-ose/files/patch-src-VBox-Frontends-VBoxManage-VBoxManageHelp.cpp (revision 0) +++ emulators/virtualbox-ose/files/patch-src-VBox-Frontends-VBoxManage-VBoxManageHelp.cpp (working copy) @@ -0,0 +1,32 @@ +--- src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp.orig 2015-06-01 13:55:01.000000000 -0400 ++++ src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp 2015-06-04 15:03:32.105882000 -0400 +@@ -298,7 +298,7 @@ + #endif + ); + } +- if (fLinux) ++ if (fLinux || fFreeBSD) + { + RTStrmPrintf(pStrm, "|oss" + #ifdef VBOX_WITH_ALSA +@@ -309,20 +309,6 @@ + #endif + ); + } +- if (fFreeBSD) +- { +- /* Get the line break sorted when dumping all option variants. */ +- if (fDumpOpts) +- { +- RTStrmPrintf(pStrm, "|\n" +- " oss"); +- } +- else +- RTStrmPrintf(pStrm, "|oss"); +-#ifdef VBOX_WITH_PULSE +- RTStrmPrintf(pStrm, "|pulse"); +-#endif +- } + if (fDarwin) + { + RTStrmPrintf(pStrm, "|coreaudio"); Property changes on: emulators/virtualbox-ose/files/patch-src-VBox-Frontends-VBoxManage-VBoxManageHelp.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: emulators/virtualbox-ose/files/patch-src-VBox-Frontends-VBoxManage-VBoxManageModifyVM.cpp =================================================================== --- emulators/virtualbox-ose/files/patch-src-VBox-Frontends-VBoxManage-VBoxManageModifyVM.cpp (revision 391665) +++ emulators/virtualbox-ose/files/patch-src-VBox-Frontends-VBoxManage-VBoxManageModifyVM.cpp (working copy) @@ -1,11 +1,41 @@ ---- src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp.orig 2015-03-02 10:09:37.000000000 -0500 -+++ src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp 2015-03-12 18:33:09.348465000 -0400 -@@ -1732,7 +1732,7 @@ - CHECK_ERROR(nic, COMGETTER(NATEngine)(engine.asOutParam())); - - uint32_t aliasMode = 0; -- if (!RTStrCmp(ValueUnion.psz, "default") == 0) -+ if (RTStrCmp(ValueUnion.psz, "default") != 0) +--- src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp.orig 2015-06-04 14:50:37.278693000 -0400 ++++ src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp 2015-06-04 15:07:21.389661000 -0400 +@@ -2177,7 +2177,7 @@ + CHECK_ERROR(audioAdapter, COMSETTER(Enabled)(true)); + } + #endif /* RT_OS_WINDOWS */ +-#ifdef RT_OS_LINUX ++#if defined(RT_OS_FREEBSD) || defined(RT_OS_LINUX) + # ifdef VBOX_WITH_ALSA + else if (!RTStrICmp(ValueUnion.psz, "alsa")) { - char *token = (char *)ValueUnion.psz; - while(token) +@@ -2192,7 +2192,7 @@ + CHECK_ERROR(audioAdapter, COMSETTER(Enabled)(true)); + } + # endif +-#endif /* !RT_OS_LINUX */ ++#endif /* !RT_OS_FREEBSD && !RT_OS_LINUX */ + #ifdef RT_OS_SOLARIS + else if (!RTStrICmp(ValueUnion.psz, "solaudio")) + { +@@ -2200,20 +2200,6 @@ + CHECK_ERROR(audioAdapter, COMSETTER(Enabled)(true)); + } + #endif /* !RT_OS_SOLARIS */ +-#ifdef RT_OS_FREEBSD +- else if (!RTStrICmp(ValueUnion.psz, "oss")) +- { +- CHECK_ERROR(audioAdapter, COMSETTER(AudioDriver)(AudioDriverType_OSS)); +- CHECK_ERROR(audioAdapter, COMSETTER(Enabled)(true)); +- } +-# ifdef VBOX_WITH_PULSE +- else if (!RTStrICmp(ValueUnion.psz, "pulse")) +- { +- CHECK_ERROR(audioAdapter, COMSETTER(AudioDriver)(AudioDriverType_Pulse)); +- CHECK_ERROR(audioAdapter, COMSETTER(Enabled)(true)); +- } +-# endif +-#endif /* !RT_OS_FREEBSD */ + #ifdef RT_OS_DARWIN + else if (!RTStrICmp(ValueUnion.psz, "coreaudio")) + { Index: emulators/virtualbox-ose/files/patch-src-VBox-Frontends-VirtualBox-Makefile.kmk =================================================================== --- emulators/virtualbox-ose/files/patch-src-VBox-Frontends-VirtualBox-Makefile.kmk (revision 391665) +++ emulators/virtualbox-ose/files/patch-src-VBox-Frontends-VirtualBox-Makefile.kmk (working copy) @@ -1,13 +0,0 @@ ---- src/VBox/Frontends/VirtualBox/Makefile.kmk.orig 2013-10-16 21:47:09.588793988 +0400 -+++ src/VBox/Frontends/VirtualBox/Makefile.kmk 2013-10-16 21:47:37.458794265 +0400 -@@ -175,10 +175,6 @@ - # Necessary for the hdd backend enumeration - VirtualBox_LIBS = $(LIB_DDU) - --if1of ($(KBUILD_TARGET), linux freebsd netbsd openbsd) -- VirtualBox_LIBS += dl --endif -- - # This library is required for multi-monitor support - VirtualBox_LIBS.linux += Xinerama - VirtualBox_LIBS.solaris += Xinerama Index: emulators/virtualbox-ose/files/patch-src-VBox-Frontends-VirtualBox-src-runtime-UIKeyboardHandler.cpp =================================================================== --- emulators/virtualbox-ose/files/patch-src-VBox-Frontends-VirtualBox-src-runtime-UIKeyboardHandler.cpp (revision 391665) +++ emulators/virtualbox-ose/files/patch-src-VBox-Frontends-VirtualBox-src-runtime-UIKeyboardHandler.cpp (working copy) @@ -1,20 +0,0 @@ ---- src/VBox/Frontends/VirtualBox/src/runtime/UIKeyboardHandler.cpp.orig 2015-03-02 10:09:41.000000000 -0500 -+++ src/VBox/Frontends/VirtualBox/src/runtime/UIKeyboardHandler.cpp 2015-03-12 17:11:33.029804000 -0400 -@@ -622,7 +622,7 @@ - unsigned scan = handleXKeyEvent(pEvent); - - /* Scancodes 0x00 (no valid translation) and 0x80 are ignored: */ -- if (!scan & 0x7F) -+ if (!(scan & 0x7F)) - { - fResult = true; - break; -@@ -1603,7 +1603,7 @@ - { - KeySym ks = wrapXkbKeycodeToKeysym(pDisplay, keyCode, i, 0); - char symbol = 0; -- if (!XkbTranslateKeySym(pDisplay, &ks, 0, &symbol, 1, NULL) == 1) -+ if (XkbTranslateKeySym(pDisplay, &ks, 0, &symbol, 1, NULL) == 0) - symbol = 0; - if (symbol) - { Index: emulators/virtualbox-ose/files/patch-src-VBox-Frontends-VirtualBox-src-settings-machine-UIMachineSettingsAudio.cpp =================================================================== --- emulators/virtualbox-ose/files/patch-src-VBox-Frontends-VirtualBox-src-settings-machine-UIMachineSettingsAudio.cpp (revision 0) +++ emulators/virtualbox-ose/files/patch-src-VBox-Frontends-VirtualBox-src-settings-machine-UIMachineSettingsAudio.cpp (working copy) @@ -0,0 +1,44 @@ +--- src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsAudio.cpp.orig 2015-06-01 13:55:19.000000000 -0400 ++++ src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsAudio.cpp 2015-06-04 14:55:06.593769000 -0400 +@@ -161,17 +161,14 @@ + + #if defined Q_OS_LINUX || defined Q_OS_FREEBSD + m_pComboAudioDriver->setItemText(++iIndex, gpConverter->toString(KAudioDriverType_OSS)); ++# ifdef VBOX_WITH_ALSA ++ m_pComboAudioDriver->setItemText(++iIndex, gpConverter->toString(KAudioDriverType_ALSA)); ++# endif /* VBOX_WITH_ALSA */ + # ifdef VBOX_WITH_PULSE + m_pComboAudioDriver->setItemText(++iIndex, gpConverter->toString(KAudioDriverType_Pulse)); + # endif /* VBOX_WITH_PULSE */ + #endif /* Q_OS_LINUX | Q_OS_FREEBSD */ + +-#ifdef Q_OS_LINUX +-# ifdef VBOX_WITH_ALSA +- m_pComboAudioDriver->setItemText(++iIndex, gpConverter->toString(KAudioDriverType_ALSA)); +-# endif /* VBOX_WITH_ALSA */ +-#endif /* Q_OS_LINUX */ +- + #ifdef Q_OS_MACX + m_pComboAudioDriver->setItemText(++iIndex, gpConverter->toString(KAudioDriverType_CoreAudio)); + #endif /* Q_OS_MACX */ +@@ -229,17 +226,14 @@ + + #if defined Q_OS_LINUX || defined Q_OS_FREEBSD + m_pComboAudioDriver->insertItem(++iIndex, "", KAudioDriverType_OSS); ++# ifdef VBOX_WITH_ALSA ++ m_pComboAudioDriver->insertItem(++iIndex, "", KAudioDriverType_ALSA); ++# endif /* VBOX_WITH_ALSA */ + # ifdef VBOX_WITH_PULSE + m_pComboAudioDriver->insertItem(++iIndex, "", KAudioDriverType_Pulse); + # endif /* VBOX_WITH_PULSE */ + #endif /* Q_OS_LINUX | Q_OS_FREEBSD */ + +-#ifdef Q_OS_LINUX +-# ifdef VBOX_WITH_ALSA +- m_pComboAudioDriver->insertItem(++iIndex, "", KAudioDriverType_ALSA); +-# endif /* VBOX_WITH_ALSA */ +-#endif /* Q_OS_LINUX */ +- + #ifdef Q_OS_MACX + m_pComboAudioDriver->insertItem(++iIndex, "", KAudioDriverType_CoreAudio); + #endif /* Q_OS_MACX */ Property changes on: emulators/virtualbox-ose/files/patch-src-VBox-Frontends-VirtualBox-src-settings-machine-UIMachineSettingsAudio.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: emulators/virtualbox-ose/files/patch-src-VBox-GuestHost-OpenGL-include-state-cr_line.h =================================================================== --- emulators/virtualbox-ose/files/patch-src-VBox-GuestHost-OpenGL-include-state-cr_line.h (revision 391665) +++ emulators/virtualbox-ose/files/patch-src-VBox-GuestHost-OpenGL-include-state-cr_line.h (working copy) @@ -1,11 +0,0 @@ ---- src/VBox/GuestHost/OpenGL/include/state/cr_line.h.orig 2015-03-02 10:09:45.000000000 -0500 -+++ src/VBox/GuestHost/OpenGL/include/state/cr_line.h 2015-03-02 19:26:01.576169000 -0500 -@@ -5,7 +5,7 @@ - */ - - #ifndef CR_STATE_LINE_H --#define SR_STATE_LINE_H -+#define CR_STATE_LINE_H - - #include "state/cr_statetypes.h" - Index: emulators/virtualbox-ose/files/patch-src-VBox-GuestHost-OpenGL-include-state-cr_point.h =================================================================== --- emulators/virtualbox-ose/files/patch-src-VBox-GuestHost-OpenGL-include-state-cr_point.h (revision 391665) +++ emulators/virtualbox-ose/files/patch-src-VBox-GuestHost-OpenGL-include-state-cr_point.h (working copy) @@ -1,19 +0,0 @@ ---- src/VBox/GuestHost/OpenGL/include/state/cr_point.h.orig 2015-03-02 10:09:45.000000000 -0500 -+++ src/VBox/GuestHost/OpenGL/include/state/cr_point.h 2015-03-02 19:21:08.518525000 -0500 -@@ -4,8 +4,8 @@ - * See the file LICENSE.txt for information on redistributing this software. - */ - --#ifndef CR_STATE_LINE_H --#define SR_STATE_LINE_H -+#ifndef CR_STATE_POINT_H -+#define CR_STATE_POINT_H - - #include "state/cr_statetypes.h" - -@@ -59,4 +59,4 @@ - } - #endif - --#endif /* CR_STATE_LINE_H */ -+#endif /* CR_STATE_POINT_H */ Index: emulators/virtualbox-ose/files/patch-src-VBox-HostDrivers-Support-freebsd-Makefile =================================================================== --- emulators/virtualbox-ose/files/patch-src-VBox-HostDrivers-Support-freebsd-Makefile (revision 391665) +++ emulators/virtualbox-ose/files/patch-src-VBox-HostDrivers-Support-freebsd-Makefile (working copy) @@ -1,18 +0,0 @@ ---- src/VBox/HostDrivers/Support/freebsd/Makefile.orig 2014-09-09 23:54:29.000000000 +0400 -+++ src/VBox/HostDrivers/Support/freebsd/Makefile 2014-09-15 02:58:19.712268153 +0400 -@@ -81,6 +81,7 @@ - handletable.c \ - handletablectx.c \ - once.c \ -+ term.c \ - thread.c - - .PATH: ${.CURDIR}/common/string -@@ -170,6 +171,7 @@ - SRCS += \ - semspinmutex-r0drv-generic.c \ - mpnotification-r0drv-generic.c \ -+ threadctxhooks-r0drv-generic.c \ - RTMpIsCpuWorkPending-r0drv-generic.c - - .PATH: ${.CURDIR}/VBox Index: emulators/virtualbox-ose/files/patch-src-VBox-HostDrivers-Support-freebsd-SUPDrv-freebsd.c =================================================================== --- emulators/virtualbox-ose/files/patch-src-VBox-HostDrivers-Support-freebsd-SUPDrv-freebsd.c (revision 0) +++ emulators/virtualbox-ose/files/patch-src-VBox-HostDrivers-Support-freebsd-SUPDrv-freebsd.c (working copy) @@ -0,0 +1,12 @@ +--- src/VBox/HostDrivers/Support/freebsd/SUPDrv-freebsd.c.orig 2015-04-14 15:41:17.000000000 -0400 ++++ src/VBox/HostDrivers/Support/freebsd/SUPDrv-freebsd.c 2015-04-23 16:57:48.778153000 -0400 +@@ -541,8 +541,7 @@ + + bool VBOXCALL supdrvOSAreCpusOfflinedOnSuspend(void) + { +- /** @todo verify this. */ +- return false; ++ return true; + } + + Property changes on: emulators/virtualbox-ose/files/patch-src-VBox-HostDrivers-Support-freebsd-SUPDrv-freebsd.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: emulators/virtualbox-ose/files/patch-src-VBox-HostDrivers-Support-freebsd-files_vboxdrv =================================================================== --- emulators/virtualbox-ose/files/patch-src-VBox-HostDrivers-Support-freebsd-files_vboxdrv (revision 391665) +++ emulators/virtualbox-ose/files/patch-src-VBox-HostDrivers-Support-freebsd-files_vboxdrv (working copy) @@ -1,10 +0,0 @@ ---- src/VBox/HostDrivers/Support/freebsd/files_vboxdrv.orig 2014-09-15 03:01:58.782238686 +0400 -+++ src/VBox/HostDrivers/Support/freebsd/files_vboxdrv 2014-09-15 03:02:08.840242076 +0400 -@@ -112,6 +112,7 @@ - ${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 \ - ${PATH_ROOT}/src/VBox/Runtime/common/string/RTStrCopyP.cpp=>common/string/RTStrCopyP.c \ - ${PATH_ROOT}/src/VBox/Runtime/common/string/RTStrCopy.cpp=>common/string/RTStrCopy.c \ Index: emulators/virtualbox-ose/files/patch-src-VBox-Main-Makefile.kmk =================================================================== --- emulators/virtualbox-ose/files/patch-src-VBox-Main-Makefile.kmk (revision 391665) +++ emulators/virtualbox-ose/files/patch-src-VBox-Main-Makefile.kmk (working copy) @@ -1,12 +0,0 @@ ---- src/VBox/Main/Makefile.kmk.orig 2013-11-09 02:27:38.919839981 +0400 -+++ src/VBox/Main/Makefile.kmk 2013-11-09 02:19:21.868873439 +0400 -@@ -404,7 +404,8 @@ - src-server/HostDnsServiceResolvConf.cpp - - VBoxSVC_SOURCES.freebsd = \ -- src-server/freebsd/HostHardwareFreeBSD.cpp -+ src-server/freebsd/HostHardwareFreeBSD.cpp \ -+ src-server/HostDnsServiceResolvConf.cpp - - - ifdef VBOX_WITH_USB Index: emulators/virtualbox-ose/files/patch-src-VBox-Main-src-client-ConsoleImpl2.cpp =================================================================== --- emulators/virtualbox-ose/files/patch-src-VBox-Main-src-client-ConsoleImpl2.cpp (revision 391665) +++ emulators/virtualbox-ose/files/patch-src-VBox-Main-src-client-ConsoleImpl2.cpp (working copy) @@ -1,34 +0,0 @@ ---- src/VBox/Main/src-client/ConsoleImpl2.cpp.orig 2015-03-02 10:09:53.000000000 -0500 -+++ src/VBox/Main/src-client/ConsoleImpl2.cpp 2015-03-13 12:49:53.780376000 -0400 -@@ -4447,12 +4447,12 @@ - } - } - -- Assert((int)maTapFD[uInstance] >= 0); -- if ((int)maTapFD[uInstance] >= 0) -+ Assert((intptr_t)maTapFD[uInstance] >= 0); -+ if ((intptr_t)maTapFD[uInstance] >= 0) - { - InsertConfigString(pLunL0, "Driver", "HostInterface"); - InsertConfigNode(pLunL0, "Config", &pCfg); -- InsertConfigInteger(pCfg, "FileHandle", maTapFD[uInstance]); -+ InsertConfigInteger(pCfg, "FileHandle", (intptr_t)maTapFD[uInstance]); - } - - #elif defined(VBOX_WITH_NETFLT) -@@ -4646,12 +4646,12 @@ - } - } - -- Assert((int)maTapFD[uInstance] >= 0); -- if ((int)maTapFD[uInstance] >= 0) -+ Assert((intptr_t)maTapFD[uInstance] >= 0); -+ if ((intptr_t)maTapFD[uInstance] >= 0) - { - InsertConfigString(pLunL0, "Driver", "HostInterface"); - InsertConfigNode(pLunL0, "Config", &pCfg); -- InsertConfigInteger(pCfg, "FileHandle", maTapFD[uInstance]); -+ InsertConfigInteger(pCfg, "FileHandle", (intptr_t)maTapFD[uInstance]); - } - break; - } Index: emulators/virtualbox-ose/files/patch-src-VBox-Main-src-server-MachineImpl.cpp =================================================================== --- emulators/virtualbox-ose/files/patch-src-VBox-Main-src-server-MachineImpl.cpp (revision 391665) +++ emulators/virtualbox-ose/files/patch-src-VBox-Main-src-server-MachineImpl.cpp (working copy) @@ -1,6 +1,6 @@ ---- src/VBox/Main/src-server/MachineImpl.cpp.orig 2013-12-18 11:10:25.000000000 -0500 -+++ src/VBox/Main/src-server/MachineImpl.cpp 2014-02-20 19:17:10.000000000 -0500 -@@ -2374,7 +2374,7 @@ +--- src/VBox/Main/src-server/MachineImpl.cpp.orig 2015-04-01 12:15:13.000000000 -0400 ++++ src/VBox/Main/src-server/MachineImpl.cpp 2015-04-01 16:11:54.601620000 -0400 +@@ -2299,7 +2299,7 @@ case 0x8: case 0x9: case 0xA: @@ -7,9 +7,9 @@ - AssertCompile(RT_ELEMENTS(mHWData->mCpuIdStdLeafs) == 0xB); + // AssertCompile(RT_ELEMENTS(mHWData->mCpuIdStdLeafs) == 0xB); AssertRelease(aId < RT_ELEMENTS(mHWData->mCpuIdStdLeafs)); - setModified(IsModified_MachineData); + i_setModified(IsModified_MachineData); mHWData.backup(); -@@ -2396,7 +2396,7 @@ +@@ -2321,7 +2321,7 @@ case 0x80000008: case 0x80000009: case 0x8000000A: @@ -16,9 +16,9 @@ - AssertCompile(RT_ELEMENTS(mHWData->mCpuIdExtLeafs) == 0xB); + // AssertCompile(RT_ELEMENTS(mHWData->mCpuIdExtLeafs) == 0xB); AssertRelease(aId - 0x80000000 < RT_ELEMENTS(mHWData->mCpuIdExtLeafs)); - setModified(IsModified_MachineData); + i_setModified(IsModified_MachineData); mHWData.backup(); -@@ -2436,7 +2436,7 @@ +@@ -2358,7 +2358,7 @@ case 0x8: case 0x9: case 0xA: @@ -25,9 +25,9 @@ - AssertCompile(RT_ELEMENTS(mHWData->mCpuIdStdLeafs) == 0xB); + // AssertCompile(RT_ELEMENTS(mHWData->mCpuIdStdLeafs) == 0xB); AssertRelease(aId < RT_ELEMENTS(mHWData->mCpuIdStdLeafs)); - setModified(IsModified_MachineData); + i_setModified(IsModified_MachineData); mHWData.backup(); -@@ -2455,7 +2455,7 @@ +@@ -2377,7 +2377,7 @@ case 0x80000008: case 0x80000009: case 0x8000000A: @@ -34,11 +34,11 @@ - AssertCompile(RT_ELEMENTS(mHWData->mCpuIdExtLeafs) == 0xB); + // AssertCompile(RT_ELEMENTS(mHWData->mCpuIdExtLeafs) == 0xB); AssertRelease(aId - 0x80000000 < RT_ELEMENTS(mHWData->mCpuIdExtLeafs)); - setModified(IsModified_MachineData); + i_setModified(IsModified_MachineData); mHWData.backup(); -@@ -9322,7 +9322,7 @@ +@@ -8790,7 +8790,7 @@ mHWData->mVideoCaptureEnabled = data.fVideoCaptureEnabled; - for (unsigned i = 0; i < RT_ELEMENTS(mHWData->maVideoCaptureScreens); i++) + for (unsigned i = 0; i < RT_ELEMENTS(mHWData->maVideoCaptureScreens); ++i) mHWData->maVideoCaptureScreens[i] = ASMBitTest(&data.u64VideoCaptureScreens, i); - AssertCompile(RT_ELEMENTS(mHWData->maVideoCaptureScreens) == sizeof(data.u64VideoCaptureScreens) * 8); + // AssertCompile(RT_ELEMENTS(mHWData->maVideoCaptureScreens) == sizeof(data.u64VideoCaptureScreens) * 8); Index: emulators/virtualbox-ose/files/patch-src-VBox-Main-src-server-VirtualBoxImpl.cpp =================================================================== --- emulators/virtualbox-ose/files/patch-src-VBox-Main-src-server-VirtualBoxImpl.cpp (revision 391665) +++ emulators/virtualbox-ose/files/patch-src-VBox-Main-src-server-VirtualBoxImpl.cpp (working copy) @@ -1,6 +1,6 @@ ---- src/VBox/Main/src-server/VirtualBoxImpl.cpp.orig 2013-12-18 11:10:25.000000000 -0500 -+++ src/VBox/Main/src-server/VirtualBoxImpl.cpp 2014-02-20 19:51:23.000000000 -0500 -@@ -2355,7 +2355,7 @@ +--- src/VBox/Main/src-server/VirtualBoxImpl.cpp.orig 2015-04-01 12:15:14.000000000 -0400 ++++ src/VBox/Main/src-server/VirtualBoxImpl.cpp 2015-04-07 12:25:59.226583000 -0400 +@@ -2172,7 +2172,7 @@ if (aCiphertextSize < 32) return VERR_INVALID_PARAMETER; Index: emulators/virtualbox-ose/files/patch-src-VBox-Main-src-server-freebsd-HostHardwareFreeBSD.cpp =================================================================== --- emulators/virtualbox-ose/files/patch-src-VBox-Main-src-server-freebsd-HostHardwareFreeBSD.cpp (revision 391665) +++ emulators/virtualbox-ose/files/patch-src-VBox-Main-src-server-freebsd-HostHardwareFreeBSD.cpp (working copy) @@ -1,19 +1,14 @@ ---- src/VBox/Main/src-server/freebsd/HostHardwareFreeBSD.cpp.orig 2013-11-29 14:24:12.000000000 -0500 -+++ src/VBox/Main/src-server/freebsd/HostHardwareFreeBSD.cpp 2013-12-13 18:03:02.000000000 -0500 -@@ -39,6 +39,7 @@ - # include - # include - # include -+# include - # include - # include - # include -@@ -250,7 +251,7 @@ +--- src/VBox/Main/src-server/freebsd/HostHardwareFreeBSD.cpp.orig 2015-04-14 15:41:25.000000000 -0400 ++++ src/VBox/Main/src-server/freebsd/HostHardwareFreeBSD.cpp 2015-04-14 18:25:23.156536000 -0400 +@@ -251,8 +251,9 @@ 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_MATCH_PATH | PERIPH_MATCH_TARGET | PERIPH_MATCH_LUN); +- PeriphMatchPattern.pattern.periph_pattern.flags = PERIPH_MATCH_PATH | PERIPH_MATCH_TARGET | +- PERIPH_MATCH_LUN; ++ PeriphMatchPattern.pattern.periph_pattern.flags = static_cast ++ (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; Index: emulators/virtualbox-ose/files/patch-src-VBox-Main-xml-Settings.cpp =================================================================== --- emulators/virtualbox-ose/files/patch-src-VBox-Main-xml-Settings.cpp (revision 0) +++ emulators/virtualbox-ose/files/patch-src-VBox-Main-xml-Settings.cpp (working copy) @@ -0,0 +1,27 @@ +--- src/VBox/Main/xml/Settings.cpp.orig 2015-06-01 13:55:44.000000000 -0400 ++++ src/VBox/Main/xml/Settings.cpp 2015-06-04 15:01:05.473090000 -0400 +@@ -5434,22 +5434,17 @@ + #ifdef RT_OS_SOLARIS + case AudioDriverType_SolAudio: + #endif +-#ifdef RT_OS_LINUX ++#if defined (RT_OS_LINUX) || defined (RT_OS_FREEBSD) + # ifdef VBOX_WITH_ALSA + case AudioDriverType_ALSA: + # endif + # ifdef VBOX_WITH_PULSE + case AudioDriverType_Pulse: + # endif +-#endif /* RT_OS_LINUX */ ++#endif /* RT_OS_LINUX || RT_OS_FREEBSD */ + #if defined (RT_OS_LINUX) || defined (RT_OS_FREEBSD) || defined(VBOX_WITH_SOLARIS_OSS) + case AudioDriverType_OSS: + #endif +-#ifdef RT_OS_FREEBSD +-# ifdef VBOX_WITH_PULSE +- case AudioDriverType_Pulse: +-# endif +-#endif + #ifdef RT_OS_DARWIN + case AudioDriverType_CoreAudio: + #endif Property changes on: emulators/virtualbox-ose/files/patch-src-VBox-Main-xml-Settings.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: emulators/virtualbox-ose/files/patch-src-VBox-Runtime-Makefile.kmk =================================================================== --- emulators/virtualbox-ose/files/patch-src-VBox-Runtime-Makefile.kmk (revision 391665) +++ emulators/virtualbox-ose/files/patch-src-VBox-Runtime-Makefile.kmk (working copy) @@ -12,12 +12,3 @@ # Unicode Specification reader used to regenerate unidata-*.cpp. # uniread_TEMPLATE = VBoxBldProg -@@ -1004,7 +1009,7 @@ - r3/posix/RTMemProtect-posix.cpp \ - r3/posix/RTPathUserHome-posix.cpp \ - r3/posix/RTSystemQueryOSInfo-posix.cpp \ -- r3/posix/RTSystemQueryTotalRam-posix.cpp \ -+ r3/freebsd/RTSystemQueryTotalRam-freebsd.cpp \ - r3/posix/RTTimeNow-posix.cpp \ - r3/posix/RTTimeSet-posix.cpp \ - r3/posix/dir-posix.cpp \ Index: emulators/virtualbox-ose/files/patch-src-VBox-Runtime-common-checksum-manifest3.cpp =================================================================== --- emulators/virtualbox-ose/files/patch-src-VBox-Runtime-common-checksum-manifest3.cpp (revision 391665) +++ emulators/virtualbox-ose/files/patch-src-VBox-Runtime-common-checksum-manifest3.cpp (working copy) @@ -1,11 +0,0 @@ ---- src/VBox/Runtime/common/checksum/manifest3.cpp.orig 2015-03-02 10:09:59.000000000 -0500 -+++ src/VBox/Runtime/common/checksum/manifest3.cpp 2015-03-12 15:40:09.008443000 -0400 -@@ -427,7 +427,7 @@ - uint32_t cRefs = RTManifestRetain(hManifest); - AssertReturn(cRefs != UINT32_MAX, VERR_INVALID_HANDLE); - cRefs = RTVfsIoStrmRetain(hVfsIos); -- AssertReturnStmt(cRefs != UINT32_MAX, VERR_INVALID_HANDLE, RTManifestRelease(hManifest)); -+ AssertReturnStmt(cRefs != UINT32_MAX, RTManifestRelease(hManifest), VERR_INVALID_HANDLE); - - /* - * Create an instace of the passthru I/O stream. Index: emulators/virtualbox-ose/files/patch-src-VBox-Runtime-common-dbg-dbgmodcodeview.cpp =================================================================== --- emulators/virtualbox-ose/files/patch-src-VBox-Runtime-common-dbg-dbgmodcodeview.cpp (revision 391665) +++ emulators/virtualbox-ose/files/patch-src-VBox-Runtime-common-dbg-dbgmodcodeview.cpp (working copy) @@ -1,11 +0,0 @@ ---- src/VBox/Runtime/common/dbg/dbgmodcodeview.cpp.orig 2015-03-02 10:10:00.000000000 -0500 -+++ src/VBox/Runtime/common/dbg/dbgmodcodeview.cpp 2015-03-12 16:22:25.459078000 -0400 -@@ -2717,7 +2717,7 @@ - { - /* Try the executable in case it has a NBxx tail header. */ - rc2 = rtDbgModCvProbeFile(pMod, pMod->pszImgFile, enmArch); -- if (RT_FAILURE(rc2) && (RT_SUCCESS(rc) || VERR_DBG_NO_MATCHING_INTERPRETER)) -+ if (RT_FAILURE(rc2) && (RT_SUCCESS(rc) || rc == VERR_DBG_NO_MATCHING_INTERPRETER)) - rc = rc2; - } - } Index: emulators/virtualbox-ose/files/patch-src-VBox-Runtime-common-misc-uri.cpp =================================================================== --- emulators/virtualbox-ose/files/patch-src-VBox-Runtime-common-misc-uri.cpp (revision 391665) +++ emulators/virtualbox-ose/files/patch-src-VBox-Runtime-common-misc-uri.cpp (working copy) @@ -1,14 +0,0 @@ ---- src/VBox/Runtime/common/misc/uri.cpp.orig 2013-12-18 11:10:34.000000000 -0500 -+++ src/VBox/Runtime/common/misc/uri.cpp 2013-12-19 20:57:32.000000000 -0500 -@@ -132,7 +132,10 @@ - /* % encoding means the percent sign and exactly 2 hexadecimal - * digits describing the ASCII number of the character. */ - ++iIn; -- char szNum[] = { pszString[iIn++], pszString[iIn++], '\0' }; -+ char szNum[3]; -+ szNum[0] = pszString[iIn++]; -+ szNum[1] = pszString[iIn++]; -+ szNum[2] = '\0'; - uint8_t u8; - rc = RTStrToUInt8Ex(szNum, NULL, 16, &u8); - if (RT_FAILURE(rc)) Index: emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd.c =================================================================== --- emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd.c (revision 391665) +++ emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd.c (working copy) @@ -1,35 +1,24 @@ -From Alan L. Cox on FreeBSD-current: - - I just glanced at the virtualbox code for a couple minutes. For - FreeBSD 9 and 10, these lock acquires are completely unnecessary, and - have been since FreeBSD 9.0. Just delete them. They may be equally - unnecessary under FreeBSD 8, but I didn't look carefully enough to - answer that question. - -[1] http://lists.freebsd.org/pipermail/freebsd-current/2012-November/037963.html ---- src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c.orig 2015-05-13 11:12:38.000000000 -0400 -+++ src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c 2015-06-10 16:42:33.632228000 -0400 -@@ -168,14 +168,19 @@ +--- src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c.orig 2015-06-01 13:56:01.000000000 -0400 ++++ src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c 2015-06-10 17:37:18.388107000 -0400 +@@ -168,7 +168,7 @@ VM_OBJECT_LOCK(pMemFreeBSD->pObject); #endif vm_page_t pPage = vm_page_find_least(pMemFreeBSD->pObject, 0); +-#if __FreeBSD_version < 1000000 +#if __FreeBSD_version < 900000 -+ /* See http://lists.freebsd.org/pipermail/freebsd-current/2012-November/037963.html */ vm_page_lock_queues(); -+#endif + #endif for (vm_page_t pPage = vm_page_find_least(pMemFreeBSD->pObject, 0); - pPage != NULL; - pPage = vm_page_next(pPage)) +@@ -177,7 +177,7 @@ { vm_page_unwire(pPage, 0); } +-#if __FreeBSD_version < 1000000 +#if __FreeBSD_version < 900000 vm_page_unlock_queues(); -+#endif + #endif #if __FreeBSD_version >= 1000030 - VM_OBJECT_WUNLOCK(pMemFreeBSD->pObject); - #else -@@ -201,12 +206,12 @@ +@@ -205,12 +205,12 @@ vm_page_t pPages; int cTries = 0; @@ -44,7 +33,7 @@ { #if __FreeBSD_version >= 1000030 VM_OBJECT_WLOCK(pObject); -@@ -220,18 +225,20 @@ +@@ -224,18 +224,20 @@ #else VM_OBJECT_UNLOCK(pObject); #endif @@ -70,7 +59,7 @@ break; vm_contig_grow_cache(cTries, 0, VmPhysAddrHigh); cTries++; -@@ -239,11 +246,8 @@ +@@ -243,11 +245,8 @@ if (!pPages) return pPages; @@ -83,7 +72,7 @@ for (vm_pindex_t iPage = 0; iPage < cPages; iPage++) { vm_page_t pPage = pPages + iPage; -@@ -255,13 +259,9 @@ +@@ -259,13 +258,9 @@ atomic_add_int(&cnt.v_wire_count, 1); } } @@ -97,23 +86,23 @@ } static int rtR0MemObjFreeBSDPhysAllocHelper(vm_object_t pObject, u_long cPages, -@@ -291,11 +291,15 @@ +@@ -295,13 +290,13 @@ while (iPage-- > 0) { pPage = vm_page_lookup(pObject, iPage); +-#if __FreeBSD_version < 1000000 +#if __FreeBSD_version < 900000 vm_page_lock_queues(); -+#endif + #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 + #endif } - #if __FreeBSD_version >= 1000030 - VM_OBJECT_WUNLOCK(pObject); -@@ -743,7 +747,12 @@ +@@ -751,7 +746,12 @@ { /** @todo: is this needed?. */ PROC_LOCK(pProc); Index: emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r0drv-freebsd-time-r0drv-freebsd.c =================================================================== --- emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r0drv-freebsd-time-r0drv-freebsd.c (revision 0) +++ emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r0drv-freebsd-time-r0drv-freebsd.c (working copy) @@ -0,0 +1,43 @@ +--- src/VBox/Runtime/r0drv/freebsd/time-r0drv-freebsd.c.orig 2015-04-14 15:41:35.000000000 -0400 ++++ src/VBox/Runtime/r0drv/freebsd/time-r0drv-freebsd.c 2015-04-23 19:10:05.312328000 -0400 +@@ -40,16 +40,23 @@ + + RTDECL(uint64_t) RTTimeNanoTS(void) + { +- struct timespec tsp; +- nanouptime(&tsp); +- return tsp.tv_sec * RT_NS_1SEC_64 +- + tsp.tv_nsec; ++ struct bintime bt; ++ uint64_t ns; ++ binuptime(&bt); ++ ns = RT_NS_1SEC_64 * bt.sec; ++ ns += (RT_NS_1SEC_64 * (uint32_t)(bt.frac >> 32)) >> 32; ++ return ns; + } + + + RTDECL(uint64_t) RTTimeMilliTS(void) + { +- return RTTimeNanoTS() / RT_NS_1MS; ++ struct bintime bt; ++ uint64_t ms; ++ binuptime(&bt); ++ ms = RT_MS_1SEC_64 * bt.sec; ++ ms += (RT_MS_1SEC_64 * (uint32_t)(bt.frac >> 32)) >> 32; ++ return ms; + } + + +@@ -67,8 +74,7 @@ + + RTDECL(PRTTIMESPEC) RTTimeNow(PRTTIMESPEC pTime) + { +- struct timespec tsp; +- nanotime(&tsp); +- return RTTimeSpecSetTimespec(pTime, &tsp); ++ struct timespec ts; ++ nanotime(&ts); ++ return RTTimeSpecSetTimespec(pTime, &ts); + } +- Property changes on: emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r0drv-freebsd-time-r0drv-freebsd.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r3-freebsd-RTSystemQueryTotalRam-freebsd.cpp =================================================================== --- emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r3-freebsd-RTSystemQueryTotalRam-freebsd.cpp (revision 391665) +++ emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r3-freebsd-RTSystemQueryTotalRam-freebsd.cpp (working copy) @@ -1,83 +0,0 @@ ---- ./src/VBox/Runtime/r3/freebsd/RTSystemQueryTotalRam-freebsd.cpp.ORIG 2013-06-30 09:27:59.000000000 +0200 -+++ ./src/VBox/Runtime/r3/freebsd/RTSystemQueryTotalRam-freebsd.cpp 2013-06-30 09:51:29.000000000 +0200 -@@ -0,0 +1,80 @@ -+/* $Id: RTSystemQueryTotalRam-freebsd.cpp $ */ -+/** @file -+ * IPRT - RTSystemQueryTotalRam, FreeBSD style -+ */ -+ -+/* -+ * Copyright (C) 2013 Martin Birgmeier, 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. -+ * -+ * The contents of this file may alternatively be used under the terms -+ * of the Common Development and Distribution License Version 1.0 -+ * (CDDL) only, as it comes in the "COPYING.CDDL" file of the -+ * VirtualBox OSE distribution, in which case the provisions of the -+ * CDDL are applicable instead of those of the GPL. -+ * -+ * You may elect to license modified versions of this file under the -+ * terms and conditions of either the GPL or the CDDL or both. -+ */ -+ -+ -+/******************************************************************************* -+* Header Files * -+*******************************************************************************/ -+#include -+#include "internal/iprt.h" -+ -+#include -+#include -+#include -+ -+/* FreeBSD */ -+#include -+#include -+#include -+ -+RTDECL(int) RTSystemQueryTotalRam(uint64_t *pcb) -+{ -+ int mib[2]; -+ size_t pcblen = sizeof(*pcb); -+ -+ AssertPtrReturn(pcb, VERR_INVALID_POINTER); -+ -+ mib[0] = CTL_HW; -+ mib[1] = HW_PHYSMEM; /* HW_REALMEM is also possible, but -+ includes non-main memory as well */ -+ *pcb = 0; -+ if (sysctl(mib, 2, pcb, &pcblen, NULL, 0) == 0) { -+ if (pcblen == sizeof(*pcb) || pcblen == sizeof(uint32_t)) -+ return VINF_SUCCESS; -+ else -+ return VERR_NO_MEMORY; /* XXX */ -+ } -+ return RTErrConvertFromErrno(errno); -+} -+ -+RTDECL(int) RTSystemQueryAvailableRam(uint64_t *pcb) -+{ -+ int mib[2]; -+ size_t pcblen = sizeof(*pcb); -+ -+ AssertPtrReturn(pcb, VERR_INVALID_POINTER); -+ -+ mib[0] = CTL_HW; -+ mib[1] = HW_USERMEM; -+ *pcb = 0; -+ if (sysctl(mib, 2, pcb, &pcblen, NULL, 0) == 0) { -+ if (pcblen == sizeof(*pcb) || pcblen == sizeof(uint32_t)) -+ return VINF_SUCCESS; -+ else -+ return VERR_NO_MEMORY; /* XXX */ -+ } -+ return RTErrConvertFromErrno(errno); -+} Index: emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r3-posix-utf8-posix.cpp =================================================================== --- emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r3-posix-utf8-posix.cpp (revision 391665) +++ emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r3-posix-utf8-posix.cpp (working copy) @@ -1,26 +1,20 @@ ---- src/VBox/Runtime/r3/posix/utf8-posix.cpp.orig 2015-03-16 17:04:36 UTC -+++ src/VBox/Runtime/r3/posix/utf8-posix.cpp -@@ -194,7 +194,10 @@ static int rtstrConvertCached(const void +--- src/VBox/Runtime/r3/posix/utf8-posix.cpp.orig 2015-04-14 15:41:38.000000000 -0400 ++++ src/VBox/Runtime/r3/posix/utf8-posix.cpp 2015-04-15 12:50:21.401092000 -0400 +@@ -194,7 +194,7 @@ const void *pvInputLeft = pvInput; void *pvOutputLeft = pvOutput; size_t cchNonRev; -#if defined(RT_OS_LINUX) || defined(RT_OS_HAIKU) || defined(RT_OS_SOLARIS) || (defined(RT_OS_DARWIN) && defined(_DARWIN_FEATURE_UNIX_CONFORMANCE)) /* there are different opinions about the constness of the input buffer. */ -+#if defined(RT_OS_LINUX) || defined(RT_OS_HAIKU) || defined(RT_OS_SOLARIS) \ -+ || defined(RT_OS_FREEBSD) || defined(RT_OS_DRAGONFLY) \ -+ || (defined(RT_OS_DARWIN) && defined(_DARWIN_FEATURE_UNIX_CONFORMANCE)) -+/* there are different opinions about the constness of the input buffer. */ ++#if defined(RT_OS_LINUX) || defined(RT_OS_HAIKU) || defined(RT_OS_FREEBSD) || defined(RT_OS_DRAGONFLY) || defined(RT_OS_SOLARIS) || (defined(RT_OS_DARWIN) && defined(_DARWIN_FEATURE_UNIX_CONFORMANCE)) /* there are different opinions about the constness of the input buffer. */ cchNonRev = iconv(hIconv, (char **)&pvInputLeft, &cbInLeft, (char **)&pvOutputLeft, &cbOutLeft); #else cchNonRev = iconv(hIconv, (const char **)&pvInputLeft, &cbInLeft, (char **)&pvOutputLeft, &cbOutLeft); -@@ -324,7 +327,10 @@ static int rtStrConvertUncached(const vo +@@ -324,7 +324,7 @@ const void *pvInputLeft = pvInput; void *pvOutputLeft = pvOutput; size_t cchNonRev; -#if defined(RT_OS_LINUX) || defined(RT_OS_HAIKU) || defined(RT_OS_SOLARIS) || (defined(RT_OS_DARWIN) && defined(_DARWIN_FEATURE_UNIX_CONFORMANCE)) /* there are different opinions about the constness of the input buffer. */ -+#if defined(RT_OS_LINUX) || defined(RT_OS_HAIKU) || defined(RT_OS_SOLARIS) \ -+ || defined(RT_OS_FREEBSD) || defined(RT_OS_DRAGONFLY) \ -+ || (defined(RT_OS_DARWIN) && defined(_DARWIN_FEATURE_UNIX_CONFORMANCE)) -+/* there are different opinions about the constness of the input buffer. */ ++#if defined(RT_OS_LINUX) || defined(RT_OS_HAIKU) || defined(RT_OS_FREEBSD) || defined(RT_OS_DRAGONFLY) || defined(RT_OS_SOLARIS) || (defined(RT_OS_DARWIN) && defined(_DARWIN_FEATURE_UNIX_CONFORMANCE)) /* there are different opinions about the constness of the input buffer. */ cchNonRev = iconv(icHandle, (char **)&pvInputLeft, &cbInLeft, (char **)&pvOutputLeft, &cbOutLeft); #else cchNonRev = iconv(icHandle, (const char **)&pvInputLeft, &cbInLeft, (char **)&pvOutputLeft, &cbOutLeft); Index: emulators/virtualbox-ose/files/vboxheadless.in =================================================================== --- emulators/virtualbox-ose/files/vboxheadless.in (revision 391665) +++ emulators/virtualbox-ose/files/vboxheadless.in (working copy) @@ -73,7 +73,7 @@ vboxheadless_start() vboxheadless_stop() { - local machine mpidfile pid vmname vmuser vmstop vmdelay + local machine mpidfile pid pids vmname vmuser vmstop vmdelay echo "Saving states for Virtual Machines:" for machine in ${vboxheadless_machines}; do @@ -87,14 +87,17 @@ vboxheadless_stop() /usr/bin/printf "%25s " "${vmname}" if [ -n "${pid}" ]; then + pids="${pids} ${pid}" /bin/sleep ${vmdelay} - /usr/bin/su ${vmuser} -c "%%VBOXDIR%%/VBoxManage controlvm '${vmname}' ${vmstop} >/dev/null" 2>/dev/null - wait_for_pids $pid >/dev/null - echo "Stopped" - else - echo "Not running?" + /usr/bin/su ${vmuser} -c "%%VBOXDIR%%/VBoxManage controlvm '${vmname}' ${vmstop} >/dev/null &" 2>/dev/null fi done + if [ -n "${pids}" ]; then + wait_for_pids $pids >/dev/null + echo "Stopped" + else + echo "Not running?" + fi } vboxheadless_status() Index: emulators/virtualbox-ose/pkg-plist =================================================================== --- emulators/virtualbox-ose/pkg-plist (revision 391665) +++ emulators/virtualbox-ose/pkg-plist (working copy) @@ -12,14 +12,6 @@ bin/vboxmanage %%X11%%bin/vboxsdl %%WEBSERVICE%%bin/vboxwebsrv %%QT4%%bin/virtualbox -include/virtualbox/VBoxCAPI_v2_2.h -include/virtualbox/VBoxCAPI_v3_0.h -include/virtualbox/VBoxCAPI_v3_1.h -include/virtualbox/VBoxCAPI_v3_2.h -include/virtualbox/VBoxCAPI_v4_0.h -include/virtualbox/VBoxCAPI_v4_1.h -include/virtualbox/VBoxCAPI_v4_2.h -include/virtualbox/VBoxCAPI_v4_3.h include/virtualbox/VirtualBox_XPCOM.h include/virtualbox/ipcIClientObserver.h include/virtualbox/ipcIDConnectService.h @@ -28,13 +20,6 @@ include/virtualbox/ipcIMessageObserver.h include/virtualbox/ipcIService.h include/virtualbox/ipcITransactionObserver.h include/virtualbox/ipcITransactionService.h -include/virtualbox/ipcd/ipcCID.h -include/virtualbox/ipcd/ipcLockCID.h -include/virtualbox/ipcd/ipcMessageReader.h -include/virtualbox/ipcd/ipcMessageWriter.h -include/virtualbox/ipcd/ipcModule.h -include/virtualbox/ipcd/ipcModuleUtil.h -include/virtualbox/ipcd/ipcdclient.h include/virtualbox/nsIArray.h include/virtualbox/nsIAsyncInputStream.h include/virtualbox/nsIAsyncOutputStream.h @@ -118,34 +103,15 @@ include/virtualbox/nsITraceRefcnt.h include/virtualbox/nsIVariant.h include/virtualbox/nsIWeakReference.h include/virtualbox/nsIXPTLoader.h -include/virtualbox/nsprpub/md/_darwin.cfg -include/virtualbox/nsprpub/md/_darwin.h -include/virtualbox/nsprpub/md/_freebsd.cfg -include/virtualbox/nsprpub/md/_freebsd.h -include/virtualbox/nsprpub/md/_iprt_atomic.h -include/virtualbox/nsprpub/md/_linux.cfg -include/virtualbox/nsprpub/md/_linux.h -include/virtualbox/nsprpub/md/_macos.h -include/virtualbox/nsprpub/md/_netbsd.cfg -include/virtualbox/nsprpub/md/_netbsd.h -include/virtualbox/nsprpub/md/_openbsd.cfg -include/virtualbox/nsprpub/md/_openbsd.h -include/virtualbox/nsprpub/md/_os2.cfg -include/virtualbox/nsprpub/md/_os2.h -include/virtualbox/nsprpub/md/_os2_errors.h -include/virtualbox/nsprpub/md/_pcos.h -include/virtualbox/nsprpub/md/_pth.h -include/virtualbox/nsprpub/md/_solaris.h -include/virtualbox/nsprpub/md/_solaris32.cfg -include/virtualbox/nsprpub/md/_solaris64.cfg -include/virtualbox/nsprpub/md/_unix_errors.h -include/virtualbox/nsprpub/md/_unixos.h -include/virtualbox/nsprpub/md/prosdep.h +include/virtualbox/nsrootidl.h +include/virtualbox/ipcd/ipcCID.h +include/virtualbox/ipcd/ipcLockCID.h +include/virtualbox/ipcd/ipcMessageReader.h +include/virtualbox/ipcd/ipcMessageWriter.h +include/virtualbox/ipcd/ipcModule.h +include/virtualbox/ipcd/ipcModuleUtil.h +include/virtualbox/ipcd/ipcdclient.h include/virtualbox/nsprpub/nspr.h -include/virtualbox/nsprpub/obsolete/pralarm.h -include/virtualbox/nsprpub/obsolete/probslet.h -include/virtualbox/nsprpub/obsolete/protypes.h -include/virtualbox/nsprpub/obsolete/prsem.h include/virtualbox/nsprpub/plarena.h include/virtualbox/nsprpub/plarenas.h include/virtualbox/nsprpub/plbase64.h @@ -170,9 +136,6 @@ include/virtualbox/nsprpub/prinit.h include/virtualbox/nsprpub/prinrval.h include/virtualbox/nsprpub/prio.h include/virtualbox/nsprpub/pripcsem.h -include/virtualbox/nsprpub/private/pprio.h -include/virtualbox/nsprpub/private/pprthred.h -include/virtualbox/nsprpub/private/prpriv.h include/virtualbox/nsprpub/prlink.h include/virtualbox/nsprpub/prlock.h include/virtualbox/nsprpub/prlog.h @@ -197,7 +160,36 @@ include/virtualbox/nsprpub/prtrace.h include/virtualbox/nsprpub/prtypes.h include/virtualbox/nsprpub/prvrsion.h include/virtualbox/nsprpub/prwin16.h -include/virtualbox/nsrootidl.h +include/virtualbox/nsprpub/md/_darwin.cfg +include/virtualbox/nsprpub/md/_darwin.h +include/virtualbox/nsprpub/md/_freebsd.cfg +include/virtualbox/nsprpub/md/_freebsd.h +include/virtualbox/nsprpub/md/_iprt_atomic.h +include/virtualbox/nsprpub/md/_linux.cfg +include/virtualbox/nsprpub/md/_linux.h +include/virtualbox/nsprpub/md/_macos.h +include/virtualbox/nsprpub/md/_netbsd.cfg +include/virtualbox/nsprpub/md/_netbsd.h +include/virtualbox/nsprpub/md/_openbsd.cfg +include/virtualbox/nsprpub/md/_openbsd.h +include/virtualbox/nsprpub/md/_os2.cfg +include/virtualbox/nsprpub/md/_os2.h +include/virtualbox/nsprpub/md/_os2_errors.h +include/virtualbox/nsprpub/md/_pcos.h +include/virtualbox/nsprpub/md/_pth.h +include/virtualbox/nsprpub/md/_solaris.h +include/virtualbox/nsprpub/md/_solaris32.cfg +include/virtualbox/nsprpub/md/_solaris64.cfg +include/virtualbox/nsprpub/md/_unix_errors.h +include/virtualbox/nsprpub/md/_unixos.h +include/virtualbox/nsprpub/md/prosdep.h +include/virtualbox/nsprpub/obsolete/pralarm.h +include/virtualbox/nsprpub/obsolete/probslet.h +include/virtualbox/nsprpub/obsolete/protypes.h +include/virtualbox/nsprpub/obsolete/prsem.h +include/virtualbox/nsprpub/private/pprio.h +include/virtualbox/nsprpub/private/pprthred.h +include/virtualbox/nsprpub/private/prpriv.h include/virtualbox/string/nsAString.h include/virtualbox/string/nsAlgorithm.h include/virtualbox/string/nsCharTraits.h @@ -339,7 +331,42 @@ include/virtualbox/xpcom/xptcall.h include/virtualbox/xpcom/xptcstubsdecl.inc include/virtualbox/xpcom/xptcstubsdef.inc include/virtualbox/xpcom/xptinfo.h -lib/virtualbox/DBGCPlugInDiggers.so +%%PYTHON%%%%PYTHON_SITELIBDIR%%/vboxapi-1.0-py%%PYTHON_VER%%.egg-info +%%PYTHON%%%%PYTHON_SITELIBDIR%%/vboxapi/VirtualBox_constants.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/vboxapi/VirtualBox_constants.pyc +%%PYTHON%%%%PYTHON_SITELIBDIR%%/vboxapi/__init__.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/vboxapi/__init__.pyc +%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/__init__.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/__init__.pyc +%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/components.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/components.pyc +%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/file.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/file.pyc +%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/nsError.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/nsError.pyc +%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/primitives.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/primitives.pyc +%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/vboxxpcom.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/vboxxpcom.pyc +%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/xpcom_consts.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/xpcom_consts.pyc +%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/xpt.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/xpt.pyc +%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/client/__init__.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/client/__init__.pyc +%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/server/__init__.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/server/__init__.pyc +%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/server/enumerator.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/server/enumerator.pyc +%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/server/factory.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/server/factory.pyc +%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/server/loader.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/server/loader.pyc +%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/server/module.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/server/module.pyc +%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/server/policy.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/server/policy.pyc +%%QT4%%lib/virtualbox/DbgPlugInDiggers.so lib/virtualbox/VBox.sh lib/virtualbox/VBoxAuth.so lib/virtualbox/VBoxAuthSimple.so @@ -347,10 +374,10 @@ lib/virtualbox/VBoxAutostart lib/virtualbox/VBoxBalloonCtrl lib/virtualbox/VBoxDD.so lib/virtualbox/VBoxDD2.so -lib/virtualbox/VBoxDD2GC.gc lib/virtualbox/VBoxDD2R0.r0 -lib/virtualbox/VBoxDDGC.gc +lib/virtualbox/VBoxDD2RC.rc lib/virtualbox/VBoxDDR0.r0 +lib/virtualbox/VBoxDDRC.rc lib/virtualbox/VBoxDDU.so %%QT4%%lib/virtualbox/VBoxDbg.so %%QT4%%lib/virtualbox/VBoxDragAndDropSvc.so @@ -372,6 +399,7 @@ lib/virtualbox/VBoxNetNAT.so %%X11%%lib/virtualbox/VBoxOGLhosterrorspu.so %%X11%%lib/virtualbox/VBoxOGLrenderspu.so %%PYTHON%%lib/virtualbox/VBoxPython.so +%%PYTHON%%lib/virtualbox/VBoxPython%%PYTHON_VERU%%.so lib/virtualbox/VBoxREM.so %%I386%%lib/virtualbox/VBoxREM32.so %%I386%%lib/virtualbox/VBoxREM64.so @@ -388,9 +416,13 @@ lib/virtualbox/VBoxVMMPreload.so lib/virtualbox/VBoxXPCOM.so lib/virtualbox/VBoxXPCOMC.so lib/virtualbox/VBoxXPCOMIPCD +lib/virtualbox/VMMR0.r0 +lib/virtualbox/VMMRC.rc %%QT4%%@(root,%%VBOXGROUP%%,4510) lib/virtualbox/VirtualBox %%QT4%%lib/virtualbox/VirtualBox.so lib/virtualbox/sdk +%%WEBSERVICE%%lib/virtualbox/vboxwebsrv +%%WEBSERVICE%%lib/virtualbox/webtest %%VNC%%lib/virtualbox/ExtensionPacks/VNC/ExtPack-license.html %%VNC%%lib/virtualbox/ExtensionPacks/VNC/ExtPack-license.rtf %%VNC%%lib/virtualbox/ExtensionPacks/VNC/ExtPack-license.txt @@ -399,11 +431,6 @@ lib/virtualbox/sdk %%VNC%%lib/virtualbox/ExtensionPacks/VNC/%%ARCH%%/VBoxVNCMain.so %%GUESTADDITIONS%%lib/virtualbox/additions/VBoxGuestAdditions.iso %%GUESTADDITIONS%%lib/virtualbox/additions/VBoxGuestAdditions_%%GUEST_VER%%.iso -%%PYTHON%%lib/virtualbox/VBoxPython%%PYTHON_VERU%%.so -lib/virtualbox/VMMGC.gc -lib/virtualbox/VMMR0.r0 -%%WEBSERVICE%%lib/virtualbox/vboxwebsrv -%%WEBSERVICE%%lib/virtualbox/webtest lib/virtualbox/components/VBoxC.so lib/virtualbox/components/VBoxSVCM.so lib/virtualbox/components/VBoxXPCOMBase.xpt @@ -574,38 +601,3 @@ lib/virtualbox/components/VirtualBox_XPCOM.xpt %%DATADIR%%/samples/tstVBoxAPIXPCOM.cpp %%WEBSERVICE%%%%DATADIR%%/sdk/bindings/webservice/vboxweb.wsdl %%PYTHON%%%%DATADIR%%/sdk/bindings/xpcom/python/xpcom -%%PYTHON%%%%PYTHON_SITELIBDIR%%/vboxapi/__init__.py -%%PYTHON%%%%PYTHON_SITELIBDIR%%/vboxapi/__init__.pyc -%%PYTHON%%%%PYTHON_SITELIBDIR%%/vboxapi/VirtualBox_constants.py -%%PYTHON%%%%PYTHON_SITELIBDIR%%/vboxapi/VirtualBox_constants.pyc -%%PYTHON%%%%PYTHON_SITELIBDIR%%/vboxapi-1.0-py%%PYTHON_VER%%.egg-info -%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/__init__.py -%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/__init__.pyc -%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/components.py -%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/components.pyc -%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/file.py -%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/file.pyc -%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/nsError.py -%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/nsError.pyc -%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/primitives.py -%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/primitives.pyc -%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/vboxxpcom.py -%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/vboxxpcom.pyc -%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/xpcom_consts.py -%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/xpcom_consts.pyc -%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/xpt.py -%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/xpt.pyc -%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/client/__init__.py -%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/client/__init__.pyc -%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/server/__init__.py -%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/server/__init__.pyc -%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/server/enumerator.py -%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/server/enumerator.pyc -%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/server/factory.py -%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/server/factory.pyc -%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/server/loader.py -%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/server/loader.pyc -%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/server/module.py -%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/server/module.pyc -%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/server/policy.py -%%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/server/policy.pyc Index: emulators/virtualbox-ose-additions/Makefile =================================================================== --- emulators/virtualbox-ose-additions/Makefile (revision 391665) +++ emulators/virtualbox-ose-additions/Makefile (working copy) @@ -2,13 +2,11 @@ # $FreeBSD$ PORTNAME= virtualbox-ose -DISTVERSION= 4.3.28 +PORTVERSION= 5.0.0 CATEGORIES= emulators -MASTER_SITES= http://download.virtualbox.org/virtualbox/${DISTVERSION}/ \ - http://tmp.chruetertee.ch/ \ - http://disasterarea.chruetertee.ch/ +MASTER_SITES= http://download.virtualbox.org/virtualbox/${PORTVERSION}/ PKGNAMESUFFIX= -additions -DISTNAME= VirtualBox-${DISTVERSION} +DISTNAME= VirtualBox-${PORTVERSION} MAINTAINER= vbox@FreeBSD.org COMMENT= VirtualBox additions for FreeBSD guests @@ -32,7 +30,6 @@ MAKE_JOBS_UNSAFE= yes HAS_CONFIGURE= yes CONFIGURE_ARGS+= --disable-alsa \ - --disable-dbus \ --disable-docs \ --disable-libvpx \ --disable-pulse \ @@ -41,15 +38,17 @@ CONFIGURE_ARGS+= --disable-alsa \ --disable-xpcom CONFIGURE_ARGS+= --nofatal --with-gcc="${CC}" --with-g++="${CXX}" -CONFLICTS_INSTALL= virtualbox-ose-[3,4]* \ - virtualbox-ose-additions-devel-[3,4]* \ - virtualbox-ose-devel-[3,4]* \ - virtualbox-ose-legacy-[3,4]* +CONFLICTS_INSTALL= virtualbox-ose-[3-5]* \ + virtualbox-ose-additions-devel-[3-5]* \ + virtualbox-ose-devel-[3-5]* \ + virtualbox-ose-legacy-[3-5]* -OPTIONS_DEFINE= DEBUG OPENGL X11 -OPTIONS_DEFAULT= X11 +OPTIONS_DEFINE= DBUS DEBUG OPENGL X11 +OPTIONS_DEFAULT= DBUS X11 OPTIONS_SUB= yes +DBUS_CONFIGURE_OFF= --disable-dbus +DBUS_LIB_DEPENDS= libdbus-1.so:${PORTSDIR}/devel/dbus OPENGL_CONFIGURE_OFF= --disable-opengl .include @@ -113,7 +112,7 @@ EXTRA_PATCHES+= ${PATCHDIR}/extrapatch-src-VBox-Ad .endif .endif -.if ${OSVERSION} < 1001514 +.if ${OSVERSION} < 1100066 EXTRA_PATCHES+= ${PATCHDIR}/extrapatch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk.dri .else EXTRA_PATCHES+= ${PATCHDIR}/extrapatch-src-VBox-Additions-freebsd-drm-Makefile @@ -135,11 +134,15 @@ pre-everything:: post-patch: @${ECHO} 'VBOX_ONLY_ADDITIONS = 1' > ${WRKSRC}/LocalConfig.kmk @${ECHO} 'VBOX_WITH_DRAG_AND_DROP = ${VBOX_WITH_X11}' >> ${WRKSRC}/LocalConfig.kmk + @${ECHO} 'VBOX_WITH_DRAG_AND_DROP_GH = ${VBOX_WITH_X11}' >> ${WRKSRC}/LocalConfig.kmk @${ECHO} 'VBOX_WITH_X11_ADDITIONS = ${VBOX_WITH_X11}' >> ${WRKSRC}/LocalConfig.kmk .if ${COMPILER_TYPE} == clang @${REINPLACE_CMD} -e 's| -finline-limit=8000||' \ -e 's| -fno-merge-constants||' \ -e 's| -mpreferred-stack-boundary=2||' ${WRKSRC}/Config.kmk +.if ${COMPILER_FEATURES:Mlibc++} + @${ECHO} 'VBOX_GCC_std = -std=c++11' >> ${WRKSRC}/LocalConfig.kmk +.endif @${ECHO} 'VBOX_GCC_Wno-unused-parameter = -Wno-unused-parameter' >> ${WRKSRC}/LocalConfig.kmk .endif @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ @@ -177,6 +180,7 @@ do-install: .endif .endif + ${INSTALL_LIB} ${VBOX_BIN}/pam_vbox.so ${STAGEDIR}${PREFIX}/lib ${INSTALL_PROGRAM} ${VBOX_SBINS:S|^|${VBOX_BIN}/|} \ ${STAGEDIR}${PREFIX}/sbin/ Index: emulators/virtualbox-ose-additions/distinfo =================================================================== --- emulators/virtualbox-ose-additions/distinfo (revision 391665) +++ emulators/virtualbox-ose-additions/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (VirtualBox-4.3.28.tar.bz2) = e157ab76d1958ae2c56b2a3875194fbff3de82486ad0e30032fd5bd772297c31 -SIZE (VirtualBox-4.3.28.tar.bz2) = 100092002 +SHA256 (VirtualBox-5.0.0.tar.bz2) = bb71356c8f82012c9b5ae16e12302eb111c71ae7b063ada7688fbfa8aa10c2f7 +SIZE (VirtualBox-5.0.0.tar.bz2) = 109816664 Index: emulators/virtualbox-ose-additions/pkg-plist =================================================================== --- emulators/virtualbox-ose-additions/pkg-plist (revision 391665) +++ emulators/virtualbox-ose-additions/pkg-plist (working copy) @@ -8,6 +8,7 @@ %%OPENGL%%lib/VBoxOGLfeedbackspu.so %%OPENGL%%lib/VBoxOGLpackspu.so %%OPENGL%%lib/VBoxOGLpassthroughspu.so +lib/pam_vbox.so %%OPENGL%%lib/dri/vboxvideo_dri.so %%X11%%lib/xorg/modules/drivers/vboxvideo_drv.so %%X11%%lib/xorg/modules/input/vboxmouse_drv.so Index: emulators/virtualbox-ose-kmod/Makefile =================================================================== --- emulators/virtualbox-ose-kmod/Makefile (revision 391665) +++ emulators/virtualbox-ose-kmod/Makefile (working copy) @@ -2,13 +2,11 @@ # $FreeBSD$ PORTNAME= virtualbox-ose -DISTVERSION= 4.3.28 +PORTVERSION= 5.0.0 CATEGORIES= emulators -MASTER_SITES= http://download.virtualbox.org/virtualbox/${DISTVERSION}/ \ - http://tmp.chruetertee.ch/ \ - http://disasterarea.chruetertee.ch/ +MASTER_SITES= http://download.virtualbox.org/virtualbox/${PORTVERSION}/ PKGNAMESUFFIX= -kmod -DISTNAME= VirtualBox-${DISTVERSION} +DISTNAME= VirtualBox-${PORTVERSION} MAINTAINER= vbox@FreeBSD.org COMMENT= VirtualBox kernel module for FreeBSD @@ -40,8 +38,8 @@ CONFIGURE_ARGS+= --disable-alsa \ --disable-xpcom CONFIGURE_ARGS+= --nofatal --with-gcc="${CC}" --with-g++="${CXX}" -CONFLICTS_INSTALL= virtualbox-ose-kmod-devel-4* \ - virtualbox-ose-kmod-legacy-4* +CONFLICTS_INSTALL= virtualbox-ose-kmod-devel-[4-5]* \ + virtualbox-ose-kmod-legacy-[4-5]* OPTIONS_DEFINE= DEBUG VIMAGE OPTIONS_SUB= yes Index: emulators/virtualbox-ose-kmod/distinfo =================================================================== --- emulators/virtualbox-ose-kmod/distinfo (revision 391665) +++ emulators/virtualbox-ose-kmod/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (VirtualBox-4.3.28.tar.bz2) = e157ab76d1958ae2c56b2a3875194fbff3de82486ad0e30032fd5bd772297c31 -SIZE (VirtualBox-4.3.28.tar.bz2) = 100092002 +SHA256 (VirtualBox-5.0.0.tar.bz2) = bb71356c8f82012c9b5ae16e12302eb111c71ae7b063ada7688fbfa8aa10c2f7 +SIZE (VirtualBox-5.0.0.tar.bz2) = 109816664