diff --git a/fixes_for_5.5.patch b/fixes_for_5.5.patch index 15662e4..84facc1 100644 --- a/fixes_for_5.5.patch +++ b/fixes_for_5.5.patch @@ -218,18 +218,22 @@ Index: VirtualBox-6.1.2/src/VBox/Additions/linux/drm/vbox_mode.c =================================================================== --- VirtualBox-6.1.2.orig/src/VBox/Additions/linux/drm/vbox_mode.c +++ VirtualBox-6.1.2/src/VBox/Additions/linux/drm/vbox_mode.c -@@ -45,6 +45,10 @@ +@@ -45,6 +45,14 @@ #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0) || defined(RHEL_81) #include #endif +#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 5, 0) +#include +#endif ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0) +#include ++#else ++#include ++#endif #include "VBoxVideo.h" -@@ -398,6 +402,13 @@ static struct drm_encoder *drm_encoder_f +@@ -398,6 +406,13 @@ static struct drm_encoder *drm_encoder_f static struct drm_encoder *vbox_best_single_encoder(struct drm_connector *connector) { @@ -243,7 +247,7 @@ Index: VirtualBox-6.1.2/src/VBox/Additions/linux/drm/vbox_mode.c int enc_id = connector->encoder_ids[0]; /* pick the encoder ids */ -@@ -410,6 +421,7 @@ static struct drm_encoder *vbox_best_sin +@@ -410,6 +425,7 @@ static struct drm_encoder *vbox_best_sin #else return drm_encoder_find(connector->dev, enc_id); #endif diff --git a/virtualbox.changes b/virtualbox.changes index 89d1d69..37aa107 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -11,6 +11,7 @@ Fri Jan 17 22:56:58 UTC 2020 - Larry Finger File "vbox_fix_for_gcc7.patch" is deleted - fixed upstream. File "fixes_for_5.4.patch" is deleted - fixed upstream. Exclude 32-bit builds + Update so the openSUSE Leap 42.3 builds OK. As announced earlier by Oracle, 32-bit builds are no longer supported. diff --git a/virtualbox.spec b/virtualbox.spec index 9da2368..a430d7d 100644 --- a/virtualbox.spec +++ b/virtualbox.spec @@ -236,7 +236,6 @@ Obsoletes: %{name}-ose < %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %(sed -e '/^Provides: multiversion(kernel)/d' %{_libexecdir}/rpm/kernel-module-subpackage > %{_builddir}/virtualbox-kmp-template) ExclusiveArch: x86_64 -ExcludeArch: %ix86 %ifarch amd64 x86_64 ia32e em64t BuildRequires: gcc-32bit BuildRequires: gcc-c++-32bit