[Pkg-virtualbox-commits] [virtualbox] 03/04: Refresh, drop upstreamed patches
Gianfranco Costamagna
locutusofborg at moszumanska.debian.org
Wed Apr 19 06:30:01 UTC 2017
This is an automated email from the git hooks/post-receive script.
locutusofborg pushed a commit to branch master
in repository virtualbox.
commit d2346ea806e0c5a50485d173ba3a149f73634c8d
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date: Wed Apr 19 08:09:21 2017 +0200
Refresh, drop upstreamed patches
---
debian/patches/12-make-module.patch | 2 +-
debian/patches/16-no-update.patch | 8 +-
debian/patches/27-hide-host-cache-warning.patch | 2 +-
debian/patches/28-no-selinux-fedora.patch | 2 +-
debian/patches/29-fix-ftbfs-as-needed.patch | 2 +-
debian/patches/36-fix-vnc-version-string.patch | 2 +-
debian/patches/add-prime-to-vbox-video.patch | 160 ------------------------
debian/patches/series | 1 -
8 files changed, 9 insertions(+), 170 deletions(-)
diff --git a/debian/patches/12-make-module.patch b/debian/patches/12-make-module.patch
index a8c9467..0efe76c 100644
--- a/debian/patches/12-make-module.patch
+++ b/debian/patches/12-make-module.patch
@@ -117,7 +117,7 @@ Index: virtualbox/src/VBox/Installer/linux/Makefile.include.header
===================================================================
--- virtualbox.orig/src/VBox/Installer/linux/Makefile.include.header 2013-11-19 03:41:05.821476025 -0500
+++ virtualbox/src/VBox/Installer/linux/Makefile.include.header 2013-11-19 03:41:05.821476025 -0500
-@@ -54,9 +54,21 @@
+@@ -60,9 +60,21 @@
BUILD_TARGET_ARCH := amd64
else
ifeq ($(ARCH),i386)
diff --git a/debian/patches/16-no-update.patch b/debian/patches/16-no-update.patch
index f1a33ef..5ad1c06 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
-@@ -474,6 +474,8 @@
+@@ -481,6 +481,8 @@
void UIUpdateManager::sltForceCheck()
{
@@ -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
-@@ -1307,8 +1307,6 @@
+@@ -1312,8 +1312,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 */
-@@ -1348,7 +1346,7 @@ void UISelectorWindow::prepareMenuFile(QMenu *pMenu)
+@@ -1353,7 +1351,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));
-@@ -1373,9 +1371,6 @@
+@@ -1378,9 +1376,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/27-hide-host-cache-warning.patch b/debian/patches/27-hide-host-cache-warning.patch
index c32797a..4b8c8d1 100644
--- a/debian/patches/27-hide-host-cache-warning.patch
+++ b/debian/patches/27-hide-host-cache-warning.patch
@@ -6,7 +6,7 @@ Index: virtualbox/src/VBox/Main/src-client/ConsoleImpl2.cpp
===================================================================
--- virtualbox.orig/src/VBox/Main/src-client/ConsoleImpl2.cpp 2015-04-02 15:46:54.415740583 +0200
+++ virtualbox/src/VBox/Main/src-client/ConsoleImpl2.cpp 2015-04-02 15:46:54.411740580 +0200
-@@ -4116,34 +4116,12 @@ int Console::i_configMediumAttachment(const char *pcszDevice,
+@@ -4117,34 +4117,12 @@ int Console::i_configMediumAttachment(const char *pcszDevice,
if ( enmFsTypeFile == RTFSTYPE_EXT4
|| enmFsTypeFile == RTFSTYPE_XFS)
{
diff --git a/debian/patches/28-no-selinux-fedora.patch b/debian/patches/28-no-selinux-fedora.patch
index 632fdaa..106d01a 100644
--- a/debian/patches/28-no-selinux-fedora.patch
+++ b/debian/patches/28-no-selinux-fedora.patch
@@ -3,7 +3,7 @@ Author: Felix Geyer <fgeyer at debian.org>
--- a/src/VBox/Additions/linux/Makefile.kmk
+++ b/src/VBox/Additions/linux/Makefile.kmk
-@@ -345,9 +345,7 @@ lnx_add_inst-noexec_INST = $(VBOX_LN
+@@ -346,9 +346,7 @@ lnx_add_inst-noexec_INST = $(VBOX_LN
lnx_add_inst-noexec_SOURCES = \
$(VBOX_REL_X11_ADD_INST)vboxclient.desktop \
$(VBOX_REL_X11_ADD_INST)vboxvideo.ids \
diff --git a/debian/patches/29-fix-ftbfs-as-needed.patch b/debian/patches/29-fix-ftbfs-as-needed.patch
index 9ba9b27..329e2f3 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
-@@ -6198,7 +6198,7 @@
+@@ -6106,7 +6106,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 295e810..1fd3e29 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
-@@ -2954,6 +2954,7 @@
+@@ -2945,6 +2945,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/add-prime-to-vbox-video.patch b/debian/patches/add-prime-to-vbox-video.patch
deleted file mode 100644
index 6659f43..0000000
--- a/debian/patches/add-prime-to-vbox-video.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-Author: Andreas Pokorny <andreas.pokorny at canonical.com>
-Description: fix unity9
---- virtualbox-5.1.14-dfsg.orig/src/VBox/Additions/linux/drm/Makefile.module.kms
-+++ virtualbox-5.1.14-dfsg/src/VBox/Additions/linux/drm/Makefile.module.kms
-@@ -36,7 +36,7 @@ ifeq ($(filter 1.% 2.% 3.0.% 3.1.% 3.2.%
- 3.8.% 3.9.% 3.10.%,$(MY_KERNELRELEASE)),)
- MOD_OBJS = HGSMIBase.o HGSMICommon.o HGSMIMemAlloc.o heapoffset.o \
- Modesetting.o vbox_drv.o vbox_fb.o vbox_irq.o vbox_main.o \
-- vbox_mode.o vbox_ttm.o VBVABase.o
-+ vbox_mode.o vbox_ttm.o vbox_prime.o VBVABase.o
- else
- MOD_OBJS = vbox_dummy.o
- endif
---- virtualbox-5.1.14-dfsg.orig/src/VBox/Additions/linux/drm/files_vboxvideo_drv
-+++ virtualbox-5.1.14-dfsg/src/VBox/Additions/linux/drm/files_vboxvideo_drv
-@@ -66,6 +66,7 @@ FILES_VBOXVIDEO_DRM_NOBIN=" \
- ${PATH_ROOT}/src/VBox/Additions/linux/drm/vbox_main.c=>vbox_main.c \
- ${PATH_ROOT}/src/VBox/Additions/linux/drm/vbox_mode.c=>vbox_mode.c \
- ${PATH_ROOT}/src/VBox/Additions/linux/drm/vbox_ttm.c=>vbox_ttm.c \
-+ ${PATH_ROOT}/src/VBox/Additions/linux/drm/vbox_prime.c=>vbox_prime.c \
- ${PATH_ROOT}/src/VBox/GuestHost/HGSMI/HGSMICommon.cpp=>HGSMICommon.c \
- ${PATH_ROOT}/src/VBox/GuestHost/HGSMI/HGSMIMemAlloc.cpp=>HGSMIMemAlloc.c \
- ${PATH_ROOT}/src/VBox/Runtime/common/alloc/heapoffset.cpp=>heapoffset.c \
---- virtualbox-5.1.14-dfsg.orig/src/VBox/Additions/linux/drm/vbox_drv.c
-+++ virtualbox-5.1.14-dfsg/src/VBox/Additions/linux/drm/vbox_drv.c
-@@ -273,7 +273,7 @@ static void vbox_master_drop(struct drm_
-
- static struct drm_driver driver =
- {
-- .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED,
-+ .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | DRIVER_PRIME,
- .dev_priv_size = 0,
-
- .load = vbox_driver_load,
-@@ -302,6 +302,17 @@ static struct drm_driver driver =
- #else
- .dumb_destroy = drm_gem_dumb_destroy,
- #endif
-+ .prime_handle_to_fd = drm_gem_prime_handle_to_fd,
-+ .prime_fd_to_handle = drm_gem_prime_fd_to_handle,
-+ .gem_prime_export = drm_gem_prime_export,
-+ .gem_prime_import = drm_gem_prime_import,
-+ .gem_prime_pin = vbox_gem_prime_pin,
-+ .gem_prime_unpin = vbox_gem_prime_unpin,
-+ .gem_prime_get_sg_table = vbox_gem_prime_get_sg_table,
-+ .gem_prime_import_sg_table = vbox_gem_prime_import_sg_table,
-+ .gem_prime_vmap = vbox_gem_prime_vmap,
-+ .gem_prime_vunmap = vbox_gem_prime_vunmap,
-+ .gem_prime_mmap = vbox_gem_prime_mmap,
-
- };
-
---- virtualbox-5.1.14-dfsg.orig/src/VBox/Additions/linux/drm/vbox_drv.h
-+++ virtualbox-5.1.14-dfsg/src/VBox/Additions/linux/drm/vbox_drv.h
-@@ -320,6 +320,18 @@ void vbox_ttm_placement(struct vbox_bo *
- int vbox_bo_push_sysram(struct vbox_bo *bo);
- int vbox_mmap(struct file *filp, struct vm_area_struct *vma);
-
-+/*vbox_prime*/
-+int vbox_gem_prime_pin(struct drm_gem_object *obj);
-+void vbox_gem_prime_unpin(struct drm_gem_object *obj);
-+struct sg_table *vbox_gem_prime_get_sg_table(struct drm_gem_object *obj);
-+struct drm_gem_object *vbox_gem_prime_import_sg_table(
-+ struct drm_device *dev, struct dma_buf_attachment *attach,
-+ struct sg_table *table);
-+void *vbox_gem_prime_vmap(struct drm_gem_object *obj);
-+void vbox_gem_prime_vunmap(struct drm_gem_object *obj, void *vaddr);
-+int vbox_gem_prime_mmap(struct drm_gem_object *obj,
-+ struct vm_area_struct *area);
-+
- /* vbox_irq.c */
- int vbox_irq_init(struct vbox_private *vbox);
- void vbox_irq_fini(struct vbox_private *vbox);
---- /dev/null
-+++ virtualbox-5.1.14-dfsg/src/VBox/Additions/linux/drm/vbox_prime.c
-@@ -0,0 +1,84 @@
-+/*
-+ * Copyright (C) 2017 Oracle Corporation
-+ *
-+ * This file is part of VirtualBox Open Source Edition (OSE), as
-+ * available from http://www.virtualbox.org. This file is free software;
-+ * you can redistribute it and/or modify it under the terms of the GNU
-+ * General Public License (GPL) as published by the Free Software
-+ * Foundation, in version 2 as it comes in the "COPYING" file of the
-+ * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
-+ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
-+ * --------------------------------------------------------------------
-+
-+ * Copyright 2017 Canonical
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the "Software"),
-+ * to deal in the Software without restriction, including without limitation
-+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+ * and/or sell copies of the Software, and to permit persons to whom the
-+ * Software is furnished to do so, subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice shall be included in
-+ * all copies or substantial portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
-+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-+ * OTHER DEALINGS IN THE SOFTWARE.
-+ *
-+ * Authors: Andreas Pokorny
-+ */
-+
-+#include "vbox_drv.h"
-+
-+/* Based on qxl_prime.c:
-+ * Empty Implementations as there should not be any other driver for a virtual
-+ * device that might share buffers with vboxvideo */
-+
-+int vbox_gem_prime_pin(struct drm_gem_object *obj)
-+{
-+ WARN_ONCE(1, "not implemented");
-+ return -ENOSYS;
-+}
-+
-+void vbox_gem_prime_unpin(struct drm_gem_object *obj)
-+{
-+ WARN_ONCE(1, "not implemented");
-+}
-+
-+
-+struct sg_table *vbox_gem_prime_get_sg_table(struct drm_gem_object *obj)
-+{
-+ WARN_ONCE(1, "not implemented");
-+ return ERR_PTR(-ENOSYS);
-+}
-+
-+struct drm_gem_object *vbox_gem_prime_import_sg_table(
-+ struct drm_device *dev, struct dma_buf_attachment *attach,
-+ struct sg_table *table)
-+{
-+ WARN_ONCE(1, "not implemented");
-+ return ERR_PTR(-ENOSYS);
-+}
-+
-+void *vbox_gem_prime_vmap(struct drm_gem_object *obj)
-+{
-+ WARN_ONCE(1, "not implemented");
-+ return ERR_PTR(-ENOSYS);
-+}
-+
-+void vbox_gem_prime_vunmap(struct drm_gem_object *obj, void *vaddr)
-+{
-+ WARN_ONCE(1, "not implemented");
-+}
-+
-+int vbox_gem_prime_mmap(struct drm_gem_object *obj,
-+ struct vm_area_struct *area)
-+{
-+ WARN_ONCE(1, "not implemented");
-+ return -ENOSYS;
-+}
diff --git a/debian/patches/series b/debian/patches/series
index af60944..b48bc21 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,4 +15,3 @@
35-libvdeplug-soname.patch
36-fix-vnc-version-string.patch
new-xorg-1.19.patch
-add-prime-to-vbox-video.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