[VirtualBox] Add more one ifdef in VirtualBox-5.0.18-xserver_guest.patch

[Sérgio M. Basto]

commit 5295a4e050a1eefcf840288990ebf304e9c153ab
Author: Sérgio M. Basto <sergio at serjux.com>
Date:   Fri Oct 14 02:47:42 2016 +0100

    Add more one ifdef in VirtualBox-5.0.18-xserver_guest.patch

 VirtualBox-5.0.18-xserver_guest.patch | 12 ++++++++++++
 VirtualBox.spec                       |  8 +++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)
---
diff --git a/VirtualBox-5.0.18-xserver_guest.patch b/VirtualBox-5.0.18-xserver_guest.patch
index 5beefb8..d9d2ccb 100644
--- a/VirtualBox-5.0.18-xserver_guest.patch
+++ b/VirtualBox-5.0.18-xserver_guest.patch
@@ -117,3 +117,15 @@ xf86_ansic.h doesn't exist anymore.
   SYSMODS := $(filter-out vboxvideo_drv%,$(SYSMODS))
   vboxvideo_drv_system_TEMPLATE = VBOXGUESTR3XORGMOD
   vboxvideo_drv_system_CFLAGS := \
+--- ./src/VBox/Additions/common/crOpenGL/Makefile.kmk.orig	2016-10-12 02:45:13.748143934 +0100
++++ ./src/VBox/Additions/common/crOpenGL/Makefile.kmk	2016-10-13 23:20:27.876516475 +0100
+@@ -709,7 +709,9 @@ $(VBOX_PATH_CROGL_GENFILES)/feedbackspu_
+ 
+ VBoxEGL_TEMPLATE       = VBOXCROGLR3GUESTDLL
+ VBoxEGL_SOURCES        = egl.c
++ifndef VBOX_USE_SYSTEM_XORG_HEADERS
+ VBoxEGL_INCS           = $(VBOX_PATH_X11_ROOT)/mesa-11.0.7
++endif
+ VBoxEGL_LIBS           = $(VBOX_LIB_OGL) $(VBOX_LIB_IPRT_GUEST_R3_SHARED)
+ VBoxEGL_SONAME.linux   = libEGL.so.1
+ 
diff --git a/VirtualBox.spec b/VirtualBox.spec
index 1a925d2..3116942 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -25,7 +25,7 @@
 Name:       VirtualBox
 Version:    5.1.6
 #Release:   1%%{?prerel:.%%{prerel}}%%{?dist}
-Release:    4%{?dist}
+Release:    5%{?dist}
 Summary:    A general-purpose full virtualizer for PC hardware
 
 License:    GPLv2 or (GPLv2 and CDDL)
@@ -754,12 +754,18 @@ getent group vboxsf >/dev/null || groupadd -r vboxsf 2>&1
 %{_datadir}/%{name}-kmod-%{version}
 
 %changelog
+* Thu Oct 13 2016 Sérgio Basto <sergio at serjux.com> - 5.1.6-5
+- Add more one ifdef in VirtualBox-5.0.18-xserver_guest.patch
+
 * Wed Oct 12 2016 Sérgio Basto <sergio at serjux.com> - 5.1.6-4
 - Some fixes:
   Add full description on %{name} package.
   Fix requires on sub-packages to %{name}-server.
   Add %{?_isa}.
   Do not provide %{name}-gui, we don't use it and it is ambiguous.
+- Refactor the patch VirtualBox-5.0.18-xserver_guest.patch
+  using VBOX_USE_SYSTEM_XORG_HEADERS instead drop and replace code, for
+  include upstream, also add MIT License.
 
 * Sat Oct 08 2016 Sérgio Basto <sergio at serjux.com> - 5.1.6-3
 - rfbz#1169 v2, use another sub-package schema.