- Fix 3D acceleration as reported in bsc #1024934. The steps needed are as follows:

-  Remove file "vbox_prevent_wrong_SONAME.patch" - the original SONAME values are needed for
    libGL.so.1 and libEGL.so.1 to be replaced by VBoxOGL.so and VBoxEGL.so, respectively.
 -  Package VBoxEGL.so

OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=311

vbox-vboxadd-init-script.diff

@@ -1,7 +1,7 @@
-Index: VirtualBox-5.1.4/src/VBox/Additions/linux/installer/vboxadd.sh
+Index: VirtualBox-5.1.14/src/VBox/Additions/linux/installer/vboxadd.sh
 ===================================================================
---- VirtualBox-5.1.4.orig/src/VBox/Additions/linux/installer/vboxadd.sh
+--- VirtualBox-5.1.14.orig/src/VBox/Additions/linux/installer/vboxadd.sh
-+++ VirtualBox-5.1.4/src/VBox/Additions/linux/installer/vboxadd.sh
++++ VirtualBox-5.1.14/src/VBox/Additions/linux/installer/vboxadd.sh
 @@ -23,9 +23,12 @@
  # Provides:       vboxadd
  # Required-Start:
@@ -73,7 +73,7 @@ Index: VirtualBox-5.1.4/src/VBox/Additions/linux/installer/vboxadd.sh
                  fail "modprobe vboxguest failed"
              }
          }
-@@ -217,7 +200,7 @@ start()
+@@ -217,14 +200,14 @@ start()
      }
  
      # Put the X.Org driver in place.  This is harmless if it is not needed.
@@ -82,7 +82,16 @@ Index: VirtualBox-5.1.4/src/VBox/Additions/linux/installer/vboxadd.sh
      # Install the guest OpenGL drivers.  For now we don't support
      # multi-architecture installations
      rm -f /etc/ld.so.conf.d/00vboxvideo.conf
-@@ -378,7 +361,7 @@ extra_setup()
+     if /usr/bin/VBoxClient --check3d 2>/dev/null; then
+         mkdir -p /var/lib/VBoxGuestAdditions/lib
+-        ln -sf "${INSTALL_DIR}/lib/VBoxOGL.so" /var/lib/VBoxGuestAdditions/lib/libGL.so.1
+-        ln -sf "${INSTALL_DIR}/lib/VBoxEGL.so" /var/lib/VBoxGuestAdditions/lib/libEGL.so.1
++        ln -sf "/usr/lib64/VBoxOGL.so" /var/lib/VBoxGuestAdditions/lib/libGL.so.1
++        ln -sf "/usr/lib64/VBoxEGL.so" /var/lib/VBoxGuestAdditions/lib/libEGL.so.1
+         # 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.
+@@ -382,7 +365,7 @@ extra_setup()
      ln -sf "$lib_path/$PACKAGE/mount.vboxsf" /sbin
      # And an rc file to re-build the kernel modules and re-set-up the X server.
      ln -sf "$lib_path/$PACKAGE/vboxadd" /sbin/rcvboxadd
@@ -91,7 +100,7 @@ Index: VirtualBox-5.1.4/src/VBox/Additions/linux/installer/vboxadd.sh
      # And a post-installation script for rebuilding modules when a new kernel
      # is installed.
      mkdir -p /etc/kernel/postinst.d /etc/kernel/prerm.d
-@@ -411,49 +394,13 @@ EOF
+@@ -415,49 +398,13 @@ EOF
  # setup_script
  setup()
  {
@@ -143,7 +152,7 @@ Index: VirtualBox-5.1.4/src/VBox/Additions/linux/installer/vboxadd.sh
      # Delete old versions of VBox modules.
      cleanup_modules
      depmod
-@@ -464,12 +411,12 @@ cleanup()
+@@ -468,12 +415,12 @@ cleanup()
      done
  
      # Clean-up X11-related bits

vbox_prevent_wrong_SONAME.patch

@@ -1,13 +0,0 @@
-Index: VirtualBox-5.1.2/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
-@@ -221,7 +221,7 @@ if1of ($(KBUILD_TARGET), linux solaris f
-   	dl
-   endif
-  else
--  VBoxOGL_SONAME.linux = libGL.so.1
-+  VBoxOGL_SONAME.linux = VBoxOGL.so.1
-   VBoxOGL_LDFLAGS.linux += -Wl,-e,LibMain
-  endif
- endif

virtualbox.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Feb 24 03:34:35 UTC 2017 - Larry.Finger@lwfinger.net
+
+- Fix 3D acceleration as reported in bsc #1024934. The steps needed are as follows:
+ -  Remove file "vbox_prevent_wrong_SONAME.patch" - the original SONAME values are needed for
+    libGL.so.1 and libEGL.so.1 to be replaced by VBoxOGL.so and VBoxEGL.so, respectively.
+ -  Package VBoxEGL.so 
+
 -------------------------------------------------------------------
 Thu Feb 23 12:37:09 CET 2017 - kukuk@suse.de
 

virtualbox.spec

@@ -83,8 +83,6 @@ Patch107:       virtualbox-sed-params.patch
 Patch108:       virtualbox-snpritnf-buffer-overflow.patch
 # Patch to add code to explain USB Passthru
 Patch109:       vbox-usb-warning.diff
-# Prevent Guest Additions from creating wrong SONAME
-Patch111:       vbox_prevent_wrong_SONAME.patch
 # Fix change in kernel API for ttm_bo_move_memcpy()
 Patch112:       modify_for_4_8_bo_move.patch
 # Remove all mention of _smp_mflags
@@ -333,7 +331,6 @@ This package contains icons for guest desktop files that were created on the des
 %patch107 -p1
 %patch108 -p1
 %patch109 -p1
-%patch111 -p1
 %patch112 -p1
 %patch113 -p1
 %patch116 -p1
@@ -508,6 +505,9 @@ popd
 # VBoxOGL* libs for guest-x11 subpackage
 install -m 644 out/linux.*/release/bin/additions/VBoxOGL*.so \
 						%{buildroot}%{_libdir}
+# VBoxEGL* libs for guest-x11 subpackage
+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
 # install init script which start VBoxClient daemon (support for clipboard,autoresize,seamless windows)
@@ -760,6 +760,7 @@ exit 0
 %{_vbox_instdir}/VBoxSharedCrOpenGL.so
 %{_vbox_instdir}/VBoxSharedFolders.so
 %{_vbox_instdir}/VBoxVMM.so
+#%{_vbox_instdir}/VBoxVNC.so
 %{_vbox_instdir}/VBoxXPCOMC.so
 %{_vbox_instdir}/VBoxXPCOM.so
 %{_vbox_instdir}/VBoxDD2RC.rc
@@ -823,6 +824,7 @@ exit 0
 %dir %{_libdir}/dri/
 %{_bindir}/VBoxClient
 %{_libdir}/VBoxOGL*.so
+%{_libdir}/VBoxEGL*.so
 %{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
 %{_libdir}/dri/vboxvideo_dri.so
 %{_sysconfdir}/X11/xinit/xinitrc.d/vboxadd-xclient.sh