Hello community, here is the log from the commit of package virtualbox for openSUSE:Factory checked in at 2018-01-09 14:35:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/virtualbox (Old) and /work/SRC/openSUSE:Factory/.virtualbox.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "virtualbox" Tue Jan 9 14:35:46 2018 rev:152 rq:560652 version:5.2.4 Changes: -------- --- /work/SRC/openSUSE:Factory/virtualbox/virtualbox.changes 2017-12-23 12:18:30.422448438 +0100 +++ /work/SRC/openSUSE:Factory/.virtualbox.new/virtualbox.changes 2018-01-09 14:35:52.272539848 +0100 @@ -1,0 +2,78 @@ +Fri Dec 29 19:19:22 UTC 2017 - [email protected] + +- File "fixes_for_4.14.patch" deleted - upstream fix. + File "remove_vbox_video_build.patch" added as current versions of Xorg no longer need this component. + +Version update to 5.2.4 (released 2017-12-19 by Oracle) + +This is a maintenance release. The following items were fixed and/or added: + + User interface: Adjusting desktop file for X11 window managers (bug #17312) + User interface: various high resolution display adjustments + Audio: fixed SB16 volume handling (5.2 regression) + Audio: various fixes + USB/OHCI: fixed a problem where OHCI emulation might sporadically drop data transfers + Linux hosts: fixed screen corruption when the host screen changes and a virtual machine window is maximized + X11 Guest Additions: fixed a hang at the GNOME Shell login screen with 3D enabled (5.2 regression, bugs #17189 and #17190) + +Version bump to 5.2.2 (released 2017-11-24 by Oracle) + +This is a maintenance release. The following items were fixed and/or added: + + User interface: various improvements for high resolution screens + User interface: added functionality to duplicate optical and floppy images + User interface: various improvements for the virtual media manager + VMM: fixed emulation so that Plan 9 guests can start once more (5.1.0 regression) + Storage: fixed regression breaking iSCSI (bug #17196) + Audio: added HDA support for more exotic guests (e.g. Haiku) + Serial: fixed hanging I/O when using named pipes on Windows (5.2.0 regression; bug #17227) + Serial: fixed broken communication with certain devices on Linux hosts + USB/OHCI: improved behavior so that the controller state after a VM reset is closer to the initial state after VM start + EFI: fixed HFS+ driver which in rare cases failed to access most files on a volume + Shared clipboard: fixed hang with OS X host and Linux guest (bug #15782) + Linux hosts: fixed kernel module compilation and start failures with Linux kernel 4.14 (bug #17267) + X11 hosts: better handle WM_CLASS setting (bug #12534) + Linux guests: fixed kernel module compilation and other problems with Linux kernel 4.14 (bug #12534) + Linux guests: fixed kernel module compilation and other problems with Linux kernel 4.14 + Linux guests: fixed various 5.2.0 regressions (bug #17163) + Bridged networking: fixed duplicate EtherType in VLAN/priority tags on Linux (5.2.0 regression; bug #17277) + +Version change to 5.2.0 (released 2017-10-18 by Oracle) + +This is a major update. The following major new features were added: + + VM export to Oracle Cloud (OPC) + Unattended guest installation (bug #5810; see the manual for more information) + Overhauled VM selector GUI (improved tools VM / global tools handling, new icons) + Added experimental audio support for video recording + +In addition, the following items were fixed and/or added: + + VMM: fixed reason for recent Linux kernels on also recent CPU models warning about "XSAVE consistency problem" + GUI: Virtual Media Manager rework allowing to manage media attributes, like size, location, type and description + GUI: Host-only Network Manager implemented to simplify managing corresponding networks and their attributes + GUI: Snapshot Pane rework allowing to manage snapshot attributes, like name and description; reworked snapshot details which looks more clear, corresponds to VM Details pane and reflects current VM state difference according to last snapshot taken + GUI: Audio settings extended with possibility to enable/disable audio input/output; corresponding changed were done to Audio and Video Capture settings pages; VM Devices menu and status-bar extended with corresponding actions and indicator as well + GUI: improvements with accessibility support + GUI: Fixed double mouse cursor when using mouse integration without Guest Additions, actually a Qt 5.6 bug fixed with QT 5.6.3 (Mac OS X hosts only; bug #15610) + Audio: implemented (optional) device enumeration support for audio backends + Audio: implemented support for host device callbacks (e.g. when adding or removing an audio device) + Audio: HDA emulation now uses asynchronous data processing in separate threads + Audio: implemented ability to enable or disable audio input / output on-the-fly + Storage: implemented support for CUE/BIN images as CD/DVD media including multiple tracks + Storage: implemented support for the controller memory buffer feature for NVMe + Storage: first milestone of the I/O stack redesign landed + E1000: Fix for Windows XP freeze when booting with unplugged cable + NAT network: do not skip some port forwarding setup when multiple VMs are active (Windows hosts only; bug #17041) + Serial: fixed extremely rare misbehavior on VM poweroff + EFI: better video mode handling, supporting custom video modes and easier configuration (bug #6783) + BIOS: properly report floppy logical sectors per track for unusual formats + BIOS: update ATA disk parameter table vectors only if there is actually a corresponding ATA disk attached + PXE: speed up booting by better handling pending packets when the link is not up yet + VBoxManage: handle CPUID sub-leaf overrides better + Windows Additions: fix several 3D related crashes + Solaris hosts: allow increasing MTU size for host-only adapter to 9706 bytes to support jumbo frames + Linux Additions: on systems using systemd, make sure that only the Guest Additions timesync service is active + many unlisted fixes and improvements + +------------------------------------------------------------------- Old: ---- VirtualBox-5.1.30-patched.tar.bz2 fixes_for_4.14.patch New: ---- VirtualBox-5.2.4-patched.tar.bz2 remove_vbox_video_build.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virtualbox.spec ++++++ --- /var/tmp/diff_new_pack.0Arrql/_old 2018-01-09 14:35:55.324396691 +0100 +++ /var/tmp/diff_new_pack.0Arrql/_new 2018-01-09 14:35:55.328396503 +0100 @@ -27,7 +27,7 @@ %define _vbox_instdir %{_libexecdir}/virtualbox %define _udevrulesdir %{_sysconfdir}/udev/rules.d Name: virtualbox -Version: 5.1.30 +Version: 5.2.4 Release: 0 Summary: VirtualBox is an Emulator License: GPL-2.0+ @@ -102,8 +102,6 @@ Patch112: modify_for_4_8_bo_move.patch # Remove all mention of _smp_mflags Patch113: vbox_remove_smp_mflags.patch -# Fix for removal of vfs_write() in kernel 4.14 -Patch114: fixes_for_4.14.patch # Allow use of gcc7 Patch115: vbox_fix_for_gcc7.patch # Fix for missing include needed for server 1.19 @@ -116,6 +114,8 @@ Patch119: fixes_for_leap15.patch # Fix rpmlint error for script /lib/usr/virtualbox/vboxshell.py Patch120: fixes_for_python.patch +# Remove vboxvideo from build +Patch121: remove_vbox_video_build.patch # BuildRequires: LibVNCServer-devel BuildRequires: SDL-devel @@ -140,7 +140,7 @@ BuildRequires: glibc-devel-static BuildRequires: gsoap-devel BuildRequires: java-devel >= 1.6.0 -BuildRequires: kbuild >= 0.1.9998svn2808 +BuildRequires: kbuild >= 0.1.9998svn3101 #BuildRequires: kernel-syms BuildRequires: libcap-devel BuildRequires: libcurl-devel @@ -388,7 +388,7 @@ %patch9 -p1 %patch10 -p1 %patch99 -p1 -%patch100 +%patch100 -p1 %patch101 -p1 %patch103 -p1 %patch104 -p1 @@ -399,15 +399,15 @@ %patch109 -p1 %patch112 -p1 %patch113 -p1 -%patch114 -p1 %patch115 -p1 %patch116 -p1 %patch117 -p1 %patch118 -p1 -%if 0%{suse_version} >= 1500 +%if 0%{suse_version} == 1500 %patch119 -p1 %endif %patch120 -p1 +%patch121 -p1 #copy user manual cp %{SOURCE1} UserManual.pdf @@ -482,10 +482,10 @@ # # build kernel modules for guest and host (check novel-kmp package as example) # host modules : vboxdrv,vboxnetflt,vboxnetadp,vboxpci -# guest modules : vboxguest,vboxsf,vboxvideo +# guest modules : vboxguest,vboxsf echo "build kernel modules" for vbox_module in out/linux.*/release/bin/src/vbox{drv,netflt,netadp,pci} \ - out/linux.*/release/bin/additions/src/vbox{guest,sf,video}; do + out/linux.*/release/bin/additions/src/vbox{guest,sf}; do #get the module name from path module_name=$(basename "$vbox_module") @@ -513,10 +513,10 @@ $PWD/modules_build_dir/$flavor/$module_name fi # copy vboxguest (for guest) module symbols which are used by vboxvideo km: - if [ "$module_name" = "vboxvideo" ]; then - cp $PWD/modules_build_dir/$flavor/vboxguest/Module.symvers \ - $PWD/modules_build_dir/$flavor/$module_name - fi +# if [ "$module_name" = "vboxvideo" ]; then +# cp $PWD/modules_build_dir/$flavor/vboxguest/Module.symvers \ +# $PWD/modules_build_dir/$flavor/$module_name +# fi # build the module for the specific flavor make -j2 -C %{_prefix}/src/linux-obj/%{_target_cpu}/$flavor modules \ M=$PWD/modules_build_dir/$flavor/$module_name @@ -555,7 +555,7 @@ export INITRD_IN_POSTTRANS=1 export KMP_NEEDS_MKINITRD=0 #to install modules we use here similar steps like in build phase, go through all the modules : -for module_name in vbox{drv,netflt,pci,netadp,guest,sf,video} +for module_name in vbox{drv,netflt,pci,netadp,guest,sf} do #and through the all flavors for flavor in %{flavors_to_build}; do @@ -585,7 +585,7 @@ #VBoxClient daemon (support for clipboard,autoresize,seamless windows) install -m 755 VBoxClient %{buildroot}%{_bindir} # xorg drivers for video -install -m 755 vboxvideo_drv_system.so %{buildroot}%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so +#install -m 755 vboxvideo_drv_system.so %{buildroot}%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so popd # VBoxOGL* libs for guest-x11 subpackage install -m 644 out/linux.*/release/bin/additions/VBoxOGL*.so \ @@ -594,7 +594,7 @@ install -m 755 out/linux.*/release/bin/additions/VBoxEGL*.so \ %{buildroot}%{_libdir} # make link for dri lib -ln -s %{_libdir}/VBoxOGL.so %{buildroot}%{_libdir}/dri/vboxvideo_dri.so +#ln -s %{_libdir}/VBoxOGL.so %{buildroot}%{_libdir}/dri/vboxvideo_dri.so # install init script which start VBoxClient daemon (support for clipboard,autoresize,seamless windows) install -m 755 src/VBox/Additions/x11/Installer/98vboxadd-xclient %{buildroot}%{_sysconfdir}/X11/xinit/xinitrc.d/vboxadd-xclient.sh @@ -945,8 +945,8 @@ %{_bindir}/VBoxClient %{_libdir}/VBoxOGL*.so %{_libdir}/VBoxEGL*.so -%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so -%{_libdir}/dri/vboxvideo_dri.so +#%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so +#%{_libdir}/dri/vboxvideo_dri.so %{_sysconfdir}/X11/xinit/xinitrc.d/vboxadd-xclient.sh %files guest-tools ++++++ Fix_for_server_1.19.patch ++++++ --- /var/tmp/diff_new_pack.0Arrql/_old 2018-01-09 14:35:55.348395565 +0100 +++ /var/tmp/diff_new_pack.0Arrql/_new 2018-01-09 14:35:55.348395565 +0100 @@ -1,40 +1,9 @@ -Index: VirtualBox-5.1.10/src/VBox/Additions/x11/vboxvideo/vboxvideo.h +Index: VirtualBox-5.2.0/src/VBox/Additions/x11/vboxvideo/vboxvideo.c =================================================================== ---- VirtualBox-5.1.10.orig/src/VBox/Additions/x11/vboxvideo/vboxvideo.h -+++ VirtualBox-5.1.10/src/VBox/Additions/x11/vboxvideo/vboxvideo.h -@@ -52,6 +52,10 @@ - #ifndef _VBOXVIDEO_H_ - #define _VBOXVIDEO_H_ - -+#if XORG_VERSION_CURRENT >= 11900000 -+#include <bits/sigset.h> -+typedef __sigset_t sigset_t; -+#endif - #include <VBox/VBoxVideoGuest.h> - #include <VBox/VBoxVideo.h> - #include "version-generated.h" -Index: VirtualBox-5.1.10/src/VBox/Additions/x11/vboxvideo/helpers.c -=================================================================== ---- VirtualBox-5.1.10.orig/src/VBox/Additions/x11/vboxvideo/helpers.c -+++ VirtualBox-5.1.10/src/VBox/Additions/x11/vboxvideo/helpers.c -@@ -82,7 +82,11 @@ void vbvxSetIntegerPropery(ScrnInfoPtr p - - property_name = MakeAtom(pszName, strlen(pszName), TRUE); - VBVXASSERT(property_name != BAD_RESOURCE, ("Failed to set atom \"%s\"\n", pszName)); -+#if XORG_VERSION_CURRENT >= 11900000 -+ dixChangeWindowProperty(serverClient, ROOT_WINDOW(pScrn), property_name, XA_INTEGER, 32, PropModeReplace, cData, paData, fSendEvent); -+#else - ChangeWindowProperty(ROOT_WINDOW(pScrn), property_name, XA_INTEGER, 32, PropModeReplace, cData, paData, fSendEvent); -+#endif - } - - void vbvxReprobeCursor(ScrnInfoPtr pScrn) -Index: VirtualBox-5.1.10/src/VBox/Additions/x11/vboxvideo/vboxvideo.c -=================================================================== ---- VirtualBox-5.1.10.orig/src/VBox/Additions/x11/vboxvideo/vboxvideo.c -+++ VirtualBox-5.1.10/src/VBox/Additions/x11/vboxvideo/vboxvideo.c -@@ -1229,7 +1229,11 @@ static Bool VBOXScreenInit(ScreenPtr pSc - updateGraphicsCapability(pScrn, TRUE); +--- VirtualBox-5.2.0.orig/src/VBox/Additions/x11/vboxvideo/vboxvideo.c ++++ VirtualBox-5.2.0/src/VBox/Additions/x11/vboxvideo/vboxvideo.c +@@ -1237,7 +1237,11 @@ static Bool VBOXScreenInit(ScreenPtr pSc + #endif /* Register block and wake-up handlers for getting new screen size hints. */ +#if XORG_VERSION_CURRENT >= 11900000 @@ -45,33 +14,33 @@ /* software cursor */ miDCInitialize(pScreen, xf86GetPointerScreenFuncs()); -Index: VirtualBox-5.1.10/src/VBox/Additions/x11/vboxvideo/pointer.c +Index: VirtualBox-5.2.0/src/VBox/Additions/x11/vboxvideo/pointer.c =================================================================== ---- VirtualBox-5.1.10.orig/src/VBox/Additions/x11/vboxvideo/pointer.c -+++ VirtualBox-5.1.10/src/VBox/Additions/x11/vboxvideo/pointer.c -@@ -15,6 +15,10 @@ - * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. - */ +--- VirtualBox-5.2.0.orig/src/VBox/Additions/x11/vboxvideo/pointer.c ++++ VirtualBox-5.2.0/src/VBox/Additions/x11/vboxvideo/pointer.c +@@ -36,6 +36,10 @@ + #include "cursorstr.h" + #include "servermd.h" +#if XORG_VERSION_CURRENT >= 11900000 +#include <bits/sigset.h> +typedef __sigset_t sigset_t; +#endif - #include <VBox/VBoxGuestLib.h> + #include "vboxvideo.h" - #ifndef PCIACCESS -Index: VirtualBox-5.1.10/src/VBox/Additions/x11/vboxvideo/edid.c + #ifdef XORG_7X +Index: VirtualBox-5.2.0/src/VBox/Additions/x11/vboxvideo/edid.c =================================================================== ---- VirtualBox-5.1.10.orig/src/VBox/Additions/x11/vboxvideo/edid.c -+++ VirtualBox-5.1.10/src/VBox/Additions/x11/vboxvideo/edid.c -@@ -44,6 +44,10 @@ - * Dave Airlie <[email protected]> +--- VirtualBox-5.2.0.orig/src/VBox/Additions/x11/vboxvideo/edid.c ++++ VirtualBox-5.2.0/src/VBox/Additions/x11/vboxvideo/edid.c +@@ -36,6 +36,10 @@ + * Michael Thayer <[email protected]> */ +#if XORG_VERSION_CURRENT >= 11900000 +#include <bits/sigset.h> +typedef __sigset_t sigset_t; +#endif - #include <misc.h> - #include <xf86DDC.h> - #include <xf86Crtc.h> + #include "misc.h" + #include "xf86DDC.h" + #include "xf86Crtc.h" ++++++ UserManual.pdf ++++++ (binary differes) ++++++ VirtualBox-5.1.30-patched.tar.bz2 -> VirtualBox-5.2.4-patched.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/virtualbox/VirtualBox-5.1.30-patched.tar.bz2 /work/SRC/openSUSE:Factory/.virtualbox.new/VirtualBox-5.2.4-patched.tar.bz2 differ: char 11, line 1 ++++++ fixes_for_4.15.patch ++++++ --- /var/tmp/diff_new_pack.0Arrql/_old 2018-01-09 14:35:55.424392000 +0100 +++ /var/tmp/diff_new_pack.0Arrql/_new 2018-01-09 14:35:55.424392000 +0100 @@ -15,10 +15,27 @@ Signed-off-by: Larry Finger <[email protected]> -Index: VirtualBox-5.1.30/src/VBox/Runtime/r0drv/linux/timer-r0drv-linux.c +This patch file makes the necessary changes to the VirtualBox 5.1.30 sources +to allow the kernel modules to build with kernel 4.15. + +The API changes are of several types: + +1. The timer initialization routine init_timer_pinned() no longer exists, and + is replaced by timer_setup(). +2. The timer callback routine calling sequence is changed as is the technique + for getting the timer information from the callback parameters. +3. The calling sequence for drm_encoder_find() is changed. +4. The calling sequence for the .get and .set members of the module_param_call() + calls have changed. + +This patch is released under the MIT license when appropriate, GPLv2 otherwise. + +Signed-off-by: Larry Finger <[email protected]> + +Index: VirtualBox-5.2.2/src/VBox/Runtime/r0drv/linux/timer-r0drv-linux.c =================================================================== ---- VirtualBox-5.1.30.orig/src/VBox/Runtime/r0drv/linux/timer-r0drv-linux.c -+++ VirtualBox-5.1.30/src/VBox/Runtime/r0drv/linux/timer-r0drv-linux.c +--- VirtualBox-5.2.2.orig/src/VBox/Runtime/r0drv/linux/timer-r0drv-linux.c ++++ VirtualBox-5.2.2/src/VBox/Runtime/r0drv/linux/timer-r0drv-linux.c @@ -715,6 +715,14 @@ static enum hrtimer_restart rtTimerLinux #endif /* RTTIMER_LINUX_WITH_HRTIMER */ @@ -61,11 +78,11 @@ pTimer->aSubTimers[iCpu].u.Std.LnxTimer.expires = jiffies; pTimer->aSubTimers[iCpu].u.Std.u64NextTS = 0; } -Index: VirtualBox-5.1.30/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c +Index: VirtualBox-5.2.2/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c =================================================================== ---- VirtualBox-5.1.30.orig/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c -+++ VirtualBox-5.1.30/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c -@@ -958,7 +958,11 @@ EXPORT_SYMBOL(VBoxGuestIDCCall); +--- VirtualBox-5.2.2.orig/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c ++++ VirtualBox-5.2.2/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c +@@ -1058,7 +1058,11 @@ void VGDrvNativeISRMousePollEvent(PVBOXG #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0) /** log and dbg_log parameter setter. */ @@ -77,7 +94,7 @@ { if (g_fLoggerCreated) { -@@ -973,7 +973,11 @@ static int vgdrvLinuxParamLogGrpSet(cons +@@ -1073,7 +1077,11 @@ static int vgdrvLinuxParamLogGrpSet(cons } /** log and dbg_log parameter getter. */ @@ -89,7 +106,7 @@ { PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() : RTLogRelGetDefaultInstance(); *pszBuf = '\0'; -@@ -984,7 +984,11 @@ static int vgdrvLinuxParamLogGrpGet(char +@@ -1084,7 +1092,11 @@ static int vgdrvLinuxParamLogGrpGet(char /** log and dbg_log_flags parameter setter. */ @@ -101,7 +118,7 @@ { if (g_fLoggerCreated) { -@@ -998,7 +998,11 @@ static int vgdrvLinuxParamLogFlagsSet(co +@@ -1098,7 +1110,11 @@ static int vgdrvLinuxParamLogFlagsSet(co } /** log and dbg_log_flags parameter getter. */ @@ -113,7 +130,7 @@ { PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() : RTLogRelGetDefaultInstance(); *pszBuf = '\0'; -@@ -1009,7 +1009,11 @@ static int vgdrvLinuxParamLogFlagsGet(ch +@@ -1109,7 +1125,11 @@ static int vgdrvLinuxParamLogFlagsGet(ch /** log and dbg_log_dest parameter setter. */ @@ -125,7 +142,7 @@ { if (g_fLoggerCreated) { -@@ -1023,7 +1023,11 @@ static int vgdrvLinuxParamLogDstSet(cons +@@ -1123,7 +1143,11 @@ static int vgdrvLinuxParamLogDstSet(cons } /** log and dbg_log_dest parameter getter. */ @@ -137,7 +154,7 @@ { PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() : RTLogRelGetDefaultInstance(); *pszBuf = '\0'; -@@ -1034,7 +1034,11 @@ static int vgdrvLinuxParamLogDstGet(char +@@ -1134,7 +1158,11 @@ static int vgdrvLinuxParamLogDstGet(char /** r3_log_to_host parameter setter. */ @@ -149,7 +166,7 @@ { if ( pszValue == NULL || *pszValue == '\0' -@@ -1052,7 +1052,11 @@ static int vgdrvLinuxParamR3LogToHostSet +@@ -1152,7 +1180,11 @@ static int vgdrvLinuxParamR3LogToHostSet } /** r3_log_to_host parameter getter. */ @@ -161,20 +178,37 @@ { strcpy(pszBuf, g_DevExt.fLoggingEnabled ? "enabled" : "disabled"); return strlen(pszBuf); -Index: VirtualBox-5.1.30/src/VBox/Additions/linux/drm/vbox_mode.c +Index: VirtualBox-5.2.2/src/VBox/Additions/linux/drm/vbox_mode.c =================================================================== ---- VirtualBox-5.1.30.orig/src/VBox/Additions/linux/drm/vbox_mode.c -+++ VirtualBox-5.1.30/src/VBox/Additions/linux/drm/vbox_mode.c -@@ -369,7 +369,12 @@ static struct drm_encoder *vbox_best_sin - LogFunc(("vboxvideo: %d: connector=%p\n", __LINE__, connector)); - /* pick the encoder ids */ - if (enc_id) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) -+ return drm_encoder_find(connector->dev, NULL, enc_id); -+#else - return drm_encoder_find(connector->dev, enc_id); -+#endif -+ - LogFunc(("vboxvideo: %d\n", __LINE__)); - return NULL; +--- VirtualBox-5.2.2.orig/src/VBox/Additions/linux/drm/vbox_mode.c ++++ VirtualBox-5.2.2/src/VBox/Additions/linux/drm/vbox_mode.c +@@ -398,11 +398,15 @@ static struct drm_encoder *vbox_best_sin + *connector) + { + int enc_id = connector->encoder_ids[0]; +- + /* pick the encoder ids */ + if (enc_id) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) ++ return drm_encoder_find(connector->dev, NULL, enc_id); ++#else + return drm_encoder_find(connector->dev, enc_id); ++#endif + ++ LogFunc(("vboxvideo: %d\n", __LINE__)); + return NULL; } + +Index: VirtualBox-5.2.2/configure +=================================================================== +--- VirtualBox-5.2.2.orig/configure ++++ VirtualBox-5.2.2/configure +@@ -1538,7 +1538,7 @@ EOF + INCQT5=`strip_I "$FLGQT5"` + LIBDIR5=`pkg-config Qt5Core --variable=libdir` + LIBQT5=`pkg-config Qt5Core --libs` +- LIBQT5="-L$LIBDIR5 $LIBQT5" ++ LIBQT5="-L$LIBDIR5 $LIBQT5 -std=c++11" + TOOLQT5=`pkg-config Qt5Core --variable=prefix` + TOOLQT5BIN=`pkg-config Qt5Core --variable=host_bins` + if test_compile "$LIBQT5 $LIBPTHREAD $FLGQT5" qt5 qt5 nofatal; then ++++++ gcc5-real-support.patch ++++++ --- /var/tmp/diff_new_pack.0Arrql/_old 2018-01-09 14:35:55.440391249 +0100 +++ /var/tmp/diff_new_pack.0Arrql/_new 2018-01-09 14:35:55.444391061 +0100 @@ -1,21 +1,8 @@ -Index: VirtualBox-5.1.10/Config.kmk +Index: VirtualBox-5.2.0/configure =================================================================== ---- VirtualBox-5.1.10.orig/Config.kmk -+++ VirtualBox-5.1.10/Config.kmk -@@ -2479,7 +2479,7 @@ else - # 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) -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))|' ) -+ $(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))|' ) - endif - - # Find MinGW cross compilers for EFI on non-windows systems. We need to probe -Index: VirtualBox-5.1.10/configure -=================================================================== ---- VirtualBox-5.1.10.orig/configure -+++ VirtualBox-5.1.10/configure -@@ -433,8 +433,13 @@ check_gcc() +--- VirtualBox-5.2.0.orig/configure ++++ VirtualBox-5.2.0/configure +@@ -429,8 +429,13 @@ check_gcc() log_failure "cannot execute '$CXX -dumpversion'" fail really fi ++++++ internal-headers.patch ++++++ --- /var/tmp/diff_new_pack.0Arrql/_old 2018-01-09 14:35:55.456390499 +0100 +++ /var/tmp/diff_new_pack.0Arrql/_new 2018-01-09 14:35:55.456390499 +0100 @@ -1,7 +1,7 @@ -Index: VirtualBox-5.1.26/src/VBox/Additions/x11/vboxvideo/Makefile.kmk +Index: VirtualBox-5.2.0/src/VBox/Additions/x11/vboxvideo/Makefile.kmk =================================================================== ---- VirtualBox-5.1.26.orig/src/VBox/Additions/x11/vboxvideo/Makefile.kmk -+++ VirtualBox-5.1.26/src/VBox/Additions/x11/vboxvideo/Makefile.kmk +--- VirtualBox-5.2.0.orig/src/VBox/Additions/x11/vboxvideo/Makefile.kmk ++++ VirtualBox-5.2.0/src/VBox/Additions/x11/vboxvideo/Makefile.kmk @@ -23,6 +23,9 @@ vboxvideo_70_DEFS := \ ifeq ($(KBUILD_TARGET),solaris) # don't use .solaris or anything here. vboxvideo_70_DEFS += __EXTENSIONS__ ## @todo Why this? @@ -12,61 +12,48 @@ vboxvideo_13_DEFS := $(vboxvideo_70_DEFS) VBOXVIDEO_13 vboxvideo_15_DEFS := \ $(vboxvideo_13_DEFS) NO_ANSIC PCIACCESS XSERVER_LIBPCIACCESS _XORG_SERVER_H_ _DIX_CONFIG_H_ -Index: VirtualBox-5.1.26/src/VBox/Additions/x11/vboxvideo/edid.c +Index: VirtualBox-5.2.0/src/VBox/Additions/x11/vboxvideo/edid.c =================================================================== ---- VirtualBox-5.1.26.orig/src/VBox/Additions/x11/vboxvideo/edid.c -+++ VirtualBox-5.1.26/src/VBox/Additions/x11/vboxvideo/edid.c -@@ -44,10 +44,6 @@ - * Dave Airlie <[email protected]> +--- VirtualBox-5.2.0.orig/src/VBox/Additions/x11/vboxvideo/edid.c ++++ VirtualBox-5.2.0/src/VBox/Additions/x11/vboxvideo/edid.c +@@ -36,10 +36,6 @@ + * Michael Thayer <[email protected]> */ -#if XORG_VERSION_CURRENT >= 11900000 -#include <bits/sigset.h> -typedef __sigset_t sigset_t; -#endif - #include <misc.h> - #include <xf86DDC.h> - #include <xf86Crtc.h> -Index: VirtualBox-5.1.26/src/VBox/Additions/x11/vboxvideo/pointer.c + #include "misc.h" + #include "xf86DDC.h" + #include "xf86Crtc.h" +Index: VirtualBox-5.2.0/src/VBox/Additions/x11/vboxvideo/pointer.c =================================================================== ---- VirtualBox-5.1.26.orig/src/VBox/Additions/x11/vboxvideo/pointer.c -+++ VirtualBox-5.1.26/src/VBox/Additions/x11/vboxvideo/pointer.c -@@ -15,10 +15,6 @@ - * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. - */ +--- VirtualBox-5.2.0.orig/src/VBox/Additions/x11/vboxvideo/pointer.c ++++ VirtualBox-5.2.0/src/VBox/Additions/x11/vboxvideo/pointer.c +@@ -36,10 +36,6 @@ + #include "cursorstr.h" + #include "servermd.h" -#if XORG_VERSION_CURRENT >= 11900000 -#include <bits/sigset.h> -typedef __sigset_t sigset_t; -#endif - #include <VBox/VBoxGuestLib.h> + #include "vboxvideo.h" - #ifndef PCIACCESS -Index: VirtualBox-5.1.26/src/VBox/Additions/x11/vboxvideo/vboxvideo.h + #ifdef XORG_7X +Index: VirtualBox-5.2.0/src/VBox/Additions/x11/vboxvideo/vboxvideo.h =================================================================== ---- VirtualBox-5.1.26.orig/src/VBox/Additions/x11/vboxvideo/vboxvideo.h -+++ VirtualBox-5.1.26/src/VBox/Additions/x11/vboxvideo/vboxvideo.h -@@ -52,10 +52,6 @@ +--- VirtualBox-5.2.0.orig/src/VBox/Additions/x11/vboxvideo/vboxvideo.h ++++ VirtualBox-5.2.0/src/VBox/Additions/x11/vboxvideo/vboxvideo.h +@@ -42,8 +42,8 @@ #ifndef _VBOXVIDEO_H_ #define _VBOXVIDEO_H_ --#if XORG_VERSION_CURRENT >= 11900000 --#include <bits/sigset.h> --typedef __sigset_t sigset_t; --#endif - #include <VBox/VBoxVideoGuest.h> - #include <VBox/VBoxVideo.h> +-#include <VBoxVideoGuest.h> +-#include <VBoxVideo.h> ++#include <VBox/Graphics/VBoxVideoGuest.h> ++#include <VBox/Graphics/VBoxVideo.h> #include "version-generated.h" -Index: VirtualBox-5.1.26/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk -=================================================================== ---- VirtualBox-5.1.26.orig/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk -+++ VirtualBox-5.1.26/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk -@@ -103,7 +103,7 @@ if defined(VBOX_WITH_EXTPACK_VBOXDTRACE) - VBoxDTraceCmd_TEMPLATE = VBoxR3ExtPackDTrace - VBoxDTraceCmd_DEFS = RTMEM_WRAP_TO_EF_APIS VBOX_EXTPACK_VBOXDTRACE_MANGLED_NAME=\"$(VBOX_EXTPACK_VBOXDTRACE_MANGLED_NAME)\" - #VBoxDTraceCmd_DEFS += YYDEBUG -- VBoxDTraceCmd_DEFS.linux = _XOPEN_SOURCE=700 -+ VBoxDTraceCmd_DEFS.linux = _XOPEN_SOURCE=700 _DEFAULT_SOURCE - VBoxDTraceCmd_DEFS.win = YY_USE_PROTOS=1 YYENABLE_NLS=0 YYLTYPE_IS_TRIVIAL=0 - VBoxDTraceCmd_SDKS = VBOX_ZLIB - ifn1of ($(KBUILD_TARGET), win) + + #define VBOX_VENDORID 0x80EE ++++++ modify_for_4_8_bo_move.patch ++++++ --- /var/tmp/diff_new_pack.0Arrql/_old 2018-01-09 14:35:55.464390124 +0100 +++ /var/tmp/diff_new_pack.0Arrql/_new 2018-01-09 14:35:55.464390124 +0100 @@ -1,19 +1,7 @@ -Index: VirtualBox-5.1.22/src/VBox/Additions/linux/drm/vbox_ttm.c +Index: VirtualBox-5.2.0/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c =================================================================== ---- VirtualBox-5.1.22.orig/src/VBox/Additions/linux/drm/vbox_ttm.c -+++ VirtualBox-5.1.22/src/VBox/Additions/linux/drm/vbox_ttm.c -@@ -231,7 +231,6 @@ static int vbox_bo_move(struct ttm_buffe - return r; - } - -- - static void vbox_ttm_backend_destroy(struct ttm_tt *tt) - { - ttm_tt_fini(tt); -Index: VirtualBox-5.1.22/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c -=================================================================== ---- VirtualBox-5.1.22.orig/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c -+++ VirtualBox-5.1.22/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c +--- VirtualBox-5.2.0.orig/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c ++++ VirtualBox-5.2.0/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c @@ -35,7 +35,7 @@ #include <iprt/assert.h> #include <iprt/err.h> ++++++ remove_vbox_video_build.patch ++++++ Index: VirtualBox-5.2.4/Makefile.kmk =================================================================== --- VirtualBox-5.2.4.orig/Makefile.kmk +++ VirtualBox-5.2.4/Makefile.kmk @@ -701,7 +701,6 @@ VBOX_CORE_DOXYFILE_INPUT_DIRS = \ src/VBox/Additions/x11/vboxmouse \ src/VBox/Additions/x11/vboxmouse/xorg70 \ src/VBox/Additions/x11/vboxmouse/xorg71 \ - src/VBox/Additions/x11/vboxvideo \ src/VBox/NetworkServices \ src/VBox/NetworkServices/DHCP \ src/VBox/NetworkServices/NAT \ Index: VirtualBox-5.2.4/src/VBox/Additions/x11/vboxvideo/Makefile.kmk =================================================================== --- VirtualBox-5.2.4.orig/src/VBox/Additions/x11/vboxvideo/Makefile.kmk +++ VirtualBox-5.2.4/src/VBox/Additions/x11/vboxvideo/Makefile.kmk @@ -395,7 +395,8 @@ vboxvideo_drv_118_INCS += $(PATH_ROOT)/s vboxvideo_drv_118_SOURCES := $(vboxvideo_drv_17_SOURCES) vboxvideo_drv_118_LIBS += $(vboxvideo_drv_70_LIBS) -ifdef VBOX_USE_SYSTEM_XORG_HEADERS +# Fix to never build +ifdef XX_VBOX_USE_SYSTEM_XORG_HEADERS # Build using local X.Org headers. We assume X.Org Server 1.7 or later. DLLS := $(filter-out vboxvideo_drv_%,$(DLLS)) vboxvideo_drv_system SYSMODS := $(filter-out vboxvideo_drv%,$(SYSMODS)) Index: VirtualBox-5.2.4/src/VBox/Additions/x11/Makefile.kmk =================================================================== --- VirtualBox-5.2.4.orig/src/VBox/Additions/x11/Makefile.kmk +++ VirtualBox-5.2.4/src/VBox/Additions/x11/Makefile.kmk @@ -22,7 +22,7 @@ include $(KBUILD_PATH)/subheader.kmk if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris) include $(PATH_SUB_CURRENT)/VBoxClient/Makefile.kmk ifndef VBOX_NO_LEGACY_XORG_X11 - include $(PATH_SUB_CURRENT)/vboxvideo/Makefile.kmk +# include $(PATH_SUB_CURRENT)/vboxvideo/Makefile.kmk ifn1of ($(KBUILD_TARGET), netbsd solaris) include $(PATH_SUB_CURRENT)/vboxmouse/Makefile.kmk endif ++++++ vbox-disable-updates.diff ++++++ --- /var/tmp/diff_new_pack.0Arrql/_old 2018-01-09 14:35:55.500388435 +0100 +++ /var/tmp/diff_new_pack.0Arrql/_new 2018-01-09 14:35:55.500388435 +0100 @@ -1,21 +1,23 @@ -Index: VirtualBox-5.1.2/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp +Index: VirtualBox-5.2.0/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp =================================================================== ---- VirtualBox-5.1.2.orig/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp -+++ VirtualBox-5.1.2/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp -@@ -68,7 +68,7 @@ void UIGlobalSettingsUpdate::loadToCache - void UIGlobalSettingsUpdate::getFromCache() - { - /* Apply internal variables data to QWidget(s): */ -- m_pCheckBoxUpdate->setChecked(m_cache.m_fCheckEnabled); +--- VirtualBox-5.2.0.orig/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp ++++ VirtualBox-5.2.0/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp +@@ -110,8 +110,8 @@ void UIGlobalSettingsUpdate::getFromCach + /* Get old update data from the cache: */ + const UIDataSettingsGlobalUpdate &oldUpdateData = m_pCache->base(); + +- /* Load old update data from the cache: */ +- m_pCheckBoxUpdate->setChecked(oldUpdateData.m_fCheckEnabled); ++ /* Disable old update data from the cache: */ + m_pCheckBoxUpdate->setChecked(false); if (m_pCheckBoxUpdate->isChecked()) { - m_pComboBoxUpdatePeriod->setCurrentIndex(m_cache.m_periodIndex); -Index: VirtualBox-5.1.2/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp + m_pComboBoxUpdatePeriod->setCurrentIndex(oldUpdateData.m_periodIndex); +Index: VirtualBox-5.2.0/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp =================================================================== ---- VirtualBox-5.1.2.orig/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp -+++ VirtualBox-5.1.2/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp -@@ -104,16 +104,6 @@ UISettingsDialogGlobal::UISettingsDialog +--- VirtualBox-5.2.0.orig/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp ++++ VirtualBox-5.2.0/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp +@@ -103,16 +103,6 @@ UISettingsDialogGlobal::UISettingsDialog iPageIndex, "#input", pSettingsPage); break; } @@ -32,7 +34,7 @@ /* Language page: */ case GlobalSettingsPageType_Language: { -@@ -252,8 +242,6 @@ void UISettingsDialogGlobal::retranslate +@@ -248,8 +238,6 @@ void UISettingsDialogGlobal::retranslate m_pSelector->setItemText(GlobalSettingsPageType_Input, tr("Input")); #ifdef VBOX_GUI_WITH_NETWORK_MANAGER ++++++ vbox-no-build-dates.diff ++++++ --- /var/tmp/diff_new_pack.0Arrql/_old 2018-01-09 14:35:55.528387121 +0100 +++ /var/tmp/diff_new_pack.0Arrql/_new 2018-01-09 14:35:55.532386934 +0100 @@ -1,7 +1,7 @@ -Index: src/VBox/Frontends/VBoxFB/VBoxFB.cpp +Index: VirtualBox-5.2.0/src/VBox/Frontends/VBoxFB/VBoxFB.cpp =================================================================== ---- src/VBox/Frontends/VBoxFB/VBoxFB.cpp.orig -+++ src/VBox/Frontends/VBoxFB/VBoxFB.cpp +--- VirtualBox-5.2.0.orig/src/VBox/Frontends/VBoxFB/VBoxFB.cpp ++++ VirtualBox-5.2.0/src/VBox/Frontends/VBoxFB/VBoxFB.cpp @@ -62,7 +62,7 @@ int main(int argc, char *argv[]) printf("VirtualBox DirectFB GUI built %s %s\n" @@ -11,11 +11,11 @@ for (;;) { -Index: src/VBox/Runtime/common/string/uniread.cpp +Index: VirtualBox-5.2.0/src/VBox/Runtime/common/string/uniread.cpp =================================================================== ---- src/VBox/Runtime/common/string/uniread.cpp.orig -+++ src/VBox/Runtime/common/string/uniread.cpp -@@ -1035,7 +1035,7 @@ int PrintHeader(const char *argv0, const +--- VirtualBox-5.2.0.orig/src/VBox/Runtime/common/string/uniread.cpp ++++ VirtualBox-5.2.0/src/VBox/Runtime/common/string/uniread.cpp +@@ -1036,7 +1036,7 @@ int PrintHeader(const char *argv0, const " * IPRT - Unicode Tables.\n" " *\n" " * Automatically Generated from %s\n" @@ -24,10 +24,10 @@ " */\n" "\n" "/*\n" -Index: src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c +Index: VirtualBox-5.2.0/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c =================================================================== ---- src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c.orig -+++ src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c +--- VirtualBox-5.2.0.orig/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c ++++ VirtualBox-5.2.0/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c @@ -42,16 +42,13 @@ /**************************IDENTITY AND VERSIONING***********************/ /************************************************************************/ @@ -50,10 +50,10 @@ #if !defined(_PRODUCTION) #define _PRODUCTION "" #endif -Index: src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c +Index: VirtualBox-5.2.0/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c =================================================================== ---- src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c.orig -+++ src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c +--- VirtualBox-5.2.0.orig/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c ++++ VirtualBox-5.2.0/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c @@ -44,16 +44,10 @@ #ifndef XP_MAC #include "_pr_bld.h" @@ -73,10 +73,10 @@ #if !defined(_PRODUCTION) #define _PRODUCTION "" #endif -Index: src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c +Index: VirtualBox-5.2.0/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c =================================================================== ---- src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c.orig -+++ src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c +--- VirtualBox-5.2.0.orig/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c ++++ VirtualBox-5.2.0/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c @@ -42,16 +42,13 @@ /**************************IDENTITY AND VERSIONING***********************/ /************************************************************************/ @@ -99,10 +99,10 @@ #if !defined(_PRODUCTION) #define _PRODUCTION "" #endif -Index: src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c +Index: VirtualBox-5.2.0/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c =================================================================== ---- src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c.orig -+++ src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c +--- VirtualBox-5.2.0.orig/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c ++++ VirtualBox-5.2.0/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c @@ -42,16 +42,13 @@ /**************************IDENTITY AND VERSIONING***********************/ /************************************************************************/ @@ -125,10 +125,10 @@ #if !defined(_PRODUCTION) #define _PRODUCTION "" #endif -Index: src/VBox/HostServices/SharedOpenGL/OpenGLTest/OpenGLTestApp.cpp +Index: VirtualBox-5.2.0/src/VBox/HostServices/SharedOpenGL/OpenGLTest/OpenGLTestApp.cpp =================================================================== ---- src/VBox/HostServices/SharedOpenGL/OpenGLTest/OpenGLTestApp.cpp.orig -+++ src/VBox/HostServices/SharedOpenGL/OpenGLTest/OpenGLTestApp.cpp +--- VirtualBox-5.2.0.orig/src/VBox/HostServices/SharedOpenGL/OpenGLTest/OpenGLTestApp.cpp ++++ VirtualBox-5.2.0/src/VBox/HostServices/SharedOpenGL/OpenGLTest/OpenGLTestApp.cpp @@ -148,7 +148,7 @@ static int vboxInitLogging(const char *p #endif "Log opened %s\n", @@ -138,10 +138,10 @@ vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp)); if (RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW) -Index: src/VBox/Devices/PC/BIOS/bios.c +Index: VirtualBox-5.2.0/src/VBox/Devices/PC/BIOS/bios.c =================================================================== ---- src/VBox/Devices/PC/BIOS/bios.c.orig -+++ src/VBox/Devices/PC/BIOS/bios.c +--- VirtualBox-5.2.0.orig/src/VBox/Devices/PC/BIOS/bios.c ++++ VirtualBox-5.2.0/src/VBox/Devices/PC/BIOS/bios.c @@ -159,7 +159,7 @@ void set_mode(uint8_t mode); #define BX_PCIBIOS 1 @@ -151,24 +151,11 @@ //-------------------------------------------------------------------------- // print_bios_banner // displays a the bios version -Index: src/VBox/Main/glue/com.cpp +Index: VirtualBox-5.2.0/src/VBox/Additions/common/VBoxService/VBoxService.cpp =================================================================== ---- src/VBox/Main/glue/com.cpp.orig -+++ src/VBox/Main/glue/com.cpp -@@ -283,7 +283,7 @@ static DECLCALLBACK(void) vboxHeaderFoot - #endif - "Log opened %s\n", - g_pszLogEntity, VBOX_VERSION_STRING, RTBldCfgRevision(), -- RTBldCfgTargetDotArch(), __DATE__, __TIME__, szTmp); -+ RTBldCfgTargetDotArch(), "openSUSE", "Buildservice", szTmp); - - pfnLog(pReleaseLogger, "Build Type: %s\n", KBUILD_TYPE); - int vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp)); -Index: src/VBox/Additions/common/VBoxService/VBoxService.cpp -=================================================================== ---- src/VBox/Additions/common/VBoxService/VBoxService.cpp.orig -+++ src/VBox/Additions/common/VBoxService/VBoxService.cpp -@@ -241,7 +241,7 @@ static DECLCALLBACK(void) vgsvcLogHeader +--- VirtualBox-5.2.0.orig/src/VBox/Additions/common/VBoxService/VBoxService.cpp ++++ VirtualBox-5.2.0/src/VBox/Additions/common/VBoxService/VBoxService.cpp +@@ -242,7 +242,7 @@ static DECLCALLBACK(void) vgsvcLogHeader "VBoxService %s r%s (verbosity: %u) %s (%s %s) release log\n" "Log opened %s\n", RTBldCfgVersion(), RTBldCfgRevisionStr(), g_cVerbosity, VBOX_BUILD_TARGET, ++++++ vbox-permissions_warning.diff ++++++ --- /var/tmp/diff_new_pack.0Arrql/_old 2018-01-09 14:35:55.548386184 +0100 +++ /var/tmp/diff_new_pack.0Arrql/_new 2018-01-09 14:35:55.548386184 +0100 @@ -14,7 +14,7 @@ =================================================================== --- /dev/null +++ VirtualBox-4.3.6/src/apps/VBoxPermissionMessage/Makefile.kmk -@@ -0,0 +1,35 @@ +@@ -0,0 +1,32 @@ +# $Id: Makefile.kmk 28800 2010-04-27 08:22:32Z vboxsync $ +## @file +# @@ -41,10 +41,7 @@ +VBoxPermissionMessage_TEMPLATE = VBOXQTGUIEXE +VBoxPermissionMessage_SOURCES = VBoxPermissionMessage.cpp +VBoxPermissionMessage_QT_MODULES = Core Gui -+ifdef VBOX_WITH_QTGUI_V5 -+ # Qt5 requires additional modules: -+ VBoxPermissionMessage_QT_MODULES += Widgets -+endif # VBOX_WITH_QTGUI_V5 ++VBoxPermissionMessage_QT_MODULES += Widgets + +#INSTALLS += VBoxPermissionMessage + ++++++ vbox-usb-warning.diff ++++++ --- /var/tmp/diff_new_pack.0Arrql/_old 2018-01-09 14:35:55.576384870 +0100 +++ /var/tmp/diff_new_pack.0Arrql/_new 2018-01-09 14:35:55.576384870 +0100 @@ -14,7 +14,7 @@ =================================================================== --- /dev/null +++ VirtualBox-5.1.22/src/apps/VBoxUSB_DevRules/Makefile.kmk -@@ -0,0 +1,33 @@ +@@ -0,0 +1,30 @@ +# $Id: Makefile.kmk 28800 2010-04-27 08:22:32Z vboxsync $ +## @file +# @@ -38,10 +38,7 @@ +VBoxUSB_DevRules_TEMPLATE = VBOXQTGUIEXE +VBoxUSB_DevRules_SOURCES = VBoxUSB_DevRules.cpp +VBoxUSB_DevRules_QT_MODULES = Core Gui -+ifdef VBOX_WITH_QTGUI_V5 -+ # Qt5 requires additional modules: -+ VBoxUSB_DevRules_QT_MODULES += Widgets -+endif # VBOX_WITH_QTGUI_V5 ++VBoxUSB_DevRules_QT_MODULES += Widgets + +#INSTALLS += VBoxUSB_DevRules + ++++++ vbox-vboxadd-init-script.diff ++++++ --- /var/tmp/diff_new_pack.0Arrql/_old 2018-01-09 14:35:55.584384495 +0100 +++ /var/tmp/diff_new_pack.0Arrql/_new 2018-01-09 14:35:55.588384307 +0100 @@ -1,7 +1,7 @@ -Index: VirtualBox-5.1.24/src/VBox/Additions/linux/installer/vboxadd.sh +Index: VirtualBox-5.2.0/src/VBox/Additions/linux/installer/vboxadd.sh =================================================================== ---- VirtualBox-5.1.24.orig/src/VBox/Additions/linux/installer/vboxadd.sh -+++ VirtualBox-5.1.24/src/VBox/Additions/linux/installer/vboxadd.sh +--- VirtualBox-5.2.0.orig/src/VBox/Additions/linux/installer/vboxadd.sh ++++ VirtualBox-5.2.0/src/VBox/Additions/linux/installer/vboxadd.sh @@ -25,11 +25,14 @@ # Provides: vboxadd # Required-Start: @@ -18,7 +18,7 @@ ### END INIT INFO ## @todo This file duplicates a lot of script with vboxdrv.sh. When making -@@ -112,18 +115,9 @@ fail() +@@ -129,18 +132,9 @@ log() dev=/dev/vboxguest userdev=/dev/vboxuser @@ -37,7 +37,7 @@ running_vboxguest() { lsmod | grep -q "vboxguest[^_-]" -@@ -166,12 +160,6 @@ do_vboxguest_non_udev() +@@ -183,12 +177,6 @@ do_vboxguest_non_udev() fail "Cannot create device $dev with major $maj and minor $min" } fi @@ -50,7 +50,7 @@ if [ ! -c $userdev ]; then maj=10 -@@ -182,12 +170,6 @@ do_vboxguest_non_udev() +@@ -199,12 +187,6 @@ do_vboxguest_non_udev() rmmod vboxguest 2>/dev/null fail "Cannot create device $userdev with major $maj and minor $min" } @@ -63,8 +63,8 @@ fi fi } -@@ -197,9 +179,8 @@ start() - begin "Starting the VirtualBox Guest Additions" console; +@@ -214,9 +196,8 @@ start() + begin "Starting." # If we got this far assume that the slow set-up has been done. QUICKSETUP=yes - if test -z "${INSTALL_NO_MODULE_BUILDS}"; then @@ -75,19 +75,20 @@ no_udev=1 running_vboxguest || { rm -f $dev || { -@@ -213,7 +194,6 @@ start() +@@ -229,7 +210,7 @@ start() + $MODPROBE vboxguest >/dev/null 2>&1 || { setup - $MODPROBE vboxguest >/dev/null 2>&1 || { -- ${INSTALL_DIR}/init/vboxadd-x11 cleanup +- $MODPROBE vboxguest >/dev/null 2>&1 || ++ $MODPROBE vboxguest >/dev/null 2>&1 || { fail "modprobe vboxguest failed" - } } -@@ -238,14 +218,15 @@ start() + case "$no_udev" in 1) +@@ -252,14 +233,15 @@ start() fi # INSTALL_NO_MODULE_BUILDS # Put the X.Org driver in place. This is harmless if it is not needed. -- /sbin/rcvboxadd-x11 setup +- "${INSTALL_DIR}/init/vboxadd-x11" setup 2>> "${LOG}" + #/sbin/rcvboxadd-x11 setup # Install the guest OpenGL drivers. For now we don't support # multi-architecture installations @@ -101,7 +102,7 @@ # SELinux for the OpenGL libraries, so that gdm can load them during the # acceleration support check. This prevents an "Oh no, something has gone # wrong!" error when starting EL7 guests. -@@ -256,6 +237,15 @@ start() +@@ -270,6 +252,15 @@ start() chcon -h -t lib_t "/var/lib/VBoxGuestAdditions/lib/libGL.so.1" fi echo "/var/lib/VBoxGuestAdditions/lib" > /etc/ld.so.conf.d/00vboxvideo.conf @@ -117,7 +118,7 @@ fi ldconfig -@@ -396,9 +386,9 @@ create_udev_rule() +@@ -408,9 +399,9 @@ create_udev_rule() echo "KERNEL=${udev_fix}\"vboxuser\", NAME=\"vboxuser\", OWNER=\"vboxadd\", MODE=\"0666\"" >> /etc/udev/rules.d/60-vboxadd.rules fi } @@ -130,29 +131,28 @@ # And a post-installation script for rebuilding modules when a new kernel # is installed. mkdir -p /etc/kernel/postinst.d /etc/kernel/prerm.d -@@ -429,47 +419,18 @@ shared_folder_setup() +@@ -440,45 +431,21 @@ shared_folder_setup() ## @todo It would be nicer if the kernel module just parsed parameters # itself instead of needing a separate binary to do that. - ln -sf "$lib_path/$PACKAGE/mount.vboxsf" /sbin + ln -sf "${INSTALL_DIR}/other/mount.vboxsf" /sbin - # SELinux security context for the mount helper. - if test -e /etc/selinux/config; then - # This is correct. semanage maps this to the real path, and it aborts - # with an error, telling you what you should have typed, if you specify - # the real path. The "chcon" is there as a back-up for old guests. - command -v semanage > /dev/null && -- semanage fcontext -a -t mount_exec_t "/usr/lib/$PACKAGE/mount.vboxsf" -- chcon -t mount_exec_t "$lib_path/$PACKAGE/mount.vboxsf" +- semanage fcontext -a -t mount_exec_t "${INSTALL_DIR}/other/mount.vboxsf" +- chcon -t mount_exec_t "${INSTALL_DIR}/other/mount.vboxsf" - fi -- succ_msg --} -- ++ succ_msg + } + # setup_script setup() { - export BUILD_TYPE - export USERNAME - -- rm -f $LOG - MODULE_SRC="$INSTALL_DIR/src/vboxguest-$INSTALL_VER" - BUILDINTMP="$MODULE_SRC/build_in_tmp" - chcon -t bin_t "$BUILDINTMP" > /dev/null 2>&1 @@ -164,7 +164,7 @@ - test -n "${QUICKSETUP}" && return 0 - shared_folder_setup - if running_vboxguest || running_vboxadd; then -- begin "Running kernel modules will not be replaced until the system is restarted" +- info "Running kernel modules will not be replaced until the system is restarted" - fi - return 0 + begin "Recompiling VirtualBox kernel module, NOT. It has been packaged." @@ -182,11 +182,11 @@ depmod # Remove old module sources -@@ -479,13 +440,14 @@ cleanup() +@@ -488,13 +455,14 @@ cleanup() fi # Clean-up X11-related bits -- ${INSTALL_DIR}/init/vboxadd-x11 cleanup +- "${INSTALL_DIR}/init/vboxadd-x11" cleanup 2>> "${LOG}" + #/sbin/rcvboxadd-x11 cleanup # Remove other files @@ -201,23 +201,23 @@ fi rm /etc/udev/rules.d/60-vboxadd.rules 2>/dev/null } -Index: VirtualBox-5.1.24/src/VBox/Additions/linux/installer/vboxadd-service.sh +Index: VirtualBox-5.2.0/src/VBox/Additions/linux/installer/vboxadd-service.sh =================================================================== ---- VirtualBox-5.1.24.orig/src/VBox/Additions/linux/installer/vboxadd-service.sh -+++ VirtualBox-5.1.24/src/VBox/Additions/linux/installer/vboxadd-service.sh -@@ -20,7 +20,7 @@ +--- VirtualBox-5.2.0.orig/src/VBox/Additions/linux/installer/vboxadd-service.sh ++++ VirtualBox-5.2.0/src/VBox/Additions/linux/installer/vboxadd-service.sh +@@ -23,7 +23,7 @@ # Provides: vboxadd-service # Required-Start: vboxadd # Required-Stop: vboxadd -# Default-Start: 2 3 4 5 +# Default-Start: 2 3 5 # Default-Stop: 0 1 6 + # X-Conflicts-With: systemd-timesyncd.service # Description: VirtualBox Additions Service - ### END INIT INFO -Index: VirtualBox-5.1.24/src/VBox/Installer/linux/vboxautostart-service.sh +Index: VirtualBox-5.2.0/src/VBox/Installer/linux/vboxautostart-service.sh =================================================================== ---- VirtualBox-5.1.24.orig/src/VBox/Installer/linux/vboxautostart-service.sh -+++ VirtualBox-5.1.24/src/VBox/Installer/linux/vboxautostart-service.sh +--- VirtualBox-5.2.0.orig/src/VBox/Installer/linux/vboxautostart-service.sh ++++ VirtualBox-5.2.0/src/VBox/Installer/linux/vboxautostart-service.sh @@ -20,7 +20,7 @@ # Provides: vboxautostart-service # Required-Start: vboxdrv @@ -227,10 +227,10 @@ # Default-Stop: 0 1 6 # Description: VirtualBox autostart service ### END INIT INFO -Index: VirtualBox-5.1.24/src/VBox/Installer/linux/vboxballoonctrl-service.sh +Index: VirtualBox-5.2.0/src/VBox/Installer/linux/vboxballoonctrl-service.sh =================================================================== ---- VirtualBox-5.1.24.orig/src/VBox/Installer/linux/vboxballoonctrl-service.sh -+++ VirtualBox-5.1.24/src/VBox/Installer/linux/vboxballoonctrl-service.sh +--- VirtualBox-5.2.0.orig/src/VBox/Installer/linux/vboxballoonctrl-service.sh ++++ VirtualBox-5.2.0/src/VBox/Installer/linux/vboxballoonctrl-service.sh @@ -20,7 +20,7 @@ # Provides: vboxballoonctrl-service # Required-Start: vboxdrv @@ -240,10 +240,10 @@ # Default-Stop: 0 1 6 # Description: VirtualBox watchdog daemon ### END INIT INFO -Index: VirtualBox-5.1.24/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh +Index: VirtualBox-5.2.0/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh =================================================================== ---- VirtualBox-5.1.24.orig/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh -+++ VirtualBox-5.1.24/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh +--- VirtualBox-5.2.0.orig/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh ++++ VirtualBox-5.2.0/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh @@ -31,7 +31,7 @@ # Provides: testboxscript-service # Required-Start: $network @@ -253,10 +253,10 @@ # Default-Stop: 0 1 6 # Description: TestBoxScript service ### END INIT INFO -Index: VirtualBox-5.1.24/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh +Index: VirtualBox-5.2.0/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh =================================================================== ---- VirtualBox-5.1.24.orig/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh -+++ VirtualBox-5.1.24/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh +--- VirtualBox-5.2.0.orig/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh ++++ VirtualBox-5.2.0/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh @@ -31,7 +31,7 @@ # Provides: vboxtxs # Required-Start: $network @@ -266,10 +266,10 @@ # Default-Stop: 0 1 6 # Description: VirtualBox Test Execution Service ### END INIT INFO -Index: VirtualBox-5.1.24/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh +Index: VirtualBox-5.2.0/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh =================================================================== ---- VirtualBox-5.1.24.orig/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh -+++ VirtualBox-5.1.24/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh +--- VirtualBox-5.2.0.orig/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh ++++ VirtualBox-5.2.0/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh @@ -31,7 +31,7 @@ # Provides: vboxtxs # Required-Start: $network ++++++ vbox-vboxdrv-init-script.diff ++++++ --- /var/tmp/diff_new_pack.0Arrql/_old 2018-01-09 14:35:55.612383181 +0100 +++ /var/tmp/diff_new_pack.0Arrql/_new 2018-01-09 14:35:55.612383181 +0100 @@ -1,7 +1,7 @@ -Index: VirtualBox-5.1.16/src/VBox/Installer/linux/vboxdrv.sh +Index: VirtualBox-5.2.0/src/VBox/Installer/linux/vboxdrv.sh =================================================================== ---- VirtualBox-5.1.16.orig/src/VBox/Installer/linux/vboxdrv.sh -+++ VirtualBox-5.1.16/src/VBox/Installer/linux/vboxdrv.sh +--- VirtualBox-5.2.0.orig/src/VBox/Installer/linux/vboxdrv.sh ++++ VirtualBox-5.2.0/src/VBox/Installer/linux/vboxdrv.sh @@ -19,11 +19,12 @@ # ### BEGIN INIT INFO @@ -33,7 +33,7 @@ if ! $MODPROBE vboxnetflt > /dev/null 2>&1; then failure "modprobe vboxnetflt failed. Please use 'dmesg' to find out why" fi -@@ -387,35 +381,8 @@ cleanup() +@@ -396,35 +390,8 @@ cleanup() # setup_script setup() { @@ -42,7 +42,7 @@ - --save-module-symvers /tmp/vboxdrv-Module.symvers \ - --module-source "$MODULE_SRC/vboxdrv" \ - --no-print-directory install >> $LOG 2>&1; then -- "${INSTALL_DIR}/check_module_dependencies.sh" +- "${INSTALL_DIR}/check_module_dependencies.sh" || exit 1 - failure "Look at $LOG to find out what went wrong" - fi - if ! $BUILDINTMP \ ++++++ vbox-vboxweb-init-script.diff ++++++ --- /var/tmp/diff_new_pack.0Arrql/_old 2018-01-09 14:35:55.624382619 +0100 +++ /var/tmp/diff_new_pack.0Arrql/_new 2018-01-09 14:35:55.624382619 +0100 @@ -1,7 +1,7 @@ -Index: VirtualBox-5.1.2/src/VBox/Installer/linux/vboxweb-service.sh +Index: VirtualBox-5.2.0/src/VBox/Installer/linux/vboxweb-service.sh =================================================================== ---- VirtualBox-5.1.2.orig/src/VBox/Installer/linux/vboxweb-service.sh -+++ VirtualBox-5.1.2/src/VBox/Installer/linux/vboxweb-service.sh +--- VirtualBox-5.2.0.orig/src/VBox/Installer/linux/vboxweb-service.sh ++++ VirtualBox-5.2.0/src/VBox/Installer/linux/vboxweb-service.sh @@ -20,7 +20,7 @@ # Provides: vboxweb-service # Required-Start: vboxdrv @@ -11,3 +11,4 @@ # Default-Stop: 0 1 6 # Description: VirtualBox web service API ### END INIT INFO + ++++++ vboxguestconfig.sh ++++++ --- /var/tmp/diff_new_pack.0Arrql/_old 2018-01-09 14:35:55.752376615 +0100 +++ /var/tmp/diff_new_pack.0Arrql/_new 2018-01-09 14:35:55.752376615 +0100 @@ -25,10 +25,8 @@ # # Check if virtualbox-guest-source version matches virtualbox version if [ "$(rpm -q virtualbox virtualbox-guest-source --queryformat='%{version}-%{release}\n' 2>/dev/null | sort -u | wc -l)" -ne "1" ] ; then - echo "virtualbox-guest-source package version doesn't match" - echo "the version of virtualbox package." - echo "Reinstall virtualbox-guest-source package. Quitting .." - exit 1 + echo "virtualbox-host-source package version doesn't match the version of virtualbox package." + echo "This situation is probably not fatal, thus we will try to continue .." fi # Prerequisites are available, start build pushd $SOURCE > /dev/null 2>&1 ++++++ virtualbox-guest-kmp-files ++++++ --- /var/tmp/diff_new_pack.0Arrql/_old 2018-01-09 14:35:55.816373613 +0100 +++ /var/tmp/diff_new_pack.0Arrql/_new 2018-01-09 14:35:55.820373425 +0100 @@ -2,5 +2,4 @@ %dir /lib/modules/%2-%1/ %dir /lib/modules/%2-%1/extra /lib/modules/%2-%1/extra/vboxsf.ko -/lib/modules/%2-%1/extra/vboxvideo.ko /lib/modules/%2-%1/extra/vboxguest.ko ++++++ virtualbox-sed-params.patch ++++++ --- /var/tmp/diff_new_pack.0Arrql/_old 2018-01-09 14:35:55.892370048 +0100 +++ /var/tmp/diff_new_pack.0Arrql/_new 2018-01-09 14:35:55.892370048 +0100 @@ -1,21 +1,21 @@ -Index: VirtualBox-5.1.2/src/VBox/Main/Makefile.kmk +Index: VirtualBox-5.2.0/src/VBox/Main/Makefile.kmk =================================================================== ---- VirtualBox-5.1.2.orig/src/VBox/Main/Makefile.kmk -+++ VirtualBox-5.1.2/src/VBox/Main/Makefile.kmk -@@ -1331,7 +1331,7 @@ $(VBoxAPIWrap_0_OUTDIR)/VBoxAPI.d.ts \ +--- VirtualBox-5.2.0.orig/src/VBox/Main/Makefile.kmk ++++ VirtualBox-5.2.0/src/VBox/Main/Makefile.kmk +@@ -1521,7 +1521,7 @@ $(VBoxAPIWrap_0_OUTDIR)/VBoxAPI.d.ts \ $(QUIET)$(VBOX_XSLTPROC) --stringparam KBUILD_HOST $(KBUILD_HOST) \ --stringparam generating "dtrace-probes" \ - -o "$@" $(VBoxAPIWrap_VBOX_XSLT) $< + -o "$@" $(VBoxAPIWrap_VBOX_XSLT) $(VBOX_XIDL_FILE) - $(QUIET)$(SED) -e '' -o "[email protected]" \ + $(QUIET)$(SED) -e '' --output "[email protected]" \ "$(VBOX_PATH_MAIN_SRC)/src-all/VBoxAPI-start.d" \ "$@" \ "$(VBOX_PATH_MAIN_SRC)/src-all/VBoxAPI-end.d" -Index: VirtualBox-5.0.24/src/VBox/Devices/Makefile.kmk +Index: VirtualBox-5.2.0/src/VBox/Devices/Makefile.kmk =================================================================== ---- VirtualBox-5.0.24.orig/src/VBox/Devices/Makefile.kmk -+++ VirtualBox-5.0.24/src/VBox/Devices/Makefile.kmk -@@ -818,8 +818,7 @@ if !defined(VBOX_ONLY_EXTPACKS) +--- VirtualBox-5.2.0.orig/src/VBox/Devices/Makefile.kmk ++++ VirtualBox-5.2.0/src/VBox/Devices/Makefile.kmk +@@ -892,8 +892,7 @@ if !defined(VBOX_ONLY_EXTPACKS) $(call MSG_TOOL,iasl,VBoxDD,$<,$@) $(QUIET)$(RM) -f $@ [email protected] [email protected] $(QUIET)$(TOOL_$(VBOX_GCC_TOOL)_CC) -E -P -x c -o [email protected] $< ++++++ virtualbox-system-x.patch ++++++ --- /var/tmp/diff_new_pack.0Arrql/_old 2018-01-09 14:35:55.916368922 +0100 +++ /var/tmp/diff_new_pack.0Arrql/_new 2018-01-09 14:35:55.916368922 +0100 @@ -1,11 +1,11 @@ -Index: VirtualBox-5.1.2/src/VBox/Additions/common/crOpenGL/Makefile.kmk +Index: VirtualBox-5.2.0/src/VBox/Additions/common/crOpenGL/Makefile.kmk =================================================================== ---- VirtualBox-5.1.2.orig/src/VBox/Additions/common/crOpenGL/Makefile.kmk -+++ VirtualBox-5.1.2/src/VBox/Additions/common/crOpenGL/Makefile.kmk -@@ -68,18 +68,12 @@ VBoxOGL_TEMPLATE = VBOXCROGLR3GUES - VBoxOGL_INCS = . +--- VirtualBox-5.2.0.orig/src/VBox/Additions/common/crOpenGL/Makefile.kmk ++++ VirtualBox-5.2.0/src/VBox/Additions/common/crOpenGL/Makefile.kmk +@@ -69,18 +69,13 @@ VBoxOGL_INCS = . $(VBOX_GRAPHI if1of ($(KBUILD_TARGET), linux solaris freebsd) - VBoxOGL_INCS += \ + ifndef VBOX_USE_SYSTEM_GL_HEADERS + VBoxOGL_INCS += \ - $(VBOX_PATH_X11_ROOT)/libXdamage-1.1 \ - $(VBOX_PATH_X11_ROOT)/libXcomposite-0.4.0 \ - $(VBOX_PATH_X11_ROOT)/libXext-1.3.1 \ @@ -16,20 +16,22 @@ - $(VBOX_PATH_X11_ROOT)/libx11-1.1.5-other \ - $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \ - $(VBOX_PATH_X11_ROOT)/xproto-7.0.18 \ +- $(VBOX_GL_INCS) +- endif + /usr/include/x11 \ + /usr/include/xorg \ + /usr/include/pixman-1 \ - $(VBOX_MESA_INCS) \ -- $(PATH_ROOT)/src/VBox/Additions/x11/x11include/libdrm-2.4.13 ++ $(VBOX_MESA_INCS) \ + /usr/include/drm \ + /usr/include/libdrm ++ endif VBoxOGL_DEFS += VBOX_NO_NATIVEGL endif -@@ -214,10 +208,10 @@ VBoxOGL_LIBS.win += \ - - if1of ($(KBUILD_TARGET), linux solaris freebsd) - VBoxOGL_LIBS += \ +@@ -219,10 +214,10 @@ if1of ($(KBUILD_TARGET), linux solaris f + VBoxOGL_LIBS += Xcomposite Xdamage Xfixes Xext + else + VBoxOGL_LIBS += \ - $(PATH_STAGE_LIB)/libXcomposite.so \ - $(PATH_STAGE_LIB)/libXdamage.so \ - $(PATH_STAGE_LIB)/libXfixes.so \ @@ -38,19 +40,18 @@ + Xdamage \ + Xfixes \ + Xext + endif ifdef VBoxOGL_FAKEDRI ifeq ($(KBUILD_TARGET), freebsd) - VBoxOGL_LIBS += \ -Index: VirtualBox-5.1.2/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk +Index: VirtualBox-5.2.0/src/VBox/Additions/x11/vboxvideo/getmode.c =================================================================== ---- VirtualBox-5.1.2.orig/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk -+++ VirtualBox-5.1.2/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk -@@ -40,8 +40,6 @@ LIBRARIES += \ - VBoxGuestR3LibShared - ifndef VBOX_ONLY_VALIDATIONKIT - if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd) -- LIBRARIES += \ -- VBoxGuestR3LibXFree86 - endif - if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris) - LIBRARIES += \ +--- VirtualBox-5.2.0.orig/src/VBox/Additions/x11/vboxvideo/getmode.c ++++ VirtualBox-5.2.0/src/VBox/Additions/x11/vboxvideo/getmode.c +@@ -26,6 +26,7 @@ + */ + + #include "vboxvideo.h" ++#include "VBoxVideoGuest.h" + + #define NEED_XF86_TYPES + #include "xf86.h"
