From 0b7c654c8f7d4d657490246c3bf2c643d9f96640 Mon Sep 17 00:00:00 2001
From: Sérgio M. Basto <sergio@serjux.com>
Date: Dec 20 2019 16:18:57 +0000
Subject: Upgrade to 6.1.0

Semms that VBoxOGL was removed in 6.1.0

---

diff --git a/.gitignore b/.gitignore
index 6e9b6d0..e1fe754 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@
 /VirtualBox-6.0.10.tar.bz2
 /VirtualBox-6.0.12.tar.bz2
 /VirtualBox-6.0.14.tar.bz2
+/VirtualBox-6.1.0.tar.bz2
diff --git a/VBoxOGLRun.sh b/VBoxOGLRun.sh
deleted file mode 100644
index a76738d..0000000
--- a/VBoxOGLRun.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-if VBoxClient --check3d; then
-    export LD_LIBRARY_PATH=/usr/lib64/VBoxGuestAdditions:/usr/lib/VBoxGuestAdditions
-else
-    echo "Error 3D pass-through not enabled in VM settings." 1>&2
-    exit 1
-fi
-
-exec "$@"
diff --git a/sources b/sources
index 3fe4da6..9aee41b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (VirtualBox-6.0.14.tar.bz2) = e1a64c6633987e178b368dc17e738c6fbef4ab262c574188819f1186bf33f38d8c5accd6a566279a12ccd3544bab4ee5a1f8dce7c8c56d7373489c5ff7f8556d
+SHA512 (VirtualBox-6.1.0.tar.bz2) = 3709d54861e75efc5b4998bda82ebb868790228f4e19f5e64221322efd8f17916872afa89cc2494faa445fed9ae01ef97af16e4ad111a0a04552f0fac5db3618
diff --git a/update_vbox.sh b/update_vbox.sh
index e8ec588..9a1fb5a 100755
--- a/update_vbox.sh
+++ b/update_vbox.sh
@@ -1,4 +1,4 @@
-VERSION=6.0.14
+VERSION=6.1.0
 REL=1
 RAWHIDE=32
 
diff --git a/virtualbox-guest-additions.spec b/virtualbox-guest-additions.spec
index 8714b15..438358e 100644
--- a/virtualbox-guest-additions.spec
+++ b/virtualbox-guest-additions.spec
@@ -1,8 +1,8 @@
 %global __provides_exclude_from %{_libdir}/VBoxGuestAdditions
 
 Name:       virtualbox-guest-additions
-Version:    6.0.14
-Release:    2%{?dist}
+Version:    6.1.0
+Release:    1%{?dist}
 Summary:    VirtualBox Guest Additions
 License:    GPLv2 or (GPLv2 and CDDL)
 URL:        https://www.virtualbox.org/wiki/VirtualBox
@@ -28,6 +28,7 @@ BuildRequires:  makeself
 BuildRequires:  yasm
 BuildRequires:  boost-devel
 BuildRequires:  libXcomposite-devel
+BuildRequires:  libXdamage-devel
 BuildRequires:  libXmu-devel
 BuildRequires:  libXrandr-devel
 BuildRequires:  libXt-devel
@@ -53,7 +54,7 @@ ExclusiveArch:  i686 x86_64
 # Hack to solve problem described in
 # https://bugzilla.rpmfusion.org/show_bug.cgi?id=4980#c8
 # we conflict with next (bigger, not equal or bigger) version of VirtualBox
-# to force instalation of same version VirtualBox-kmodsrc and virtualBox-guest-additions
+# to force installation of same version VirtualBox-kmodsrc and virtualBox-guest-additions
 Conflicts:      VirtualBox-server > %{version}
 
 %description
@@ -82,9 +83,7 @@ rm -r tools/
 # Remove bundle X11 sources and some lib sources
 rm -r src/VBox/Additions/x11/x11include/
 rm -r src/VBox/Additions/x11/x11stubs/
-rm include/VBox/HostServices/glext.h
-rm include/VBox/HostServices/glxext.h
-rm include/VBox/HostServices/wglext.h
+rm -r src/VBox/Additions/3D/mesa/mesa-17.3.9/
 rm -r src/libs/libxml2-2.9.*/
 rm -r src/libs/libpng-1.6.*/
 rm -r src/libs/zlib-1.2.*/
@@ -125,7 +124,6 @@ kmk %{_smp_mflags}                                             \
 mkdir -p %{buildroot}%{_bindir}
 mkdir -p %{buildroot}%{_sbindir}
 mkdir -p %{buildroot}%{_libdir}/security
-mkdir -p %{buildroot}%{_libdir}/VBoxGuestAdditions
 
 install -m 0755 -t %{buildroot}%{_sbindir}   \
     obj/bin/additions/VBoxService
@@ -135,9 +133,6 @@ install -m 0755 -t %{buildroot}%{_bindir}    \
 
 install -m 0755 -t %{buildroot}%{_libdir}/security \
     obj/bin/additions/pam_vbox.so
-install -m 0755 -t %{buildroot}%{_libdir}/VBoxGuestAdditions \
-    obj/bin/additions/VBoxOGL*.so
-ln -s VBoxOGL.so %{buildroot}%{_libdir}/VBoxGuestAdditions/libGL.so.1
 
 install -p -m 0755 -D src/VBox/Additions/x11/Installer/98vboxadd-xclient \
     %{buildroot}%{_sysconfdir}/X11/xinit/xinitrc.d/98vboxadd-xclient.sh
@@ -151,7 +146,6 @@ desktop-file-validate \
 install -p -m 0644 -D %{SOURCE1} %{buildroot}%{_unitdir}/vboxservice.service
 install -p -m 0644 -D %{SOURCE2} %{buildroot}%{_presetdir}/96-vbox.preset
 install -p -m 0644 -D %{SOURCE3} %{buildroot}%{_udevrulesdir}/60-vboxguest.rules
-install -p -m 0755 -D %{SOURCE4} %{buildroot}%{_bindir}/VBoxOGLRun
 
 
 %pre
@@ -185,13 +179,12 @@ getent passwd vboxadd >/dev/null || \
 %{_presetdir}/96-vbox.preset
 %{_udevrulesdir}/60-vboxguest.rules
 
-%files ogl
-%license COPYING*
-%{_bindir}/VBoxOGLRun
-%{_libdir}/VBoxGuestAdditions
-
 
 %changelog
+* Fri Dec 20 2019 Sérgio Basto <sergio@serjux.com> - 6.1.0-1
+- Upgrade to 6.1.0
+- Seems that VBoxOGL was removed in 6.1.0
+
 * Wed Nov 13 2019 Sérgio Basto <sergio@serjux.com> - 6.0.14-2
 - Change BR from python2 to python3