aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuido Falsi <madpilot@FreeBSD.org>2021-04-23 12:52:21 +0000
committerGuido Falsi <madpilot@FreeBSD.org>2021-04-23 12:56:33 +0000
commitd2441db781c717b17fafc2a9980b0cfa97b7ba9b (patch)
tree49f2ab39d8bcd2db3b3b4a162db76972075638e8
parentbffb12ee7c59ff564beec7dc14e6047a4dcc28c3 (diff)
downloadports-d2441db781c717b17fafc2a9980b0cfa97b7ba9b.tar.gz
ports-d2441db781c717b17fafc2a9980b0cfa97b7ba9b.zip
emulators/virtualbox-ose: Update to 6.1.20
- Also update related kmod and additions ports - In additions, use INSTALL_LIB to install X11 modules, so binaries get stripped - Trim some `#if __FreeBSD_version` checks for unsupported FreeBSD versions from patches PR: 255301
Diffstat
-rw-r--r--emulators/virtualbox-ose-additions/Makefile7
-rw-r--r--emulators/virtualbox-ose-additions/distinfo6
-rw-r--r--emulators/virtualbox-ose-kmod/Makefile3
-rw-r--r--emulators/virtualbox-ose-kmod/distinfo6
-rw-r--r--emulators/virtualbox-ose/Makefile2
-rw-r--r--emulators/virtualbox-ose/distinfo10
-rw-r--r--emulators/virtualbox-ose/files/patch-include-iprt-x86.h6
-rw-r--r--emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vfsops.c10
-rw-r--r--emulators/virtualbox-ose/files/patch-src_VBox_Devices_Audio_DrvHostAudioAlsa.cpp (renamed from emulators/virtualbox-ose/files/patch-src_VBox_Devices_Audio_DrvHostALSAAudio.cpp)8
-rw-r--r--emulators/virtualbox-ose/files/patch-src_VBox_Devices_Audio_DrvHostAudioOss.cpp (renamed from emulators/virtualbox-ose/files/patch-src_VBox_Devices_Audio_DrvHostOSSAudio.cpp)8
-rw-r--r--emulators/virtualbox-ose/files/patch-src_VBox_Runtime_r0drv_freebsd_thread-r0drv-freebsd.c38
11 files changed, 45 insertions, 59 deletions
diff --git a/emulators/virtualbox-ose-additions/Makefile b/emulators/virtualbox-ose-additions/Makefile
index b335cda7154e..c4501b06a5a8 100644
--- a/emulators/virtualbox-ose-additions/Makefile
+++ b/emulators/virtualbox-ose-additions/Makefile
@@ -1,8 +1,7 @@
# Created by: Bernhard Froehlich <decke@bluelife.at>
PORTNAME= virtualbox-ose
-PORTVERSION= 6.1.18
-PORTREVISION= 1
+PORTVERSION= 6.1.20
CATEGORIES= emulators
MASTER_SITES= https://download.virtualbox.org/virtualbox/${PORTVERSION}/
PKGNAMESUFFIX?= -additions
@@ -155,10 +154,10 @@ do-install-X11-on:
${WRKSRC}/src/VBox/Additions/x11/Installer/vboxclient.desktop \
${STAGEDIR}${PREFIX}/share/autostart/
${MKDIR} ${STAGEDIR}${VIDEODIR}
- ${INSTALL_DATA} ${VBOX_BIN}/vboxvideo_drv_system.so \
+ ${INSTALL_LIB} ${VBOX_BIN}/vboxvideo_drv_system.so \
${STAGEDIR}${VIDEODIR}/vboxvideo_drv.so
${MKDIR} ${STAGEDIR}${INPUTDIR}
- ${INSTALL_DATA} ${VBOX_BIN}/vboxmouse_drv_system.so \
+ ${INSTALL_LIB} ${VBOX_BIN}/vboxmouse_drv_system.so \
${STAGEDIR}${INPUTDIR}/vboxmouse_drv.so
.include <bsd.port.post.mk>
diff --git a/emulators/virtualbox-ose-additions/distinfo b/emulators/virtualbox-ose-additions/distinfo
index bd3152a6518c..248bf5a683be 100644
--- a/emulators/virtualbox-ose-additions/distinfo
+++ b/emulators/virtualbox-ose-additions/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1613903085
-SHA256 (VirtualBox-6.1.18.tar.bz2) = 108d42b9b391b7a332a33df1662cf7b0e9d9a80f3079d16288d8b9487f427d40
-SIZE (VirtualBox-6.1.18.tar.bz2) = 165507486
+TIMESTAMP = 1619010563
+SHA256 (VirtualBox-6.1.20.tar.bz2) = e690c91974a2e7a5aca2c0939ad514382f9a2136797a5e0b96aab778e42bc8a7
+SIZE (VirtualBox-6.1.20.tar.bz2) = 165569564
diff --git a/emulators/virtualbox-ose-kmod/Makefile b/emulators/virtualbox-ose-kmod/Makefile
index c8d08b3a0cde..6c78df5a7776 100644
--- a/emulators/virtualbox-ose-kmod/Makefile
+++ b/emulators/virtualbox-ose-kmod/Makefile
@@ -1,8 +1,7 @@
# Created by: Bernhard Froehlich <decke@bluelife.at>
PORTNAME= virtualbox-ose
-PORTVERSION= 6.1.18
-PORTREVISION= 1
+PORTVERSION= 6.1.20
CATEGORIES= emulators
MASTER_SITES= https://download.virtualbox.org/virtualbox/${PORTVERSION}/
PKGNAMESUFFIX= -kmod
diff --git a/emulators/virtualbox-ose-kmod/distinfo b/emulators/virtualbox-ose-kmod/distinfo
index fd36c0cc9df7..248bf5a683be 100644
--- a/emulators/virtualbox-ose-kmod/distinfo
+++ b/emulators/virtualbox-ose-kmod/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1613865409
-SHA256 (VirtualBox-6.1.18.tar.bz2) = 108d42b9b391b7a332a33df1662cf7b0e9d9a80f3079d16288d8b9487f427d40
-SIZE (VirtualBox-6.1.18.tar.bz2) = 165507486
+TIMESTAMP = 1619010563
+SHA256 (VirtualBox-6.1.20.tar.bz2) = e690c91974a2e7a5aca2c0939ad514382f9a2136797a5e0b96aab778e42bc8a7
+SIZE (VirtualBox-6.1.20.tar.bz2) = 165569564
diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile
index 30fd87793412..58147713719e 100644
--- a/emulators/virtualbox-ose/Makefile
+++ b/emulators/virtualbox-ose/Makefile
@@ -1,7 +1,7 @@
# Created by: Bernhard Froehlich <decke@bluelife.at>
PORTNAME= virtualbox-ose
-PORTVERSION= 6.1.18
+PORTVERSION= 6.1.20
CATEGORIES= emulators
MASTER_SITES= https://download.virtualbox.org/virtualbox/${PORTVERSION}/
DISTFILES= VirtualBox-${PORTVERSION}${EXTRACT_SUFX} ${GUESTADDITIONS}
diff --git a/emulators/virtualbox-ose/distinfo b/emulators/virtualbox-ose/distinfo
index 966401a69196..2cb40a75f2d9 100644
--- a/emulators/virtualbox-ose/distinfo
+++ b/emulators/virtualbox-ose/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1613863264
-SHA256 (VirtualBox-6.1.18.tar.bz2) = 108d42b9b391b7a332a33df1662cf7b0e9d9a80f3079d16288d8b9487f427d40
-SIZE (VirtualBox-6.1.18.tar.bz2) = 165507486
-SHA256 (VBoxGuestAdditions_6.1.18.iso) = 904432eb331d7ae517afaa4e4304e6492b7947b46ecb8267de7ef792c4921b4c
-SIZE (VBoxGuestAdditions_6.1.18.iso) = 61157376
+TIMESTAMP = 1619010563
+SHA256 (VirtualBox-6.1.20.tar.bz2) = e690c91974a2e7a5aca2c0939ad514382f9a2136797a5e0b96aab778e42bc8a7
+SIZE (VirtualBox-6.1.20.tar.bz2) = 165569564
+SHA256 (VBoxGuestAdditions_6.1.20.iso) = 65d22a9f1fcf690d77be99d549149ec9129e2a728ddd9202df436ed9593ba520
+SIZE (VBoxGuestAdditions_6.1.20.iso) = 61018112
diff --git a/emulators/virtualbox-ose/files/patch-include-iprt-x86.h b/emulators/virtualbox-ose/files/patch-include-iprt-x86.h
index 9a66249e045e..ca73a306df88 100644
--- a/emulators/virtualbox-ose/files/patch-include-iprt-x86.h
+++ b/emulators/virtualbox-ose/files/patch-include-iprt-x86.h
@@ -1,4 +1,4 @@
---- include/iprt/x86.h.orig 2021-01-07 15:31:34 UTC
+--- include/iprt/x86.h.orig 2021-04-20 04:22:23 UTC
+++ include/iprt/x86.h
@@ -38,6 +38,16 @@
# pragma D depends_on library vbox-types.d
@@ -14,6 +14,6 @@
+# undef MSR_IA32_FEATURE_CONTROL
+#endif
+
- /* Workaround for Solaris sys/regset.h defining CS, DS */
+ /** Workaround for Solaris sys/regset.h defining CS, DS and sys/controlregs.h
+ * defining MSR_IA32_FLUSH_CMD */
#ifdef RT_OS_SOLARIS
- # undef CS
diff --git a/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vfsops.c b/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vfsops.c
index 5d21a89925de..f496e3367647 100644
--- a/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vfsops.c
+++ b/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vfsops.c
@@ -1,4 +1,4 @@
---- src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vfsops.c.orig 2021-01-07 15:34:22 UTC
+--- src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vfsops.c.orig 2021-04-20 04:24:19 UTC
+++ src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vfsops.c
@@ -1,8 +1,3 @@
-/* $Id: vboxvfs_vfsops.c $ */
@@ -9,7 +9,7 @@
/*
* Copyright (C) 2008-2020 Oracle Corporation
*
-@@ -14,245 +9,478 @@
+@@ -14,245 +9,474 @@
* VirtualBox OSE distribution. VirtualBox OSE is distributed in the
* hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
*/
@@ -456,12 +456,8 @@
+ mp->mnt_flag |= MNT_LOCAL;
+ if (readonly != 0)
+ mp->mnt_flag |= MNT_RDONLY;
-+#if __FreeBSD_version >= 1000021
++
+ mp->mnt_kern_flag |= MNTK_LOOKUP_SHARED | MNTK_EXTENDED_SHARED;
-+#else
-+ mp->mnt_kern_flag |= MNTK_MPSAFE | MNTK_LOOKUP_SHARED |
-+ MNTK_EXTENDED_SHARED;
-+#endif
+ MNT_IUNLOCK(mp);
+ vfs_mountedfrom(mp, share_name);
+
diff --git a/emulators/virtualbox-ose/files/patch-src_VBox_Devices_Audio_DrvHostALSAAudio.cpp b/emulators/virtualbox-ose/files/patch-src_VBox_Devices_Audio_DrvHostAudioAlsa.cpp
index 3d4a63920b68..fec7ba18f722 100644
--- a/emulators/virtualbox-ose/files/patch-src_VBox_Devices_Audio_DrvHostALSAAudio.cpp
+++ b/emulators/virtualbox-ose/files/patch-src_VBox_Devices_Audio_DrvHostAudioAlsa.cpp
@@ -1,6 +1,6 @@
---- src/VBox/Devices/Audio/DrvHostALSAAudio.cpp.orig 2021-01-07 15:37:12 UTC
-+++ src/VBox/Devices/Audio/DrvHostALSAAudio.cpp
-@@ -820,6 +820,7 @@ static DECLCALLBACK(int) drvHostAlsaAudioHA_StreamPlay
+--- src/VBox/Devices/Audio/DrvHostAudioAlsa.cpp.orig 2021-04-20 04:27:52 UTC
++++ src/VBox/Devices/Audio/DrvHostAudioAlsa.cpp
+@@ -833,6 +833,7 @@ static DECLCALLBACK(int) drvHostAlsaAudioHA_StreamPlay
continue;
}
@@ -8,7 +8,7 @@
case -ESTRPIPE:
{
/* Stream was suspended and waiting for a recovery. */
-@@ -833,6 +834,7 @@ static DECLCALLBACK(int) drvHostAlsaAudioHA_StreamPlay
+@@ -846,6 +847,7 @@ static DECLCALLBACK(int) drvHostAlsaAudioHA_StreamPlay
LogFlowFunc(("Resumed suspended output stream\n"));
continue;
}
diff --git a/emulators/virtualbox-ose/files/patch-src_VBox_Devices_Audio_DrvHostOSSAudio.cpp b/emulators/virtualbox-ose/files/patch-src_VBox_Devices_Audio_DrvHostAudioOss.cpp
index 7c484bb9d3b6..0c79581ccd3f 100644
--- a/emulators/virtualbox-ose/files/patch-src_VBox_Devices_Audio_DrvHostOSSAudio.cpp
+++ b/emulators/virtualbox-ose/files/patch-src_VBox_Devices_Audio_DrvHostAudioOss.cpp
@@ -1,5 +1,5 @@
---- src/VBox/Devices/Audio/DrvHostOSSAudio.cpp.orig 2021-01-07 15:37:12 UTC
-+++ src/VBox/Devices/Audio/DrvHostOSSAudio.cpp
+--- src/VBox/Devices/Audio/DrvHostAudioOss.cpp.orig 2021-04-20 04:27:52 UTC
++++ src/VBox/Devices/Audio/DrvHostAudioOss.cpp
@@ -253,10 +253,11 @@ static int ossStreamOpen(const char *pszDev, int fOpen
default:
@@ -17,7 +17,7 @@
pCfgAcq->Backend.cFramesPeriod = PDMAUDIOSTREAMCFG_B2F(pCfgAcq, ossAcq.cbFragmentSize);
pCfgAcq->Backend.cFramesBufferSize = pCfgAcq->Backend.cFramesPeriod * 2; /* Use "double buffering". */
-+ pCfgAcq->Backend.cFramesPreBuffering = pCfgAcq->Backend.cFramesBufferSize;
++ pCfgAcq->Backend.cFramesPreBuffering = pCfgAcq->Backend.cFramesBufferSize;
/** @todo Pre-buffering required? */
}
}
@@ -25,7 +25,7 @@
#endif
pCfgAcq->Backend.cFramesPeriod = PDMAUDIOSTREAMCFG_B2F(pCfgAcq, obtStream.cbFragmentSize);
pCfgAcq->Backend.cFramesBufferSize = pCfgAcq->Backend.cFramesPeriod * 2; /* Use "double buffering" */
-+ pCfgAcq->Backend.cFramesPreBuffering = pCfgAcq->Backend.cFramesBufferSize;
++ pCfgAcq->Backend.cFramesPreBuffering = pCfgAcq->Backend.cFramesBufferSize;
}
} while (0);
diff --git a/emulators/virtualbox-ose/files/patch-src_VBox_Runtime_r0drv_freebsd_thread-r0drv-freebsd.c b/emulators/virtualbox-ose/files/patch-src_VBox_Runtime_r0drv_freebsd_thread-r0drv-freebsd.c
index 2c65ff3a2029..c1ba2d811cde 100644
--- a/emulators/virtualbox-ose/files/patch-src_VBox_Runtime_r0drv_freebsd_thread-r0drv-freebsd.c
+++ b/emulators/virtualbox-ose/files/patch-src_VBox_Runtime_r0drv_freebsd_thread-r0drv-freebsd.c
@@ -1,4 +1,4 @@
---- src/VBox/Runtime/r0drv/freebsd/thread-r0drv-freebsd.c.orig 2018-10-15 14:31:31 UTC
+--- src/VBox/Runtime/r0drv/freebsd/thread-r0drv-freebsd.c.orig 2021-04-20 04:32:44 UTC
+++ src/VBox/Runtime/r0drv/freebsd/thread-r0drv-freebsd.c
@@ -49,7 +49,6 @@ RTDECL(RTNATIVETHREAD) RTThreadNativeSelf(void)
static int rtR0ThreadFbsdSleepCommon(RTMSINTERVAL cMillies)
@@ -8,7 +8,7 @@
/*
* 0 ms sleep -> yield.
-@@ -60,11 +59,28 @@ static int rtR0ThreadFbsdSleepCommon(RTMSINTERVAL cMil
+@@ -60,30 +59,34 @@ static int rtR0ThreadFbsdSleepCommon(RTMSINTERVAL cMil
return VINF_SUCCESS;
}
@@ -19,7 +19,17 @@
*/
if (cMillies != RT_INDEFINITE_WAIT)
{
-+#if __FreeBSD_version >= 1000029
+- if (hz == 1000)
+- cTicks = cMillies;
+- else if (hz == 100)
+- cTicks = cMillies / 10;
+- else
+- {
+- int64_t cTicks64 = ((uint64_t)cMillies * hz) / 1000;
+- cTicks = (int)cTicks64;
+- if (cTicks != cTicks64)
+- cTicks = INT_MAX;
+- }
+ struct timeval tv;
+
+ tv.tv_sec = cMillies / 1000;
@@ -31,24 +41,6 @@
+ tvtosbt(tv),
+ 0,
+ C_ABSOLUTE);
-+#else
-+ int cTicks;
-+
- if (hz == 1000)
- cTicks = cMillies;
- else if (hz == 100)
-@@ -76,14 +92,24 @@ static int rtR0ThreadFbsdSleepCommon(RTMSINTERVAL cMil
- if (cTicks != cTicks64)
- cTicks = INT_MAX;
- }
-+ if (!cTicks)
-+ cTicks = 1;
-+
-+ rc = tsleep((void *)RTThreadSleep,
-+ PZERO | PCATCH,
-+ "iprtsl", /* max 6 chars */
-+ cTicks);
-+#endif
}
else
- cTicks = 0; /* requires giant lock! */
@@ -68,7 +60,7 @@
switch (rc)
{
case 0:
-@@ -114,11 +140,13 @@ RTDECL(int) RTThreadSleepNoLog(RTMSINTERVAL cMillies)
+@@ -114,11 +117,13 @@ RTDECL(int) RTThreadSleepNoLog(RTMSINTERVAL cMillies)
RTDECL(bool) RTThreadYield(void)
{
@@ -82,7 +74,7 @@
return false; /** @todo figure this one ... */
}
-@@ -167,12 +195,14 @@ RTDECL(void) RTThreadPreemptDisable(PRTTHREADPREEMPTST
+@@ -167,12 +172,14 @@ RTDECL(void) RTThreadPreemptDisable(PRTTHREADPREEMPTST
RTDECL(void) RTThreadPreemptRestore(PRTTHREADPREEMPTSTATE pState)
{
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-27 07:30:28 +0000