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

Accepting request 667009 from Virtualization

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/667009
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/virtualbox?expand=0&rev=172
This commit is contained in:
Dominique Leuenberger 2019-01-21 10:07:07 +00:00 committed by Git OBS Bridge
commit 01767d5098
4 changed files with 46 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
change_default_net_adapter.patch
View File

@ -1,51 +0,0 @@
Index: VirtualBox-5.2.22/src/VBox/Main/src-all/Global.cpp
===================================================================
--- VirtualBox-5.2.22.orig/src/VBox/Main/src-all/Global.cpp
+++ VirtualBox-5.2.22/src/VBox/Main/src-all/Global.cpp
@@ -181,18 +181,18 @@ const Global::OSType Global::sOSTypes[]
{ "Linux", "Linux", "Linux24_64", "Linux 2.4 (64-bit)",
VBOXOSTYPE_Linux24_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC,
- 128, 16, 4 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+ 128, 16, 4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 },
{ "Linux", "Linux", "Linux26", "Linux 2.6 / 3.x / 4.x (32-bit)",
VBOXOSTYPE_Linux26, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC,
- 512, 16, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+ 512, 16, 8 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 },
{ "Linux", "Linux", "Linux26_64", "Linux 2.6 / 3.x / 4.x (64-bit)",
VBOXOSTYPE_Linux26_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC
| VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC,
- 1024, 16, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+ 1024, 16, 8 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 },
{ "Linux", "Linux", "ArchLinux", "Arch Linux (32-bit)",
@@ -219,13 +219,13 @@ const Global::OSType Global::sOSTypes[]
{ "Linux", "Linux", "OpenSUSE", "openSUSE (32-bit)",
VBOXOSTYPE_OpenSUSE, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC,
- 1024, 16, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+ 1024, 16, 8 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 },
{ "Linux", "Linux", "OpenSUSE_64", "openSUSE (64-bit)",
VBOXOSTYPE_OpenSUSE_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC
| VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC,
- 1024, 16, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+ 1024, 16, 8 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 },
{ "Linux", "Linux", "Fedora", "Fedora (32-bit)",
@@ -323,7 +323,7 @@ const Global::OSType Global::sOSTypes[]
{ "Linux", "Linux", "Linux_64", "Other Linux (64-bit)",
VBOXOSTYPE_Linux_x64, VBOXOSHINT_64BIT | VBOXOSHINT_PAE | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC
| VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC,
- 512, 16, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+ 512, 16, 8 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_STAC9700 },
{ "Solaris", "Solaris", "Solaris", "Oracle Solaris 10 5/09 and earlier (32-bit)",

26
fixes_for_gcc9 Normal file
View File

@ -0,0 +1,26 @@
Index: VirtualBox-5.2.22/src/VBox/Runtime/r3/linux/semevent-linux.cpp
===================================================================
--- VirtualBox-5.2.22.orig/src/VBox/Runtime/r3/linux/semevent-linux.cpp
+++ VirtualBox-5.2.22/src/VBox/Runtime/r3/linux/semevent-linux.cpp
@@ -37,7 +37,7 @@
* against glibc < 2.6.
*/
#include "../posix/semevent-posix.cpp"
-asm volatile (".global epoll_pwait");
+asm (".global epoll_pwait");
#else /* glibc < 2.6 */
Index: VirtualBox-5.2.22/src/VBox/Runtime/r3/linux/semeventmulti-linux.cpp
===================================================================
--- VirtualBox-5.2.22.orig/src/VBox/Runtime/r3/linux/semeventmulti-linux.cpp
+++ VirtualBox-5.2.22/src/VBox/Runtime/r3/linux/semeventmulti-linux.cpp
@@ -39,7 +39,7 @@
* against glibc < 2.6.
*/
#include "../posix/semeventmulti-posix.cpp"
-asm volatile (".global epoll_pwait");
+asm (".global epoll_pwait");
#else /* glibc < 2.6 */

15
virtualbox.changes
View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Wed Jan 16 18:32:24 UTC 2019 - Larry Finger <Larry.Finger@gmail.com>
- Remove test patch "change_default_net_adapter.patch". It was made obsolete by upstream changes.
-------------------------------------------------------------------
Sun Jan 13 18:31:20 UTC 2019 - Larry Finger <Larry.Finger@gmail.com>
- Fix for latest gcc8 was incomplete.
-------------------------------------------------------------------
Sat Jan 12 18:01:29 UTC 2019 - Larry Finger <Larry.Finger@gmail.com>
- Fix builds for the latest version of gcc8 and above. File "fixes_for_gcc9" is added.
-------------------------------------------------------------------
Sat Dec 8 18:10:09 UTC 2018 - Hans-Peter Jansen <hpj@urpla.net>

7
virtualbox.spec
View File

@ -129,8 +129,10 @@ Patch123: switch_to_python3.4+.patch
Patch124: fix_32_bit_builds.patch
# Fix API changes for kernel 4.20+
Patch125: fixes_for_4.20.patch
# Change default network adapter
Patch126: change_default_net_adapter.patch
# Fix changes for gcc9
Patch126: fixes_for_gcc9
# Fix API changes for kernel 5.0+
#Patch127: fixes_for_5.0.patch
#
BuildRequires: LibVNCServer-devel
BuildRequires: SDL-devel
@ -437,6 +439,7 @@ as an "extpack" for VirtualBox. The implementation is licensed under GPL.
%patch124 -p1
%patch125 -p1
%patch126 -p1
#%patch127 -p1
#copy user manual
cp %{SOURCE1} UserManual.pdf