Index: head/emulators/virtualbox-ose/Makefile =================================================================== --- head/emulators/virtualbox-ose/Makefile (revision 386271) +++ head/emulators/virtualbox-ose/Makefile (revision 386272) @@ -1,345 +1,345 @@ # Created by: Bernhard Froehlich # $FreeBSD$ PORTNAME= virtualbox-ose -DISTVERSION= 4.3.26 +DISTVERSION= 4.3.28 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} MAINTAINER= vbox@FreeBSD.org COMMENT= General-purpose full virtualizer for x86 hardware LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= yasm:${PORTSDIR}/devel/yasm \ xsltproc:${PORTSDIR}/textproc/libxslt \ kmk:${PORTSDIR}/devel/kBuild \ gtar:${PORTSDIR}/archivers/gtar \ cdrecord:${PORTSDIR}/sysutils/cdrtools LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png \ libxslt.so:${PORTSDIR}/textproc/libxslt \ libcurl.so:${PORTSDIR}/ftp/curl RUN_DEPENDS= ${LOCALBASE}/etc/rc.d/vboxnet:${PORTSDIR}/emulators/virtualbox-ose-kmod \ cdrecord:${PORTSDIR}/sysutils/cdrtools CPE_VENDOR= oracle CPE_PRODUCT= vm_virtualbox WRKSRC= ${WRKDIR}/VirtualBox-${PORTVERSION} ONLY_FOR_ARCHS= i386 amd64 USES= compiler cpe iconv pkgconfig tar:bzip2 USE_GNOME= libidl USE_LDCONFIG= ${VBOX_DIR} 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* VBOXUSER?= vboxusers VBOXWSUSER?= vboxusers VBOXGROUP?= vboxusers USERS= ${VBOXUSER} GROUPS= ${VBOXGROUP} VBOX_DIR= ${PREFIX}/lib/virtualbox VBOX_LINKS= VBoxVRDP VBOX_PROGS= VBoxAutostart VBoxBalloonCtrl VBoxHeadless VBoxManage 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_DEFAULT= DBUS PYTHON QT4 UDPTUNNEL VNC WEBSERVICE X11 OPTIONS_SUB= yes DEBUG_DESC= Debug symbols, additional logs and assertions GUESTADDITIONS_DESC= Build with Guest Additions MANUAL_DESC= Build with user manual QT4_DESC= Build with QT4 Frontend UDPTUNNEL_DESC= Build with UDP tunnel support VDE_DESC= Build with VDE support VNC_DESC= Build with VNC support VPX_DESC= Use vpx for video capturing WEBSERVICE_DESC= Build Webservice 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 VPX_LIB_DEPENDS= libvpx.so:${PORTSDIR}/multimedia/libvpx VDE_RUN_DEPENDS= vde_switch:${PORTSDIR}/net/vde2 DBUS_CONFIGURE_OFF= --disable-dbus DEBUG_CONFIGURE_ON= --build-debug MANUAL_CONFIGURE_OFF= --disable-docs PULSEAUDIO_CONFIGURE_OFF= --disable-pulse PYTHON_CONFIGURE_OFF= --disable-python QT4_CONFIGURE_OFF= --disable-qt4 UDPTUNNEL_CONFIGURE_OFF= --disable-udptunnel VDE_CONFIGURE_ON= --enable-vde VNC_CONFIGURE_ON= --enable-vnc VPX_CONFIGURE_OFF= --disable-libvpx X11_CONFIGURE_OFF= --build-headless # bmake doesn't know about unsetenv=true .if defined(.PARSEDIR) ENV= .export ENV .else .SHELL: path="/bin/sh" unsetenv=true .endif PLIST_SUB+= GUEST_VER=${VBOX_GUEST_VER} \ PYTHON_VER=${PYTHON_VER} \ PYTHON_VERU=${PYTHON_VER:S/./_/} \ VBOXGROUP=${VBOXGROUP} SUB_LIST+= VBOXDIR=${VBOX_DIR} \ VBOXGROUP=${VBOXGROUP} \ VBOXUSER=${VBOXUSER} \ VBOXWSUSER=${VBOXWSUSER} USE_RC_SUBR+= vboxheadless vboxwatchdog .include .if empty(PORT_OPTIONS:MQT4) && !empty(PORT_OPTIONS:MNLS) BROKEN= NLS support requires QT4 frontend. Run 'make config' again! .endif .if empty(PORT_OPTIONS:MX11) && !empty(PORT_OPTIONS:MQT4) BROKEN= QT4 frontend requires X11 support. Run 'make config' again! .endif .if ${PORT_OPTIONS:MDEBUG} KMK_BUILDTYPE= debug .else KMK_BUILDTYPE= release .endif .if ${PORT_OPTIONS:MGUESTADDITIONS} GUESTADDITIONS= VBoxGuestAdditions_${VBOX_GUEST_VER}.iso GADISTFILES= ${GUESTADDITIONS}:guestadditions RESTRICTED= for personal use only RESTRICTED_FILES= ${GUESTADDITIONS} .endif .if ${PORT_OPTIONS:MMANUAL} USE_TEX= dvipsk:build formats:build .endif .if ${PORT_OPTIONS:MPYTHON} USES+= python:2 USE_PYTHON= distutils noegginfo PYDISTUTILS_PKGNAME= vboxapi PYDISTUTILS_PKGVERSION= 1.0 .else USES+= python:build .endif .if ${PORT_OPTIONS:MQT4} QT_NONSTANDARD= yes USE_QT4= linguist_build moc_build rcc_build uic_build USE_QT4+= gui network opengl INSTALLS_ICONS= yes VBOX_PROGS+= VirtualBox VBOX_UTILS+= VBoxTestOGL VBOX_WITH_QT4= 1 .else VBOX_WITH_QT4= .endif .if ${PORT_OPTIONS:MWEBSERVICE} BUILD_DEPENDS+= soapcpp2:${PORTSDIR}/devel/gsoap USE_RC_SUBR+= vboxwebsrv VBOX_LINKS+= vboxwebsrv VBOX_UTILS+= vboxwebsrv webtest .endif .if ${PORT_OPTIONS:MX11} USE_SDL= sdl USE_XORG= xcursor xmu inputproto xinerama VBOX_PROGS+= VBoxSDL .endif .if ${PORT_OPTIONS:MPYTHON} || ${PORT_OPTIONS:MWEBSERVICE} PLIST_SUB+= SDK="" .else PLIST_SUB+= SDK="@comment " .endif .if ${ARCH} == i386 KMK_ARCH= freebsd.x86 PLIST_SUB+= I386="" .else KMK_ARCH= freebsd.${ARCH} PLIST_SUB+= I386="@comment " .endif PLIST_SUB+= ARCH="${KMK_ARCH}" KMK_BUILDDIR= ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE} KMK_CONFIG= VBOX_LIBPATH_X11=${LOCALBASE} VBOX_FREEBSD_SRC=${SRC_BASE}/sys KMK_FLAGS= -j${MAKE_JOBS_NUMBER} .include .if ${OSVERSION} < 900000 EXTRA_PATCHES+= ${PATCHDIR}/extrapatch-src-VBox-Devices-PC-vbox.dsl \ ${PATCHDIR}/extrapatch-src-VBox-Main-src-server-generic-NetIf-generic.cpp .endif .if ${COMPILER_TYPE} == clang PATCH_DEPENDS+= ${LOCALBASE}/share/kBuild/tools/GXX3.kmk:${PORTSDIR}/devel/kBuild EXTRA_PATCHES+= ${PATCHDIR}/extrapatch-Config.kmk \ ${PATCHDIR}/extrapatch-src-VBox-Devices-PC-ipxe-Makefile.kmk \ ${PATCHDIR}/extrapatch-src-recompiler-Makefile.kmk .endif pre-everything:: .if ${ARCH} == "amd64" .if !exists(/usr/lib32/libc.so) @${ECHO} 'Requires 32-bit libraries installed under /usr/lib32.' @${ECHO} 'Do: cd /usr/src; make build32 install32; /etc/rc.d/ldconfig restart' @${FALSE} .endif .endif post-patch: @${ECHO} 'VBOX_PATH_APP_PRIVATE_ARCH = ${VBOX_DIR}' > \ ${WRKSRC}/LocalConfig.kmk @${ECHO} 'VBOX_PATH_SHARED_LIBS = ${VBOX_DIR}' >> \ ${WRKSRC}/LocalConfig.kmk @${ECHO} 'VBOX_WITH_RUNPATH = ${VBOX_DIR}' >> \ ${WRKSRC}/LocalConfig.kmk @${ECHO} 'VBOX_PATH_APP_PRIVATE = ${DATADIR}' >> ${WRKSRC}/LocalConfig.kmk @${ECHO} 'VBOX_PATH_APP_DOCS = ${DOCSDIR}' >> ${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 @${ECHO} 'SDK_VBOX_LIBPNG_INCS = ${PREFIX}/include/libpng' >> ${WRKSRC}/LocalConfig.kmk @${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_X11_ADDITIONS =' >> ${WRKSRC}/LocalConfig.kmk .if ${PORT_OPTIONS:MWEBSERVICE} @${ECHO} 'VBOX_WITH_WEBSERVICES = 1' >> ${WRKSRC}/LocalConfig.kmk @${ECHO} 'VBOX_GSOAP_INSTALLED = 1' >> ${WRKSRC}/LocalConfig.kmk @${ECHO} 'VBOX_PATH_GSOAP = ${PREFIX}/lib/gsoap' >> ${WRKSRC}/LocalConfig.kmk @${ECHO} 'VBOX_PATH_GSOAP_BIN = ${PREFIX}/bin' >> ${WRKSRC}/LocalConfig.kmk @${ECHO} 'VBOX_PATH_GSOAP_IMPORT = ${PREFIX}/share/gsoap/import' >> ${WRKSRC}/LocalConfig.kmk @${ECHO} 'VBOX_GCC_PEDANTIC_CXX = -Wshadow $(VBOX_GCC_WARN) -Wno-long-long' >> ${WRKSRC}/LocalConfig.kmk .endif .if ${COMPILER_TYPE} == clang @${REINPLACE_CMD} -e 's| -finline-limit=8000||' \ -e 's| -mpreferred-stack-boundary=2||' ${WRKSRC}/Config.kmk @${REINPLACE_CMD} -e 's| -fpermissive||' ${WRKSRC}/Config.kmk ${WRKSRC}/src/VBox/Main/webservice/Makefile.kmk @${ECHO} 'VBOX_GCC_Wno-unused-parameter = -Wno-unused-parameter' >> ${WRKSRC}/LocalConfig.kmk @${ECHO} '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/units/qt3.kmk ${WRKSRC}/kBuild/units/qt4.kmk \ ${WRKSRC}/kBuild/sdks/LIBSDL.kmk \ ${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 @${ECHO} 'VBOX_ICONV_DEFS = LIBICONV_PLUG' >> ${WRKSRC}/LocalConfig.kmk .endif @${REINPLACE_CMD} -e 's|/usr/local/lib/virtualbox|${VBOX_DIR}|' \ -e 's|/usr/local|${PREFIX}|' \ ${WRKSRC}/src/VBox/Installer/freebsd/VBox.sh do-build: cd ${WRKSRC} && \ ${SH} -c '. env.sh && ${KMK_CONFIG} ${LOCALBASE}/bin/kmk ${KMK_FLAGS}' .if ${PORT_OPTIONS:MPYTHON} ${PYTHON_CMD} -mcompileall ${KMK_BUILDDIR}/bin/sdk/bindings/xpcom/python/xpcom .endif do-install: ${MKDIR} ${STAGEDIR}${DATADIR} cd ${KMK_BUILDDIR}/bin/sdk/bindings/xpcom && ${COPYTREE_SHARE} "idl samples" ${STAGEDIR}${DATADIR} ${MKDIR} ${STAGEDIR}${PREFIX}/include/virtualbox cd ${KMK_BUILDDIR}/bin/sdk/bindings/xpcom/include && ${COPYTREE_SHARE} "*" ${STAGEDIR}${PREFIX}/include/virtualbox ${MKDIR} ${STAGEDIR}${VBOX_DIR} cd ${KMK_BUILDDIR}/bin && ${COPYTREE_SHARE} \ "*.so *.gc *.r0 *.fd components" ${STAGEDIR}${VBOX_DIR} ${LN} -sf ${DATADIR}/sdk ${STAGEDIR}${VBOX_DIR} ${INSTALL_SCRIPT} ${WRKSRC}/src/VBox/Installer/freebsd/VBox.sh \ ${STAGEDIR}${VBOX_DIR} .for f in ${VBOX_PROGS} ${VBOX_UTILS} ${INSTALL_PROGRAM} ${KMK_BUILDDIR}/bin/${f} ${STAGEDIR}${VBOX_DIR} .endfor .for f in ${VBOX_PROGS} ${VBOX_LINKS} ${LN} -sf ${VBOX_DIR}/VBox.sh ${STAGEDIR}${PREFIX}/bin/${f} .endfor .for f in ${VBOX_PROGS} ${LN} -sf ${VBOX_DIR}/VBox.sh ${STAGEDIR}${PREFIX}/bin/${f:tl} .endfor .if ${PORT_OPTIONS:MGUESTADDITIONS} ${MKDIR} ${STAGEDIR}${VBOX_DIR}/additions ${INSTALL_DATA} ${DISTDIR}/${GUESTADDITIONS} \ ${STAGEDIR}${VBOX_DIR}/additions/ ${LN} -sf ${VBOX_DIR}/additions/${GUESTADDITIONS} \ ${STAGEDIR}${VBOX_DIR}/additions/VBoxGuestAdditions.iso .endif .if ${PORT_OPTIONS:MMANUAL} ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${KMK_BUILDDIR}/bin/UserManual*.pdf ${STAGEDIR}${DOCSDIR} .endif .if ${PORT_OPTIONS:MNLS} cd ${KMK_BUILDDIR}/obj/VirtualBox/qtnls && ${COPYTREE_SHARE} "*.qm" ${STAGEDIR}${DATADIR}/nls .endif .if ${PORT_OPTIONS:MPYTHON} cd ${KMK_BUILDDIR}/bin/sdk/installer && \ ${SETENV} VBOX_INSTALL_PATH="${VBOX_DIR}" \ ${PYTHON_CMD} vboxapisetup.py install --root=${STAGEDIR} @${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/xpcom cd ${KMK_BUILDDIR}/bin/sdk/bindings/xpcom/python/xpcom && \ ${COPYTREE_SHARE} "*" ${STAGEDIR}${PYTHON_SITELIBDIR}/xpcom @${MKDIR} ${STAGEDIR}${DATADIR}/sdk/bindings/xpcom/python ${LN} -sf ${PYTHON_SITELIBDIR}/xpcom \ ${STAGEDIR}${DATADIR}/sdk/bindings/xpcom/python .endif .if ${PORT_OPTIONS:MQT4} ${INSTALL_DATA} ${WRKSRC}/src/VBox/Frontends/VirtualBox/images/OSE/VirtualBox_48px.png ${STAGEDIR}${PREFIX}/share/pixmaps/VBox.png ${INSTALL_DATA} ${WRKSRC}/src/VBox/Installer/freebsd/virtualbox.desktop ${STAGEDIR}${PREFIX}/share/applications/virtualbox.desktop .endif .if ${PORT_OPTIONS:MVNC} ${MKDIR} ${STAGEDIR}${VBOX_DIR}/ExtensionPacks/VNC/${KMK_ARCH} ${INSTALL_DATA} ${KMK_BUILDDIR}/bin/ExtensionPacks/VNC/ExtPack* \ ${STAGEDIR}${VBOX_DIR}/ExtensionPacks/VNC/ ${INSTALL_LIB} ${KMK_BUILDDIR}/bin/ExtensionPacks/VNC/${KMK_ARCH}/* \ ${STAGEDIR}${VBOX_DIR}/ExtensionPacks/VNC/${KMK_ARCH}/ .endif .if ${PORT_OPTIONS:MWEBSERVICE} ${MKDIR} ${STAGEDIR}${DATADIR}/sdk/bindings/webservice ${INSTALL_DATA} ${KMK_BUILDDIR}/obj/webservice/vboxweb.wsdl \ ${STAGEDIR}${DATADIR}/sdk/bindings/webservice/ .endif .include Index: head/emulators/virtualbox-ose/distinfo =================================================================== --- head/emulators/virtualbox-ose/distinfo (revision 386271) +++ head/emulators/virtualbox-ose/distinfo (revision 386272) @@ -1,4 +1,4 @@ -SHA256 (VirtualBox-4.3.26.tar.bz2) = e2949c250a1de30997e658de9e3d8545e71318a9844d80536137d76db4f08961 -SIZE (VirtualBox-4.3.26.tar.bz2) = 102676804 -SHA256 (VBoxGuestAdditions_4.3.26.iso) = c5e46533a6ff8df177ed5c9098624f6cec46ca392bab16de2017195580088670 -SIZE (VBoxGuestAdditions_4.3.26.iso) = 58120192 +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 Index: head/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r3-freebsd-mp-freebsd.cpp =================================================================== --- head/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r3-freebsd-mp-freebsd.cpp (revision 386271) +++ head/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r3-freebsd-mp-freebsd.cpp (nonexistent) @@ -1,29 +0,0 @@ ---- src/VBox/Runtime/r3/freebsd/mp-freebsd.cpp.orig 2013-11-29 14:24:23.000000000 -0500 -+++ src/VBox/Runtime/r3/freebsd/mp-freebsd.cpp 2013-12-13 16:25:44.000000000 -0500 -@@ -93,7 +93,7 @@ - char szDriver[10]; - size_t cbDriver = sizeof(szDriver); - RT_ZERO(szDriver); /* this shouldn't be necessary. */ -- int rcBsd = sysctlbyname(szName, szDriver, &cbDriver, NULL, NULL); -+ int rcBsd = sysctlbyname(szName, szDriver, &cbDriver, NULL, 0); - if (rcBsd == 0) - return true; - -@@ -154,7 +154,7 @@ - return 0; - - /* CPU's have a common frequency. */ -- int rc = sysctlbyname("dev.cpu.0.freq", &uFreqCurr, &cbParameter, NULL, NULL); -+ int rc = sysctlbyname("dev.cpu.0.freq", &uFreqCurr, &cbParameter, NULL, 0); - if (rc) - return 0; - -@@ -176,7 +176,7 @@ - * CPU 0 has the freq levels entry. ENOMEM is ok as we don't need all supported - * levels but only the first one. - */ -- int rc = sysctlbyname("dev.cpu.0.freq_levels", szFreqLevels, &cbFreqLevels, NULL, NULL); -+ int rc = sysctlbyname("dev.cpu.0.freq_levels", szFreqLevels, &cbFreqLevels, NULL, 0); - if ( (rc && (errno != ENOMEM)) - || (cbFreqLevels == 0)) - return 0; Property changes on: head/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r3-freebsd-mp-freebsd.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/emulators/virtualbox-ose/files/patch-src-VBox-Devices-Storage-DevAHCI.cpp =================================================================== --- head/emulators/virtualbox-ose/files/patch-src-VBox-Devices-Storage-DevAHCI.cpp (revision 386271) +++ head/emulators/virtualbox-ose/files/patch-src-VBox-Devices-Storage-DevAHCI.cpp (nonexistent) @@ -1,11 +0,0 @@ ---- src/VBox/Devices/Storage/DevAHCI.cpp.orig 2013-11-29 14:23:47.000000000 -0500 -+++ src/VBox/Devices/Storage/DevAHCI.cpp 2013-12-13 20:05:56.000000000 -0500 -@@ -3242,7 +3242,7 @@ - return 0; - - ataH2BE_U16(pbBuf, 0x0); /* feature 0: list of profiles supported */ -- pbBuf[2] = (0 << 2) | (1 << 1) | (1 || 0); /* version 0, persistent, current */ -+ pbBuf[2] = (0 << 2) | (1 << 1) | (1 << 0); /* version 0, persistent, current */ - pbBuf[3] = 8; /* additional bytes for profiles */ - /* The MMC-3 spec says that DVD-ROM read capability should be reported - * before CD-ROM read capability. */ Property changes on: head/emulators/virtualbox-ose/files/patch-src-VBox-Devices-Storage-DevAHCI.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/emulators/virtualbox-ose/files/patch-src-VBox-Devices-PC-DrvACPI.cpp =================================================================== --- head/emulators/virtualbox-ose/files/patch-src-VBox-Devices-PC-DrvACPI.cpp (revision 386271) +++ head/emulators/virtualbox-ose/files/patch-src-VBox-Devices-PC-DrvACPI.cpp (nonexistent) @@ -1,29 +0,0 @@ ---- src/VBox/Devices/PC/DrvACPI.cpp.orig 2013-11-29 14:23:31.000000000 -0500 -+++ src/VBox/Devices/PC/DrvACPI.cpp 2013-12-13 17:36:50.000000000 -0500 -@@ -204,7 +204,7 @@ - int fAcLine = 0; - size_t cbParameter = sizeof(fAcLine); - -- int rc = sysctlbyname("hw.acpi.acline", &fAcLine, &cbParameter, NULL, NULL); -+ int rc = sysctlbyname("hw.acpi.acline", &fAcLine, &cbParameter, NULL, 0); - - if (!rc) - { -@@ -463,7 +463,7 @@ - int fBatteryState = 0; - size_t cbParameter = sizeof(fBatteryState); - -- rc = sysctlbyname("hw.acpi.battery.state", &fBatteryState, &cbParameter, NULL, NULL); -+ rc = sysctlbyname("hw.acpi.battery.state", &fBatteryState, &cbParameter, NULL, 0); - if (!rc) - { - if ((fBatteryState & ACPI_BATT_STAT_NOT_PRESENT) == ACPI_BATT_STAT_NOT_PRESENT) -@@ -485,7 +485,7 @@ - /* Get battery level. */ - int curCapacity = 0; - cbParameter = sizeof(curCapacity); -- rc = sysctlbyname("hw.acpi.battery.life", &curCapacity, &cbParameter, NULL, NULL); -+ rc = sysctlbyname("hw.acpi.battery.life", &curCapacity, &cbParameter, NULL, 0); - if (!rc && curCapacity >= 0) - *penmRemainingCapacity = (PDMACPIBATCAPACITY)curCapacity; - Property changes on: head/emulators/virtualbox-ose/files/patch-src-VBox-Devices-PC-DrvACPI.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/emulators/virtualbox-ose/files/patch-src-VBox-VMM-VMMR3-PDMDriver.cpp =================================================================== --- head/emulators/virtualbox-ose/files/patch-src-VBox-VMM-VMMR3-PDMDriver.cpp (revision 386271) +++ head/emulators/virtualbox-ose/files/patch-src-VBox-VMM-VMMR3-PDMDriver.cpp (nonexistent) @@ -1,15 +0,0 @@ ---- src/VBox/VMM/VMMR3/PDMDriver.cpp.orig 2015-03-02 10:10:12.000000000 -0500 -+++ src/VBox/VMM/VMMR3/PDMDriver.cpp 2015-03-12 20:01:00.170988000 -0400 -@@ -512,11 +512,7 @@ - AssertLogRelRCReturn(rc, rc); - - rc = CFGMR3ReplaceSubTree(*ppNode, pBelowThisCopy); -- if (RT_FAILURE(rc)) -- { -- CFGMR3RemoveNode(pBelowThis); -- AssertLogRelReturn(("rc=%Rrc\n", rc), rc); -- } -+ AssertLogRelRCReturnStmt(rc, CFGMR3RemoveNode(pBelowThis), rc); - } - } - /* Property changes on: head/emulators/virtualbox-ose/files/patch-src-VBox-VMM-VMMR3-PDMDriver.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/emulators/virtualbox-ose/files/patch-src-VBox-Main-src-server-freebsd-NetIf-freebsd.cpp =================================================================== --- head/emulators/virtualbox-ose/files/patch-src-VBox-Main-src-server-freebsd-NetIf-freebsd.cpp (revision 386271) +++ head/emulators/virtualbox-ose/files/patch-src-VBox-Main-src-server-freebsd-NetIf-freebsd.cpp (nonexistent) @@ -1,17 +0,0 @@ ---- src/VBox/Main/src-server/freebsd/NetIf-freebsd.cpp.orig 2015-03-02 10:09:55.000000000 -0500 -+++ src/VBox/Main/src-server/freebsd/NetIf-freebsd.cpp 2015-03-12 19:23:15.950051000 -0400 -@@ -290,12 +290,14 @@ - ComObjPtr IfObj; - IfObj.createObject(); - if (SUCCEEDED(IfObj->init(Bstr(pNew->szName), enmType, pNew))) -+ { - /* Make sure the default interface gets to the beginning. */ - if ( fDefaultIfaceExistent - && pIfMsg->ifm_index == u16DefaultIface) - list.push_front(IfObj); - else - list.push_back(IfObj); -+ } - } - RTMemFree(pNew); - } Property changes on: head/emulators/virtualbox-ose/files/patch-src-VBox-Main-src-server-freebsd-NetIf-freebsd.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/emulators/virtualbox-ose/files/patch-src-VBox-Devices-Storage-DevATA.cpp =================================================================== --- head/emulators/virtualbox-ose/files/patch-src-VBox-Devices-Storage-DevATA.cpp (revision 386271) +++ head/emulators/virtualbox-ose/files/patch-src-VBox-Devices-Storage-DevATA.cpp (nonexistent) @@ -1,11 +0,0 @@ ---- src/VBox/Devices/Storage/DevATA.cpp.orig 2014-07-15 13:24:35.000000000 -0400 -+++ src/VBox/Devices/Storage/DevATA.cpp 2014-07-16 18:17:03.000000000 -0400 -@@ -2479,7 +2479,7 @@ - return 0; - - ataH2BE_U16(pbBuf, 0x0); /* feature 0: list of profiles supported */ -- pbBuf[2] = (0 << 2) | (1 << 1) | (1 || 0); /* version 0, persistent, current */ -+ pbBuf[2] = (0 << 2) | (1 << 1) | (1 << 0); /* version 0, persistent, current */ - pbBuf[3] = 8; /* additional bytes for profiles */ - /* The MMC-3 spec says that DVD-ROM read capability should be reported - * before CD-ROM read capability. */ Property changes on: head/emulators/virtualbox-ose/files/patch-src-VBox-Devices-Storage-DevATA.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/emulators/virtualbox-ose/files/patch-src-VBox-VMM-VMMR3-CPUMR3CpuId.cpp =================================================================== --- head/emulators/virtualbox-ose/files/patch-src-VBox-VMM-VMMR3-CPUMR3CpuId.cpp (revision 386271) +++ head/emulators/virtualbox-ose/files/patch-src-VBox-VMM-VMMR3-CPUMR3CpuId.cpp (nonexistent) @@ -1,27 +0,0 @@ ---- src/VBox/VMM/VMMR3/CPUMR3CpuId.cpp.orig 2015-03-02 10:10:12.000000000 -0500 -+++ src/VBox/VMM/VMMR3/CPUMR3CpuId.cpp 2015-03-12 18:58:11.784386000 -0400 -@@ -146,15 +146,15 @@ - case 0x06: - switch (bModel) - { -- case 0: kCpumMicroarch_AMD_K7_Palomino; -- case 1: kCpumMicroarch_AMD_K7_Palomino; -- case 2: kCpumMicroarch_AMD_K7_Palomino; -- case 3: kCpumMicroarch_AMD_K7_Spitfire; -- case 4: kCpumMicroarch_AMD_K7_Thunderbird; -- case 6: kCpumMicroarch_AMD_K7_Palomino; -- case 7: kCpumMicroarch_AMD_K7_Morgan; -- case 8: kCpumMicroarch_AMD_K7_Thoroughbred; -- case 10: kCpumMicroarch_AMD_K7_Barton; /* Thorton too. */ -+ case 0: return kCpumMicroarch_AMD_K7_Palomino; -+ case 1: return kCpumMicroarch_AMD_K7_Palomino; -+ case 2: return kCpumMicroarch_AMD_K7_Palomino; -+ case 3: return kCpumMicroarch_AMD_K7_Spitfire; -+ case 4: return kCpumMicroarch_AMD_K7_Thunderbird; -+ case 6: return kCpumMicroarch_AMD_K7_Palomino; -+ case 7: return kCpumMicroarch_AMD_K7_Morgan; -+ case 8: return kCpumMicroarch_AMD_K7_Thoroughbred; -+ case 10: return kCpumMicroarch_AMD_K7_Barton; /* Thorton too. */ - } - return kCpumMicroarch_AMD_K7_Unknown; - case 0x0f: Property changes on: head/emulators/virtualbox-ose/files/patch-src-VBox-VMM-VMMR3-CPUMR3CpuId.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk =================================================================== --- head/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk (revision 386271) +++ head/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk (nonexistent) @@ -1,168 +0,0 @@ ---- src/VBox/Additions/x11/vboxvideo/Makefile.kmk.orig 2015-03-02 10:06:58.000000000 -0500 -+++ src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2015-03-02 18:25:17.273964000 -0500 -@@ -26,7 +26,7 @@ - vboxvideo_13_DEFS := $(vboxvideo_70_DEFS) VBOXVIDEO_13 - vboxvideo_15_DEFS := \ - $(vboxvideo_13_DEFS) NO_ANSIC PCIACCESS XSERVER_LIBPCIACCESS _XORG_SERVER_H_ _DIX_CONFIG_H_ --if1of ($(KBUILD_TARGET), linux solaris) -+if1of ($(KBUILD_TARGET), freebsd linux solaris) - vboxvideo_15_DEFS += \ - VBOX_DRI - endif -@@ -190,7 +190,7 @@ - vboxvideo_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD - vboxvideo_drv_15_CFLAGS := $(vboxvideo_drv_70_CFLAGS) - vboxvideo_drv_15_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=10503000 --if1of ($(KBUILD_TARGET), linux solaris) -+if1of ($(KBUILD_TARGET), freebsd linux solaris) - vboxvideo_drv_15_DEFS += \ - VBOX_DRI_OLD - endif -@@ -199,7 +199,7 @@ - $(VBOX_PATH_X11_ROOT)/xorg-server-1.5.3 - vboxvideo_drv_15_INCS += $(PATH_ROOT)/src/VBox/Runtime/include - vboxvideo_drv_15_SOURCES = $(vboxvideo_drv_13_SOURCES) --if1of ($(KBUILD_TARGET), linux solaris) -+if1of ($(KBUILD_TARGET), freebsd linux solaris) - vboxvideo_drv_15_SOURCES += \ - vboxvideo_dri.c - endif -@@ -212,7 +212,7 @@ - vboxvideo_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD - vboxvideo_drv_16_CFLAGS := $(vboxvideo_drv_70_CFLAGS) - vboxvideo_drv_16_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=10600000 --if1of ($(KBUILD_TARGET), linux solaris) -+if1of ($(KBUILD_TARGET), freebsd linux solaris) - vboxvideo_drv_16_DEFS += \ - VBOX_DRI_OLD - endif -@@ -230,11 +230,19 @@ - vboxvideo_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD - vboxvideo_drv_17_CFLAGS := $(vboxvideo_drv_70_CFLAGS) - vboxvideo_drv_17_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=10699000 -+if1of ($(KBUILD_TARGET), freebsd) -+ vboxvideo_drv_17_DEFS += \ -+ VBOX_DRI_OLD -+endif - vboxvideo_drv_17_INCS = \ - $(vboxvideo_xorg_INCS) \ - $(VBOX_PATH_X11_ROOT)/xorg-server-1.7.7 - vboxvideo_drv_17_INCS += $(PATH_ROOT)/src/VBox/Runtime/include - vboxvideo_drv_17_SOURCES := $(vboxvideo_drv_13_SOURCES) -+if1of ($(KBUILD_TARGET), freebsd) -+ vboxvideo_drv_17_SOURCES += \ -+ vboxvideo_dri.c -+endif - if1of ($(KBUILD_TARGET), linux solaris) - vboxvideo_drv_17_SOURCES += \ - vboxvideo_dri2.c -@@ -248,6 +256,10 @@ - vboxvideo_drv_18_TEMPLATE = VBOXGUESTR3XORGMOD - vboxvideo_drv_18_CFLAGS := $(vboxvideo_drv_70_CFLAGS) - vboxvideo_drv_18_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=10800000 -+if1of ($(KBUILD_TARGET), freebsd) -+ vboxvideo_drv_18_DEFS += \ -+ VBOX_DRI_OLD -+endif - vboxvideo_drv_18_INCS = \ - $(vboxvideo_xorg_INCS) \ - $(VBOX_PATH_X11_ROOT)/xorg-server-1.8.0 -@@ -262,6 +274,10 @@ - vboxvideo_drv_19_TEMPLATE = VBOXGUESTR3XORGMOD - vboxvideo_drv_19_CFLAGS := $(vboxvideo_drv_70_CFLAGS) - vboxvideo_drv_19_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=10900000 -+if1of ($(KBUILD_TARGET), freebsd) -+ vboxvideo_drv_19_DEFS += \ -+ VBOX_DRI_OLD -+endif - vboxvideo_drv_19_INCS = \ - $(vboxvideo_xorg_INCS) \ - $(VBOX_PATH_X11_ROOT)/xorg-server-1.9.0 -@@ -276,6 +292,10 @@ - vboxvideo_drv_110_TEMPLATE = VBOXGUESTR3XORGMOD - vboxvideo_drv_110_CFLAGS := $(vboxvideo_drv_70_CFLAGS) - vboxvideo_drv_110_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=11000000 -+if1of ($(KBUILD_TARGET), freebsd) -+ vboxvideo_drv_110_DEFS += \ -+ VBOX_DRI_OLD -+endif - vboxvideo_drv_110_INCS = \ - $(vboxvideo_xorg_INCS) \ - $(VBOX_PATH_X11_ROOT)/xorg-server-1.10.0 -@@ -290,6 +310,10 @@ - vboxvideo_drv_111_TEMPLATE = VBOXGUESTR3XORGMOD - vboxvideo_drv_111_CFLAGS := $(vboxvideo_drv_70_CFLAGS) - vboxvideo_drv_111_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=11100000 -+if1of ($(KBUILD_TARGET), freebsd) -+ vboxvideo_drv_111_DEFS += \ -+ VBOX_DRI_OLD -+endif - vboxvideo_drv_111_INCS = \ - $(vboxvideo_xorg_INCS) \ - $(VBOX_PATH_X11_ROOT)/xorg-server-1.11.0 -@@ -304,6 +328,10 @@ - vboxvideo_drv_112_TEMPLATE = VBOXGUESTR3XORGMOD - vboxvideo_drv_112_CFLAGS := $(vboxvideo_drv_70_CFLAGS) - vboxvideo_drv_112_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=11200000 -+if1of ($(KBUILD_TARGET), freebsd) -+ vboxvideo_drv_112_DEFS += \ -+ VBOX_DRI_OLD -+endif - vboxvideo_drv_112_INCS = \ - $(vboxvideo_xorg_INCS) \ - $(VBOX_PATH_X11_ROOT)/xorg-server-1.12.0 -@@ -318,6 +346,10 @@ - vboxvideo_drv_113_TEMPLATE = VBOXGUESTR3XORGMOD - vboxvideo_drv_113_CFLAGS := $(vboxvideo_drv_70_CFLAGS) - vboxvideo_drv_113_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=11300000 -+if1of ($(KBUILD_TARGET), freebsd) -+ vboxvideo_drv_113_DEFS += \ -+ VBOX_DRI_OLD -+endif - vboxvideo_drv_113_INCS = \ - $(vboxvideo_xorg_INCS) \ - $(VBOX_PATH_X11_ROOT)/xorg-server-1.13.0 -@@ -332,6 +364,10 @@ - vboxvideo_drv_114_TEMPLATE = VBOXGUESTR3XORGMOD - vboxvideo_drv_114_CFLAGS := $(vboxvideo_drv_70_CFLAGS) - vboxvideo_drv_114_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=11400000 -+if1of ($(KBUILD_TARGET), freebsd) -+ vboxvideo_drv_114_DEFS += \ -+ VBOX_DRI_OLD -+endif - vboxvideo_drv_114_INCS = \ - $(vboxvideo_xorg_INCS) \ - $(VBOX_PATH_X11_ROOT)/xorg-server-1.14.0 -@@ -346,6 +382,10 @@ - vboxvideo_drv_115_TEMPLATE = VBOXGUESTR3XORGMOD - vboxvideo_drv_115_CFLAGS := $(vboxvideo_drv_70_CFLAGS) - vboxvideo_drv_115_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=11500000 -+if1of ($(KBUILD_TARGET), freebsd) -+ vboxvideo_drv_115_DEFS += \ -+ VBOX_DRI_OLD -+endif - vboxvideo_drv_115_INCS = \ - $(vboxvideo_xorg_INCS) \ - $(VBOX_PATH_X11_ROOT)/xorg-server-1.15.0 -@@ -360,6 +400,10 @@ - vboxvideo_drv_116_TEMPLATE = VBOXGUESTR3XORGMOD - vboxvideo_drv_116_CFLAGS := $(vboxvideo_drv_70_CFLAGS) - vboxvideo_drv_116_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=11600000 -+if1of ($(KBUILD_TARGET), freebsd) -+ vboxvideo_drv_116_DEFS += \ -+ VBOX_DRI_OLD -+endif - vboxvideo_drv_116_INCS = \ - $(vboxvideo_xorg_INCS) \ - $(VBOX_PATH_X11_ROOT)/xorg-server-1.16.0 -@@ -374,6 +418,10 @@ - vboxvideo_drv_117_TEMPLATE = VBOXGUESTR3XORGMOD - vboxvideo_drv_117_CFLAGS := $(vboxvideo_drv_70_CFLAGS) - vboxvideo_drv_117_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=11700000 -+if1of ($(KBUILD_TARGET), freebsd) -+ vboxvideo_drv_117_DEFS += \ -+ VBOX_DRI_OLD -+endif - vboxvideo_drv_117_INCS = \ - $(vboxvideo_xorg_INCS) \ - $(VBOX_PATH_X11_ROOT)/xorg-server-1.17.1 Property changes on: head/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-common-ldr-ldrELFRelocatable.cpp.h =================================================================== --- head/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-common-ldr-ldrELFRelocatable.cpp.h (revision 386271) +++ head/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-common-ldr-ldrELFRelocatable.cpp.h (nonexistent) @@ -1,11 +0,0 @@ ---- src/VBox/Runtime/common/ldr/ldrELFRelocatable.cpp.h.orig 2015-03-02 10:10:00.000000000 -0500 -+++ src/VBox/Runtime/common/ldr/ldrELFRelocatable.cpp.h 2015-03-12 15:59:41.932947000 -0400 -@@ -249,7 +249,7 @@ - } - else - { -- AssertReturn(pSym->st_shndx < pModElf->cSyms || pSym->st_shndx == SHN_ABS, ("%#x\n", pSym->st_shndx)); -+ AssertMsg(pSym->st_shndx < pModElf->cSyms || pSym->st_shndx == SHN_ABS, ("%#x\n", pSym->st_shndx)); - #if ELF_MODE == 64 - SymValue = pSym->st_value; - #endif Property changes on: head/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-common-ldr-ldrELFRelocatable.cpp.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r3-freebsd-fileaio-freebsd.cpp =================================================================== --- head/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r3-freebsd-fileaio-freebsd.cpp (revision 386271) +++ head/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r3-freebsd-fileaio-freebsd.cpp (nonexistent) @@ -1,11 +0,0 @@ ---- src/VBox/Runtime/r3/freebsd/fileaio-freebsd.cpp.orig 2013-11-29 14:24:23.000000000 -0500 -+++ src/VBox/Runtime/r3/freebsd/fileaio-freebsd.cpp 2013-12-13 17:32:50.000000000 -0500 -@@ -124,7 +124,7 @@ - &cReqsOutstandingMax, /* Where to store the old value. */ - &cbParameter, /* Size of the memory pointed to. */ - NULL, /* Where the new value is located. */ -- NULL); /* Where the size of the new value is stored. */ -+ 0); /* Where the size of the new value is stored. */ - if (rcBSD == -1) - { - /* ENOENT means the value is unknown thus the module is not loaded. */ Property changes on: head/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r3-freebsd-fileaio-freebsd.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/emulators/virtualbox-ose/files/extrapatch-src-VBox-Additions-freebsd-drm-Makefile =================================================================== --- head/emulators/virtualbox-ose/files/extrapatch-src-VBox-Additions-freebsd-drm-Makefile (nonexistent) +++ head/emulators/virtualbox-ose/files/extrapatch-src-VBox-Additions-freebsd-drm-Makefile (revision 386272) @@ -0,0 +1,17 @@ +--- src/VBox/Additions/freebsd/drm/Makefile.orig 2015-03-16 13:00:32.000000000 -0400 ++++ src/VBox/Additions/freebsd/drm/Makefile 2015-03-27 18:18:03.432353000 -0400 +@@ -18,10 +18,10 @@ + + KMOD = vboxvideo + +-SRCS = \ +- vboxvideo_drm.c ++SRCS = vboxvideo_drm.c ++SRCS += device_if.h bus_if.h pci_if.h ++SRCS += opt_compat.h opt_drm.h opt_syscons.h + +-SRCS += device_if.h bus_if.h pci_if.h opt_drm.h ++CFLAGS+= -DVBOXVIDEO_DRM2 + + .include +- Property changes on: head/emulators/virtualbox-ose/files/extrapatch-src-VBox-Additions-freebsd-drm-Makefile ___________________________________________________________________ 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: head/emulators/virtualbox-ose/files/extrapatch-src-VBox-Additions-freebsd-drm-Makefile.kmk =================================================================== --- head/emulators/virtualbox-ose/files/extrapatch-src-VBox-Additions-freebsd-drm-Makefile.kmk (nonexistent) +++ head/emulators/virtualbox-ose/files/extrapatch-src-VBox-Additions-freebsd-drm-Makefile.kmk (revision 386272) @@ -0,0 +1,38 @@ +--- src/VBox/Additions/freebsd/drm/Makefile.kmk.orig 2015-03-16 13:00:32.000000000 -0400 ++++ src/VBox/Additions/freebsd/drm/Makefile.kmk 2015-03-27 22:28:21.000000000 -0400 +@@ -46,6 +46,7 @@ + vboxvideo_drm_TEMPLATE = VBOXGUESTR0 + vboxvideo_drm_NAME = vboxvideo + vboxvideo_drm_DEFS = VBOX_WITH_HGCM VBOX_SVN_REV=$(VBOX_SVN_REV) ++vboxvideo_drm_DEFS += VBOXVIDEO_DRM2 + vboxvideo_drm_DEPS += $(VBOX_SVN_REV_KMK) + vboxvideo_drm_INCS.freebsd = \ + $(vboxvideo_drm_0_OUTDIR) \ +@@ -58,15 +59,24 @@ + $(PATH_STAGE)/gen-sys-hdrs/pci_if.h \ + $(PATH_STAGE)/gen-sys-hdrs/bus_if.h \ + $(PATH_STAGE)/gen-sys-hdrs/device_if.h \ +- $(vboxvideo_drm_0_OUTDIR)/opt_drm.h ++ $(vboxvideo_drm_0_OUTDIR)/opt_compat.h \ ++ $(vboxvideo_drm_0_OUTDIR)/opt_drm.h \ ++ $(vboxvideo_drm_0_OUTDIR)/opt_syscons.h + vboxvideo_drm_CLEAN.freebsd = $(vboxvideo_drm_DEPS) + + # +-# Header for DRM not included by us. ++# Headers for DRM not included by us. + # ++$$(vboxvideo_drm_0_OUTDIR)/opt_compat.h: ++ $(QUIET)$(MKDIR) -p $(vboxvideo_drm_0_OUTDIR) ++ $(QUIET)touch $(vboxvideo_drm_0_OUTDIR)/opt_compat.h ++ + $$(vboxvideo_drm_0_OUTDIR)/opt_drm.h: + $(QUIET)$(MKDIR) -p $(vboxvideo_drm_0_OUTDIR) + $(QUIET)touch $(vboxvideo_drm_0_OUTDIR)/opt_drm.h + +-include $(FILE_KBUILD_SUB_FOOTER) ++$$(vboxvideo_drm_0_OUTDIR)/opt_syscons.h: ++ $(QUIET)$(MKDIR) -p $(vboxvideo_drm_0_OUTDIR) ++ $(QUIET)touch $(vboxvideo_drm_0_OUTDIR)/opt_syscons.h + ++include $(FILE_KBUILD_SUB_FOOTER) Property changes on: head/emulators/virtualbox-ose/files/extrapatch-src-VBox-Additions-freebsd-drm-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: head/emulators/virtualbox-ose/files/extrapatch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk =================================================================== --- head/emulators/virtualbox-ose/files/extrapatch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk (revision 386271) +++ head/emulators/virtualbox-ose/files/extrapatch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk (revision 386272) @@ -1,12 +1,12 @@ ---- 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 @@ +--- 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 @@ vboxvideo_70_DEFS := \ IN_MODULE XORG_7X RENDER=1 IN_RT_STATIC +ifeq ($(KBUILD_TARGET),freebsd) # don't use .freebsd or anything here. + vboxvideo_70_DEFS += GCCUSESGAS +endif ifeq ($(KBUILD_TARGET),solaris) # don't use .solaris or anything here. vboxvideo_70_DEFS += __EXTENSIONS__ ## @todo Why this? endif Index: head/emulators/virtualbox-ose/files/extrapatch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk.dri =================================================================== --- head/emulators/virtualbox-ose/files/extrapatch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk.dri (nonexistent) +++ head/emulators/virtualbox-ose/files/extrapatch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk.dri (revision 386272) @@ -0,0 +1,168 @@ +--- src/VBox/Additions/x11/vboxvideo/Makefile.kmk.orig 2015-03-02 10:06:58.000000000 -0500 ++++ src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2015-03-02 18:25:17.273964000 -0500 +@@ -26,7 +26,7 @@ + vboxvideo_13_DEFS := $(vboxvideo_70_DEFS) VBOXVIDEO_13 + vboxvideo_15_DEFS := \ + $(vboxvideo_13_DEFS) NO_ANSIC PCIACCESS XSERVER_LIBPCIACCESS _XORG_SERVER_H_ _DIX_CONFIG_H_ +-if1of ($(KBUILD_TARGET), linux solaris) ++if1of ($(KBUILD_TARGET), freebsd linux solaris) + vboxvideo_15_DEFS += \ + VBOX_DRI + endif +@@ -190,7 +190,7 @@ + vboxvideo_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_15_CFLAGS := $(vboxvideo_drv_70_CFLAGS) + vboxvideo_drv_15_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=10503000 +-if1of ($(KBUILD_TARGET), linux solaris) ++if1of ($(KBUILD_TARGET), freebsd linux solaris) + vboxvideo_drv_15_DEFS += \ + VBOX_DRI_OLD + endif +@@ -199,7 +199,7 @@ + $(VBOX_PATH_X11_ROOT)/xorg-server-1.5.3 + vboxvideo_drv_15_INCS += $(PATH_ROOT)/src/VBox/Runtime/include + vboxvideo_drv_15_SOURCES = $(vboxvideo_drv_13_SOURCES) +-if1of ($(KBUILD_TARGET), linux solaris) ++if1of ($(KBUILD_TARGET), freebsd linux solaris) + vboxvideo_drv_15_SOURCES += \ + vboxvideo_dri.c + endif +@@ -212,7 +212,7 @@ + vboxvideo_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_16_CFLAGS := $(vboxvideo_drv_70_CFLAGS) + vboxvideo_drv_16_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=10600000 +-if1of ($(KBUILD_TARGET), linux solaris) ++if1of ($(KBUILD_TARGET), freebsd linux solaris) + vboxvideo_drv_16_DEFS += \ + VBOX_DRI_OLD + endif +@@ -230,11 +230,19 @@ + vboxvideo_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_17_CFLAGS := $(vboxvideo_drv_70_CFLAGS) + vboxvideo_drv_17_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=10699000 ++if1of ($(KBUILD_TARGET), freebsd) ++ vboxvideo_drv_17_DEFS += \ ++ VBOX_DRI_OLD ++endif + vboxvideo_drv_17_INCS = \ + $(vboxvideo_xorg_INCS) \ + $(VBOX_PATH_X11_ROOT)/xorg-server-1.7.7 + vboxvideo_drv_17_INCS += $(PATH_ROOT)/src/VBox/Runtime/include + vboxvideo_drv_17_SOURCES := $(vboxvideo_drv_13_SOURCES) ++if1of ($(KBUILD_TARGET), freebsd) ++ vboxvideo_drv_17_SOURCES += \ ++ vboxvideo_dri.c ++endif + if1of ($(KBUILD_TARGET), linux solaris) + vboxvideo_drv_17_SOURCES += \ + vboxvideo_dri2.c +@@ -248,6 +256,10 @@ + vboxvideo_drv_18_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_18_CFLAGS := $(vboxvideo_drv_70_CFLAGS) + vboxvideo_drv_18_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=10800000 ++if1of ($(KBUILD_TARGET), freebsd) ++ vboxvideo_drv_18_DEFS += \ ++ VBOX_DRI_OLD ++endif + vboxvideo_drv_18_INCS = \ + $(vboxvideo_xorg_INCS) \ + $(VBOX_PATH_X11_ROOT)/xorg-server-1.8.0 +@@ -262,6 +274,10 @@ + vboxvideo_drv_19_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_19_CFLAGS := $(vboxvideo_drv_70_CFLAGS) + vboxvideo_drv_19_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=10900000 ++if1of ($(KBUILD_TARGET), freebsd) ++ vboxvideo_drv_19_DEFS += \ ++ VBOX_DRI_OLD ++endif + vboxvideo_drv_19_INCS = \ + $(vboxvideo_xorg_INCS) \ + $(VBOX_PATH_X11_ROOT)/xorg-server-1.9.0 +@@ -276,6 +292,10 @@ + vboxvideo_drv_110_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_110_CFLAGS := $(vboxvideo_drv_70_CFLAGS) + vboxvideo_drv_110_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=11000000 ++if1of ($(KBUILD_TARGET), freebsd) ++ vboxvideo_drv_110_DEFS += \ ++ VBOX_DRI_OLD ++endif + vboxvideo_drv_110_INCS = \ + $(vboxvideo_xorg_INCS) \ + $(VBOX_PATH_X11_ROOT)/xorg-server-1.10.0 +@@ -290,6 +310,10 @@ + vboxvideo_drv_111_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_111_CFLAGS := $(vboxvideo_drv_70_CFLAGS) + vboxvideo_drv_111_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=11100000 ++if1of ($(KBUILD_TARGET), freebsd) ++ vboxvideo_drv_111_DEFS += \ ++ VBOX_DRI_OLD ++endif + vboxvideo_drv_111_INCS = \ + $(vboxvideo_xorg_INCS) \ + $(VBOX_PATH_X11_ROOT)/xorg-server-1.11.0 +@@ -304,6 +328,10 @@ + vboxvideo_drv_112_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_112_CFLAGS := $(vboxvideo_drv_70_CFLAGS) + vboxvideo_drv_112_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=11200000 ++if1of ($(KBUILD_TARGET), freebsd) ++ vboxvideo_drv_112_DEFS += \ ++ VBOX_DRI_OLD ++endif + vboxvideo_drv_112_INCS = \ + $(vboxvideo_xorg_INCS) \ + $(VBOX_PATH_X11_ROOT)/xorg-server-1.12.0 +@@ -318,6 +346,10 @@ + vboxvideo_drv_113_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_113_CFLAGS := $(vboxvideo_drv_70_CFLAGS) + vboxvideo_drv_113_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=11300000 ++if1of ($(KBUILD_TARGET), freebsd) ++ vboxvideo_drv_113_DEFS += \ ++ VBOX_DRI_OLD ++endif + vboxvideo_drv_113_INCS = \ + $(vboxvideo_xorg_INCS) \ + $(VBOX_PATH_X11_ROOT)/xorg-server-1.13.0 +@@ -332,6 +364,10 @@ + vboxvideo_drv_114_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_114_CFLAGS := $(vboxvideo_drv_70_CFLAGS) + vboxvideo_drv_114_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=11400000 ++if1of ($(KBUILD_TARGET), freebsd) ++ vboxvideo_drv_114_DEFS += \ ++ VBOX_DRI_OLD ++endif + vboxvideo_drv_114_INCS = \ + $(vboxvideo_xorg_INCS) \ + $(VBOX_PATH_X11_ROOT)/xorg-server-1.14.0 +@@ -346,6 +382,10 @@ + vboxvideo_drv_115_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_115_CFLAGS := $(vboxvideo_drv_70_CFLAGS) + vboxvideo_drv_115_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=11500000 ++if1of ($(KBUILD_TARGET), freebsd) ++ vboxvideo_drv_115_DEFS += \ ++ VBOX_DRI_OLD ++endif + vboxvideo_drv_115_INCS = \ + $(vboxvideo_xorg_INCS) \ + $(VBOX_PATH_X11_ROOT)/xorg-server-1.15.0 +@@ -360,6 +400,10 @@ + vboxvideo_drv_116_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_116_CFLAGS := $(vboxvideo_drv_70_CFLAGS) + vboxvideo_drv_116_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=11600000 ++if1of ($(KBUILD_TARGET), freebsd) ++ vboxvideo_drv_116_DEFS += \ ++ VBOX_DRI_OLD ++endif + vboxvideo_drv_116_INCS = \ + $(vboxvideo_xorg_INCS) \ + $(VBOX_PATH_X11_ROOT)/xorg-server-1.16.0 +@@ -374,6 +418,10 @@ + vboxvideo_drv_117_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_117_CFLAGS := $(vboxvideo_drv_70_CFLAGS) + vboxvideo_drv_117_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=11700000 ++if1of ($(KBUILD_TARGET), freebsd) ++ vboxvideo_drv_117_DEFS += \ ++ VBOX_DRI_OLD ++endif + vboxvideo_drv_117_INCS = \ + $(vboxvideo_xorg_INCS) \ + $(VBOX_PATH_X11_ROOT)/xorg-server-1.17.1 Property changes on: head/emulators/virtualbox-ose/files/extrapatch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk.dri ___________________________________________________________________ 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: head/emulators/virtualbox-ose/files/extrapatch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk.dri2 =================================================================== --- head/emulators/virtualbox-ose/files/extrapatch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk.dri2 (nonexistent) +++ head/emulators/virtualbox-ose/files/extrapatch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk.dri2 (revision 386272) @@ -0,0 +1,47 @@ +--- 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:06.707754000 -0400 +@@ -26,7 +26,7 @@ + vboxvideo_13_DEFS := $(vboxvideo_70_DEFS) VBOXVIDEO_13 + vboxvideo_15_DEFS := \ + $(vboxvideo_13_DEFS) NO_ANSIC PCIACCESS XSERVER_LIBPCIACCESS _XORG_SERVER_H_ _DIX_CONFIG_H_ +-if1of ($(KBUILD_TARGET), linux solaris) ++if1of ($(KBUILD_TARGET), freebsd linux solaris) + vboxvideo_15_DEFS += \ + VBOX_DRI + endif +@@ -190,7 +190,7 @@ + vboxvideo_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_15_CFLAGS := $(vboxvideo_drv_70_CFLAGS) + vboxvideo_drv_15_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=10503000 +-if1of ($(KBUILD_TARGET), linux solaris) ++if1of ($(KBUILD_TARGET), freebsd linux solaris) + vboxvideo_drv_15_DEFS += \ + VBOX_DRI_OLD + endif +@@ -199,7 +199,7 @@ + $(VBOX_PATH_X11_ROOT)/xorg-server-1.5.3 + vboxvideo_drv_15_INCS += $(PATH_ROOT)/src/VBox/Runtime/include + vboxvideo_drv_15_SOURCES = $(vboxvideo_drv_13_SOURCES) +-if1of ($(KBUILD_TARGET), linux solaris) ++if1of ($(KBUILD_TARGET), freebsd linux solaris) + vboxvideo_drv_15_SOURCES += \ + vboxvideo_dri.c + endif +@@ -212,7 +212,7 @@ + vboxvideo_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_16_CFLAGS := $(vboxvideo_drv_70_CFLAGS) + vboxvideo_drv_16_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=10600000 +-if1of ($(KBUILD_TARGET), linux solaris) ++if1of ($(KBUILD_TARGET), freebsd linux solaris) + vboxvideo_drv_16_DEFS += \ + VBOX_DRI_OLD + endif +@@ -235,7 +235,7 @@ + $(VBOX_PATH_X11_ROOT)/xorg-server-1.7.7 + vboxvideo_drv_17_INCS += $(PATH_ROOT)/src/VBox/Runtime/include + vboxvideo_drv_17_SOURCES := $(vboxvideo_drv_13_SOURCES) +-if1of ($(KBUILD_TARGET), linux solaris) ++if1of ($(KBUILD_TARGET), freebsd linux solaris) + vboxvideo_drv_17_SOURCES += \ + vboxvideo_dri2.c + endif Property changes on: head/emulators/virtualbox-ose/files/extrapatch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk.dri2 ___________________________________________________________________ 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: head/emulators/virtualbox-ose/files/patch-src-VBox-Additions-freebsd-drm-vboxvideo_drm.c =================================================================== --- head/emulators/virtualbox-ose/files/patch-src-VBox-Additions-freebsd-drm-vboxvideo_drm.c (nonexistent) +++ head/emulators/virtualbox-ose/files/patch-src-VBox-Additions-freebsd-drm-vboxvideo_drm.c (revision 386272) @@ -0,0 +1,77 @@ +--- src/VBox/Additions/freebsd/drm/vboxvideo_drm.c.orig 2015-03-16 13:00:32.000000000 -0400 ++++ src/VBox/Additions/freebsd/drm/vboxvideo_drm.c 2015-03-27 17:40:43.686690000 -0400 +@@ -54,8 +54,13 @@ + #include + __FBSDID("$FreeBSD$"); + ++#ifdef VBOXVIDEO_DRM2 ++#include "dev/drm2/drmP.h" ++#include "dev/drm2/drm_pciids.h" ++#else + #include "dev/drm/drmP.h" + #include "dev/drm/drm_pciids.h" ++#endif + + #define DRIVER_AUTHOR "Oracle Corporation" + #define DRIVER_NAME "vboxvideo" +@@ -74,6 +79,54 @@ + vboxvideo_PCI_IDS + }; + ++#ifdef VBOXVIDEO_DRM2 ++ ++static struct drm_driver vboxvideo_info = { ++ .buf_priv_size = 1, /* No dev_priv */ ++ ++ .num_ioctls = 0, ++ ++ .name = DRIVER_NAME, ++ .desc = DRIVER_DESC, ++ .date = DRIVER_DATE, ++ .major = DRIVER_MAJOR, ++ .minor = DRIVER_MINOR, ++ .patchlevel = DRIVER_PATCHLEVEL, ++}; ++ ++static int ++vboxvideo_probe(device_t kdev) ++{ ++ return -drm_probe_helper(kdev, vboxvideo_pciidlist); ++} ++ ++static int ++vboxvideo_attach(device_t kdev) ++{ ++ return -drm_attach_helper(kdev, vboxvideo_pciidlist, &vboxvideo_info); ++} ++ ++static device_method_t vboxvideo_methods[] = { ++ /* Device interface */ ++ DEVMETHOD(device_probe, vboxvideo_probe), ++ DEVMETHOD(device_attach, vboxvideo_attach), ++ DEVMETHOD(device_detach, drm_generic_detach), ++ ++ DEVMETHOD_END ++}; ++ ++static driver_t vboxvideo_driver = { ++ "drmn", ++ vboxvideo_methods, ++ sizeof(struct drm_device) ++}; ++ ++extern devclass_t drm_devclass; ++DRIVER_MODULE(vboxvideo, vgapci, vboxvideo_driver, drm_devclass, 0, 0); ++MODULE_DEPEND(vboxvideo, drmn, 1, 1, 1); ++ ++#else /* !VBOXVIDEO_DRM2 */ ++ + static void vboxvideo_configure(struct drm_device *dev) + { + #if __FreeBSD_version >= 702000 +@@ -161,3 +214,5 @@ + DRIVER_MODULE(vboxvideo, pci, vboxvideo_driver, drm_devclass, 0, 0); + #endif + MODULE_DEPEND(vboxvideo, drm, 1, 1, 1); ++ ++#endif /* VBOXVIDEO_DRM2 */ Property changes on: head/emulators/virtualbox-ose/files/patch-src-VBox-Additions-freebsd-drm-vboxvideo_drm.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: head/emulators/virtualbox-ose-additions/Makefile =================================================================== --- head/emulators/virtualbox-ose-additions/Makefile (revision 386271) +++ head/emulators/virtualbox-ose-additions/Makefile (revision 386272) @@ -1,208 +1,216 @@ # Created by: Bernhard Froehlich # $FreeBSD$ PORTNAME= virtualbox-ose -DISTVERSION= 4.3.26 +DISTVERSION= 4.3.28 CATEGORIES= emulators MASTER_SITES= http://download.virtualbox.org/virtualbox/${DISTVERSION}/ \ http://tmp.chruetertee.ch/ \ http://disasterarea.chruetertee.ch/ PKGNAMESUFFIX= -additions DISTNAME= VirtualBox-${DISTVERSION} MAINTAINER= vbox@FreeBSD.org COMMENT= VirtualBox additions for FreeBSD guests LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= yasm:${PORTSDIR}/devel/yasm \ kmk:${PORTSDIR}/devel/kBuild CPE_VENDOR= oracle CPE_PRODUCT= vm_virtualbox UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} PATCHDIR= ${.CURDIR}/../${PORTNAME}/files WRKSRC= ${WRKDIR}/VirtualBox-${PORTVERSION} USE_RC_SUBR= vboxguest vboxservice USES= compiler:features cpe iconv kmod python:build tar:bzip2 ONLY_FOR_ARCHS= i386 amd64 MAKE_JOBS_UNSAFE= yes HAS_CONFIGURE= yes CONFIGURE_ARGS+= --disable-alsa \ --disable-dbus \ --disable-docs \ --disable-libvpx \ --disable-pulse \ --disable-python \ --disable-sdl-ttf \ --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]* OPTIONS_DEFINE= DEBUG OPENGL X11 OPTIONS_DEFAULT= X11 OPTIONS_SUB= yes OPENGL_CONFIGURE_OFF= --disable-opengl .include VIDEODIR= ${PREFIX}/lib/xorg/modules/drivers INPUTDIR= ${PREFIX}/lib/xorg/modules/input VBOX_BIN= ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/additions VBOX_SBINS= VBoxControl \ VBoxService BUILD_WRKSRC= ${VBOX_BIN}/src KMK_BUILDTYPE= release KMK_CONFIG= VBOX_LIBPATH_X11=${LOCALBASE} KMK_FLAGS= .if ${PORT_OPTIONS:MDEBUG} KMK_FLAGS+= BUILD_TYPE=debug KMK_BUILDTYPE= debug MAKE_ARGS+= DEBUG_FLAGS="-O1 -g" .endif .if ${PORT_OPTIONS:MOPENGL} USE_XORG+= xcomposite xdamage xext xfixes USE_GL= gl VBOX_LIBS= VBoxOGL.so \ VBoxOGLarrayspu.so \ VBoxOGLcrutil.so \ VBoxOGLerrorspu.so \ VBoxOGLfeedbackspu.so \ VBoxOGLpackspu.so \ VBoxOGLpassthroughspu.so .endif .if ${PORT_OPTIONS:MX11} BUILD_DEPENDS+= ${LOCALBASE}/bin/X:${PORTSDIR}/x11-servers/xorg-server USE_XORG= xcursor xmu inputproto xorg-server xrandr USES+= pkgconfig VBOX_WITH_X11= 1 XORG_DRV_ABI= pkgconf --modversion xorg-server | \ ${SED} -E -e 's/\.[0-9]+$$//' -e 's/\.//' .else VBOX_WITH_X11= .endif .if ${ARCH} == i386 KMK_ARCH= freebsd.x86 .else KMK_ARCH= freebsd.${ARCH} .endif .include .if ${COMPILER_TYPE} == clang EXTRA_PATCHES= ${PATCHDIR}/extrapatch-Config.kmk \ ${PATCHDIR}/extrapatch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk \ ${PATCHDIR}/extrapatch-src-VBox-Additions-x11-x11include-xorg-server-1.17.1-compiler.h .if ${COMPILER_FEATURES:Mlibc++} EXTRA_PATCHES+= ${PATCHDIR}/extrapatch-src-VBox-Additions-x11-VBoxClient-Makefile.kmk .endif +.endif + +.if ${OSVERSION} < 1001514 +EXTRA_PATCHES+= ${PATCHDIR}/extrapatch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk.dri +.else +EXTRA_PATCHES+= ${PATCHDIR}/extrapatch-src-VBox-Additions-freebsd-drm-Makefile +EXTRA_PATCHES+= ${PATCHDIR}/extrapatch-src-VBox-Additions-freebsd-drm-Makefile.kmk +EXTRA_PATCHES+= ${PATCHDIR}/extrapatch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk.dri2 .endif SUB_LIST+= KMODDIR=${KMODDIR} pre-everything:: .if ${ARCH} == "amd64" .if !exists(/usr/lib32/libc.so) @${ECHO} 'Requires 32-bit libraries installed under /usr/lib32.' @${ECHO} 'Do: cd /usr/src; make build32 install32; ldconfig -v -m -R /usr/lib32' @${FALSE} .endif .endif 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_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 @${ECHO} 'VBOX_GCC_Wno-unused-parameter = -Wno-unused-parameter' >> ${WRKSRC}/LocalConfig.kmk .endif @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ ${WRKSRC}/Config.kmk \ ${WRKSRC}/configure \ ${WRKSRC}/kBuild/units/qt4.kmk \ ${WRKSRC}/kBuild/sdks/LIBSDL.kmk \ ${WRKSRC}/src/VBox/Additions/common/crOpenGL/fakedri_drv.c \ ${WRKSRC}/src/VBox/Additions/x11/Installer/98vboxadd-xclient \ ${WRKSRC}/src/VBox/Additions/x11/Installer/vboxclient.desktop @${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 \ ${WRKSRC}/src/VBox/Additions/x11/VBoxClient/Makefile.kmk @${ECHO} 'VBOX_ICONV_DEFS = LIBICONV_PLUG' >> ${WRKSRC}/LocalConfig.kmk .endif pre-build: @${REINPLACE_CMD} -e 's|/bin/bash|/bin/sh|' \ ${WRKSRC}/env.sh \ ${WRKSRC}/src/VBox/Additions/freebsd/Installer/vboxguest.sh cd ${WRKSRC} && ${SH} env.sh && \ ${KMK_CONFIG} ${LOCALBASE}/bin/kmk ${KMK_FLAGS} do-install: ${MKDIR} ${STAGEDIR}${KMODDIR} ${INSTALL_KLD} ${VBOX_BIN}/src/vboxguest/vboxguest.ko ${STAGEDIR}${KMODDIR} .if ${PORT_OPTIONS:MDEBUG} ${INSTALL_KLD} ${VBOX_BIN}/src/vboxguest/vboxguest.ko.symbols ${STAGEDIR}${KMODDIR} .endif .if ${PORT_OPTIONS:MOPENGL} ${INSTALL_KLD} ${VBOX_BIN}/vboxvideo.ko ${STAGEDIR}${KMODDIR} .if ${PORT_OPTIONS:MDEBUG} ${INSTALL_KLD} ${VBOX_BIN}/vboxvideo.ko.symbols ${STAGEDIR}${KMODDIR} .endif .endif ${INSTALL_PROGRAM} ${VBOX_SBINS:S|^|${VBOX_BIN}/|} \ ${STAGEDIR}${PREFIX}/sbin/ .if ${PORT_OPTIONS:MX11} ${INSTALL_PROGRAM} ${VBOX_BIN}/VBoxClient ${STAGEDIR}${PREFIX}/bin/ ${INSTALL_SCRIPT} ${WRKSRC}/src/VBox/Additions/x11/Installer/98vboxadd-xclient \ ${STAGEDIR}${PREFIX}/bin/VBoxClient-all # X11 autostart ${MKDIR} ${STAGEDIR}${PREFIX}/etc/xdg/autostart/ ${INSTALL_DATA} ${WRKSRC}/src/VBox/Additions/x11/Installer/vboxclient.desktop \ ${STAGEDIR}${PREFIX}/etc/xdg/autostart/ # KDE autostart ${MKDIR} ${STAGEDIR}${PREFIX}/share/autostart/ ${INSTALL_DATA} ${WRKSRC}/src/VBox/Additions/x11/Installer/vboxclient.desktop \ ${STAGEDIR}${PREFIX}/share/autostart/ ${MKDIR} ${STAGEDIR}${VIDEODIR} ${INSTALL_DATA} ${VBOX_BIN}/vboxvideo_drv_$$(${XORG_DRV_ABI}).so \ ${STAGEDIR}${VIDEODIR}/vboxvideo_drv.so ${MKDIR} ${STAGEDIR}${INPUTDIR} ${INSTALL_DATA} ${VBOX_BIN}/vboxmouse_drv_$$(${XORG_DRV_ABI}).so \ ${STAGEDIR}${INPUTDIR}/vboxmouse_drv.so .endif .if ${PORT_OPTIONS:MOPENGL} ${INSTALL_DATA} ${VBOX_LIBS:S|^|${VBOX_BIN}/|} \ ${STAGEDIR}${PREFIX}/lib/ ${MKDIR} ${STAGEDIR}${PREFIX}/lib/dri ${LN} -sf ${PREFIX}/lib/VBoxOGL.so \ ${STAGEDIR}${PREFIX}/lib/dri/vboxvideo_dri.so .endif .include Index: head/emulators/virtualbox-ose-additions/distinfo =================================================================== --- head/emulators/virtualbox-ose-additions/distinfo (revision 386271) +++ head/emulators/virtualbox-ose-additions/distinfo (revision 386272) @@ -1,2 +1,2 @@ -SHA256 (VirtualBox-4.3.26.tar.bz2) = e2949c250a1de30997e658de9e3d8545e71318a9844d80536137d76db4f08961 -SIZE (VirtualBox-4.3.26.tar.bz2) = 102676804 +SHA256 (VirtualBox-4.3.28.tar.bz2) = e157ab76d1958ae2c56b2a3875194fbff3de82486ad0e30032fd5bd772297c31 +SIZE (VirtualBox-4.3.28.tar.bz2) = 100092002 Index: head/emulators/virtualbox-ose-kmod/Makefile =================================================================== --- head/emulators/virtualbox-ose-kmod/Makefile (revision 386271) +++ head/emulators/virtualbox-ose-kmod/Makefile (revision 386272) @@ -1,108 +1,108 @@ # Created by: Bernhard Froehlich # $FreeBSD$ PORTNAME= virtualbox-ose -DISTVERSION= 4.3.26 +DISTVERSION= 4.3.28 CATEGORIES= emulators MASTER_SITES= http://download.virtualbox.org/virtualbox/${DISTVERSION}/ \ http://tmp.chruetertee.ch/ \ http://disasterarea.chruetertee.ch/ PKGNAMESUFFIX= -kmod DISTNAME= VirtualBox-${DISTVERSION} MAINTAINER= vbox@FreeBSD.org COMMENT= VirtualBox kernel module for FreeBSD LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= kmk:${PORTSDIR}/devel/kBuild CPE_VENDOR= oracle CPE_PRODUCT= vm_virtualbox USES= cpe kmod tar:bzip2 UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} PATCHDIR= ${.CURDIR}/../${PORTNAME}/files WRKSRC= ${WRKDIR}/VirtualBox-${PORTVERSION} USE_RC_SUBR= vboxnet ONLY_FOR_ARCHS= i386 amd64 HAS_CONFIGURE= yes CONFIGURE_ARGS+= --build-headless CONFIGURE_ARGS+= --disable-alsa \ --disable-dbus \ --disable-docs \ --disable-libvpx \ --disable-pulse \ --disable-python \ --disable-sdl-ttf \ --disable-xpcom CONFIGURE_ARGS+= --nofatal --with-gcc="${CC}" --with-g++="${CXX}" CONFLICTS_INSTALL= virtualbox-ose-kmod-devel-4* \ virtualbox-ose-kmod-legacy-4* OPTIONS_DEFINE= DEBUG VIMAGE OPTIONS_SUB= yes DEBUG_DESC= Debug symbols, additional logs and assertions VIMAGE_DESC= VIMAGE virtual networking support .include VBOX_BIN= ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/src VBOX_KMODS= vboxdrv \ vboxnetadp \ vboxnetflt BUILD_WRKSRC= ${VBOX_BIN} KMK_BUILDTYPE= release KMK_CONFIG= VBOX_LIBPATH_X11=${LOCALBASE} VBOX_FREEBSD_SRC=${SRC_BASE}/sys KMK_FLAGS= HostDrivers-scripts vboxdrv-mod VBoxNetFlt-src VBoxNetAdp-src .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 .if ${ARCH} == i386 KMK_ARCH= freebsd.x86 .else KMK_ARCH= freebsd.${ARCH} .endif .include post-patch: @${ECHO} 'VBOX_WITH_VBOXDRV = 1' > ${WRKSRC}/LocalConfig.kmk @${ECHO} 'VBOX_WITH_NETFLT = 1' >> ${WRKSRC}/LocalConfig.kmk @${ECHO} 'VBOX_WITH_NETADP = 1' >> ${WRKSRC}/LocalConfig.kmk @${ECHO} 'VBOX_WITH_ADDITIONS =' >> ${WRKSRC}/LocalConfig.kmk .if ${PORT_OPTIONS:MVIMAGE} @${ECHO} 'VBOX_WITH_NETFLT_VIMAGE = 1' >> ${WRKSRC}/LocalConfig.kmk .endif @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ ${WRKSRC}/Config.kmk \ ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|\$$KBUILDDIR_BIN/kmk_sed|${LOCALBASE}/bin/kmk_sed|g' ${WRKSRC}/configure pre-build: @${REINPLACE_CMD} -e 's|/bin/bash|/bin/sh|' \ ${WRKSRC}/env.sh cd ${WRKSRC} && ${SH} env.sh && cd ${WRKSRC}/src/VBox/HostDrivers && \ ${KMK_CONFIG} ${LOCALBASE}/bin/kmk ${KMK_FLAGS} do-install: ${MKDIR} ${STAGEDIR}${KMODDIR} .for i in ${VBOX_KMODS} ${INSTALL_KLD} ${VBOX_BIN}/${i}/${i}.ko ${STAGEDIR}${KMODDIR} .if ${PORT_OPTIONS:MDEBUG} ${INSTALL_KLD} ${VBOX_BIN}/${i}/${i}.ko.symbols ${STAGEDIR}${KMODDIR} .endif .endfor .include Index: head/emulators/virtualbox-ose-kmod/distinfo =================================================================== --- head/emulators/virtualbox-ose-kmod/distinfo (revision 386271) +++ head/emulators/virtualbox-ose-kmod/distinfo (revision 386272) @@ -1,2 +1,2 @@ -SHA256 (VirtualBox-4.3.26.tar.bz2) = e2949c250a1de30997e658de9e3d8545e71318a9844d80536137d76db4f08961 -SIZE (VirtualBox-4.3.26.tar.bz2) = 102676804 +SHA256 (VirtualBox-4.3.28.tar.bz2) = e157ab76d1958ae2c56b2a3875194fbff3de82486ad0e30032fd5bd772297c31 +SIZE (VirtualBox-4.3.28.tar.bz2) = 100092002