summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2018-05-14 04:33:20 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2018-05-14 04:33:42 +0000
commit0859868044ebe32a46881abc5ca2337b3d869977 (patch)
treeecd23b59ce4c0740da9c0023eae785c43ac38c96
parentMerging upstream version 5.2.12-dfsg. (diff)
downloadvirtualbox-0859868044ebe32a46881abc5ca2337b3d869977.zip
virtualbox-0859868044ebe32a46881abc5ca2337b3d869977.tar.xz
Merging debian version 5.2.12-dfsg-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/changelog8
-rw-r--r--debian/patches/29-fix-ftbfs-as-needed.patch2
-rw-r--r--debian/patches/36-fix-vnc-version-string.patch2
-rw-r--r--debian/patches/71985.patch139
-rw-r--r--debian/patches/GL-fixes.patch97
-rw-r--r--debian/patches/java9.patch2
-rw-r--r--debian/patches/series3
-rw-r--r--debian/patches/videorec.patch2
-rw-r--r--debian/patches/vm-restore.patch12
9 files changed, 12 insertions, 255 deletions
diff --git a/debian/changelog b/debian/changelog
index 0357716..1d32dc4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+virtualbox (5.2.12-dfsg-1) unstable; urgency=medium
+
+ * New upstream version 5.2.12-dfsg
+ * Patch refresh, drop upstream patches:
+ GL-fixes.patch, vm-restore.patch, 71985.patch
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org> Thu, 10 May 2018 15:12:08 +0200
+
virtualbox (5.2.10-dfsg-7~dschinn1) dschinn-backports; urgency=medium
* Uploading to dschinn-backports, remaining changes:
diff --git a/debian/patches/29-fix-ftbfs-as-needed.patch b/debian/patches/29-fix-ftbfs-as-needed.patch
index 82fb577..9a6c4ba 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
-@@ -6300,7 +6300,7 @@
+@@ -6339,7 +6339,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 8fe0319..d5caa06 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
-@@ -3072,6 +3072,7 @@
+@@ -3071,6 +3071,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/71985.patch b/debian/patches/71985.patch
deleted file mode 100644
index 1940e2e..0000000
--- a/debian/patches/71985.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-Index: src/VBox/Additions/linux/drm/vbox_ttm.c
-===================================================================
---- a/src/VBox/Additions/linux/drm/vbox_ttm.c
-+++ b/src/VBox/Additions/linux/drm/vbox_ttm.c
-@@ -198,22 +198,6 @@ static void vbox_ttm_io_mem_free(struct ttm_bo_device *bdev,
- {
- }
-
--static int vbox_bo_move(struct ttm_buffer_object *bo,
-- bool evict, bool interruptible,
-- bool no_wait_gpu, struct ttm_mem_reg *new_mem)
--{
-- int r;
--
--#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 8, 0) && !defined(RHEL_74)
-- r = ttm_bo_move_memcpy(bo, evict, no_wait_gpu, new_mem);
--#elif LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0) && !defined(RHEL_74)
-- r = ttm_bo_move_memcpy(bo, evict, interruptible, no_wait_gpu, new_mem);
--#else
-- r = ttm_bo_move_memcpy(bo, interruptible, no_wait_gpu, new_mem);
--#endif
-- return r;
--}
--
- static void vbox_ttm_backend_destroy(struct ttm_tt *tt)
- {
- ttm_tt_fini(tt);
-@@ -244,31 +228,44 @@ static struct ttm_tt *vbox_ttm_tt_create(struct ttm_bo_device *bdev,
- return tt;
- }
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 17, 0)
-+# if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
- static int vbox_ttm_tt_populate(struct ttm_tt *ttm)
- {
- return ttm_pool_populate(ttm);
- }
-+# else
-+static int vbox_ttm_tt_populate(struct ttm_tt *ttm,
-+ struct ttm_operation_ctx *ctx)
-+{
-+ return ttm_pool_populate(ttm, ctx);
-+}
-+# endif
-
- static void vbox_ttm_tt_unpopulate(struct ttm_tt *ttm)
- {
- ttm_pool_unpopulate(ttm);
- }
-+#endif
-
- struct ttm_bo_driver vbox_bo_driver = {
- .ttm_tt_create = vbox_ttm_tt_create,
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 17, 0)
- .ttm_tt_populate = vbox_ttm_tt_populate,
- .ttm_tt_unpopulate = vbox_ttm_tt_unpopulate,
-+#endif
- .init_mem_type = vbox_bo_init_mem_type,
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) || defined(RHEL_74)
- .eviction_valuable = ttm_bo_eviction_valuable,
- #endif
- .evict_flags = vbox_bo_evict_flags,
-- .move = vbox_bo_move,
- .verify_access = vbox_bo_verify_access,
- .io_mem_reserve = &vbox_ttm_io_mem_reserve,
- .io_mem_free = &vbox_ttm_io_mem_free,
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
-+# if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
- .io_mem_pfn = ttm_bo_default_io_mem_pfn,
-+# endif
- #endif
- #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) && LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)) \
- || defined(RHEL_74)
-@@ -422,6 +419,9 @@ static inline u64 vbox_bo_gpu_offset(struct vbox_bo *bo)
-
- int vbox_bo_pin(struct vbox_bo *bo, u32 pl_flag, u64 *gpu_addr)
- {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 16, 0)
-+ struct ttm_operation_ctx ctx = { false, false };
-+#endif
- int i, ret;
-
- if (bo->pin_count) {
-@@ -437,7 +437,11 @@ int vbox_bo_pin(struct vbox_bo *bo, u32 pl_flag, u64 *gpu_addr)
- for (i = 0; i < bo->placement.num_placement; i++)
- PLACEMENT_FLAGS(bo->placements[i]) |= TTM_PL_FLAG_NO_EVICT;
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
- ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false);
-+#else
-+ ret = ttm_bo_validate(&bo->bo, &bo->placement, &ctx);
-+#endif
- if (ret)
- return ret;
-
-@@ -451,6 +455,9 @@ int vbox_bo_pin(struct vbox_bo *bo, u32 pl_flag, u64 *gpu_addr)
-
- int vbox_bo_unpin(struct vbox_bo *bo)
- {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 16, 0)
-+ struct ttm_operation_ctx ctx = { false, false };
-+#endif
- int i, ret;
-
- if (!bo->pin_count) {
-@@ -464,7 +471,11 @@ int vbox_bo_unpin(struct vbox_bo *bo)
- for (i = 0; i < bo->placement.num_placement; i++)
- PLACEMENT_FLAGS(bo->placements[i]) &= ~TTM_PL_FLAG_NO_EVICT;
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
- ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false);
-+#else
-+ ret = ttm_bo_validate(&bo->bo, &bo->placement, &ctx);
-+#endif
- if (ret)
- return ret;
-
-@@ -478,6 +489,9 @@ int vbox_bo_unpin(struct vbox_bo *bo)
- */
- int vbox_bo_push_sysram(struct vbox_bo *bo)
- {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 16, 0)
-+ struct ttm_operation_ctx ctx = { false, false };
-+#endif
- int i, ret;
-
- if (!bo->pin_count) {
-@@ -496,7 +510,11 @@ int vbox_bo_push_sysram(struct vbox_bo *bo)
- for (i = 0; i < bo->placement.num_placement; i++)
- PLACEMENT_FLAGS(bo->placements[i]) |= TTM_PL_FLAG_NO_EVICT;
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)
- ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false);
-+#else
-+ ret = ttm_bo_validate(&bo->bo, &bo->placement, &ctx);
-+#endif
- if (ret) {
- DRM_ERROR("pushing to VRAM failed\n");
- return ret;
diff --git a/debian/patches/GL-fixes.patch b/debian/patches/GL-fixes.patch
deleted file mode 100644
index 5880b99..0000000
--- a/debian/patches/GL-fixes.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-Description: patches to make virtualbox work with new mesa GL API
---- virtualbox-5.2.8-dfsg.orig/src/VBox/GuestHost/OpenGL/glapi_parser/APIspec.txt
-+++ virtualbox-5.2.8-dfsg/src/VBox/GuestHost/OpenGL/glapi_parser/APIspec.txt
-@@ -10249,6 +10249,15 @@ param framebuffer GLuint
- category GL_EXT_framebuffer_object
- chromium extpack
-
-+name BindFramebuffer
-+alias BindFramebufferEXT
-+return void
-+param target GLenum
-+paramprop target GL_FRAMEBUFFER_EXT GL_READ_FRAMEBUFFER_EXT GL_DRAW_FRAMEBUFFER_EXT
-+param framebuffer GLuint
-+category GL_EXT_framebuffer_object
-+chromium extpack
-+
- name DeleteFramebuffersEXT
- return void
- param n GLsizei
-@@ -10264,6 +10273,15 @@ category GL_EXT_framebuffer_object
- props get
- chromium extpack
-
-+name GenFramebuffers
-+alias GenFramebuffersEXT
-+return void
-+param n GLsizei
-+param framebuffers GLuint *
-+category GL_EXT_framebuffer_object
-+props get
-+chromium extpack
-+
- name CheckFramebufferStatusEXT
- return GLenum
- param target GLenum
-@@ -10298,6 +10316,20 @@ return void
- category GL_EXT_framebuffer_object
- chromium extpack
-
-+name FramebufferTexture2D
-+alias FramebufferTexture2DEXT
-+return void
-+param target GLenum
-+paramprop target GL_FRAMEBUFFER_EXT GL_READ_FRAMEBUFFER_EXT GL_DRAW_FRAMEBUFFER_EXT
-+param attachment GLenum
-+paramprop attachment GL_COLOR_ATTACHMENT0_EXT GL_COLOR_ATTACHMENT1_EXT GL_COLOR_ATTACHMENT2_EXT GL_COLOR_ATTACHMENT3_EXT GL_COLOR_ATTACHMENT4_EXT GL_COLOR_ATTACHMENT5_EXT GL_COLOR_ATTACHMENT6_EXT GL_COLOR_ATTACHMENT7_EXT GL_COLOR_ATTACHMENT8_EXT GL_COLOR_ATTACHMENT9_EXT GL_COLOR_ATTACHMENT10_EXT GL_COLOR_ATTACHMENT11_EXT GL_COLOR_ATTACHMENT12_EXT GL_COLOR_ATTACHMENT13_EXT GL_COLOR_ATTACHMENT14_EXT GL_COLOR_ATTACHMENT15_EXT GL_DEPTH_ATTACHMENT_EXT GL_STENCIL_ATTACHMENT_EXT
-+param textarget GLenum
-+param texture GLuint
-+param level GLint
-+return void
-+category GL_EXT_framebuffer_object
-+chromium extpack
-+
- name FramebufferTexture3DEXT
- return void
- param target GLenum
-@@ -10427,6 +10459,24 @@ name BlitFramebufferEXT
- return void
- param srcX0 GLint
- param srcY0 GLint
-+param srcX1 GLint
-+param srcY1 GLint
-+param dstX0 GLint
-+param dstY0 GLint
-+param dstX1 GLint
-+param dstY1 GLint
-+param mask GLbitfield
-+param filter GLenum
-+paramprop filter GL_LINEAR GL_NEAREST
-+category GL_EXT_framebuffer_blit
-+chromium extpack
-+
-+# GL_EXT_framebuffer_blit
-+name BlitFramebuffer
-+alias BlitFramebufferEXT
-+return void
-+param srcX0 GLint
-+param srcY0 GLint
- param srcX1 GLint
- param srcY1 GLint
- param dstX0 GLint
---- virtualbox-5.2.8-dfsg.orig/src/VBox/GuestHost/OpenGL/include/chromium.h
-+++ virtualbox-5.2.8-dfsg/src/VBox/GuestHost/OpenGL/include/chromium.h
-@@ -61,6 +61,13 @@
- #endif
-
- #include <GL/gl.h>
-+/* Quick fix so as not to update the version of glext.h we provide. */
-+#ifdef GL_GLEXT_PROTOTYPES
-+GLAPI void APIENTRY glFramebufferTexture2D (GLenum, GLenum, GLenum, GLuint, GLint);
-+GLAPI void APIENTRY glBindFramebuffer (GLenum, GLuint);
-+GLAPI void APIENTRY glBlitFramebuffer (GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLbitfield, GLenum);
-+GLAPI void APIENTRY glGenFramebuffers (GLsizei, GLuint *);
-+#endif
-
- #ifndef WINDOWS
- # ifndef RT_OS_WINDOWS /* If we don't need it in ring-3, we probably not need it in ring-0 either (triggers warnings). */
diff --git a/debian/patches/java9.patch b/debian/patches/java9.patch
index 61a724c..eb19280 100644
--- a/debian/patches/java9.patch
+++ b/debian/patches/java9.patch
@@ -2,7 +2,7 @@ Index: virtualbox/Config.kmk
===================================================================
--- virtualbox.orig/Config.kmk
+++ virtualbox/Config.kmk
-@@ -7215,8 +7215,8 @@
+@@ -7262,8 +7262,8 @@
else
VBOX_SEP = $(COLON)
endif
diff --git a/debian/patches/series b/debian/patches/series
index 725b555..e3ef3ab 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -16,7 +16,4 @@
36-fix-vnc-version-string.patch
37-python-3.6-support.patch
fix-build.patch
-GL-fixes.patch
videorec.patch
-vm-restore.patch
-71985.patch
diff --git a/debian/patches/videorec.patch b/debian/patches/videorec.patch
index d69c9c7..f5f96d2 100644
--- a/debian/patches/videorec.patch
+++ b/debian/patches/videorec.patch
@@ -66,7 +66,7 @@ diff --git a/Config.kmk b/Config.kmk
index ee6f70771..0d2408384 100644
--- a/Config.kmk
+++ b/Config.kmk
-@@ -1181,14 +1181,14 @@ ifdef VBOX_OSE
+@@ -1179,14 +1179,14 @@ ifdef VBOX_OSE
ifn1of ($(KBUILD_TARGET), darwin linux solaris win)
VBOX_WITH_INSTALLER=
endif
diff --git a/debian/patches/vm-restore.patch b/debian/patches/vm-restore.patch
deleted file mode 100644
index a45c16d..0000000
--- a/debian/patches/vm-restore.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Origin: https://www.virtualbox.org/ticket/17711
-
-Index: src/VBox/Devices/VMMDev/VMMDevHGCM.cpp
-===================================================================
---- a/src/VBox/Devices/VMMDev/VMMDevHGCM.cpp
-+++ b/src/VBox/Devices/VMMDev/VMMDevHGCM.cpp
-@@ -1822,4 +1822,5 @@
- /* Get local copy of the list of loaded commands. */
- RTLISTANCHOR listLoadedCommands;
-+ RTListInit(&listLoadedCommands); /* RTListMove does not touch the destination is the source list is empty. */
- RTListMove(&listLoadedCommands, &pThis->listHGCMCmd);
-