aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--emulators/virtualbox-ose-additions/Makefile2
-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/Makefile6
-rw-r--r--emulators/virtualbox-ose/distinfo10
-rw-r--r--emulators/virtualbox-ose/files/patch-configure42
-rw-r--r--emulators/virtualbox-ose/files/patch-src_VBox_Devices_Audio_DrvHostAudioAlsa.cpp18
-rw-r--r--emulators/virtualbox-ose/files/patch-src_VBox_Devices_Audio_DrvHostAudioOss.cpp31
-rw-r--r--emulators/virtualbox-ose/pkg-message12
10 files changed, 53 insertions, 83 deletions
diff --git a/emulators/virtualbox-ose-additions/Makefile b/emulators/virtualbox-ose-additions/Makefile
index 5d5e6dd75c50..c4a98be98307 100644
--- a/emulators/virtualbox-ose-additions/Makefile
+++ b/emulators/virtualbox-ose-additions/Makefile
@@ -1,7 +1,7 @@
# Created by: Bernhard Froehlich <decke@bluelife.at>
PORTNAME= virtualbox-ose
-PORTVERSION= 6.1.22
+PORTVERSION= 6.1.26
CATEGORIES= emulators
MASTER_SITES= https://download.virtualbox.org/virtualbox/${PORTVERSION}/
PKGNAMESUFFIX?= -additions
diff --git a/emulators/virtualbox-ose-additions/distinfo b/emulators/virtualbox-ose-additions/distinfo
index 3c2b6f0a9661..9e49d8389835 100644
--- a/emulators/virtualbox-ose-additions/distinfo
+++ b/emulators/virtualbox-ose-additions/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619727799
-SHA256 (VirtualBox-6.1.22.tar.bz2) = 99816d2a15205d49362a31e8ffeb8262d2fa0678c751dfd0a7c43b2faca8be49
-SIZE (VirtualBox-6.1.22.tar.bz2) = 165560989
+TIMESTAMP = 1627588776
+SHA256 (VirtualBox-6.1.26.tar.bz2) = 0212602eea878d6c9fd7f4a3e0182da3e4505f31d25f5539fb8f7b1fbe366195
+SIZE (VirtualBox-6.1.26.tar.bz2) = 165690074
diff --git a/emulators/virtualbox-ose-kmod/Makefile b/emulators/virtualbox-ose-kmod/Makefile
index ce8e3ff97221..1d442019323d 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.22
-PORTREVISION= 1
+PORTVERSION= 6.1.26
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 3c2b6f0a9661..d454993893c9 100644
--- a/emulators/virtualbox-ose-kmod/distinfo
+++ b/emulators/virtualbox-ose-kmod/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619727799
-SHA256 (VirtualBox-6.1.22.tar.bz2) = 99816d2a15205d49362a31e8ffeb8262d2fa0678c751dfd0a7c43b2faca8be49
-SIZE (VirtualBox-6.1.22.tar.bz2) = 165560989
+TIMESTAMP = 1627588696
+SHA256 (VirtualBox-6.1.26.tar.bz2) = 0212602eea878d6c9fd7f4a3e0182da3e4505f31d25f5539fb8f7b1fbe366195
+SIZE (VirtualBox-6.1.26.tar.bz2) = 165690074
diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile
index 02de351a56fa..af6e998b9676 100644
--- a/emulators/virtualbox-ose/Makefile
+++ b/emulators/virtualbox-ose/Makefile
@@ -1,8 +1,7 @@
# Created by: Bernhard Froehlich <decke@bluelife.at>
PORTNAME= virtualbox-ose
-PORTVERSION= 6.1.22
-PORTREVISION= 1
+PORTVERSION= 6.1.26
CATEGORIES= emulators
MASTER_SITES= https://download.virtualbox.org/virtualbox/${PORTVERSION}/
DISTFILES= VirtualBox-${PORTVERSION}${EXTRACT_SUFX} ${GUESTADDITIONS}
@@ -56,6 +55,9 @@ VBOX_UTILS= VBoxExtPackHelperApp VBoxNetAdpCtl VBoxNetDHCP VBoxNetNAT \
OPTIONS_DEFINE= AIO ALSA DBUS DEBUG GUESTADDITIONS MANUAL NLS OPUS PULSEAUDIO \
PYTHON QT5 R0LOGGING UDPTUNNEL VDE VNC WEBSERVICE VPX X11
OPTIONS_DEFAULT= AIO DBUS QT5 UDPTUNNEL VNC WEBSERVICE X11
+# Since version 6.1.24 pulseaudio is broken at runtime, preventing
+# virtual machines from starting if configured to use it.
+OPTIONS_EXCLUDE= PULSEAUDIO
OPTIONS_SUB= yes
AIO_DESC= Enable Asyncronous IO support (check pkg-message)
diff --git a/emulators/virtualbox-ose/distinfo b/emulators/virtualbox-ose/distinfo
index 0611ab0932a9..249c55653f84 100644
--- a/emulators/virtualbox-ose/distinfo
+++ b/emulators/virtualbox-ose/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1619728110
-SHA256 (VirtualBox-6.1.22.tar.bz2) = 99816d2a15205d49362a31e8ffeb8262d2fa0678c751dfd0a7c43b2faca8be49
-SIZE (VirtualBox-6.1.22.tar.bz2) = 165560989
-SHA256 (VBoxGuestAdditions_6.1.22.iso) = bffc316a7b8d5ed56d830e9f6aef02b4e5ffc28674032142e96ffbedd905f8c9
-SIZE (VBoxGuestAdditions_6.1.22.iso) = 61020160
+TIMESTAMP = 1627588510
+SHA256 (VirtualBox-6.1.26.tar.bz2) = 0212602eea878d6c9fd7f4a3e0182da3e4505f31d25f5539fb8f7b1fbe366195
+SIZE (VirtualBox-6.1.26.tar.bz2) = 165690074
+SHA256 (VBoxGuestAdditions_6.1.26.iso) = 22d02ec417cd7723d7269dbdaa71c48815f580c0ca7a0606c42bd623f84873d7
+SIZE (VBoxGuestAdditions_6.1.26.iso) = 61073408
diff --git a/emulators/virtualbox-ose/files/patch-configure b/emulators/virtualbox-ose/files/patch-configure
index 1312d17cacc2..c0e7aa3f0d8a 100644
--- a/emulators/virtualbox-ose/files/patch-configure
+++ b/emulators/virtualbox-ose/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig 2021-01-07 15:31:21 UTC
+--- configure.orig 2021-07-28 16:13:45 UTC
+++ configure
-@@ -140,10 +140,14 @@ CXX_FLAGS=""
+@@ -139,10 +139,14 @@ CXX_FLAGS=""
if [ "$OS" = "freebsd" ]; then
INCCURL="-I/usr/local/include"
LIBCURL="-L/usr/local/lib -lcurl"
@@ -15,7 +15,7 @@
else
INCCURL=""
LIBCURL="-lcurl"
-@@ -1258,7 +1262,7 @@ extern "C" int main(void)
+@@ -1257,7 +1261,7 @@ extern "C" int main(void)
#endif
}
EOF
@@ -24,18 +24,15 @@
test_execute
fi
}
-@@ -1563,9 +1567,7 @@ EOF
- if [ $? -eq 0 ]; then
- echo "(Qt5 from pkg-config)" >> $LOG
- FLGQT5=`pkg-config Qt5Core --cflags`
-- # gcc 4.8 is able to compile with C++11 (see also VBOX_GCC_std in Config.kmk)
-- [ $cc_maj -eq 4 -a $cc_min -eq 8 ] && FLGQT5="$FLGQT5 -std=c++11"
-- INCQT5=`strip_I "$FLGQT5"`
-+ FLGQT5="$FLGQT5 -std=c++11" INCQT5=`strip_I "$FLGQT5"`
+@@ -1564,6 +1568,7 @@ EOF
+ FLGQT5=`pkg-config Qt5Core Qt5Gui --cflags`
+ # gcc 4.8 is able to compile with C++11 (see also VBOX_GCC_std in Config.kmk)
+ [ $(($cc_maj * 100 + $cc_min)) -ge 408 ] && FLGQT5="$FLGQT5 -std=c++11"
++ FLGQT5="$FLGQT5 -std=c++11"
+ INCQT5=`strip_I "$FLGQT5"`
LIBDIR5=`pkg-config Qt5Core --variable=libdir`
- LIBQT5=`pkg-config Qt5Core --libs`
- LIBQT5="-L$LIBDIR5 $LIBQT5"
-@@ -1703,7 +1705,7 @@ check_libopus()
+ LIBQT5=`pkg-config Qt5Core Qt5Gui --libs`
+@@ -1702,7 +1707,7 @@ check_libopus()
fi
cat > $ODIR.tmp_src.cc << EOF
#include <cstdio>
@@ -44,7 +41,7 @@
extern "C" int main(void)
{
OpusEncoder *test;
-@@ -2035,8 +2037,8 @@ EOF
+@@ -2034,8 +2039,8 @@ EOF
echo "compiling the following source file:" >> $LOG
cat $ODIR.tmp_src.cc >> $LOG
echo "using the following command line:" >> $LOG
@@ -55,7 +52,16 @@
if [ $? -eq 0 ]; then
found=1
break
-@@ -2512,7 +2514,7 @@ for option in "$@"; do
+@@ -2151,7 +2156,7 @@ check_gsoap()
+ else
+ cnf_append "VBOX_GSOAP_CXX_SOURCES" ""
+ fi
+- cnf_append "VBOX_GSOAP_CXX_LIBS" "`strip_l "$GSOAP_CXX_LIBS"`"
++ cnf_append "VBOX_GSOAP_CXX_LIBS" "`strip_l "$GSOAP_CXX_LIBS"` z"
+ gsoap_version=`pkg-config gsoapssl++ --modversion`
+ log_success "found version $gsoap_version"
+ return
+@@ -2510,7 +2515,7 @@ for option in "$@"; do
--with-openssl-dir=*)
OPENSSLDIR=`echo $option | cut -d'=' -f2`
INCCRYPTO="-I${OPENSSLDIR}/include"
@@ -64,7 +70,7 @@
;;
--with-ow-dir=*)
WATCOM=`echo $option | cut -d'=' -f2`
-@@ -2856,14 +2858,23 @@ if [ $ONLY_ADDITIONS -eq 0 ]; then
+@@ -2853,14 +2858,23 @@ if [ $ONLY_ADDITIONS -eq 0 ]; then
[ $WITH_PYTHON -eq 1 ] && check_python
[ $WITH_JAVA -eq 1 ] && check_java
@@ -96,7 +102,7 @@
fi
# Linux-specific
-@@ -2878,14 +2889,6 @@ if [ "$OS" = "linux" ]; then
+@@ -2875,14 +2889,6 @@ if [ "$OS" = "linux" ]; then
cnf_append "VBOX_WITHOUT_LINUX_TEST_BUILDS" "1"
fi
if [ $ONLY_ADDITIONS -eq 0 ]; then
diff --git a/emulators/virtualbox-ose/files/patch-src_VBox_Devices_Audio_DrvHostAudioAlsa.cpp b/emulators/virtualbox-ose/files/patch-src_VBox_Devices_Audio_DrvHostAudioAlsa.cpp
deleted file mode 100644
index fec7ba18f722..000000000000
--- a/emulators/virtualbox-ose/files/patch-src_VBox_Devices_Audio_DrvHostAudioAlsa.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
---- 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;
- }
-
-+#if EPIPE != ESTRPIPE
- case -ESTRPIPE:
- {
- /* Stream was suspended and waiting for a recovery. */
-@@ -846,6 +847,7 @@ static DECLCALLBACK(int) drvHostAlsaAudioHA_StreamPlay
- LogFlowFunc(("Resumed suspended output stream\n"));
- continue;
- }
-+#endif
-
- default:
- LogFlowFunc(("Failed to write %RU32 bytes, error unknown\n", cbToWrite));
diff --git a/emulators/virtualbox-ose/files/patch-src_VBox_Devices_Audio_DrvHostAudioOss.cpp b/emulators/virtualbox-ose/files/patch-src_VBox_Devices_Audio_DrvHostAudioOss.cpp
deleted file mode 100644
index 0c79581ccd3f..000000000000
--- a/emulators/virtualbox-ose/files/patch-src_VBox_Devices_Audio_DrvHostAudioOss.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
---- 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:
- rc = VERR_AUDIO_STREAM_COULD_NOT_CREATE;
-+ iFormat = -1;
- break;
- }
-
-- if (RT_FAILURE(rc))
-+ if (RT_UNLIKELY(iFormat == -1))
- break;
-
- if (ioctl(fdFile, SNDCTL_DSP_SAMPLESIZE, &iFormat))
-@@ -664,6 +665,7 @@ static int ossCreateStreamIn(POSSAUDIOSTREAM pStreamOS
-
- pCfgAcq->Backend.cFramesPeriod = PDMAUDIOSTREAMCFG_B2F(pCfgAcq, ossAcq.cbFragmentSize);
- pCfgAcq->Backend.cFramesBufferSize = pCfgAcq->Backend.cFramesPeriod * 2; /* Use "double buffering". */
-+ pCfgAcq->Backend.cFramesPreBuffering = pCfgAcq->Backend.cFramesBufferSize;
- /** @todo Pre-buffering required? */
- }
- }
-@@ -782,6 +784,7 @@ static int ossCreateStreamOut(POSSAUDIOSTREAM pStreamO
- #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;
- }
-
- } while (0);
diff --git a/emulators/virtualbox-ose/pkg-message b/emulators/virtualbox-ose/pkg-message
index 0cf6996bbefa..20fa96d594fa 100644
--- a/emulators/virtualbox-ose/pkg-message
+++ b/emulators/virtualbox-ose/pkg-message
@@ -66,4 +66,16 @@ http://wiki.freebsd.org/VirtualBox
Please report any problems to emulation@. Thanks!
EOM
}
+{ type: upgrade
+ maximum_version: 6.1.22
+ message: <<EOM
+The PULSEAUDIO option has been forcibly disabled since VirtualBox
+version 6.1.24 due to a bug in it preventing virtual machines
+configured to use it from starting.
+
+When upgrading from a previous version please reconfigure any virtual
+machines using the Pulseaudio host audio driver to use another
+supported one.
+EOM
+}
]
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-25 01:38:55 +0000