Update to 5.1.10.
This commit is contained in:
parent
f0c900f9df
commit
fb3b57862e
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=427059
10 changed files with 34 additions and 89 deletions
|
@ -2,7 +2,7 @@
|
|||
# $FreeBSD$
|
||||
|
||||
PORTNAME= virtualbox-ose
|
||||
PORTVERSION= 5.1.8
|
||||
PORTVERSION= 5.1.10
|
||||
CATEGORIES= emulators
|
||||
MASTER_SITES= http://download.virtualbox.org/virtualbox/${PORTVERSION}/
|
||||
PKGNAMESUFFIX?= -additions
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1477249150
|
||||
SHA256 (VirtualBox-5.1.8.tar.bz2) = e447031de468aee746529b2cf60768922f9beff22a13c54284aa430f5e925933
|
||||
SIZE (VirtualBox-5.1.8.tar.bz2) = 114688166
|
||||
TIMESTAMP = 1479993983
|
||||
SHA256 (VirtualBox-5.1.10.tar.bz2) = 98073b1b2adee4e6553df73cb5bb6ea8ed7c3a41a475757716fd9400393bea40
|
||||
SIZE (VirtualBox-5.1.10.tar.bz2) = 114912508
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
# $FreeBSD$
|
||||
|
||||
PORTNAME= virtualbox-ose
|
||||
PORTVERSION= 5.1.8
|
||||
PORTVERSION= 5.1.10
|
||||
CATEGORIES= emulators
|
||||
MASTER_SITES= http://download.virtualbox.org/virtualbox/${PORTVERSION}/
|
||||
PKGNAMESUFFIX= -kmod
|
||||
|
@ -37,8 +37,8 @@ CONFIGURE_ARGS+= --disable-alsa \
|
|||
--disable-xpcom
|
||||
CONFIGURE_ARGS+= --nofatal --with-gcc="${CC}" --with-g++="${CXX}"
|
||||
|
||||
CONFLICTS_INSTALL= virtualbox-ose-kmod-devel-4* \
|
||||
virtualbox-ose-kmod-legacy-4*
|
||||
CONFLICTS_INSTALL= virtualbox-ose-kmod-devel-* \
|
||||
virtualbox-ose-kmod-legacy-*
|
||||
|
||||
OPTIONS_DEFINE= DEBUG VIMAGE
|
||||
OPTIONS_SUB= yes
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1477249150
|
||||
SHA256 (VirtualBox-5.1.8.tar.bz2) = e447031de468aee746529b2cf60768922f9beff22a13c54284aa430f5e925933
|
||||
SIZE (VirtualBox-5.1.8.tar.bz2) = 114688166
|
||||
TIMESTAMP = 1479993983
|
||||
SHA256 (VirtualBox-5.1.10.tar.bz2) = 98073b1b2adee4e6553df73cb5bb6ea8ed7c3a41a475757716fd9400393bea40
|
||||
SIZE (VirtualBox-5.1.10.tar.bz2) = 114912508
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
# $FreeBSD$
|
||||
|
||||
PORTNAME= virtualbox-ose
|
||||
PORTVERSION= 5.1.8
|
||||
PORTVERSION= 5.1.10
|
||||
CATEGORIES= emulators
|
||||
MASTER_SITES= http://download.virtualbox.org/virtualbox/${PORTVERSION}/
|
||||
DISTFILES= VirtualBox-${PORTVERSION}${EXTRACT_SUFX} ${GUESTADDITIONS}
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
TIMESTAMP = 1477249150
|
||||
SHA256 (VirtualBox-5.1.8.tar.bz2) = e447031de468aee746529b2cf60768922f9beff22a13c54284aa430f5e925933
|
||||
SIZE (VirtualBox-5.1.8.tar.bz2) = 114688166
|
||||
SHA256 (VBoxGuestAdditions_5.1.8.iso) = 347fd39df6ddee8079ad41fbc038e2fb64952a40255d75292e8e49a0a0cbf657
|
||||
SIZE (VBoxGuestAdditions_5.1.8.iso) = 59314176
|
||||
TIMESTAMP = 1479993983
|
||||
SHA256 (VirtualBox-5.1.10.tar.bz2) = 98073b1b2adee4e6553df73cb5bb6ea8ed7c3a41a475757716fd9400393bea40
|
||||
SIZE (VirtualBox-5.1.10.tar.bz2) = 114912508
|
||||
SHA256 (VBoxGuestAdditions_5.1.10.iso) = 29fa0af66a3dd273b0c383c4adee31a52061d52f57d176b67f444698300b8c41
|
||||
SIZE (VBoxGuestAdditions_5.1.10.iso) = 59408384
|
||||
|
|
|
@ -0,0 +1,18 @@
|
|||
--- 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",
|
|
@ -1,23 +0,0 @@
|
|||
--- src/libs/xpcom18a4/python/src/PyIID.cpp.orig 2016-09-12 16:20:10 UTC
|
||||
+++ src/libs/xpcom18a4/python/src/PyIID.cpp
|
||||
@@ -318,12 +318,20 @@ Py_nsIID::PyTypeMethod_str(PyObject *sel
|
||||
return ret;
|
||||
}
|
||||
|
||||
+#if PY_VERSION_HEX < 0x03020000
|
||||
/* static */long
|
||||
+#else
|
||||
+/* static */Py_hash_t
|
||||
+#endif
|
||||
Py_nsIID::PyTypeMethod_hash(PyObject *self)
|
||||
{
|
||||
const nsIID &iid = ((Py_nsIID *)self)->m_iid;
|
||||
|
||||
+#if PY_VERSION_HEX < 0x03020000
|
||||
long ret = iid.m0 + iid.m1 + iid.m2;
|
||||
+#else
|
||||
+ Py_hash_t ret = iid.m0 + iid.m1 + iid.m2;
|
||||
+#endif
|
||||
for (int i=0;i<7;i++)
|
||||
ret += iid.m3[i];
|
||||
if ( ret == -1 )
|
|
@ -1,26 +0,0 @@
|
|||
--- src/libs/xpcom18a4/python/src/PyXPCOM.h.orig 2016-09-12 16:20:10 UTC
|
||||
+++ src/libs/xpcom18a4/python/src/PyXPCOM.h
|
||||
@@ -286,7 +286,11 @@ public:
|
||||
static int Py_setattr(PyObject *op, char *name, PyObject *v);
|
||||
static int Py_cmp(PyObject *ob1, PyObject *ob2);
|
||||
static PyObject *Py_richcmp(PyObject *ob1, PyObject *ob2, int op);
|
||||
+#if PY_VERSION_HEX < 0x03020000
|
||||
static long Py_hash(PyObject *self);
|
||||
+#else
|
||||
+ static Py_hash_t Py_hash(PyObject *self);
|
||||
+#endif
|
||||
};
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
@@ -442,7 +446,11 @@ public:
|
||||
#endif
|
||||
static PyObject *PyTypeMethod_richcompare(PyObject *self, PyObject *ob, int op);
|
||||
static PyObject *PyTypeMethod_repr(PyObject *self);
|
||||
+#if PY_VERSION_HEX < 0x03020000
|
||||
static long PyTypeMethod_hash(PyObject *self);
|
||||
+#else
|
||||
+ static Py_hash_t PyTypeMethod_hash(PyObject *self);
|
||||
+#endif
|
||||
static PyObject *PyTypeMethod_str(PyObject *self);
|
||||
static void PyTypeMethod_dealloc(PyObject *self);
|
||||
static NS_EXPORT_STATIC_MEMBER_(PyTypeObject) type;
|
|
@ -1,24 +0,0 @@
|
|||
--- src/libs/xpcom18a4/python/src/TypeObject.cpp.orig 2016-09-12 16:20:11 UTC
|
||||
+++ src/libs/xpcom18a4/python/src/TypeObject.cpp
|
||||
@@ -155,13 +155,21 @@ PyXPCOM_TypeObject::Py_richcmp(PyObject
|
||||
}
|
||||
|
||||
// @pymethod int|Py_nsISupports|__hash__|Implement a hash-code for the XPCOM object using XPCOM identity rules.
|
||||
+#if PY_VERSION_HEX < 0x03020000
|
||||
/*static*/long PyXPCOM_TypeObject::Py_hash(PyObject *self)
|
||||
+#else
|
||||
+/*static*/Py_hash_t PyXPCOM_TypeObject::Py_hash(PyObject *self)
|
||||
+#endif
|
||||
{
|
||||
// We always return the value of the nsISupports *.
|
||||
nsISupports *pUnkThis;
|
||||
if (!Py_nsISupports::InterfaceFromPyObject(self, NS_GET_IID(nsISupports), &pUnkThis, PR_FALSE))
|
||||
return -1;
|
||||
+#if PY_VERSION_HEX < 0x03020000
|
||||
long ret = _Py_HashPointer(pUnkThis);
|
||||
+#else
|
||||
+ Py_hash_t ret = _Py_HashPointer(pUnkThis);
|
||||
+#endif
|
||||
pUnkThis->Release();
|
||||
return ret;
|
||||
}
|
Loading…
Reference in a new issue