diff options
author | Jung-uk Kim <jkim@FreeBSD.org> | 2019-04-23 19:20:48 +0000 |
---|---|---|
committer | Jung-uk Kim <jkim@FreeBSD.org> | 2019-04-23 19:20:48 +0000 |
commit | 3c53b6d1516b3c97793211bf96a03ee42630e08f (patch) | |
tree | 42866df8471bea339587051d3adb9edfca049927 /emulators | |
parent | 22938be7b095f13f4d8d775f0a6623d76b2340bf (diff) | |
download | ports-3c53b6d1516b3c97793211bf96a03ee42630e08f.tar.gz ports-3c53b6d1516b3c97793211bf96a03ee42630e08f.zip |
Update to 5.2.28.
Notes
Notes:
svn path=/head/; revision=499787
Diffstat (limited to 'emulators')
-rw-r--r-- | emulators/virtualbox-ose-additions/Makefile | 3 | ||||
-rw-r--r-- | emulators/virtualbox-ose-additions/distinfo | 6 | ||||
-rw-r--r-- | emulators/virtualbox-ose-kmod/Makefile | 2 | ||||
-rw-r--r-- | emulators/virtualbox-ose-kmod/distinfo | 6 | ||||
-rw-r--r-- | emulators/virtualbox-ose/Makefile | 9 | ||||
-rw-r--r-- | emulators/virtualbox-ose/distinfo | 10 | ||||
-rw-r--r-- | emulators/virtualbox-ose/files/patch-Config.kmk | 20 | ||||
-rw-r--r-- | emulators/virtualbox-ose/files/patch-include_VBox_com_array.h | 36 |
8 files changed, 54 insertions, 38 deletions
diff --git a/emulators/virtualbox-ose-additions/Makefile b/emulators/virtualbox-ose-additions/Makefile index 0a1741d99266..0057dd7a4678 100644 --- a/emulators/virtualbox-ose-additions/Makefile +++ b/emulators/virtualbox-ose-additions/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= virtualbox-ose -PORTVERSION= 5.2.26 -PORTREVISION= 4 +PORTVERSION= 5.2.28 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 bb5528d0e78c..9f4f82c77435 100644 --- a/emulators/virtualbox-ose-additions/distinfo +++ b/emulators/virtualbox-ose-additions/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1548732081 -SHA256 (VirtualBox-5.2.26.tar.bz2) = 4debe583463be3917ac60ad76a31f6db27586423d86f1f53c060d70d5e70d467 -SIZE (VirtualBox-5.2.26.tar.bz2) = 118371765 +TIMESTAMP = 1556040474 +SHA256 (VirtualBox-5.2.28.tar.bz2) = 802fbe9068034112c123cd160e9258e9b52e95b0b853bf6f569e8aa4a15fb94a +SIZE (VirtualBox-5.2.28.tar.bz2) = 118655475 diff --git a/emulators/virtualbox-ose-kmod/Makefile b/emulators/virtualbox-ose-kmod/Makefile index 77648487996f..911af4903f3c 100644 --- a/emulators/virtualbox-ose-kmod/Makefile +++ b/emulators/virtualbox-ose-kmod/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= virtualbox-ose -PORTVERSION= 5.2.26 +PORTVERSION= 5.2.28 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 bb5528d0e78c..9f4f82c77435 100644 --- a/emulators/virtualbox-ose-kmod/distinfo +++ b/emulators/virtualbox-ose-kmod/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1548732081 -SHA256 (VirtualBox-5.2.26.tar.bz2) = 4debe583463be3917ac60ad76a31f6db27586423d86f1f53c060d70d5e70d467 -SIZE (VirtualBox-5.2.26.tar.bz2) = 118371765 +TIMESTAMP = 1556040474 +SHA256 (VirtualBox-5.2.28.tar.bz2) = 802fbe9068034112c123cd160e9258e9b52e95b0b853bf6f569e8aa4a15fb94a +SIZE (VirtualBox-5.2.28.tar.bz2) = 118655475 diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile index db0d5cb4fa6d..1bec061c699d 100644 --- a/emulators/virtualbox-ose/Makefile +++ b/emulators/virtualbox-ose/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= virtualbox-ose -PORTVERSION= 5.2.26 -PORTREVISION= 4 +PORTVERSION= 5.2.28 CATEGORIES= emulators MASTER_SITES= https://download.virtualbox.org/virtualbox/${PORTVERSION}/ DISTFILES= VirtualBox-${PORTVERSION}${EXTRACT_SUFX} ${GUESTADDITIONS} @@ -204,9 +203,9 @@ KMK_FLAGS+= -j${MAKE_JOBS_NUMBER} .if ${COMPILER_VERSION} == 80 # XXX PR236616: Clang 8.0 caused runtime problems. BUILD_DEPENDS+= ${LOCALBASE}/bin/clang${VBOX_LLVM_VER}:devel/llvm${VBOX_LLVM_VER} -CC= ${LOCALBASE}/bin/clang${VBOX_LLVM_VER} -CXX= ${LOCALBASE}/bin/clang++${VBOX_LLVM_VER} -VBOX_LLVM_VER?= 60 +CC= ${LOCALBASE}/bin/clang${VBOX_LLVM_VER} +CXX= ${LOCALBASE}/bin/clang++${VBOX_LLVM_VER} +VBOX_LLVM_VER?= 60 .endif PATCH_DEPENDS+= ${LOCALBASE}/share/kBuild/tools/GXX3.kmk:devel/kBuild EXTRA_PATCHES+= ${PATCHDIR}/extrapatch-Config.kmk \ diff --git a/emulators/virtualbox-ose/distinfo b/emulators/virtualbox-ose/distinfo index c5c530a2db3e..d5d7f887f026 100644 --- a/emulators/virtualbox-ose/distinfo +++ b/emulators/virtualbox-ose/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1548732081 -SHA256 (VirtualBox-5.2.26.tar.bz2) = 4debe583463be3917ac60ad76a31f6db27586423d86f1f53c060d70d5e70d467 -SIZE (VirtualBox-5.2.26.tar.bz2) = 118371765 -SHA256 (VBoxGuestAdditions_5.2.26.iso) = b927c5d0d4c97a9da2522daad41fe96b616ed06bfb0c883f9c42aad2244f7c38 -SIZE (VBoxGuestAdditions_5.2.26.iso) = 58433536 +TIMESTAMP = 1556040474 +SHA256 (VirtualBox-5.2.28.tar.bz2) = 802fbe9068034112c123cd160e9258e9b52e95b0b853bf6f569e8aa4a15fb94a +SIZE (VirtualBox-5.2.28.tar.bz2) = 118655475 +SHA256 (VBoxGuestAdditions_5.2.28.iso) = 69876a992001ef3d3b9c3f40aa0fb6653e1b6663632576b8d75e86c65eab8d33 +SIZE (VBoxGuestAdditions_5.2.28.iso) = 58568704 diff --git a/emulators/virtualbox-ose/files/patch-Config.kmk b/emulators/virtualbox-ose/files/patch-Config.kmk index 2539bb6aba9b..9ce6b8f24f7f 100644 --- a/emulators/virtualbox-ose/files/patch-Config.kmk +++ b/emulators/virtualbox-ose/files/patch-Config.kmk @@ -1,4 +1,4 @@ ---- Config.kmk.orig 2019-01-25 18:24:01 UTC +--- Config.kmk.orig 2019-04-12 15:47:38 UTC +++ Config.kmk @@ -445,11 +445,11 @@ ifn1of ($(KBUILD_TARGET), win darwin) # Enable OSS audio support. @@ -57,24 +57,6 @@ VBOX_WITH_DOCS= VBOX_WITH_DOCS_PACKING= endif -@@ -1176,13 +1172,13 @@ ifdef VBOX_OSE - ifn1of ($(KBUILD_TARGET), darwin linux solaris win) - VBOX_WITH_INSTALLER= - endif -+ # Undefine codec libraries which are not needed. -+ VBOX_WITH_LIBOPUS= -+ # Disable video recording (with audio support). -+ VBOX_WITH_AUDIO_VIDEOREC= - if1of ($(KBUILD_TARGET), win) -- # Undefine codec libraries which are not needed. - VBOX_WITH_LIBVPX= -- VBOX_WITH_LIBOPUS= -- # Disable video recording (with audio support). - VBOX_WITH_VIDEOREC= -- VBOX_WITH_AUDIO_VIDEOREC= - endif - # branding - VBOX_BRAND_LICENSE_HTML := $(PATH_ROOT)/doc/License-gpl-2.0.html @@ -4556,7 +4552,7 @@ TEMPLATE_VBOXR0DRV_CFLAGS = \ -O2 -ffreestanding -fno-strict-aliasing -fno-common -finline-limit=8000 \ $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \ diff --git a/emulators/virtualbox-ose/files/patch-include_VBox_com_array.h b/emulators/virtualbox-ose/files/patch-include_VBox_com_array.h new file mode 100644 index 000000000000..ad8071687bbf --- /dev/null +++ b/emulators/virtualbox-ose/files/patch-include_VBox_com_array.h @@ -0,0 +1,36 @@ +--- include/VBox/com/array.h.orig 2019-04-12 15:47:42 UTC ++++ include/VBox/com/array.h +@@ -168,7 +168,7 @@ + + #include "VBox/com/defs.h" + +-#if RT_GNUC_PREREQ(4, 6) || (defined(_MSC_VER) && (_MSC_VER >= 1600)) ++#if RT_GNUC_PREREQ(4, 6) || (defined(_MSC_VER) && (_MSC_VER >= 1600)) || defined(_LIBCPP_VERSION) + /** @def VBOX_WITH_TYPE_TRAITS + * Type traits are a C++ 11 feature, so not available everywhere (yet). + * Only GCC 4.6 or newer and MSVC++ 16.0 (Visual Studio 2010) or newer. +@@ -940,12 +940,12 @@ class SafeArray : public Traits (public) + */ + T &operator[] (size_t aIdx) + { +- AssertReturn(m.arr != NULL, *((T *)NULL)); +- AssertReturn(aIdx < size(), *((T *)NULL)); ++ AssertReturn(m.arr != NULL, *((T *)1)); ++ AssertReturn(aIdx < size(), *((T *)1)); + #ifdef VBOX_WITH_XPCOM + return m.arr[aIdx]; + #else +- AssertReturn(m.raw != NULL, *((T *)NULL)); ++ AssertReturn(m.raw != NULL, *((T *)1)); + return m.raw[aIdx]; + #endif + } +@@ -960,7 +960,7 @@ class SafeArray : public Traits (public) + #ifdef VBOX_WITH_XPCOM + return m.arr[aIdx]; + #else +- AssertReturn(m.raw != NULL, *((T *)NULL)); ++ AssertReturn(m.raw != NULL, *((T *)1)); + return m.raw[aIdx]; + #endif + } |