Permalink
Browse files

Replace ports virtualbox-ose* with the jkim version from redports, sh…

…ould

fix the segfault issues we are seeing.
  • Loading branch information...
1 parent 74b5a55 commit 5c7debe4e4aed34fad8afd195e6deebf66197b17 @kmoore134 kmoore134 committed Feb 24, 2014
Showing with 352 additions and 412 deletions.
  1. +47 −32 emulators/virtualbox-ose-additions/Makefile
  2. +0 −12 emulators/virtualbox-ose-additions/files/extrapatch-Config.kmk
  3. +0 −58 emulators/virtualbox-ose-additions/files/patch-Config.kmk
  4. +0 −10 emulators/virtualbox-ose-additions/files/patch-src-VBox-Additions-common-VBoxGuest-freebsd-Makefile
  5. +0 −14 emulators/virtualbox-ose-additions/files/patch-src-VBox-Runtime-common-misc-uri.cpp
  6. +0 −47 emulators/virtualbox-ose-additions/files/patch-src-VBox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd.c
  7. +0 −29 emulators/virtualbox-ose-additions/files/patch-src-VBox-Runtime-r3-freebsd-mp-freebsd.cpp
  8. +5 −8 emulators/virtualbox-ose-additions/pkg-plist
  9. +18 −18 emulators/virtualbox-ose-kmod/Makefile
  10. +0 −11 emulators/virtualbox-ose-kmod/files/extrapatch-Config.kmk
  11. +0 −56 emulators/virtualbox-ose-kmod/files/patch-Config.kmk
  12. +0 −47 emulators/virtualbox-ose-kmod/files/patch-src-VBox-Runtime-r0drv-freebsd-memobj-r0drv-freebsd.c
  13. +1 −1 emulators/virtualbox-ose-kmod/files/vboxnet.in
  14. +4 −3 emulators/virtualbox-ose-kmod/pkg-plist
  15. +53 −61 emulators/virtualbox-ose/Makefile
  16. +9 −0 emulators/virtualbox-ose/files/extrapatch-Config.kmk
  17. 0 ...x-ose-additions → virtualbox-ose}/files/extrapatch-src-VBox-Additions-x11-VBoxClient-Makefile.kmk
  18. 0 ...ox-ose-additions → virtualbox-ose}/files/extrapatch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk
  19. 0 ...tualbox-ose-kmod → virtualbox-ose}/files/extrapatch-src-VBox-HostDrivers-Support-freebsd-Makefile
  20. 0 ...ditions → virtualbox-ose}/files/patch-src-VBox-Additions-common-VBoxGuest-freebsd-files_vboxguest
  21. 0 ...x-ose-additions → virtualbox-ose}/files/patch-src-VBox-Additions-common-VBoxGuestLib-Makefile.kmk
  22. 0 ...ox-ose-additions → virtualbox-ose}/files/patch-src-VBox-Additions-x11-Installer-98vboxadd-xclient
  23. 0 ...x-ose-additions → virtualbox-ose}/files/patch-src-VBox-Additions-x11-Installer-vboxclient.desktop
  24. 0 ...tualbox-ose-additions → virtualbox-ose}/files/patch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk
  25. 0 .../{virtualbox-ose-kmod → virtualbox-ose}/files/patch-src-VBox-HostDrivers-Support-freebsd-Makefile
  26. +25 −0 emulators/virtualbox-ose/files/patch-src-VBox-HostDrivers-VBoxNetAdp-Makefile.kmk
  27. +72 −0 emulators/virtualbox-ose/files/patch-src-VBox-HostDrivers-VBoxNetFlt-freebsd-VBoxNetFlt-freebsd.c
  28. +47 −0 emulators/virtualbox-ose/files/patch-src-VBox-Main-src-server-MachineImpl.cpp
  29. +11 −0 emulators/virtualbox-ose/files/patch-src-VBox-Main-src-server-VirtualBoxImpl.cpp
  30. +15 −3 emulators/virtualbox-ose/files/patch-src-VBox-Runtime-Makefile.kmk
  31. 0 ...-ose-kmod → virtualbox-ose}/files/patch-src-VBox-Runtime-r0drv-freebsd-sleepqueue-r0drv-freebsd.h
  32. +45 −2 emulators/virtualbox-ose/pkg-plist
@@ -1,5 +1,5 @@
# Created by: Bernhard Froehlich <decke@bluelife.at>
-# $FreeBSD$
+# $FreeBSD: jkim/emulators/virtualbox-ose-additions/Makefile 23406 2014-02-21 19:10:07Z jkim $
PORTNAME= virtualbox-ose
DISTVERSION= 4.3.6
@@ -21,10 +21,10 @@ 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
-USE_GCC= any
+USES= compiler:features iconv kmod
ONLY_FOR_ARCHS= i386 amd64
USE_BZIP2= yes
USE_PYTHON_BUILD= yes
@@ -40,25 +40,27 @@ 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>
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 +73,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
@@ -85,6 +94,14 @@ XSERVER_ABI:= ${XSERVER_VER:S/.//:R}
.include <bsd.port.pre.mk>
+.if ${COMPILER_TYPE} == clang
+EXTRA_PATCHES= ${PATCHDIR}/extrapatch-Config.kmk \
+ ${PATCHDIR}/extrapatch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk
+.if ${COMPILER_FEATURES:Mlibc++}
+EXTRA_PATCHES+= ${PATCHDIR}/extrapatch-src-VBox-Additions-x11-VBoxClient-Makefile.kmk
+.endif
+.endif
+
pre-everything::
.if ${ARCH} == "amd64"
.if !exists(/usr/lib32/libc.so)
@@ -97,29 +114,35 @@ pre-everything::
post-patch:
@${ECHO} 'VBOX_ONLY_ADDITIONS = 1' > ${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||' ${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
-
-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}
@@ -128,48 +151,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>
@@ -1,12 +0,0 @@
---- Config.kmk.orig 2013-12-18 11:05:32.000000000 -0500
-+++ Config.kmk 2013-12-19 21:28:19.000000000 -0500
-@@ -1508,6 +1508,9 @@
- VBOX_GCC_OPT <= -march=i586
- endif
- endif
-+ifeq ($(KBUILD_TARGET),freebsd)
-+ VBOX_GCC_WARN += -Qunused-arguments
-+endif
-
-
- #
@@ -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
@@ -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
@@ -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))
@@ -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);
@@ -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;
@@ -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
Oops, something went wrong.

0 comments on commit 5c7debe

Please sign in to comment.