diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2019-04-24 03:20:48 +0800 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2019-04-24 03:20:48 +0800 |
| commit | 3c53b6d1516b3c97793211bf96a03ee42630e08f (patch) | |
| tree | 42866df8471bea339587051d3adb9edfca049927 /emulators/virtualbox-ose/files | |
| parent | 22938be7b095f13f4d8d775f0a6623d76b2340bf (diff) | |
| download | freebsd-ports-gnome-3c53b6d1516b3c97793211bf96a03ee42630e08f.tar.gz freebsd-ports-gnome-3c53b6d1516b3c97793211bf96a03ee42630e08f.tar.zst freebsd-ports-gnome-3c53b6d1516b3c97793211bf96a03ee42630e08f.zip | |
Update to 5.2.28.
https://www.virtualbox.org/wiki/Changelog-5.2#v28
Diffstat (limited to 'emulators/virtualbox-ose/files')
| -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 |
2 files changed, 37 insertions, 19 deletions
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 + } |