jengelh/virtualbox
SHA256
1
0
Fork 0
forked from pool/virtualbox
Code Pull Requests Activity

Accepting request 428206 from Virtualization

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/428206
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/virtualbox?expand=0&rev=121
This commit is contained in:
Dominique Leuenberger 2016-09-20 11:18:46 +00:00 committed by Git OBS Bridge
commit 6873216437
8 changed files with 60 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
UserManual.pdf
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:abc723f25b8429f5485d07abbfb5ad0c773a2fc85acb388c4b7e9a7c75705819
size 4335525
oid sha256:d0191d99ba1746d581920dace67d2acd65c8febc131dba9f27bde660e432ee91
size 4338868

3
VirtualBox-5.1.4-patched.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:76560ad4356f63d1a462392a0af0c2a1ead7d0a27a8a98375584bab4bd058769
size 80040206

3
VirtualBox-5.1.6-patched.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6bf464ab319df3ecb91e3e5cdc5a4b33c110342c6449359a091f484d7fcbcc7d
size 80064621

14
fix_removal_of_DEFINE_PCI_DEVICE_TABLE
View File

@ -1,14 +0,0 @@
Index: VirtualBox-5.1.4/src/VBox/Additions/linux/drm/vbox_drv.c
===================================================================
--- VirtualBox-5.1.4.orig/src/VBox/Additions/linux/drm/vbox_drv.c
+++ VirtualBox-5.1.4/src/VBox/Additions/linux/drm/vbox_drv.c
@@ -64,8 +64,7 @@ MODULE_PARM_DESC(modeset, "Disable/Enabl
module_param_named(modeset, vbox_modeset, int, 0400);
static struct drm_driver driver;
-
-static DEFINE_PCI_DEVICE_TABLE(pciidlist) =
+static const struct pci_device_id pciidlist[] =
{
{0x80ee, 0xbeef, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
{0, 0, 0},

43
modify_for_4_8_bo_move.patch
View File

@ -1,42 +1,19 @@
Index: VirtualBox-5.1.4/src/VBox/Additions/linux/drm/vbox_ttm.c
Index: VirtualBox-5.1.6/src/VBox/Additions/linux/drm/vbox_ttm.c
===================================================================
--- VirtualBox-5.1.4.orig/src/VBox/Additions/linux/drm/vbox_ttm.c
+++ VirtualBox-5.1.4/src/VBox/Additions/linux/drm/vbox_ttm.c
@@ -221,7 +221,11 @@ static int vbox_bo_move(struct ttm_buffe
struct ttm_mem_reg *new_mem)
{
int r;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 8, 0)
r = ttm_bo_move_memcpy(bo, evict, no_wait_gpu, new_mem);
+#else
+ r = ttm_bo_move_memcpy(bo, evict, interruptible, no_wait_gpu, new_mem);
+#endif
--- VirtualBox-5.1.6.orig/src/VBox/Additions/linux/drm/vbox_ttm.c
+++ VirtualBox-5.1.6/src/VBox/Additions/linux/drm/vbox_ttm.c
@@ -229,7 +229,6 @@ static int vbox_bo_move(struct ttm_buffe
return r;
}
Index: VirtualBox-5.1.4/src/VBox/Additions/linux/drm/vbox_drv.c
===================================================================
--- VirtualBox-5.1.4.orig/src/VBox/Additions/linux/drm/vbox_drv.c
+++ VirtualBox-5.1.4/src/VBox/Additions/linux/drm/vbox_drv.c
@@ -244,9 +244,14 @@ static int vbox_master_set(struct drm_de
return 0;
}
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 8, 0)
static void vbox_master_drop(struct drm_device *dev,
struct drm_file *file_priv,
bool from_release)
+#else
+static void vbox_master_drop(struct drm_device *dev,
+ struct drm_file *file_priv)
+#endif
-
static void vbox_ttm_backend_destroy(struct ttm_tt *tt)
{
struct vbox_private *vbox = dev->dev_private;
vbox->initial_mode_queried = false;
Index: VirtualBox-5.1.4/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c
ttm_tt_fini(tt);
Index: VirtualBox-5.1.6/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c
===================================================================
--- VirtualBox-5.1.4.orig/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c
+++ VirtualBox-5.1.4/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c
--- VirtualBox-5.1.6.orig/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c
+++ VirtualBox-5.1.6/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c
@@ -35,7 +35,7 @@
#include <iprt/assert.h>
#include <iprt/err.h>

14
vbox-python-detection.diff
View File

@ -1,8 +1,8 @@
Index: VirtualBox-5.1.2/src/libs/xpcom18a4/python/gen_python_deps.py
Index: VirtualBox-5.1.6/src/libs/xpcom18a4/python/gen_python_deps.py
===================================================================
--- VirtualBox-5.1.2.orig/src/libs/xpcom18a4/python/gen_python_deps.py
+++ VirtualBox-5.1.2/src/libs/xpcom18a4/python/gen_python_deps.py
@@ -75,7 +75,7 @@ def main(argv):
--- VirtualBox-5.1.6.orig/src/libs/xpcom18a4/python/gen_python_deps.py
+++ VirtualBox-5.1.6/src/libs/xpcom18a4/python/gen_python_deps.py
@@ -85,7 +85,7 @@ def main(argv):
else:
multi = 1
@ -11,7 +11,7 @@ Index: VirtualBox-5.1.2/src/libs/xpcom18a4/python/gen_python_deps.py
prefixes = ["/usr"]
versions = [str(sys.version_info[0])+'.'+str(sys.version_info[1])]
@@ -98,22 +98,23 @@ def main(argv):
@@ -112,22 +112,23 @@ def main(argv):
continue
for p in prefixes:
c = checkPair(p, v, dllpre, dllsuff, bitness_magic)
@ -28,7 +28,7 @@ Index: VirtualBox-5.1.2/src/libs/xpcom18a4/python/gen_python_deps.py
- for k in keys:
- if d is None:
- d = k
- vers = k.replace('.', '')
- vers = k.replace('.', '').upper()
- print_vars(vers, known[k], sep, bitness_magic)
- if d is not None:
- print_vars("DEF", known[d], sep, bitness_magic)
@ -39,7 +39,7 @@ Index: VirtualBox-5.1.2/src/libs/xpcom18a4/python/gen_python_deps.py
+ pass
+ if multi:
+ for ver, paths in known.items():
+ print_vars(ver.replace('.', ''), paths, sep, bitness_magic)
+ print_vars(ver.replace('.', '').upper(), paths, sep, bitness_magic)
+ else:
+ ver = versions[0]
+ paths = known[ver]

37
virtualbox.changes
View File

@ -1,3 +1,40 @@
-------------------------------------------------------------------
Mon Sep 12 22:25:42 UTC 2016 - Larry.Finger@lwfinger.net
- Remove file "fix_removal_of_DEFINE_PCI_DEVICE_TABLE" - fixed upstream.
- Version bump to 5.1.6 (released 2016-09-12 by Oracle)
This is a maintenance release. The following items were fixed and/or added:
GUI: fixed issue with opening '.vbox' files and it's aliases
GUI: keyboard grabbing fixes (bugs #15771 and #15745)
GUI: fix for passing through Ctrl + mouse-click (Mac OS X hosts only; bug #15714)
GUI: fixed automatic deletion of extension pack files (bugs #11352 and #14742)
USB: fixed showing unknown device instead of the manufacturer or product description under certain circumstances (5.1.0 regression; bug #15764)
XHCI: another fix for a hanging guest under certain conditions as result of the fix for bug #15747, this time for Windows 7 guests
Serial: fixed high CPU usage with certain USB to serial converters on Linux hosts (bug #7796)
Storage: fixed attaching stream optimized VMDK images (bug #14764)
Storage: reject image variants which are unsupported by the backend (bug #7227)
Storage: fixed loading saved states created with VirtualBox 5.0.10 and older when using a SCSI controller (bug #15865)
Storage: fixed broken NVMe emulation if the host I/O cache setting is enabled
Storage: fixed using multiple NVMe controllers if ICH9 is used
NVMe: fixed a crash during reset which could happen under certain circumstances
Audio: fixed microphone input (5.1.2 regression; bugs #14386 and #15802)
Audio: fixed crashes under certain conditions (5.1.0 regression; bug #15887 and others)
Audio: fixed recording with the ALSA backend (5.1 regression)
Audio: fixed stream access mode with OSS backend (5.1 regression, thanks to Jung-uk Kim)
E1000: do also return masked bits when reading the ICR register, this fixes booting from iPXE (5.1.2 regression; bug #15846)
BIOS: fixed 4bpp scanline calculation (bug #15787)
API: relax the check for the version attribute in OVF/OVA appliances (bug #15856)
Windows hosts: fixed crashes when terminating the VM selector or other VBox COM clients (bug #15726 and others)
Linux Installer: fixed path to the documentation in .rpm packages (5.1.0 regression)
Linux Installer: fixed the vboxdrv.sh script to prevent an SELinux complaint (bug #15816)
Linux hosts: don't use 32-bit legacy capabilities
Linux Additions: Linux 4.8 fix for the kernel display driver (bugs #15890 and #15896)
Linux Additions: don't load the kernel modules provided by the Linux distribution but load the kernel modules from the official Guest Additions package instead (bug #15324)
Linux Additions: fix dynamic resizing problems in recent Linux guests (bug #15875)
User Manual: fixed error in the VBoxManage chapter for the getextradata enumerate example (bug #15862)
-------------------------------------------------------------------
Fri Sep 9 19:24:51 UTC 2016 - Larry.Finger@lwfinger.net

5
virtualbox.spec
View File

@ -19,7 +19,7 @@
%define _vbox_instdir %{_libexecdir}/virtualbox
%define _udevrulesdir %{_libexecdir}/udev/rules.d
Name: virtualbox
Version: 5.1.4
Version: 5.1.6
Release: 0
Summary: VirtualBox is an Emulator
License: GPL-2.0+
@ -86,8 +86,6 @@ Patch109: vbox-usb-warning.diff
Patch111: vbox_prevent_wrong_SONAME.patch
# Fix change in kernel API for ttm_bo_move_memcpy()
Patch112: modify_for_4_8_bo_move.patch
# Fix source for removal of DEFINE_PCI_DEVICE_TABLE macro
Patch113: fix_removal_of_DEFINE_PCI_DEVICE_TABLE
#
BuildRequires: LibVNCServer-devel
BuildRequires: SDL-devel
@ -321,7 +319,6 @@ This package contains icons for guest desktop files that were created on the des
%patch109 -p1
%patch111 -p1
%patch112 -p1
%patch113 -p1
#copy user manual
cp %{SOURCE1} UserManual.pdf