diff options
Diffstat (limited to 'emulators/virtualbox-ose-additions')
12 files changed, 39 insertions, 254 deletions
diff --git a/emulators/virtualbox-ose-additions/Makefile b/emulators/virtualbox-ose-additions/Makefile index 7b2b34300421..6bd8f57ac8e7 100644 --- a/emulators/virtualbox-ose-additions/Makefile +++ b/emulators/virtualbox-ose-additions/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= virtualbox-ose -DISTVERSION= 4.3.6 +DISTVERSION= 4.3.8 CATEGORIES= emulators MASTER_SITES= http://download.virtualbox.org/virtualbox/${DISTVERSION}/ \ http://tmp.chruetertee.ch/ \ @@ -21,6 +21,7 @@ BUILD_DEPENDS= yasm:${PORTSDIR}/devel/yasm \ kmk:${PORTSDIR}/devel/kBuild UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} +PATCHDIR= ${.CURDIR}/../${PORTNAME}/files WRKSRC= ${WRKDIR}/VirtualBox-${PORTVERSION} USE_RC_SUBR= vboxguest vboxservice USES= iconv kmod @@ -40,7 +41,7 @@ CONFLICTS_INSTALL= virtualbox-ose-additions-devel-[3,4]* virtualbox-ose-[3,4]* v OPTIONS_DEFINE= DEBUG X11 OPENGL OPTIONS_DEFAULT= X11 -OPTIONS_SUB= DEBUG X11 OPENGL +OPTIONS_SUB= yes .include <bsd.port.options.mk> @@ -48,17 +49,19 @@ 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= -MAKE_FLAGS= SYSDIR=${SRC_BASE}/sys - .if ${PORT_OPTIONS:MDEBUG} KMK_FLAGS+= BUILD_TYPE=debug KMK_BUILDTYPE= debug -MAKE_FLAGS+= DEBUG_FLAGS="-O1 -g" +MAKE_ARGS+= DEBUG_FLAGS="-O1 -g" .endif .if ${PORT_OPTIONS:MX11} @@ -71,6 +74,13 @@ VBOX_WITH_X11= .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 .else CONFIGURE_ARGS+=--disable-opengl .endif @@ -102,6 +112,7 @@ post-patch: ${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 @@ -115,12 +126,11 @@ pre-build: @${REINPLACE_CMD} -e 's|/bin/bash|/bin/sh|' \ ${WRKSRC}/env.sh \ ${WRKSRC}/src/VBox/Additions/freebsd/Installer/vboxguest.sh - -do-build: - cd ${WRKSRC} && ${SH} env.sh && ${KMK_CONFIG} ${LOCALBASE}/bin/kmk ${KMK_FLAGS} - cd ${VBOX_BIN}/src && make ${MAKE_FLAGS} + 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} @@ -129,48 +139,40 @@ do-install: ${INSTALL_KLD} ${VBOX_BIN}/vboxvideo.ko ${STAGEDIR}${KMODDIR} .endif - ${MKDIR} ${STAGEDIR}${PREFIX}/etc/rc.d/ - - ${MKDIR} ${STAGEDIR}${PREFIX}/sbin - ${INSTALL_PROGRAM} ${VBOX_BIN}/VBoxControl ${STAGEDIR}${PREFIX}/sbin/ - ${INSTALL_PROGRAM} ${VBOX_BIN}/VBoxService ${STAGEDIR}${PREFIX}/sbin/ + ${INSTALL_PROGRAM} ${VBOX_SBINS:S|^|${VBOX_BIN}/|} \ + ${STAGEDIR}${PREFIX}/sbin/ .if ${PORT_OPTIONS:MX11} ${INSTALL_PROGRAM} ${VBOX_BIN}/VBoxClient ${STAGEDIR}${PREFIX}/bin/ - - ${MKDIR} ${STAGEDIR}${PREFIX}/bin ${INSTALL_SCRIPT} ${WRKSRC}/src/VBox/Additions/x11/Installer/98vboxadd-xclient \ - ${STAGEDIR}${PREFIX}/bin/VBoxClient-all + ${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/ + ${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/ + ${STAGEDIR}${PREFIX}/share/autostart/ ${MKDIR} ${STAGEDIR}${VIDEODIR} - ${INSTALL_DATA} ${VBOX_BIN}/vboxvideo_drv_${XSERVER_ABI}.so ${STAGEDIR}${VIDEODIR}/vboxvideo_drv.so + ${INSTALL_DATA} ${VBOX_BIN}/vboxvideo_drv_${XSERVER_ABI}.so \ + ${STAGEDIR}${VIDEODIR}/vboxvideo_drv.so ${MKDIR} ${STAGEDIR}${INPUTDIR} - ${INSTALL_DATA} ${VBOX_BIN}/vboxmouse_drv_${XSERVER_ABI}.so ${STAGEDIR}${INPUTDIR}/vboxmouse_drv.so + ${INSTALL_DATA} ${VBOX_BIN}/vboxmouse_drv_${XSERVER_ABI}.so \ + ${STAGEDIR}${INPUTDIR}/vboxmouse_drv.so .endif .if ${PORT_OPTIONS:MOPENGL} - ${MKDIR} ${STAGEDIR}${PREFIX}/lib - ${INSTALL_DATA} ${VBOX_BIN}/VBoxOGL.so ${STAGEDIR}${PREFIX}/lib/ - ${INSTALL_DATA} ${VBOX_BIN}/VBoxOGLarrayspu.so ${STAGEDIR}${PREFIX}/lib/ - ${INSTALL_DATA} ${VBOX_BIN}/VBoxOGLcrutil.so ${STAGEDIR}${PREFIX}/lib/ - ${INSTALL_DATA} ${VBOX_BIN}/VBoxOGLerrorspu.so ${STAGEDIR}${PREFIX}/lib/ - ${INSTALL_DATA} ${VBOX_BIN}/VBoxOGLfeedbackspu.so ${STAGEDIR}${PREFIX}/lib/ - ${INSTALL_DATA} ${VBOX_BIN}/VBoxOGLpackspu.so ${STAGEDIR}${PREFIX}/lib/ - ${INSTALL_DATA} ${VBOX_BIN}/VBoxOGLpassthroughspu.so ${STAGEDIR}${PREFIX}/lib/ + ${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 + ${LN} -sf ${PREFIX}/lib/VBoxOGL.so \ + ${STAGEDIR}${PREFIX}/lib/dri/vboxvideo_dri.so .endif .include <bsd.port.post.mk> diff --git a/emulators/virtualbox-ose-additions/distinfo b/emulators/virtualbox-ose-additions/distinfo index 24e378bdad60..3ccbbdbc199b 100644 --- a/emulators/virtualbox-ose-additions/distinfo +++ b/emulators/virtualbox-ose-additions/distinfo @@ -1,2 +1,2 @@ -SHA256 (VirtualBox-4.3.6.tar.bz2) = c547e1e32e0b06fba9ee4ca7842f8ddee8e94c64aab17c2b0d0793f0caccbb27 -SIZE (VirtualBox-4.3.6.tar.bz2) = 89609199 +SHA256 (VirtualBox-4.3.8.tar.bz2) = ffabd8735bdc80753cec29d01b499769f41e083f37a3f58b3055f19d3b1b9641 +SIZE (VirtualBox-4.3.8.tar.bz2) = 90224116 diff --git a/emulators/virtualbox-ose-additions/files/patch-Config.kmk b/emulators/virtualbox-ose-additions/files/patch-Config.kmk deleted file mode 100644 index 4c5387eeaee2..000000000000 --- a/emulators/virtualbox-ose-additions/files/patch-Config.kmk +++ /dev/null @@ -1,58 +0,0 @@ ---- Config.kmk.orig 2013-10-15 13:01:31.000000000 +0200 -+++ Config.kmk 2013-10-20 14:43:19.015746151 +0200 -@@ -3387,16 +3387,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 \ - $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \ - -nostdinc -std=c99 --TEMPLATE_VBOXR0DRV_CFLAGS.x86 = -m32 -mno-align-long-strings -mpreferred-stack-boundary=2 -mno-mmx -mno-3dnow -mno-sse -mno-sse2 -+TEMPLATE_VBOXR0DRV_CFLAGS.x86 = -m32 -mpreferred-stack-boundary=2 -mno-mmx -mno-3dnow -mno-sse -mno-sse2 - TEMPLATE_VBOXR0DRV_CFLAGS.amd64 = -m64 --param inline-unit-growth=100 --param large-function-growth=1000 \ - -fno-omit-frame-pointer -mcmodel=kernel -mno-red-zone -mfpmath=387 -mno-sse -mno-sse2 -mno-mmx \ - -mno-3dnow -msoft-float -fno-asynchronous-unwind-tables -Wundef - TEMPLATE_VBOXR0DRV_CXXFLAGS = -fno-exceptions -fno-rtti \ - $(VBOX_GCC_WARN) -Wpointer-arith -Winline \ -- -O2 -fno-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) -@@ -3630,8 +3630,6 @@ - /usr/X11R6/include \ - /usr/local/include - TEMPLATE_VBOXR3EXE_LIBPATH += \ -- /usr/lib \ -- /usr/X11R6/lib \ - /usr/local/lib - else ifeq ($(KBUILD_TARGET),solaris) - TEMPLATE_VBOXR3EXE_TOOL = GXX3PLAIN -@@ -4206,8 +4204,6 @@ - /usr/X11R6/include \ - /usr/local/include - TEMPLATE_VBOXMAINEXE_LIBPATH += \ -- /usr/lib \ -- /usr/X11R6/lib \ - /usr/local/lib - else ifeq ($(KBUILD_TARGET),solaris) - TEMPLATE_VBOXMAINEXE_TOOL = GXX3PLAIN -@@ -4673,8 +4669,6 @@ - /usr/X11R6/include \ - /usr/local/include - TEMPLATE_VBOXQT4GUIEXE_LIBPATH += \ -- /usr/lib \ -- /usr/X11R6/lib \ - /usr/local/lib - endif - ifeq ($(KBUILD_TARGET),solaris) -@@ -4869,8 +4863,6 @@ - /usr/X11R6/include \ - /usr/local/include - TEMPLATE_VBOXBLDPROG_LIBPATH += \ -- /usr/lib \ -- /usr/X11R6/lib \ - /usr/local/lib - else ifeq ($(KBUILD_HOST),solaris) - TEMPLATE_VBOXBLDPROG_TOOL = GXX3PLAIN diff --git a/emulators/virtualbox-ose-additions/files/patch-src-VBox-Additions-common-VBoxGuest-freebsd-Makefile b/emulators/virtualbox-ose-additions/files/patch-src-VBox-Additions-common-VBoxGuest-freebsd-Makefile deleted file mode 100644 index ed9f2b80ce46..000000000000 --- a/emulators/virtualbox-ose-additions/files/patch-src-VBox-Additions-common-VBoxGuest-freebsd-Makefile +++ /dev/null @@ -1,10 +0,0 @@ ---- src/VBox/Additions/common/VBoxGuest/freebsd/Makefile.orig 2013-11-29 14:20:37.000000000 -0500 -+++ src/VBox/Additions/common/VBoxGuest/freebsd/Makefile 2013-12-15 00:12:59.000000000 -0500 -@@ -155,6 +155,7 @@ - SRCS += \ - semspinmutex-r0drv-generic.c \ - mpnotification-r0drv-generic.c \ -+ threadctxhooks-r0drv-generic.c \ - RTMpIsCpuWorkPending-r0drv-generic.c - - .PATH: ${.CURDIR}/VBox diff --git a/emulators/virtualbox-ose-additions/files/patch-src-VBox-Additions-common-VBoxGuest-freebsd-files_vboxguest b/emulators/virtualbox-ose-additions/files/patch-src-VBox-Additions-common-VBoxGuest-freebsd-files_vboxguest deleted file mode 100644 index cde44a17359a..000000000000 --- a/emulators/virtualbox-ose-additions/files/patch-src-VBox-Additions-common-VBoxGuest-freebsd-files_vboxguest +++ /dev/null @@ -1,10 +0,0 @@ ---- src/VBox/Additions/common/VBoxGuest/freebsd/files_vboxguest.orig 2014-01-04 05:34:34.000000000 +0000 -+++ src/VBox/Additions/common/VBoxGuest/freebsd/files_vboxguest 2014-01-04 05:34:41.000000000 +0000 -@@ -185,6 +185,7 @@ - ${PATH_ROOT}/src/VBox/Runtime/r0drv/freebsd/sleepqueue-r0drv-freebsd.h=>r0drv/freebsd/sleepqueue-r0drv-freebsd.h \ - ${PATH_ROOT}/src/VBox/Runtime/r0drv/generic/semspinmutex-r0drv-generic.c=>r0drv/generic/semspinmutex-r0drv-generic.c \ - ${PATH_ROOT}/src/VBox/Runtime/r0drv/generic/mpnotification-r0drv-generic.cpp=>r0drv/generic/mpnotification-r0drv-generic.c \ -+ ${PATH_ROOT}/src/VBox/Runtime/r0drv/generic/threadctxhooks-r0drv-generic.cpp=>r0drv/generic/threadctxhooks-r0drv-generic.c \ - ${PATH_ROOT}/src/VBox/Runtime/r0drv/generic/RTMpIsCpuWorkPending-r0drv-generic.cpp=>r0drv/generic/RTMpIsCpuWorkPending-r0drv-generic.c \ - ${PATH_ROOT}/src/VBox/Runtime/r0drv/memobj-r0drv.cpp=>r0drv/memobj-r0drv.c \ - ${PATH_ROOT}/src/VBox/Runtime/VBox/log-vbox.cpp=>VBox/log-vbox.c \ diff --git a/emulators/virtualbox-ose-additions/files/patch-src-VBox-Additions-common-VBoxGuestLib-Makefile.kmk b/emulators/virtualbox-ose-additions/files/patch-src-VBox-Additions-common-VBoxGuestLib-Makefile.kmk deleted file mode 100644 index 71e85c9b2012..000000000000 --- a/emulators/virtualbox-ose-additions/files/patch-src-VBox-Additions-common-VBoxGuestLib-Makefile.kmk +++ /dev/null @@ -1,18 +0,0 @@ ---- src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk.orig 2010-10-07 11:37:10.000000000 +0200 -+++ src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk 2010-10-07 11:36:16.000000000 +0200 -@@ -140,6 +140,7 @@ - # the X server runtime instead of IPRT, for use with old servers where the - # C library is not available. - # -+ifdef VBOX_WITH_X11_ADDITIONS - VBoxGuestR3LibXFree86_TEMPLATE = VBOXGUESTR3XF86LIB - VBoxGuestR3LibXFree86_DEFS = \ - VBOX_WITH_HGCM \ -@@ -163,6 +164,7 @@ - $(VBOX_PATH_X11_XFREE_4_3)/exports/include/X11 - - VBoxGuestR3LibRuntimeXF86.cpp_CXXFLAGS = -Wno-shadow -+endif - - include $(KBUILD_PATH)/subfooter.kmk - diff --git a/emulators/virtualbox-ose-additions/files/patch-src-VBox-Additions-x11-Installer-98vboxadd-xclient b/emulators/virtualbox-ose-additions/files/patch-src-VBox-Additions-x11-Installer-98vboxadd-xclient deleted file mode 100644 index edb9514f95c5..000000000000 --- a/emulators/virtualbox-ose-additions/files/patch-src-VBox-Additions-x11-Installer-98vboxadd-xclient +++ /dev/null @@ -1,27 +0,0 @@ ---- src/VBox/Additions/x11/Installer/98vboxadd-xclient.orig 2010-09-10 14:24:55.000000000 +0200 -+++ src/VBox/Additions/x11/Installer/98vboxadd-xclient 2010-12-29 20:42:00.000000000 +0100 -@@ -28,8 +28,8 @@ - xorgbin=Xorg - found=`which Xorg | grep "no Xorg"` - if test ! -z "$found"; then -- if test -f "/usr/X11/bin/Xorg"; then -- xorgbin=/usr/X11/bin/Xorg -+ if test -f "/usr/local/bin/Xorg"; then -+ xorgbin=/usr/local/bin/Xorg - else - exit 1 - fi -@@ -40,9 +40,9 @@ - no_display=1 - fi - --/usr/bin/VBoxClient --clipboard --/usr/bin/VBoxClient --checkhostversion -+/usr/local/bin/VBoxClient --clipboard -+/usr/local/bin/VBoxClient --checkhostversion - test -z "$no_display" && -- /usr/bin/VBoxClient --display -+ /usr/local/bin/VBoxClient --display - test -z "$no_display" && -- /usr/bin/VBoxClient --seamless -+ /usr/local/bin/VBoxClient --seamless diff --git a/emulators/virtualbox-ose-additions/files/patch-src-VBox-Additions-x11-Installer-vboxclient.desktop b/emulators/virtualbox-ose-additions/files/patch-src-VBox-Additions-x11-Installer-vboxclient.desktop deleted file mode 100644 index fadd31bc4d48..000000000000 --- a/emulators/virtualbox-ose-additions/files/patch-src-VBox-Additions-x11-Installer-vboxclient.desktop +++ /dev/null @@ -1,10 +0,0 @@ ---- src/VBox/Additions/x11/Installer/vboxclient.desktop.orig 2009-06-12 12:34:57.000000000 +0000 -+++ src/VBox/Additions/x11/Installer/vboxclient.desktop 2011-01-13 22:07:37.000000000 +0000 -@@ -8,6 +8,6 @@ - Comment=VirtualBox User Session Services - Comment[it]=Servizi di sessione utente di VirtualBox - Comment[pl]=Usługi sesji użytkownika VirtualBox --Exec=/usr/bin/VBoxClient-all -+Exec=/usr/local/bin/VBoxClient-all - X-GNOME-Autostart-enabled=true - X-KDE-autostart-after=panel diff --git a/emulators/virtualbox-ose-additions/files/patch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk b/emulators/virtualbox-ose-additions/files/patch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk deleted file mode 100644 index 0525808f70c8..000000000000 --- a/emulators/virtualbox-ose-additions/files/patch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk +++ /dev/null @@ -1,20 +0,0 @@ ---- src/VBox/Additions/x11/vboxvideo/Makefile.kmk.orig 2012-10-26 18:23:35.000000000 +0200 -+++ src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2012-10-28 16:54:59.074303788 +0100 -@@ -196,7 +196,7 @@ - vboxvideo_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD - vboxvideo_drv_15_CFLAGS := $(vboxvideo_drv_70_CFLAGS) - vboxvideo_drv_15_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100503000 --if1of ($(KBUILD_TARGET), linux solaris) -+if1of ($(KBUILD_TARGET), freebsd linux solaris) - vboxvideo_drv_15_DEFS += VBOX_DRI - endif - vboxvideo_drv_15_INCS = \ -@@ -204,7 +204,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 diff --git a/emulators/virtualbox-ose-additions/files/patch-src-VBox-Runtime-Makefile.kmk b/emulators/virtualbox-ose-additions/files/patch-src-VBox-Runtime-Makefile.kmk deleted file mode 100644 index 4da15d3e545a..000000000000 --- a/emulators/virtualbox-ose-additions/files/patch-src-VBox-Runtime-Makefile.kmk +++ /dev/null @@ -1,14 +0,0 @@ ---- src/VBox/Runtime/Makefile.kmk.orig 2013-12-18 11:10:31.000000000 -0500 -+++ src/VBox/Runtime/Makefile.kmk 2014-02-20 18:14:28.000000000 -0500 -@@ -157,6 +157,11 @@ - IPRT_BLDCFG_TYPE=\"$(KBUILD_TYPE)\" - - # -+# Set the defines that utf8-posix.cpp needs. It's used by several targets. -+# -+r3/posix/utf8-posix.cpp_DEFS.freebsd = $(VBOX_ICONV_DEFS) -+ -+# - # Unicode Specification reader used to regenerate unidata.cpp. - # - uniread_TEMPLATE = VBOXBLDPROG diff --git a/emulators/virtualbox-ose-additions/files/patch-src-VBox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd.c b/emulators/virtualbox-ose-additions/files/patch-src-VBox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd.c deleted file mode 100644 index b760cfe7f940..000000000000 --- a/emulators/virtualbox-ose-additions/files/patch-src-VBox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd.c +++ /dev/null @@ -1,47 +0,0 @@ -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 2013-11-29 12:04:53.000000000 +0100 -+++ src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c 2013-11-29 12:37:29.000000000 +0100 -@@ -168,14 +168,19 @@ - VM_OBJECT_LOCK(pMemFreeBSD->pObject); - #endif - vm_page_t pPage = vm_page_find_least(pMemFreeBSD->pObject, 0); -+#if __FreeBSD_version < 900000 -+ /* See http://lists.freebsd.org/pipermail/freebsd-current/2012-November/037963.html */ - vm_page_lock_queues(); -+#endif - for (vm_page_t pPage = vm_page_find_least(pMemFreeBSD->pObject, 0); - pPage != NULL; - pPage = vm_page_next(pPage)) - { - vm_page_unwire(pPage, 0); - } -+#if __FreeBSD_version < 900000 - vm_page_unlock_queues(); -+#endif - #if __FreeBSD_version >= 1000030 - VM_OBJECT_WUNLOCK(pMemFreeBSD->pObject); - #else -@@ -291,11 +296,15 @@ - while (iPage-- > 0) - { - pPage = vm_page_lookup(pObject, iPage); -+#if __FreeBSD_version < 900000 - vm_page_lock_queues(); -+#endif - if (fWire) - vm_page_unwire(pPage, 0); - vm_page_free(pPage); -+#if __FreeBSD_version < 900000 - vm_page_unlock_queues(); -+#endif - } - #if __FreeBSD_version >= 1000030 - VM_OBJECT_WUNLOCK(pObject); diff --git a/emulators/virtualbox-ose-additions/pkg-plist b/emulators/virtualbox-ose-additions/pkg-plist index cec78351f015..84a993167952 100644 --- a/emulators/virtualbox-ose-additions/pkg-plist +++ b/emulators/virtualbox-ose-additions/pkg-plist @@ -1,8 +1,7 @@ -%%X11%%bin/VBoxClient-all +@comment $FreeBSD: ports/emulators/virtualbox-ose-additions/pkg-plist,v 1.6 2012/11/17 05:57:24 svnexp Exp $ %%X11%%bin/VBoxClient +%%X11%%bin/VBoxClient-all %%X11%%etc/xdg/autostart/vboxclient.desktop -sbin/VBoxControl -sbin/VBoxService %%OPENGL%%lib/VBoxOGL.so %%OPENGL%%lib/VBoxOGLarrayspu.so %%OPENGL%%lib/VBoxOGLcrutil.so @@ -11,20 +10,18 @@ sbin/VBoxService %%OPENGL%%lib/VBoxOGLpackspu.so %%OPENGL%%lib/VBoxOGLpassthroughspu.so %%OPENGL%%lib/dri/vboxvideo_dri.so -%%X11%%share/autostart/vboxclient.desktop %%X11%%lib/xorg/modules/drivers/vboxvideo_drv.so %%X11%%lib/xorg/modules/input/vboxmouse_drv.so +sbin/VBoxControl +sbin/VBoxService +%%X11%%share/autostart/vboxclient.desktop %%X11%%@dirrmtry share/autostart %%X11%%@dirrmtry lib/xorg/modules/drivers %%X11%%@dirrmtry lib/xorg/modules/input %%X11%%@dirrmtry lib/xorg/modules %%X11%%@dirrmtry lib/xorg -%%X11%%@dirrmtry etc/xdg/autostart -%%X11%%@dirrmtry etc/xdg %%OPENGL%%@dirrmtry lib/dri -%%X11%%@dirrmtry lib @cwd / %%KMODDIR%%/vboxguest.ko %%DEBUG%%%%KMODDIR%%/vboxguest.ko.symbols %%X11%%%%KMODDIR%%/vboxvideo.ko -%%DEBUG%%%%X11%%%%KMODDIR%%/vboxvideo.ko |