From a28169b7294abb3f844f4b703f0779a53a1aaf10 Mon Sep 17 00:00:00 2001
From: Mikhail Novosyolov <mikhailnov@dumalogiya.ru>
Date: Thu, 7 Feb 2019 00:18:27 +0300
Subject: [PATCH] Fix preloading custom libGL.so.1 and libEGL.so.1 (ALT#36035)

---
 virtualbox.spec | 30 ++++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/virtualbox.spec b/virtualbox.spec
index 6a71670f5..28654c90f 100644
--- a/virtualbox.spec
+++ b/virtualbox.spec
@@ -60,7 +60,7 @@
 
 Name: virtualbox
 Version: 5.2.24
-Release: alt3
+Release: alt4
 
 Summary: VM VirtualBox OSE - Virtual Machine for x86 hardware
 License: GPL
@@ -565,13 +565,22 @@ cd additions >/dev/null
 
   install -d %buildroot%xdrv_pre_d
   cat >%buildroot%xdrv_pre_d/virtualbox <<EOF
-#!/bin/bash
-
-if test -f /proc/bus/pci/devices && grep -q 80eebeef /proc/bus/pci/devices; then
-	mkdir -p %ld_so_confdir
-	echo %vboxadddir > %ld_so_conf
-else
-	rm -f %ld_so_conf
+#!/bin/sh
+
+if [ -f /proc/bus/pci/devices ] && \
+	[ -x "$(which VBoxClient)" ] && \
+	VBoxClient --check3d && \
+	grep -q 80eebeef /proc/bus/pci/devices;
+	then
+		mkdir -p %ld_so_confdir
+		echo %vboxadddir > %ld_so_conf
+		ldconfig
+	else
+		if [ -f %ld_so_conf ]; then
+			rm -f %ld_so_conf
+			# update /etc/ld.so.cache
+			ldconfig
+		fi
 fi
 EOF
 
@@ -805,6 +814,11 @@ mountpoint -q /dev || {
 %vboxdir/sdk/bindings/xpcom/include/VBox/com
 
 %changelog
+* Thu Feb 07 2019 Mikhail Novosyolov <mikhailnov@altlinux.org> 5.2.24-alt4
+- Propperly check if 3D acceleration is supported before preloading
+  VirtualBox's libGL.so.1 and libEGL.so.1 and update ldconfig cache
+  after changes to /etc/ld.so.conf.d/*.conf (Closes: 36035)
+
 * Fri Jan 25 2019 Evgeny Sinelnikov <sin@altlinux.org> 5.2.24-alt3
 - Fix rEFInd 0.11.4 icons missing due to inaccessible files on ISO9660 partition (Closes: 34435)
 
-- 
2.19.2