[Pkg-virtualbox-commits] [virtualbox] 06/17: Patch refresh
Gianfranco Costamagna
locutusofborg at moszumanska.debian.org
Tue Aug 23 16:42:52 UTC 2016
This is an automated email from the git hooks/post-receive script.
locutusofborg pushed a commit to branch master
in repository virtualbox.
commit 2b4cb0931d105892c39ca8b8d718e6ad59f9696a
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date: Fri Jul 22 14:12:17 2016 +0200
Patch refresh
---
debian/changelog | 5 +-
debian/patches/16-no-update.patch | 12 +--
debian/patches/gl-fix.patch | 206 --------------------------------------
debian/patches/series | 1 -
4 files changed, 8 insertions(+), 216 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 30da7d0..53f9500 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,11 @@
-virtualbox (5.1.0-dfsg-1) UNRELEASED; urgency=medium
+virtualbox (5.1.2-dfsg-1) UNRELEASED; urgency=medium
* New upstream major release, patch refresh.
+ LP: #1599775
* Update dependencies to qt5
* Regenerate manpages
[ Gianfranco Costamagna, Peter Melser ]
* Major rewrite of the guest-additions GL library handling
- * Backport upstream patch for non-root Xorg guest run
- LP: #1599775
-- Gianfranco Costamagna <locutusofborg at debian.org> Mon, 30 May 2016 12:30:24 +0200
diff --git a/debian/patches/16-no-update.patch b/debian/patches/16-no-update.patch
index f3436d3..37a21c8 100644
--- a/debian/patches/16-no-update.patch
+++ b/debian/patches/16-no-update.patch
@@ -20,7 +20,7 @@ Index: virtualbox/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp
===================================================================
--- virtualbox.orig/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp
+++ virtualbox/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp
-@@ -1097,7 +1097,6 @@
+@@ -1115,7 +1115,6 @@
m_pool[UIActionIndex_M_Application_S_Preferences] = new UIActionSimplePreferences(this);
#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
m_pool[UIActionIndex_M_Application_S_NetworkAccessManager] = new UIActionSimpleNetworkAccessManager(this);
@@ -28,7 +28,7 @@ Index: virtualbox/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp
#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
m_pool[UIActionIndex_M_Application_S_ResetWarnings] = new UIActionSimpleResetWarnings(this);
m_pool[UIActionIndex_M_Application_S_Close] = new UIActionSimplePerformClose(this);
-@@ -1143,8 +1142,6 @@
+@@ -1161,8 +1160,6 @@
#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
connect(action(UIActionIndex_M_Application_S_NetworkAccessManager), SIGNAL(triggered()),
gNetworkManager, SLOT(show()), Qt::UniqueConnection);
@@ -37,7 +37,7 @@ Index: virtualbox/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp
#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
connect(action(UIActionIndex_M_Application_S_ResetWarnings), SIGNAL(triggered()),
&msgCenter(), SLOT(sltResetSuppressedMessages()), Qt::UniqueConnection);
-@@ -1225,7 +1222,7 @@
+@@ -1243,7 +1240,7 @@
if (!fUpdateAllowed)
{
m_restrictedActionsMenuApplication[UIActionRestrictionLevel_Base] = (UIExtraDataMetaDefs::MenuApplicationActionType)
@@ -77,7 +77,7 @@ Index: virtualbox/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cp
===================================================================
--- virtualbox.orig/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp
+++ virtualbox/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp
-@@ -1262,8 +1262,6 @@
+@@ -1271,8 +1271,6 @@
/* 'About' action goes to Application menu: */
pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_About));
# ifdef VBOX_GUI_WITH_NETWORK_MANAGER
@@ -86,7 +86,7 @@ Index: virtualbox/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cp
/* 'Network Access Manager' action goes to Application menu: */
pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_NetworkAccessManager));
# endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
-@@ -1303,7 +1301,7 @@ void UISelectorWindow::prepareMenuFile(QMenu *pMenu)
+@@ -1312,7 +1310,7 @@ void UISelectorWindow::prepareMenuFile(QMenu *pMenu)
addAction(actionPool()->action(UIActionIndexST_M_File_S_ShowMediumManager));
# ifdef VBOX_GUI_WITH_NETWORK_MANAGER
addAction(actionPool()->action(UIActionIndex_M_Application_S_NetworkAccessManager));
@@ -95,7 +95,7 @@ Index: virtualbox/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cp
# endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
addAction(actionPool()->action(UIActionIndex_M_Application_S_ResetWarnings));
addAction(actionPool()->action(UIActionIndexST_M_File_S_Close));
-@@ -1328,8 +1326,6 @@
+@@ -1337,8 +1335,6 @@
# ifdef VBOX_GUI_WITH_NETWORK_MANAGER
/* 'Network Access Manager' action goes to 'File' menu: */
pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_NetworkAccessManager));
diff --git a/debian/patches/gl-fix.patch b/debian/patches/gl-fix.patch
deleted file mode 100644
index 7ccb75e..0000000
--- a/debian/patches/gl-fix.patch
+++ /dev/null
@@ -1,206 +0,0 @@
-Index: src/VBox/Additions/common/crOpenGL/egl.c
-===================================================================
---- a/src/VBox/Additions/common/crOpenGL/egl.c
-+++ b/src/VBox/Additions/common/crOpenGL/egl.c
-@@ -21,8 +21,5 @@
- *******************************************************************************/
- #include <iprt/cdefs.h>
--#include <iprt/initterm.h>
--#include <iprt/mem.h>
--#include <iprt/once.h>
--#include <iprt/thread.h>
-+#include <iprt/types.h>
-
- #include <EGL/egl.h>
-@@ -30,5 +27,11 @@
- #include <X11/Xlib.h>
-
-+#include <dlfcn.h>
-+#include <pthread.h>
-+#include <stdio.h>
- #include <stdlib.h>
-+
-+#define EGL_ASSERT(expr) \
-+ if (!(expr)) { printf("Assertion failed: %s\n", #expr); exit(1); }
-
- /*******************************************************************************
-@@ -72,14 +75,12 @@
- *******************************************************************************/
-
--static RTTLS g_tls = NIL_RTTLS;
--static RTONCE g_tlsOnce = RTONCE_INITIALIZER;
--static Display *g_pDefaultDisplay = NULL;
--static RTONCE g_defaultDisplayOnce = RTONCE_INITIALIZER;
--
--static DECLCALLBACK(int32_t) tlsInitOnce(void *pv)
--{
-- NOREF(pv);
-- g_tls = RTTlsAlloc();
-- return VINF_SUCCESS;
-+static pthread_key_t g_tls;
-+static pthread_once_t g_tlsOnce = PTHREAD_ONCE_INIT;
-+static Display *g_pDefaultDisplay = NULL;
-+static pthread_once_t g_defaultDisplayOnce = PTHREAD_ONCE_INIT;
-+
-+static void tlsInitOnce(void)
-+{
-+ pthread_key_create(&g_tls, NULL);
- }
-
-@@ -88,9 +89,9 @@
- struct VBEGLTLS *pTls;
-
-- RTOnce(&g_tlsOnce, tlsInitOnce, NULL);
-- pTls = (struct VBEGLTLS *)RTTlsGet(g_tls);
-+ pthread_once(&g_tlsOnce, tlsInitOnce);
-+ pTls = (struct VBEGLTLS *)pthread_getspecific(g_tls);
- if (RT_LIKELY(pTls))
- return pTls;
-- pTls = (struct VBEGLTLS *)RTMemAlloc(sizeof(*pTls));
-+ pTls = (struct VBEGLTLS *)malloc(sizeof(*pTls));
- if (!VALID_PTR(pTls))
- return NULL;
-@@ -101,13 +102,13 @@
- pTls->hCurrentDraw = EGL_NO_SURFACE;
- pTls->hCurrentRead = EGL_NO_SURFACE;
-- RTTlsSet(g_tls, pTls);
-- return pTls;
--}
--
--static DECLCALLBACK(int32_t) defaultDisplayInitOnce(void *pv)
--{
-- NOREF(pv);
-+ if (pthread_setspecific(g_tls, pTls) == 0)
-+ return pTls;
-+ free(pTls);
-+ return NULL;
-+}
-+
-+static void defaultDisplayInitOnce(void)
-+{
- g_pDefaultDisplay = XOpenDisplay(NULL);
-- return VINF_SUCCESS;
- }
-
-@@ -131,15 +132,24 @@
- }
-
-+static EGLBoolean testValidDisplay(EGLNativeDisplayType hDisplay)
-+{
-+ if (hDisplay == EGL_DEFAULT_DISPLAY)
-+ return EGL_TRUE;
-+ if ((void *)hDisplay == NULL)
-+ return EGL_FALSE;
-+ /* This is the test that Mesa uses to see if this is a GBM "display". Not
-+ * very pretty, but since no one can afford to break Mesa it should be
-+ * safe. Obviously we can't support GBM for now. */
-+ if (*(void **)hDisplay == dlsym(NULL, "gbm_create_device"))
-+ return EGL_FALSE;
-+ return EGL_TRUE;
-+}
-+
- DECLEXPORT(EGLDisplay) eglGetDisplay(EGLNativeDisplayType hDisplay)
- {
- Display *pDisplay;
- int rc, cError, cEvent, cMajor, cMinor;
-- /* Prevent working from inside the X server by requiring a valid DISPLAY. */
-- char *pszDisplay = getenv("DISPLAY");
--
-- if (!pszDisplay || !*pszDisplay)
-- return EGL_NO_DISPLAY;
-- rc = RTR3InitDll(RTR3INIT_FLAGS_UNOBTRUSIVE);
-- if (RT_FAILURE(rc))
-+
-+ if (!testValidDisplay(hDisplay))
- return EGL_NO_DISPLAY;
- if (!clearEGLError()) /* Set up our tls. */
-@@ -149,5 +159,5 @@
- else
- {
-- RTOnce(&g_defaultDisplayOnce, defaultDisplayInitOnce, NULL);
-+ pthread_once(&g_defaultDisplayOnce, defaultDisplayInitOnce);
- pDisplay = g_pDefaultDisplay;
- }
-@@ -170,8 +180,5 @@
- DECLEXPORT(EGLBoolean) eglInitialize (EGLDisplay hDisplay, EGLint *pcMajor, EGLint *pcMinor)
- {
-- /* Prevent working from inside the X server by requiring a valid DISPLAY. */
-- char *pszDisplay = getenv("DISPLAY");
--
-- if (!pszDisplay || !*pszDisplay)
-+ if (hDisplay == EGL_NO_DISPLAY)
- return EGL_FALSE;
- if (!VALID_PTR(hDisplay))
-@@ -222,5 +229,6 @@
- return setEGLError(EGL_BAD_PARAMETER);
- paFBConfigs = glXGetFBConfigs(pDisplay, DefaultScreen(pDisplay), &caFBConfigs);
-- AssertPtrReturn(paFBConfigs, setEGLError(EGL_BAD_PARAMETER));
-+ if (!VALID_PTR(paFBConfigs))
-+ return setEGLError(EGL_BAD_PARAMETER);
- if (caFBConfigs > caConfigs)
- caFBConfigs = caConfigs;
-@@ -426,5 +434,5 @@
- {
- aAttribList[cAttribs] = None;
-- AssertRelease(cAttribs < RT_ELEMENTS(aAttribList));
-+ EGL_ASSERT(cAttribs < RT_ELEMENTS(aAttribList));
- if (!(cRenderableType & EGL_OPENGL_BIT))
- return setEGLError(EGL_BAD_ACCESS);
-@@ -559,5 +567,5 @@
- return EGL_NO_SURFACE;
- }
-- AssertRelease(hGLXWindow < VBEGL_WINDOW_SURFACE); /* Greater than the maximum XID. */
-+ EGL_ASSERT(hGLXWindow < VBEGL_WINDOW_SURFACE); /* Greater than the maximum XID. */
- clearEGLError();
- return (EGLSurface)(hGLXWindow | VBEGL_WINDOW_SURFACE);
-@@ -627,5 +635,5 @@
- paAttributes += 2;
- }
-- AssertRelease(cIndex < RT_ELEMENTS(aAttributes) - 1);
-+ EGL_ASSERT(cIndex < RT_ELEMENTS(aAttributes) - 1);
- aAttributes[cIndex + 1] = None;
- hPbuffer = glXCreatePbuffer(pDisplay, (GLXFBConfig)config, aAttributes);
-@@ -635,5 +643,5 @@
- return EGL_NO_SURFACE;
- }
-- AssertRelease(hPbuffer < VBEGL_WINDOW_SURFACE); /* Greater than the maximum XID. */
-+ EGL_ASSERT(hPbuffer < VBEGL_WINDOW_SURFACE); /* Greater than the maximum XID. */
- clearEGLError();
- return (EGLSurface)(hPbuffer | VBEGL_PBUFFER_SURFACE);
-@@ -671,5 +679,5 @@
- return EGL_NO_SURFACE;
- }
-- AssertRelease(hGLXPixmap < VBEGL_WINDOW_SURFACE); /* Greater than the maximum XID. */
-+ EGL_ASSERT(hGLXPixmap < VBEGL_WINDOW_SURFACE); /* Greater than the maximum XID. */
- clearEGLError();
- return (EGLSurface)(hGLXPixmap | VBEGL_PIXMAP_SURFACE);
-@@ -741,9 +749,4 @@
- DECLEXPORT(EGLBoolean) eglBindAPI(EGLenum enmApi)
- {
-- /* Prevent working from inside the X server by requiring a valid DISPLAY. */
-- char *pszDisplay = getenv("DISPLAY");
--
-- if (!pszDisplay || !*pszDisplay)
-- return EGL_FALSE;
- return enmApi == EGL_OPENGL_API ? clearEGLError() : setEGLError(EGL_BAD_PARAMETER);
- }
-@@ -842,6 +845,7 @@
- DECLEXPORT(EGLDisplay) eglGetCurrentDisplay(void)
- {
-- struct VBEGLTLS *pTls = getTls();
--
-+ struct VBEGLTLS *pTls;
-+
-+ pTls = getTls();
- if (!VALID_PTR(pTls))
- return EGL_NO_DISPLAY;
-@@ -947,6 +951,7 @@
- if (!(pTls))
- return EGL_TRUE;
-- RTMemFree(pTls);
-- RTTlsSet(g_tls, NULL);
-+ free(pTls);
-+ /* Can this fail with ENOMEM? */
-+ pthread_setspecific(g_tls, NULL);
- return EGL_TRUE;
- }
diff --git a/debian/patches/series b/debian/patches/series
index 2f6ae80..5b32c83 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,4 +14,3 @@
32-disable-guest-version-check.patch
35-libvdeplug-soname.patch
36-fix-vnc-version-string.patch
-gl-fix.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