Update to 5.1.16.

This commit is contained in:
Jung-uk Kim
2017-03-09 00:25:44 +00:00
parent 72ec346ff3
commit 9fc7e23845
11 changed files with 63 additions and 39 deletions
+1 -1
View File
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= virtualbox-ose
PORTVERSION= 5.1.14
PORTVERSION= 5.1.16
CATEGORIES= emulators
MASTER_SITES= http://download.virtualbox.org/virtualbox/${PORTVERSION}/
PKGNAMESUFFIX?= -additions
+3 -3
View File
@@ -1,3 +1,3 @@
TIMESTAMP = 1484686616
SHA256 (VirtualBox-5.1.14.tar.bz2) = 8267bb026717c6e55237eb798210767d9c703cfcdf01224d9bc26f7dac9f228a
SIZE (VirtualBox-5.1.14.tar.bz2) = 115042132
TIMESTAMP = 1489004477
SHA256 (VirtualBox-5.1.16.tar.bz2) = 78071c3172f3bd3c7981c352c3ae6c6a9c01f6ab24bc0aa7ec79f3528b2291a7
SIZE (VirtualBox-5.1.16.tar.bz2) = 115670028
+1 -1
View File
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= virtualbox-ose
PORTVERSION= 5.1.14
PORTVERSION= 5.1.16
CATEGORIES= emulators
MASTER_SITES= http://download.virtualbox.org/virtualbox/${PORTVERSION}/
PKGNAMESUFFIX= -kmod
+3 -3
View File
@@ -1,3 +1,3 @@
TIMESTAMP = 1484686616
SHA256 (VirtualBox-5.1.14.tar.bz2) = 8267bb026717c6e55237eb798210767d9c703cfcdf01224d9bc26f7dac9f228a
SIZE (VirtualBox-5.1.14.tar.bz2) = 115042132
TIMESTAMP = 1489004477
SHA256 (VirtualBox-5.1.16.tar.bz2) = 78071c3172f3bd3c7981c352c3ae6c6a9c01f6ab24bc0aa7ec79f3528b2291a7
SIZE (VirtualBox-5.1.16.tar.bz2) = 115670028
+1 -2
View File
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= virtualbox-ose
PORTVERSION= 5.1.14
PORTREVISION= 2
PORTVERSION= 5.1.16
CATEGORIES= emulators
MASTER_SITES= http://download.virtualbox.org/virtualbox/${PORTVERSION}/
DISTFILES= VirtualBox-${PORTVERSION}${EXTRACT_SUFX} ${GUESTADDITIONS}
+5 -5
View File
@@ -1,5 +1,5 @@
TIMESTAMP = 1484686616
SHA256 (VirtualBox-5.1.14.tar.bz2) = 8267bb026717c6e55237eb798210767d9c703cfcdf01224d9bc26f7dac9f228a
SIZE (VirtualBox-5.1.14.tar.bz2) = 115042132
SHA256 (VBoxGuestAdditions_5.1.14.iso) = 1b206b76050dccd3ed979307230f9ddea79551e1c0aba93faee77416733cdc8a
SIZE (VBoxGuestAdditions_5.1.14.iso) = 59369472
TIMESTAMP = 1489004477
SHA256 (VirtualBox-5.1.16.tar.bz2) = 78071c3172f3bd3c7981c352c3ae6c6a9c01f6ab24bc0aa7ec79f3528b2291a7
SIZE (VirtualBox-5.1.16.tar.bz2) = 115670028
SHA256 (VBoxGuestAdditions_5.1.16.iso) = 2a327e31d5f6283d6dbdc9b32cb586848740fbefa49d96664fe463f88828cfab
SIZE (VBoxGuestAdditions_5.1.16.iso) = 59375616
@@ -1,4 +1,4 @@
--- configure.orig 2016-09-12 16:11:24 UTC
--- configure.orig 2017-03-08 17:15:08 UTC
+++ configure
@@ -140,10 +140,14 @@ CXX_FLAGS=""
if [ "$OS" = "freebsd" ]; then
@@ -34,15 +34,17 @@
test_execute
fi
}
@@ -1694,6 +1701,7 @@
@@ -1694,8 +1701,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"
+ FLGQT5="$FLGQT5 -std=c++11"
INCQT5=`strip_I "$FLGQT5"`
LIBDIR5=`pkg-config Qt5Core --variable=libdir`
LIBQT5=`pkg-config Qt5Core --libs`
@@ -2126,8 +2133,8 @@ EOF
@@ -2151,8 +2157,8 @@ EOF
echo "compiling the following source file:" >> $LOG
cat $ODIR.tmp_src.cc >> $LOG
echo "using the following command line:" >> $LOG
@@ -53,7 +55,7 @@
if [ $? -eq 0 ]; then
found=1
break
@@ -2603,7 +2610,7 @@ for option in "$@"; do
@@ -2628,7 +2634,7 @@ for option in "$@"; do
--with-openssl-dir=*)
OPENSSLDIR=`echo $option | cut -d'=' -f2`
INCCRYPTO="-I${OPENSSLDIR}/include"
@@ -62,7 +64,7 @@
;;
--with-ow-dir=*)
WATCOM=`echo $option | cut -d'=' -f2`
@@ -2944,13 +2951,20 @@ if [ $ONLY_ADDITIONS -eq 0 ]; then
@@ -2969,13 +2975,20 @@ if [ $ONLY_ADDITIONS -eq 0 ]; then
[ $WITH_PYTHON -eq 1 ] && check_python
[ $WITH_JAVA -eq 1 ] && check_java
@@ -84,7 +86,7 @@
fi
fi
@@ -2967,14 +2981,6 @@ if [ "$OS" = "linux" ]; then
@@ -2992,14 +3005,6 @@ if [ "$OS" = "linux" ]; then
cnf_append "VBOX_WITH_ADDITION_DRIVERS" ""
fi
if [ $ONLY_ADDITIONS -eq 0 ]; then
@@ -0,0 +1,22 @@
--- include/iprt/asm.h.orig 2017-03-08 17:15:12 UTC
+++ include/iprt/asm.h
@@ -140,7 +140,9 @@
* Used to work around some 4.3.x register allocation issues in this version of
* the compiler. So far this workaround is still required for 4.4 and 4.5 but
* definitely not for 5.x */
-#define RT_INLINE_ASM_GCC_4_3_X_X86 (RT_GNUC_PREREQ(4, 3) && !RT_GNUC_PREREQ(5, 0) && defined(__i386__))
+#ifndef __clang__
+# define RT_INLINE_ASM_GCC_4_3_X_X86 (RT_GNUC_PREREQ(4, 3) && !RT_GNUC_PREREQ(5, 0) && defined(__i386__))
+#endif
#ifndef RT_INLINE_ASM_GCC_4_3_X_X86
# define RT_INLINE_ASM_GCC_4_3_X_X86 0
#endif
@@ -158,6 +160,8 @@
# define RT_INLINE_DONT_MIX_CMPXCHG8B_AND_PIC 1
# elif defined(_MSC_VER) /* Visual C++ has trouble too, but it'll only tell us when C4688 is enabled. */
# define RT_INLINE_DONT_MIX_CMPXCHG8B_AND_PIC 0
+# elif defined(__clang__)
+# define RT_INLINE_DONT_MIX_CMPXCHG8B_AND_PIC 0
# else
# define RT_INLINE_DONT_MIX_CMPXCHG8B_AND_PIC \
( (defined(PIC) || defined(__PIC__)) \
@@ -1,18 +0,0 @@
--- src/VBox/Devices/Audio_50/DrvHostALSAAudio.cpp.orig 2016-11-21 17:27:56 UTC
+++ src/VBox/Devices/Audio_50/DrvHostALSAAudio.cpp
@@ -983,6 +983,7 @@ static DECLCALLBACK(int) drvHostALSAAudi
continue;
}
+#if EPIPE != ESTRPIPE
case -ESTRPIPE:
{
/* Stream was suspended and waiting for a recovery. */
@@ -996,6 +997,7 @@ static DECLCALLBACK(int) drvHostALSAAudi
LogFlowFunc(("Resumed suspended output stream\n"));
continue;
}
+#endif
default:
LogFlowFunc(("Failed to write %RI32 output frames, rc=%Rrc\n",
@@ -0,0 +1,17 @@
--- src/libs/xpcom18a4/xpcom/io/nsLocalFileUnix.h.orig 2017-03-08 17:21:24.000000000 +0000
+++ src/libs/xpcom18a4/xpcom/io/nsLocalFileUnix.h 2017-03-08 22:53:39.572250000 +0000
@@ -72,14 +72,6 @@
#define STATFS statfs
#endif
-// so we can statfs on freebsd
-#if defined(__FreeBSD__)
- #define HAVE_SYS_STATFS_H
- #define STATFS statfs
- #include <sys/param.h>
- #include <sys/mount.h>
-#endif
-
class NS_COM nsLocalFile : public nsILocalFile
{
public:
+2
View File
@@ -567,6 +567,7 @@ lib/virtualbox/components/VirtualBox_XPCOM.xpt
%%NLS%%%%DATADIR%%/nls/VirtualBox_sl.qm
%%NLS%%%%DATADIR%%/nls/VirtualBox_sr.qm
%%NLS%%%%DATADIR%%/nls/VirtualBox_sv.qm
%%NLS%%%%DATADIR%%/nls/VirtualBox_th.qm
%%NLS%%%%DATADIR%%/nls/VirtualBox_tr.qm
%%NLS%%%%DATADIR%%/nls/VirtualBox_uk.qm
%%NLS%%%%DATADIR%%/nls/VirtualBox_zh_CN.qm
@@ -603,6 +604,7 @@ lib/virtualbox/components/VirtualBox_XPCOM.xpt
%%NLS%%%%DATADIR%%/nls/qt_sl.qm
%%NLS%%%%DATADIR%%/nls/qt_sr.qm
%%NLS%%%%DATADIR%%/nls/qt_sv.qm
%%NLS%%%%DATADIR%%/nls/qt_th.qm
%%NLS%%%%DATADIR%%/nls/qt_tr.qm
%%NLS%%%%DATADIR%%/nls/qt_uk.qm
%%NLS%%%%DATADIR%%/nls/qt_zh_CN.qm