[Pkg-virtualbox-commits] [virtualbox] 03/03: Upload to unstable, patch refresh
Gianfranco Costamagna
locutusofborg at moszumanska.debian.org
Tue Feb 27 22:34:54 UTC 2018
This is an automated email from the git hooks/post-receive script.
locutusofborg pushed a commit to branch master
in repository virtualbox.
commit 06253d13c102ca212b20b141e10d1102c6196c17
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date: Tue Feb 27 23:32:56 2018 +0100
Upload to unstable, patch refresh
---
debian/changelog | 6 +
debian/patches/16-no-update.patch | 2 +-
debian/patches/27-hide-host-cache-warning.patch | 2 +-
debian/patches/29-fix-ftbfs-as-needed.patch | 2 +-
debian/patches/36-fix-vnc-version-string.patch | 2 +-
debian/patches/3d-fixes.patch | 213 ------------------------
debian/patches/kernel-4.15.patch | 114 -------------
debian/patches/nvidia-3d-fix.patch | 74 --------
debian/patches/series | 3 -
9 files changed, 10 insertions(+), 408 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 97434d9..e3d29db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+virtualbox (5.2.8-dfsg-1) unstable; urgency=medium
+
+ * New upstream release, drop the patches upstreamed.
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org> Tue, 27 Feb 2018 23:32:31 +0100
+
virtualbox (5.2.6-dfsg-5) unstable; urgency=medium
* Fixup previous upload
diff --git a/debian/patches/16-no-update.patch b/debian/patches/16-no-update.patch
index 1d0d4d3..1ba451c 100644
--- a/debian/patches/16-no-update.patch
+++ b/debian/patches/16-no-update.patch
@@ -7,7 +7,7 @@ Index: virtualbox/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp
===================================================================
--- virtualbox.orig/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp
+++ virtualbox/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp
-@@ -472,6 +472,8 @@
+@@ -482,6 +482,8 @@
void UIUpdateManager::sltForceCheck()
{
diff --git a/debian/patches/27-hide-host-cache-warning.patch b/debian/patches/27-hide-host-cache-warning.patch
index 9a518f4..0ccfea5 100644
--- a/debian/patches/27-hide-host-cache-warning.patch
+++ b/debian/patches/27-hide-host-cache-warning.patch
@@ -6,7 +6,7 @@ diff --git a/src/VBox/Main/src-client/ConsoleImpl2.cpp b/src/VBox/Main/src-clien
index 61dbf0a59..cfb76fc48 100644
--- a/src/VBox/Main/src-client/ConsoleImpl2.cpp
+++ b/src/VBox/Main/src-client/ConsoleImpl2.cpp
-@@ -4029,34 +4029,12 @@ int Console::i_checkMediumLocation(IMedium *pMedium, bool *pfUseHostIOCache)
+@@ -4038,34 +4038,12 @@ int Console::i_checkMediumLocation(IMedium *pMedium, bool *pfUseHostIOCache)
if ( enmFsTypeFile == RTFSTYPE_EXT4
|| enmFsTypeFile == RTFSTYPE_XFS)
{
diff --git a/debian/patches/29-fix-ftbfs-as-needed.patch b/debian/patches/29-fix-ftbfs-as-needed.patch
index 1b84851..82fb577 100644
--- a/debian/patches/29-fix-ftbfs-as-needed.patch
+++ b/debian/patches/29-fix-ftbfs-as-needed.patch
@@ -5,7 +5,7 @@ Index: virtualbox/Config.kmk
===================================================================
--- virtualbox.orig/Config.kmk 2015-04-02 15:46:59.611743003 +0200
+++ virtualbox/Config.kmk 2015-04-02 15:46:59.611743003 +0200
-@@ -6288,7 +6288,7 @@
+@@ -6300,7 +6300,7 @@
TEMPLATE_VBoxBldProg_LDFLAGS.amd64 = -m64
TEMPLATE_VBoxBldProg_LDFLAGS.sparc64 = -m64
ifeq ($(KBUILD_HOST),linux)
diff --git a/debian/patches/36-fix-vnc-version-string.patch b/debian/patches/36-fix-vnc-version-string.patch
index 1d70b68..8fe0319 100644
--- a/debian/patches/36-fix-vnc-version-string.patch
+++ b/debian/patches/36-fix-vnc-version-string.patch
@@ -3,7 +3,7 @@ Index: virtualbox/Config.kmk
===================================================================
--- virtualbox.orig/Config.kmk 2015-04-02 15:47:04.439745251 +0200
+++ virtualbox/Config.kmk 2015-04-02 15:47:04.435745250 +0200
-@@ -3073,6 +3073,7 @@
+@@ -3072,6 +3072,7 @@
-e 's/@VBOX_VERSION_MINOR@/$(VBOX_VERSION_MINOR)/g' \
-e 's/@VBOX_VERSION_BUILD@/$(VBOX_VERSION_BUILD)/g' \
-e 's/@VBOX_VERSION_STRING@/$(VBOX_VERSION_STRING)/g' \
diff --git a/debian/patches/3d-fixes.patch b/debian/patches/3d-fixes.patch
deleted file mode 100644
index 2182445..0000000
--- a/debian/patches/3d-fixes.patch
+++ /dev/null
@@ -1,213 +0,0 @@
-Description: fix wrong device permissions leading to run issues with 3d enabled
-Author: Upstream
-Origin: Upstream
-Last-Update: 2018-02-19
-
---- virtualbox-5.2.6-dfsg.orig/src/VBox/Additions/linux/installer/vboxadd.sh
-+++ virtualbox-5.2.6-dfsg/src/VBox/Additions/linux/installer/vboxadd.sh
-@@ -128,12 +128,11 @@ log()
- echo "${1}" >> "${LOG}"
- }
-
--dev=vboxguest
--userdev=vboxuser
-+dev=/dev/vboxguest
-+userdev=/dev/vboxuser
- config=/var/lib/VBoxGuestAdditions/config
- owner=vboxadd
- group=1
--usergroup=vboxadd
-
- if test -r $config; then
- . $config
-@@ -165,7 +164,7 @@ running_vboxvideo()
-
- do_vboxguest_non_udev()
- {
-- if [ ! -c /dev/$dev ]; then
-+ if [ ! -c $dev ]; then
- maj=`sed -n 's;\([0-9]\+\) vboxguest;\1;p' /proc/devices`
- if [ ! -z "$maj" ]; then
- min=0
-@@ -180,32 +179,32 @@ do_vboxguest_non_udev()
- fail "Cannot locate the VirtualBox device"
- }
-
-- mknod -m 0660 /dev/$dev c $maj $min || {
-+ mknod -m 0664 $dev c $maj $min || {
- rmmod vboxguest 2>/dev/null
-- fail "Cannot create device /dev/$dev with major $maj and minor $min"
-+ fail "Cannot create device $dev with major $maj and minor $min"
- }
- fi
-- chown $owner:$group /dev/$dev 2>/dev/null || {
-- rm -f /dev/$dev 2>/dev/null
-- rm -f /dev/$userdev 2>/dev/null
-+ chown $owner:$group $dev 2>/dev/null || {
-+ rm -f $dev 2>/dev/null
-+ rm -f $userdev 2>/dev/null
- rmmod vboxguest 2>/dev/null
-- fail "Cannot change owner $owner:$group for device /dev/$dev"
-+ fail "Cannot change owner $owner:$group for device $dev"
- }
-
-- if [ ! -c /dev/$userdev ]; then
-+ if [ ! -c $userdev ]; then
- maj=10
- min=`sed -n 's;\([0-9]\+\) vboxuser;\1;p' /proc/misc`
- if [ ! -z "$min" ]; then
-- mknod -m 0660 /dev/$userdev c $maj $min || {
-- rm -f /dev/$dev 2>/dev/null
-+ mknod -m 0666 $userdev c $maj $min || {
-+ rm -f $dev 2>/dev/null
- rmmod vboxguest 2>/dev/null
-- fail "Cannot create device /dev/$userdev with major $maj and minor $min"
-+ fail "Cannot create device $userdev with major $maj and minor $min"
- }
-- chown $owner:$usergroup /dev/$userdev 2>/dev/null || {
-- rm -f /dev/$dev 2>/dev/null
-- rm -f /dev/$userdev 2>/dev/null
-+ chown $owner:$group $userdev 2>/dev/null || {
-+ rm -f $dev 2>/dev/null
-+ rm -f $userdev 2>/dev/null
- rmmod vboxguest 2>/dev/null
-- fail "Cannot change owner $owner:$usergroup for device /dev/$userdev"
-+ fail "Cannot change owner $owner:$group for device $userdev"
- }
- fi
- fi
-@@ -221,12 +220,12 @@ start()
- ps -A -o comm | grep -q '/*udevd$' 2>/dev/null ||
- no_udev=1
- running_vboxguest || {
-- rm -f /dev/$dev || {
-- fail "Cannot remove /dev/$dev"
-+ rm -f $dev || {
-+ fail "Cannot remove $dev"
- }
-
-- rm -f /dev/$userdev || {
-- fail "Cannot remove /dev/$userdev"
-+ rm -f $userdev || {
-+ fail "Cannot remove $userdev"
- }
-
- $MODPROBE vboxguest >/dev/null 2>&1 || {
-@@ -370,14 +369,10 @@ create_vbox_user()
- log "Creating user for the Guest Additions."
- # This is the LSB version of useradd and should work on recent
- # distributions
-- useradd -d /var/run/"${owner}" -g 1 -r -s /bin/false "${owner}" >/dev/null 2>&1
-+ useradd -d /var/run/vboxadd -g 1 -r -s /bin/false vboxadd >/dev/null 2>&1
- # And for the others, we choose a UID ourselves
-- useradd -d /var/run/"${owner}" -g 1 -u 501 -o -s /bin/false "${owner}" >/dev/null 2>&1
-- # And create the group for the user device:
-- groupadd "${usergroup}"
-- # VBoxClient needs to be setgid.
-- chown :"${usergroup}" "${INSTALL_DIR}/bin/VBoxClient"
-- chmod g+s "${INSTALL_DIR}/bin/VBoxClient"
-+ useradd -d /var/run/vboxadd -g 1 -u 501 -o -s /bin/false vboxadd >/dev/null 2>&1
-+
- }
-
- create_udev_rule()
---- virtualbox-5.2.6-dfsg.orig/src/VBox/Additions/linux/sharedfolders/utils.c
-+++ virtualbox-5.2.6-dfsg/src/VBox/Additions/linux/sharedfolders/utils.c
-@@ -79,10 +79,7 @@ void sf_init_inode(struct sf_glob_info *
- attr = &info->Attr;
-
- #define mode_set(r) attr->fMode & (RTFS_UNIX_##r) ? (S_##r) : 0;
-- mode = mode_set(ISUID);
-- mode |= mode_set(ISGID);
--
-- mode |= mode_set(IRUSR);
-+ mode = mode_set(IRUSR);
- mode |= mode_set(IWUSR);
- mode |= mode_set(IXUSR);
-
-@@ -360,9 +357,7 @@ int sf_setattr(struct dentry *dentry, st
- RT_ZERO(info);
- if (iattr->ia_valid & ATTR_MODE)
- {
-- info.Attr.fMode = mode_set(ISUID);
-- info.Attr.fMode |= mode_set(ISGID);
-- info.Attr.fMode |= mode_set(IRUSR);
-+ info.Attr.fMode = mode_set(IRUSR);
- info.Attr.fMode |= mode_set(IWUSR);
- info.Attr.fMode |= mode_set(IXUSR);
- info.Attr.fMode |= mode_set(IRGRP);
---- virtualbox-5.2.6-dfsg.orig/src/VBox/HostServices/GuestProperties/service.cpp
-+++ virtualbox-5.2.6-dfsg/src/VBox/HostServices/GuestProperties/service.cpp
-@@ -267,6 +267,28 @@ private:
- }
-
- /**
-+ * Check whether the property name is reserved for host changes only.
-+ *
-+ * @returns Boolean true (host reserved) or false (available to guest).
-+ *
-+ * @param pszName The property name to check.
-+ */
-+ bool checkHostReserved(const char *pszName)
-+ {
-+ if (RTStrStartsWith(pszName, "/VirtualBox/GuestAdd/VBoxService/"))
-+ return true;
-+ if (RTStrStartsWith(pszName, "/VirtualBox/GuestAdd/PAM/"))
-+ return true;
-+ if (RTStrStartsWith(pszName, "/VirtualBox/GuestAdd/Greeter/"))
-+ return true;
-+ if (RTStrStartsWith(pszName, "/VirtualBox/GuestAdd/SharedFolders/"))
-+ return true;
-+ if (RTStrStartsWith(pszName, "/VirtualBox/HostInfo/"))
-+ return true;
-+ return false;
-+ }
-+
-+ /**
- * Gets a property.
- *
- * @returns Pointer to the property if found, NULL if not.
---- virtualbox-5.2.6-dfsg.orig/src/VBox/HostServices/GuestProperties/testcase/tstGuestPropSvc.cpp
-+++ virtualbox-5.2.6-dfsg/src/VBox/HostServices/GuestProperties/testcase/tstGuestPropSvc.cpp
-@@ -460,6 +460,11 @@ static void testSetProp(VBOXHGCMSVCFNTAB
- { "TEST NAME", "test", "", true, true, false },
- { "Green", "gone out...", "", false, false, false },
- { "Green", "gone out...", "", true, false, false },
-+ { "/VirtualBox/GuestAdd/SharedFolders/MountDir", "test", "", false, true, false },
-+ { "/VirtualBox/GuestAdd/SomethingElse", "test", "", false, true, true },
-+ { "/VirtualBox/HostInfo/VRDP/Client/1/Name", "test", "", false, false, false },
-+ { "/VirtualBox/GuestAdd/SharedFolders/MountDir", "test", "", true, true, true },
-+ { "/VirtualBox/HostInfo/VRDP/Client/1/Name", "test", "TRANSRESET", true, true, true },
- };
-
- for (unsigned i = 0; i < RT_ELEMENTS(s_aSetProperties); ++i)
-@@ -658,6 +663,12 @@ g_aGetNotifications[] =
- { "Amber\0Caution!\0", sizeof("Amber\0Caution!\0") },
- { "Green\0Go!\0READONLY", sizeof("Green\0Go!\0READONLY") },
- { "Blue\0What on earth...?\0", sizeof("Blue\0What on earth...?\0") },
-+ { "/VirtualBox/GuestAdd/SomethingElse\0test\0",
-+ sizeof("/VirtualBox/GuestAdd/SomethingElse\0test\0") },
-+ { "/VirtualBox/GuestAdd/SharedFolders/MountDir\0test\0RDONLYGUEST",
-+ sizeof("/VirtualBox/GuestAdd/SharedFolders/MountDir\0test\0RDONLYGUEST") },
-+ { "/VirtualBox/HostInfo/VRDP/Client/1/Name\0test\0TRANSIENT, RDONLYGUEST, TRANSRESET",
-+ sizeof("/VirtualBox/HostInfo/VRDP/Client/1/Name\0test\0TRANSIENT, RDONLYGUEST, TRANSRESET") },
- { "Red\0\0", sizeof("Red\0\0") },
- { "Amber\0\0", sizeof("Amber\0\0") },
- };
---- virtualbox-5.2.6-dfsg.orig/src/VBox/HostServices/SharedFolders/vbsf.cpp
-+++ virtualbox-5.2.6-dfsg/src/VBox/HostServices/SharedFolders/vbsf.cpp
-@@ -1525,9 +1525,13 @@ static int vbsfSetFileInfo(SHFLCLIENTDAT
-
- #ifndef RT_OS_WINDOWS
- /* Don't allow the guest to clear the own bit, otherwise the guest wouldn't be
-- * able to access this file anymore. Only for guests, which set the UNIX mode. */
-+ * able to access this file anymore. Only for guests, which set the UNIX mode.
-+ * Also, clear bits which we don't pass through for security reasons. */
- if (fMode & RTFS_UNIX_MASK)
-+ {
- fMode |= RTFS_UNIX_IRUSR;
-+ fMode &= ~(RTFS_UNIX_ISUID | RTFS_UNIX_ISGID | RTFS_UNIX_ISTXT);
-+ }
- #endif
-
- rc = RTFileSetMode(pHandle->file.Handle, fMode);
diff --git a/debian/patches/kernel-4.15.patch b/debian/patches/kernel-4.15.patch
deleted file mode 100644
index b50d0f3..0000000
--- a/debian/patches/kernel-4.15.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-Last-Update: 2018-01-18
-
---- virtualbox-5.2.6-dfsg.orig/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c
-+++ virtualbox-5.2.6-dfsg/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c
-@@ -1058,7 +1058,11 @@ void VGDrvNativeISRMousePollEvent(PVBOXG
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
-
- /** log and dbg_log parameter setter. */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
-+static int vgdrvLinuxParamLogGrpSet(const char *pszValue, const struct kernel_param *pParam)
-+#else
- static int vgdrvLinuxParamLogGrpSet(const char *pszValue, struct kernel_param *pParam)
-+#endif
- {
- if (g_fLoggerCreated)
- {
-@@ -1073,7 +1077,11 @@ static int vgdrvLinuxParamLogGrpSet(cons
- }
-
- /** log and dbg_log parameter getter. */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
-+static int vgdrvLinuxParamLogGrpGet(char *pszBuf, const struct kernel_param *pParam)
-+#else
- static int vgdrvLinuxParamLogGrpGet(char *pszBuf, struct kernel_param *pParam)
-+#endif
- {
- PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() : RTLogRelGetDefaultInstance();
- *pszBuf = '\0';
-@@ -1084,7 +1092,11 @@ static int vgdrvLinuxParamLogGrpGet(char
-
-
- /** log and dbg_log_flags parameter setter. */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
-+static int vgdrvLinuxParamLogFlagsSet(const char *pszValue, const struct kernel_param *pParam)
-+#else
- static int vgdrvLinuxParamLogFlagsSet(const char *pszValue, struct kernel_param *pParam)
-+#endif
- {
- if (g_fLoggerCreated)
- {
-@@ -1098,7 +1110,11 @@ static int vgdrvLinuxParamLogFlagsSet(co
- }
-
- /** log and dbg_log_flags parameter getter. */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
-+static int vgdrvLinuxParamLogFlagsGet(char *pszBuf, const struct kernel_param *pParam)
-+#else
- static int vgdrvLinuxParamLogFlagsGet(char *pszBuf, struct kernel_param *pParam)
-+#endif
- {
- PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() : RTLogRelGetDefaultInstance();
- *pszBuf = '\0';
-@@ -1109,7 +1125,11 @@ static int vgdrvLinuxParamLogFlagsGet(ch
-
-
- /** log and dbg_log_dest parameter setter. */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
-+static int vgdrvLinuxParamLogDstSet(const char *pszValue, const struct kernel_param *pParam)
-+#else
- static int vgdrvLinuxParamLogDstSet(const char *pszValue, struct kernel_param *pParam)
-+#endif
- {
- if (g_fLoggerCreated)
- {
-@@ -1123,7 +1143,11 @@ static int vgdrvLinuxParamLogDstSet(cons
- }
-
- /** log and dbg_log_dest parameter getter. */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
-+static int vgdrvLinuxParamLogDstGet(char *pszBuf, const struct kernel_param *pParam)
-+#else
- static int vgdrvLinuxParamLogDstGet(char *pszBuf, struct kernel_param *pParam)
-+#endif
- {
- PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() : RTLogRelGetDefaultInstance();
- *pszBuf = '\0';
-@@ -1134,7 +1158,11 @@ static int vgdrvLinuxParamLogDstGet(char
-
-
- /** r3_log_to_host parameter setter. */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
-+static int vgdrvLinuxParamR3LogToHostSet(const char *pszValue, const struct kernel_param *pParam)
-+#else
- static int vgdrvLinuxParamR3LogToHostSet(const char *pszValue, struct kernel_param *pParam)
-+#endif
- {
- if ( pszValue == NULL
- || *pszValue == '\0'
-@@ -1152,7 +1180,11 @@ static int vgdrvLinuxParamR3LogToHostSet
- }
-
- /** r3_log_to_host parameter getter. */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
-+static int vgdrvLinuxParamR3LogToHostGet(char *pszBuf, const struct kernel_param *pParam)
-+#else
- static int vgdrvLinuxParamR3LogToHostGet(char *pszBuf, struct kernel_param *pParam)
-+#endif
- {
- strcpy(pszBuf, g_DevExt.fLoggingEnabled ? "enabled" : "disabled");
- return strlen(pszBuf);
---- virtualbox-5.2.6-dfsg.orig/src/VBox/Additions/linux/drm/vbox_mode.c
-+++ virtualbox-5.2.6-dfsg/src/VBox/Additions/linux/drm/vbox_mode.c
-@@ -401,7 +401,11 @@ static struct drm_encoder *vbox_best_sin
-
- /* pick the encoder ids */
- if (enc_id)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
-+ return drm_encoder_find(connector->dev, NULL, enc_id);
-+#else
- return drm_encoder_find(connector->dev, enc_id);
-+#endif
-
- return NULL;
- }
diff --git a/debian/patches/nvidia-3d-fix.patch b/debian/patches/nvidia-3d-fix.patch
deleted file mode 100644
index 4588624..0000000
--- a/debian/patches/nvidia-3d-fix.patch
+++ /dev/null
@@ -1,74 +0,0 @@
---- virtualbox-5.2.6-dfsg.orig/src/VBox/HostServices/SharedOpenGL/render/renderspu_glx.c
-+++ virtualbox-5.2.6-dfsg/src/VBox/HostServices/SharedOpenGL/render/renderspu_glx.c
-@@ -44,6 +44,7 @@ typedef struct
- #define WINDOW_NAME window->title
-
- static Bool WindowExistsFlag;
-+static Bool CrRenderForcePresentMainThread = True;
-
- static int
- WindowExistsErrorHandler( Display *dpy, XErrorEvent *xerr )
-@@ -1114,6 +1115,15 @@ createWindow( VisualInfo *visual, GLbool
- AssertRC(rc);
- }
-
-+ /*
-+ * Runtime CR_RENDER_FORCE_PRESENT_MAIN_THREAD flag
-+ */
-+ const char *pEnvCrRenderForcePresentMainThread = crGetenv("CR_RENDER_FORCE_PRESENT_MAIN_THREAD");
-+ if (pEnvCrRenderForcePresentMainThread != NULL)
-+ {
-+ CrRenderForcePresentMainThread = crStrToInt(pEnvCrRenderForcePresentMainThread) != 0 ? True : False;
-+ }
-+
- return GL_TRUE;
- }
-
-@@ -1924,25 +1934,25 @@ renderspu_SystemShowWindow( WindowInfo *
- }
- }
-
--#define CR_RENDER_FORCE_PRESENT_MAIN_THREAD
--
- void renderspu_SystemVBoxPresentComposition( WindowInfo *window, const struct VBOXVR_SCR_COMPOSITOR_ENTRY *pChangedEntry )
- {
- /* the CR_RENDER_FORCE_PRESENT_MAIN_THREAD is actually inherited from cocoa backend impl,
- * here it forces rendering in WinCmd thread rather than a Main thread.
- * it is used for debugging only in any way actually.
- * @todo: change to some more generic macro name */
--#ifndef CR_RENDER_FORCE_PRESENT_MAIN_THREAD
-+ int rc = VERR_SEM_BUSY;
- const struct VBOXVR_SCR_COMPOSITOR *pCompositor;
-- /* we do not want to be blocked with the GUI thread here, so only draw her eif we are really able to do that w/o bllocking */
-- int rc = renderspuVBoxCompositorTryAcquire(window, &pCompositor);
-+ if (!CrRenderForcePresentMainThread)
-+ {
-+ /* we do not want to be blocked with the GUI thread here, so only draw her eif we are really able to do that w/o bllocking */
-+ rc = renderspuVBoxCompositorTryAcquire(window, &pCompositor);
-+ }
- if (RT_SUCCESS(rc))
- {
-- renderspuVBoxPresentCompositionGeneric(window, pCompositor, pChangedEntry, 0, false);
-- renderspuVBoxCompositorRelease(window);
-+ renderspuVBoxPresentCompositionGeneric(window, pCompositor, pChangedEntry, 0, false);
-+ renderspuVBoxCompositorRelease(window);
- }
- else if (rc == VERR_SEM_BUSY)
--#endif
- {
- Status status;
- XEvent event;
-@@ -1961,13 +1971,11 @@ void renderspu_SystemVBoxPresentComposit
- }
- XFlush(render_spu.pCommunicationDisplay);
- }
--#ifndef CR_RENDER_FORCE_PRESENT_MAIN_THREAD
- else
- {
- /* this is somewhat we do not expect */
- WARN(("renderspuVBoxCompositorTryAcquire failed rc %d", rc));
- }
--#endif
- }
-
- static void
diff --git a/debian/patches/series b/debian/patches/series
index a888ac9..244fb70 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -16,6 +16,3 @@
36-fix-vnc-version-string.patch
37-python-3.6-support.patch
fix-build.patch
-kernel-4.15.patch
-nvidia-3d-fix.patch
-3d-fixes.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-virtualbox/virtualbox.git
More information about the Pkg-virtualbox-commits
mailing list