Date: Wed, 17 Jan 2018 01:59:24 +0000 (UTC) From: Jung-uk Kim <jkim@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r459217 - in head/emulators/virtualbox-ose: . files Message-ID: <201801170159.w0H1xOaq090963@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jkim Date: Wed Jan 17 01:59:24 2018 New Revision: 459217 URL: https://svnweb.freebsd.org/changeset/ports/459217 Log: Update to 5.2.6. Added: head/emulators/virtualbox-ose/files/patch-include_iprt_assertcompile.h (contents, props changed) head/emulators/virtualbox-ose/files/patch-include_iprt_cdefs.h (contents, props changed) head/emulators/virtualbox-ose/files/patch-src_VBox_VMM_VMMR0_GVMMR0.cpp (contents, props changed) head/emulators/virtualbox-ose/files/patch-src_VBox_VMM_VMMR3_VMReq.cpp (contents, props changed) Deleted: head/emulators/virtualbox-ose/files/patch-src_VBox_HostServices_SharedClipboard_x11-stub.cpp Modified: head/emulators/virtualbox-ose/Makefile head/emulators/virtualbox-ose/distinfo Modified: head/emulators/virtualbox-ose/Makefile ============================================================================== --- head/emulators/virtualbox-ose/Makefile Wed Jan 17 01:28:36 2018 (r459216) +++ head/emulators/virtualbox-ose/Makefile Wed Jan 17 01:59:24 2018 (r459217) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= virtualbox-ose -PORTVERSION= 5.2.4 +PORTVERSION= 5.2.6 CATEGORIES= emulators MASTER_SITES= http://download.virtualbox.org/virtualbox/${PORTVERSION}/ DISTFILES= VirtualBox-${PORTVERSION}${EXTRACT_SUFX} ${GUESTADDITIONS} Modified: head/emulators/virtualbox-ose/distinfo ============================================================================== --- head/emulators/virtualbox-ose/distinfo Wed Jan 17 01:28:36 2018 (r459216) +++ head/emulators/virtualbox-ose/distinfo Wed Jan 17 01:59:24 2018 (r459217) @@ -1,5 +1,5 @@ -TIMESTAMP = 1514405545 -SHA256 (VirtualBox-5.2.4.tar.bz2) = c9a060bd99168e05587f1ba74b54e9c1f709734bdfc956b0242fe63e81bb7d14 -SIZE (VirtualBox-5.2.4.tar.bz2) = 118481693 -SHA256 (VBoxGuestAdditions_5.2.4.iso) = 60da4bb2d522632f6ac82377354cb03a9ff25c36d6a881d3158d22c2b6c91a62 -SIZE (VBoxGuestAdditions_5.2.4.iso) = 57868288 +TIMESTAMP = 1516131253 +SHA256 (VirtualBox-5.2.6.tar.bz2) = fe705288ee50efcce10ff4c80e461a1c7091e461a7b55f98842fa1c9772ca4e7 +SIZE (VirtualBox-5.2.6.tar.bz2) = 118530572 +SHA256 (VBoxGuestAdditions_5.2.6.iso) = c5ff76a50504e8be1f6c6f3202c78f9cd07e7023b9684bec3cce9d4dcd95a9df +SIZE (VBoxGuestAdditions_5.2.6.iso) = 57866240 Added: head/emulators/virtualbox-ose/files/patch-include_iprt_assertcompile.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/virtualbox-ose/files/patch-include_iprt_assertcompile.h Wed Jan 17 01:59:24 2018 (r459217) @@ -0,0 +1,15 @@ +--- include/iprt/assertcompile.h.orig 2018-01-15 14:49:42 UTC ++++ include/iprt/assertcompile.h +@@ -104,7 +104,11 @@ RT_C_DECLS_END + * @param expr Expression which should be true. + */ + #ifdef RTASSERT_HAVE_STATIC_ASSERT +-# define AssertCompile(expr) static_assert(!!(expr), #expr) ++# ifdef __cplusplus ++# define AssertCompile(expr) static_assert(!!(expr), #expr) ++# else ++# define AssertCompile(expr) _Static_assert(!!(expr), #expr) ++# endif + #else + # define AssertCompile(expr) AssertCompileNS(expr) + #endif Added: head/emulators/virtualbox-ose/files/patch-include_iprt_cdefs.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/virtualbox-ose/files/patch-include_iprt_cdefs.h Wed Jan 17 01:59:24 2018 (r459217) @@ -0,0 +1,83 @@ +--- include/iprt/cdefs.h.orig 2018-01-15 14:49:42 UTC ++++ include/iprt/cdefs.h +@@ -2214,6 +2214,8 @@ + */ + #if defined(__cplusplus) && RT_GNUC_PREREQ(4, 4) + # define RT_OFFSETOF(type, member) ( (int)(uintptr_t)&( ((type *)(void *)0x1000)->member) - 0x1000 ) ++#elif RT_CLANG_PREREQ(6, 0) ++# define RT_OFFSETOF(type, member) ( (int)__builtin_offsetof(type, member) ) + #else + # define RT_OFFSETOF(type, member) ( (int)(uintptr_t)&( ((type *)(void *)0)->member) ) + #endif +@@ -2232,6 +2234,8 @@ + */ + #if defined(__cplusplus) && RT_GNUC_PREREQ(4, 4) + # define RT_UOFFSETOF(type, member) ( (uintptr_t)&( ((type *)(void *)0x1000)->member) - 0x1000 ) ++#elif RT_CLANG_PREREQ(6, 0) ++# define RT_UOFFSETOF(type, member) ( (unsigned)__builtin_offsetof(type, member) ) + #else + # define RT_UOFFSETOF(type, member) ( (uintptr_t)&( ((type *)(void *)0)->member) ) + #endif +@@ -2244,7 +2248,11 @@ + * @param member Member. + * @param addend The addend to add to the offset. + */ +-#define RT_OFFSETOF_ADD(type, member, addend) ( (int)RT_UOFFSETOF_ADD(type, member, addend) ) ++#if RT_CLANG_PREREQ(6, 0) ++# define RT_OFFSETOF_ADD(type, member, addend) ( (int)(__builtin_offsetof(type, member) + addend) ) ++#else ++# define RT_OFFSETOF_ADD(type, member, addend) ( (int)RT_UOFFSETOF_ADD(type, member, addend) ) ++#endif + + /** @def RT_UOFFSETOF_ADD + * RT_UOFFSETOF with an addend. +@@ -2254,7 +2262,11 @@ + * @param member Member. + * @param addend The addend to add to the offset. + */ +-#define RT_UOFFSETOF_ADD(type, member, addend) ( (uintptr_t)&( ((type *)(void *)(uintptr_t)(addend))->member) ) ++#if RT_CLANG_PREREQ(6, 0) ++# define RT_UOFFSETOF_ADD(type, member, addend) ( (unsigned)(__builtin_offsetof(type, member) + addend) ) ++#else ++# define RT_UOFFSETOF_ADD(type, member, addend) ( (uintptr_t)&( ((type *)(void *)(uintptr_t)(addend))->member) ) ++#endif + + /** @def RT_SIZEOFMEMB + * Get the size of a structure member. +@@ -2517,28 +2529,28 @@ + + /** @def RT_BYTE1 + * Gets the first byte of something. */ +-#define RT_BYTE1(a) ( (a) & 0xff ) ++#define RT_BYTE1(a) ( (uint8_t)((a) & 0xff) ) + /** @def RT_BYTE2 + * Gets the second byte of something. */ +-#define RT_BYTE2(a) ( ((a) >> 8) & 0xff ) ++#define RT_BYTE2(a) ( (uint8_t)(((a) >> 8) & 0xff) ) + /** @def RT_BYTE3 + * Gets the second byte of something. */ +-#define RT_BYTE3(a) ( ((a) >> 16) & 0xff ) ++#define RT_BYTE3(a) ( (uint8_t)(((a) >> 16) & 0xff) ) + /** @def RT_BYTE4 + * Gets the fourth byte of something. */ +-#define RT_BYTE4(a) ( ((a) >> 24) & 0xff ) ++#define RT_BYTE4(a) ( (uint8_t)(((a) >> 24) & 0xff) ) + /** @def RT_BYTE5 + * Gets the fifth byte of something. */ +-#define RT_BYTE5(a) ( ((a) >> 32) & 0xff ) ++#define RT_BYTE5(a) ( (uint8_t)(((a) >> 32) & 0xff) ) + /** @def RT_BYTE6 + * Gets the sixth byte of something. */ +-#define RT_BYTE6(a) ( ((a) >> 40) & 0xff ) ++#define RT_BYTE6(a) ( (uint8_t)(((a) >> 40) & 0xff) ) + /** @def RT_BYTE7 + * Gets the seventh byte of something. */ +-#define RT_BYTE7(a) ( ((a) >> 48) & 0xff ) ++#define RT_BYTE7(a) ( (uint8_t)(((a) >> 48) & 0xff) ) + /** @def RT_BYTE8 + * Gets the eight byte of something. */ +-#define RT_BYTE8(a) ( ((a) >> 56) & 0xff ) ++#define RT_BYTE8(a) ( (uint8_t)(((a) >> 56) & 0xff) ) + + + /** @def RT_LODWORD Added: head/emulators/virtualbox-ose/files/patch-src_VBox_VMM_VMMR0_GVMMR0.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/virtualbox-ose/files/patch-src_VBox_VMM_VMMR0_GVMMR0.cpp Wed Jan 17 01:59:24 2018 (r459217) @@ -0,0 +1,11 @@ +--- src/VBox/VMM/VMMR0/GVMMR0.cpp.orig 2018-01-15 14:56:33.000000000 +0000 ++++ src/VBox/VMM/VMMR0/GVMMR0.cpp 2018-01-17 01:13:24.832105000 +0000 +@@ -1243,7 +1243,7 @@ static void gvmmR0CleanupVM(PGVM pGVM) + + GMMR0CleanupVM(pGVM); + +- AssertCompile((uintptr_t)NIL_RTTHREADCTXHOOK == 0); /* Depends on zero initialized memory working for NIL at the moment. */ ++ AssertCompile(NIL_RTTHREADCTXHOOK == (RTTHREADCTXHOOK)0); /* Depends on zero initialized memory working for NIL at the moment. */ + for (VMCPUID idCpu = 0; idCpu < pGVM->cCpus; idCpu++) + { + /** @todo Can we busy wait here for all thread-context hooks to be Added: head/emulators/virtualbox-ose/files/patch-src_VBox_VMM_VMMR3_VMReq.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/virtualbox-ose/files/patch-src_VBox_VMM_VMMR3_VMReq.cpp Wed Jan 17 01:59:24 2018 (r459217) @@ -0,0 +1,11 @@ +--- src/VBox/VMM/VMMR3/VMReq.cpp.orig 2018-01-15 14:56:37 UTC ++++ src/VBox/VMM/VMMR3/VMReq.cpp +@@ -669,7 +669,7 @@ VMMR3DECL(int) VMR3ReqAlloc(PUVM pUVM, PVMREQ *ppReq, + Assert(pReq->enmType == VMREQTYPE_INVALID); + Assert(pReq->enmState == VMREQSTATE_FREE); + Assert(pReq->pUVM == pUVM); +- ASMAtomicXchgSize(&pReq->pNext, NULL); ++ ASMAtomicXchgSize(&pReq->pNext, (uintptr_t)NULL); + pReq->enmState = VMREQSTATE_ALLOCATED; + pReq->iStatus = VERR_VM_REQUEST_STATUS_STILL_PENDING; + pReq->fFlags = VMREQFLAGS_VBOX_STATUS;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201801170159.w0H1xOaq090963>