forked from pool/virtualbox
Accepting request 806046 from Virtualization
OBS-URL: https://build.opensuse.org/request/show/806046 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/virtualbox?expand=0&rev=198
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
076697d1d2
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:557587dfc3941efbeb73d2cbc1bf52d86d015696588839d6bf31895f9b70b84f
|
||||
size 4893199
|
||||
oid sha256:46fef574f347a997f0fea79e088bf79ff8363832987b8994242df84b41650598
|
||||
size 4895364
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:df272e0583953e4839cbd0ddaaf232a2aad724297afe92808a9fb6eca73f7834
|
||||
size 113939098
|
||||
3
VirtualBox-6.1.8-patched.tar.bz2
Normal file
3
VirtualBox-6.1.8-patched.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:c9b3410b0aa2f8ff0bf777fe5affdc18290d2a1c2ce68ec94289329495e08de2
|
||||
size 119544634
|
||||
@ -1,36 +0,0 @@
|
||||
Index: VirtualBox-6.1.4/src/VBox/Additions/linux/drm/vbox_fb.c
|
||||
===================================================================
|
||||
--- VirtualBox-6.1.4.orig/src/VBox/Additions/linux/drm/vbox_fb.c
|
||||
+++ VirtualBox-6.1.4/src/VBox/Additions/linux/drm/vbox_fb.c
|
||||
@@ -47,7 +47,6 @@
|
||||
#include <drm/drm_crtc.h>
|
||||
#include <drm/drm_fb_helper.h>
|
||||
#include <drm/drm_crtc_helper.h>
|
||||
-
|
||||
#include <VBoxVideo.h>
|
||||
|
||||
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0) && !defined(RHEL_74)
|
||||
@@ -431,7 +430,11 @@ int vbox_fbdev_init(struct drm_device *d
|
||||
drm_fb_helper_prepare(dev, &fbdev->helper, &vbox_fb_helper_funcs);
|
||||
#endif
|
||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) || defined(RHEL_75)
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 7, 0)
|
||||
+ ret = drm_fb_helper_init(dev, &fbdev->helper);
|
||||
+#else
|
||||
ret = drm_fb_helper_init(dev, &fbdev->helper, vbox->num_crtcs);
|
||||
+#endif
|
||||
#else
|
||||
ret =
|
||||
drm_fb_helper_init(dev, &fbdev->helper, vbox->num_crtcs,
|
||||
@@ -440,7 +443,11 @@ int vbox_fbdev_init(struct drm_device *d
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 7, 0)
|
||||
+ ret = 0;
|
||||
+#else
|
||||
ret = drm_fb_helper_single_add_all_connectors(&fbdev->helper);
|
||||
+#endif
|
||||
if (ret)
|
||||
goto err_fini;
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
Index: VirtualBox-6.1.4/Config.kmk
|
||||
Index: VirtualBox-6.1.8/Config.kmk
|
||||
===================================================================
|
||||
--- VirtualBox-6.1.4.orig/Config.kmk
|
||||
+++ VirtualBox-6.1.4/Config.kmk
|
||||
--- VirtualBox-6.1.8.orig/Config.kmk
|
||||
+++ VirtualBox-6.1.8/Config.kmk
|
||||
@@ -2684,8 +2684,16 @@ else
|
||||
# The reason for this hack is that the windows kmk_ash cannot deal with $((1+1)).
|
||||
# Some versions of gcc (e.g. openSUSE11) return only major.minor on `gcc -dumpversion`.
|
||||
# gcc-5 of openSUSE42.1 only returns the major version on `gcc -dumpversion`!
|
||||
- VBOX_GCC_VERSION = $(shell ($(1) -dumpfullversion 2>/dev/null || $(1) -dumpversion) | \
|
||||
- $(SED_EXT) 's|\([0-9]\)\.\{0,1\}\([0-9]\{0,1\}\)\.\{0,1\}\([0-9]\{0,1\}\).*|$$(int-add $$(int-mul 10000, \1), $$(int-mul 100, $$(firstword \2 0)), $$(firstword \3 0))|' )
|
||||
- $(SED_EXT) 's|\([0-9][0-9]*\)\.\{0,1\}\([0-9]\{0,\}\)\.\{0,1\}\([0-9]\{0,\}\).*|$$(int-add $$(int-mul 10000, \1), $$(int-mul 100, $$(firstword \2 0)), $$(firstword \3 0))|' )
|
||||
+ #
|
||||
+ # Check to make sure that the compiler has either -dumpfullversion or -dumpversion. gcc-10 has neither
|
||||
+ RC = $(shell ($(1) -dumpfullversion 2>/dev/null || $(1) -dumpversion 2>/dev/null) ; echo $$?)
|
||||
@ -16,15 +16,15 @@ Index: VirtualBox-6.1.4/Config.kmk
|
||||
+ VBOX_GCC_VERSION = 100001
|
||||
+ else
|
||||
+ VBOX_GCC_VERSION = $(shell ($(1) -dumpfullversion 2>/dev/null || $(1) -dumpversion 2>/dev/null) | \
|
||||
+ $(SED_EXT) 's|\([0-9]\)\.\{0,1\}\([0-9]\{0,1\}\)\.\{0,1\}\([0-9]\{0,1\}\).*|$$(int-add $$(int-mul 10000, \1), $$(int-mul 100, $$(firstword \2 0)), $$(firstword \3 0))|' )
|
||||
+ $(SED_EXT) 's|\([0-9][0-9]*\)\.\{0,1\}\([0-9]\{0,\}\)\.\{0,1\}\([0-9]\{0,\}\).*|$$(int-add $$(int-mul 10000, \1), $$(int-mul 100, $$(firstword \2 0)), $$(firstword \3 0))|' )
|
||||
+ endif
|
||||
endif
|
||||
|
||||
# YASM macros
|
||||
Index: VirtualBox-6.1.4/src/VBox/Debugger/DBGCDumpImage.cpp
|
||||
Index: VirtualBox-6.1.8/src/VBox/Debugger/DBGCDumpImage.cpp
|
||||
===================================================================
|
||||
--- VirtualBox-6.1.4.orig/src/VBox/Debugger/DBGCDumpImage.cpp
|
||||
+++ VirtualBox-6.1.4/src/VBox/Debugger/DBGCDumpImage.cpp
|
||||
--- VirtualBox-6.1.8.orig/src/VBox/Debugger/DBGCDumpImage.cpp
|
||||
+++ VirtualBox-6.1.8/src/VBox/Debugger/DBGCDumpImage.cpp
|
||||
@@ -468,7 +468,7 @@ static const char *dbgcMachoCpuType(uint
|
||||
{
|
||||
switch (uType)
|
||||
|
||||
@ -1,3 +1,23 @@
|
||||
-------------------------------------------------------------------
|
||||
Sat May 16 00:52:34 UTC 2020 - Larry Finger <Larry.Finger@gmail.com>
|
||||
|
||||
- Version bump to 6.1.8 (released May 15 2020 by Oracle)
|
||||
|
||||
This is a maintenance release. The following items were fixed and/or added:
|
||||
|
||||
File "fixes_for_5.7.patch" is removed as the issue was fixed upstream.
|
||||
|
||||
GUI: Fix several layout and mouse position handling bugs with soft keyboard
|
||||
GUI: Fixed crash on last VM removed (6.1.4 regression; bug #19568, #19525, #19506, #19490, #19481, #19397)
|
||||
GUI and API: Allow renaming VMs which are in saved state
|
||||
Serial: Fixed slow guest output when using the TCP server mode without anyone being connected
|
||||
Guest Additions: Restored 'VBoxClient--checkhostversion' functionality (6.1.0 regression; bug #19470)
|
||||
Guest Additions: Fixed resizing and multi monitor handling for X11 guests. (6.1.0 regression; bug #19496)
|
||||
Guest Additions: Build problems fix with Oracle Linux 8.2 (Red Hat compatible kernel) / Red Hat Enterprise Linux 8.2 / CentOS 8.2 (bug #19391)
|
||||
Guest Control/VBoxManage: Fixed handling of multiple environment variables supplied to 'VBoxManage guestcontrol VM run' (6.1.6/6.0.20 regression; bug #19518)
|
||||
Guest Control: Implemented support for long(er) command lines
|
||||
Guest Control: Various stability improvements
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 15 17:40:41 UTC 2020 - Larry Finger <Larry.Finger@gmail.com>
|
||||
|
||||
|
||||
@ -47,7 +47,7 @@ python3 -O -c "import sys, os, compileall; br='%{buildroot}'; compileall.compile
|
||||
%define _udevrulesdir /usr/lib/udev/rules.d
|
||||
Name: virtualbox
|
||||
# ********* If the VB version exceeds 6.1.x, notify the libvirt maintainer!!
|
||||
Version: 6.1.6
|
||||
Version: 6.1.8
|
||||
Release: 0
|
||||
Summary: VirtualBox is an Emulator
|
||||
License: GPL-2.0-or-later
|
||||
@ -154,8 +154,6 @@ Patch134: fixes_for_5.5.patch
|
||||
Patch135: fix-missing-includes-with-qt-5.15.patch
|
||||
# Fix builds with GCC10
|
||||
Patch136: fixes_for_gcc10.patch
|
||||
# Fix build for kernel 5.7
|
||||
Patch137: fixes_for_5.7.patch
|
||||
Patch999: virtualbox-fix-ui-background-color.patch
|
||||
#
|
||||
BuildRequires: LibVNCServer-devel
|
||||
@ -460,7 +458,6 @@ as an "extpack" for VirtualBox. The implementation is licensed under GPL.
|
||||
%patch134 -p1
|
||||
%patch135 -p1
|
||||
%patch136 -p1
|
||||
%patch137 -p1
|
||||
# make VB UI background colors look sane again
|
||||
%patch999 -p1
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user