commit 9655f63664de5c3bb570c92c8e0ee28b10ac9cf9
Author: Jan Rękorajski <[email protected]>
Date: Sat Jan 15 15:02:12 2022 +0100
- up to 6.1.30
VirtualBox.spec | 8 ++++----
kernel-4.9.256.patch | 4 ++--
pld-guest.patch | 20 ++++++++++----------
qt-detect.patch | 2 +-
4 files changed, 17 insertions(+), 17 deletions(-)
---
diff --git a/VirtualBox.spec b/VirtualBox.spec
index e29db82..ce1cad0 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -47,19 +47,19 @@ exit 1
%define qtver 5.6.0
-%define rel 2
+%define rel 1
%define pname VirtualBox
Summary: VirtualBox - x86 hardware virtualizer
Summary(pl.UTF-8): VirtualBox - wirtualizator sprzętu x86
Name: %{pname}%{?_pld_builder:%{?with_kernel:-kernel}}%{_alt_kernel}
-Version: 6.1.26
+Version: 6.1.30
Release: %{rel}%{?_pld_builder:%{?with_kernel:@%{_kernel_ver_str}}}
License: GPL v2
Group: Applications/Emulators
Source0:
https://download.virtualbox.org/virtualbox/%{version}/%{pname}-%{version}.tar.bz2
-# Source0-md5: fce04bbef244b4df1a50e53d132d3e6f
+# Source0-md5: 2e408e56e92cf778eb8722dbbcb5c357
Source1:
https://download.virtualbox.org/virtualbox/%{version}/VBoxGuestAdditions_%{version}.iso
-# Source1-md5: cab53b0d504e08d155a8f95878b2afc1
+# Source1-md5: 3f235b417ae90a3347afa3f787bc82b9
Source2: vboxservice.init
Source3: vboxservice.service
Source4: vboxservice.sysconfig
diff --git a/kernel-4.9.256.patch b/kernel-4.9.256.patch
index f20b290..d9c6606 100644
--- a/kernel-4.9.256.patch
+++ b/kernel-4.9.256.patch
@@ -89,7 +89,7 @@ diff -ur
VirtualBox-6.1.18/kernel/GuestDrivers/vboxvideo/vbox_ttm.c VirtualBox-6
--- VirtualBox-6.1.18/kernel/GuestDrivers/vboxvideo/vbox_ttm.c 2021-02-06
22:09:21.000000000 +0100
+++ VirtualBox-6.1.18-256/kernel/GuestDrivers/vboxvideo/vbox_ttm.c
2021-02-06 21:54:24.872380697 +0100
@@ -314,7 +314,7 @@
- #if RTLNX_VER_MAX(5,10,0)
+ #if RTLNX_VER_MAX(5,10,0) && !RTLNX_RHEL_MAJ_PREREQ(8,5)
.init_mem_type = vbox_bo_init_mem_type,
#endif
-#if RTLNX_VER_MIN(4,10,0) || RTLNX_RHEL_MAJ_PREREQ(7,4)
@@ -134,7 +134,7 @@ diff -ur
VirtualBox-6.1.18/src/VBox/Additions/linux/drm/vbox_ttm.c VirtualBox-6.
--- VirtualBox-6.1.18/src/VBox/Additions/linux/drm/vbox_ttm.c 2021-01-07
16:34:24.000000000 +0100
+++ VirtualBox-6.1.18-256/src/VBox/Additions/linux/drm/vbox_ttm.c
2021-02-06 21:54:24.869047375 +0100
@@ -319,7 +319,7 @@
- #if RTLNX_VER_MAX(5,10,0)
+ #if RTLNX_VER_MAX(5,10,0) && !RTLNX_RHEL_MAJ_PREREQ(8,5)
.init_mem_type = vbox_bo_init_mem_type,
#endif
-#if RTLNX_VER_MIN(4,10,0) || RTLNX_RHEL_MAJ_PREREQ(7,4)
diff --git a/pld-guest.patch b/pld-guest.patch
index 02f7f12..42e9152 100644
--- a/pld-guest.patch
+++ b/pld-guest.patch
@@ -55,23 +55,23 @@
--- VirtualBox-5.1.2/src/VBox/Main/src-all/Global.cpp.orig 2016-07-29
19:25:16.731328887 +0200
+++ VirtualBox-5.1.2/src/VBox/Main/src-all/Global.cpp 2016-07-29
19:31:59.252427682 +0200
@@ -321,6 +321,17 @@
- 512, 16, 8 * _1G64, GraphicsControllerType_VMSVGA,
NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3,
AudioControllerType_AC97, AudioCodecType_STAC9700 },
+ 1, 512, 16, 8 * _1G64, GraphicsControllerType_VMSVGA,
NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+ StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3,
AudioControllerType_AC97, AudioCodecType_STAC9700 },
+ { "Linux", "Linux", "PLD", "PLD Linux (32-bit)",
-+ VBOXOSTYPE_Linux26, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET |
VBOXOSHINT_X2APIC,
-+ 512, 16, 8 * _1G64, GraphicsControllerType_VMSVGA,
NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3,
AudioControllerType_AC97, AudioCodecType_AD1980 },
++ VBOXOSTYPE_PLD, VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE |
VBOXOSHINT_X2APIC,
++ 1, 1024, 16, 8 * _1G64, GraphicsControllerType_VMSVGA,
NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
++ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3,
AudioControllerType_AC97, AudioCodecType_AD1980 },
+
+ { "Linux", "Linux", "PLD_64", "PLD Linux (64-bit)",
-+ VBOXOSTYPE_Linux26_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX |
VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC
-+ | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC,
-+ 1024, 16, 8 * _1G64, GraphicsControllerType_VMSVGA,
NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3,
AudioControllerType_AC97, AudioCodecType_AD1980 },
++ VBOXOSTYPE_PLD_x64, VBOXOSHINT_64BIT | VBOXOSHINT_PAE |
VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC
++ | VBOXOSHINT_X2APIC,
++ 1, 1024, 16, 8 * _1G64, GraphicsControllerType_VMSVGA,
NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
++ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3,
AudioControllerType_AC97, AudioCodecType_AD1980 },
+
{ "Solaris", "Solaris", "Solaris", "Oracle Solaris
10 5/09 and earlier (32-bit)",
VBOXOSTYPE_Solaris, VBOXOSHINT_NONE,
- 1024, 16, 32 * _1G64, GraphicsControllerType_VBoxVGA,
NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+ 1, 1024, 16, 32 * _1G64, GraphicsControllerType_VBoxVGA,
NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--- VirtualBox-4.3.8/src/VBox/Main/src-server/ApplianceImpl.cpp~
2014-02-25 19:09:15.000000000 +0200
+++ VirtualBox-4.3.8/src/VBox/Main/src-server/ApplianceImpl.cpp
2014-02-28 09:52:48.663191185 +0200
@@ -141,6 +141,8 @@
diff --git a/qt-detect.patch b/qt-detect.patch
index 564e645..f13a1ce 100644
--- a/qt-detect.patch
+++ b/qt-detect.patch
@@ -1,7 +1,7 @@
--- VirtualBox-6.1.26/configure~ 2021-09-10 08:38:49.000000000 +0200
+++ VirtualBox-6.1.26/configure 2021-09-10 09:01:11.297646984 +0200
@@ -1564,7 +1564,7 @@
- FLGQT5=`pkg-config Qt5Core Qt5Gui --cflags`
+ FLGQT5=`pkg-config Qt5Core --cflags`
# gcc 4.8 is able to compile with C++11 (see also VBOX_GCC_std in
Config.kmk)
[ $(($cc_maj * 100 + $cc_min)) -ge 408 ] && FLGQT5="$FLGQT5
-std=c++11"
- INCQT5=`strip_I "$FLGQT5"`
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/VirtualBox.git/commitdiff/9655f63664de5c3bb570c92c8e0ee28b10ac9cf9
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
