[Pkg-virtualbox-commits] [virtualbox] 01/01: Revert "Revert "Try to use again the GL stuff from vbox""

[Gianfranco Costamagna]

This is an automated email from the git hooks/post-receive script.

locutusofborg pushed a commit to branch master
in repository virtualbox.

commit 2c681fd7bc862d43c8df88de8e10fcfbf1541b5f
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Wed Sep 7 18:46:27 2016 +0200

    Revert "Revert "Try to use again the GL stuff from vbox""
    
    This reverts commit 4378a8ccde78d4ca62141a855b3fee5ba67c0ab0.
---
 debian/changelog                                   |  9 +++++++++
 debian/virtualbox-guest-x11.dirs                   |  1 +
 debian/virtualbox-guest-x11.files/00vboxvideo.conf |  1 +
 debian/virtualbox-guest-x11.install                |  2 ++
 debian/virtualbox-guest-x11.links                  |  4 ++++
 debian/virtualbox-guest-x11.postinst               | 17 +++++++++++++++++
 debian/virtualbox-guest-x11.prerm                  | 16 ++++++++++++++++
 7 files changed, 50 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index ebeb058..d1344cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+virtualbox (5.1.6-dfsg-1) UNRELEASED; urgency=medium
+
+  * New upstream release, patch refresh (Closes: #835968)
+
+  [ Gianfranco Costamagna, Peter Meiser ]
+  * Major rewrite of the guest-additions GL library handling
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org>  Wed, 07 Sep 2016 18:45:28 +0200
+
 virtualbox (5.1.4-dfsg-2) unstable; urgency=low
 
   * Switch to Python3 (LP: #1528016, Closes: #830878)
diff --git a/debian/virtualbox-guest-x11.dirs b/debian/virtualbox-guest-x11.dirs
new file mode 100644
index 0000000..0369ff7
--- /dev/null
+++ b/debian/virtualbox-guest-x11.dirs
@@ -0,0 +1 @@
+/usr/lib/virtualbox/additions
diff --git a/debian/virtualbox-guest-x11.files/00vboxvideo.conf b/debian/virtualbox-guest-x11.files/00vboxvideo.conf
new file mode 100644
index 0000000..0369ff7
--- /dev/null
+++ b/debian/virtualbox-guest-x11.files/00vboxvideo.conf
@@ -0,0 +1 @@
+/usr/lib/virtualbox/additions
diff --git a/debian/virtualbox-guest-x11.install b/debian/virtualbox-guest-x11.install
index 3b7aa74..fae5327 100644
--- a/debian/virtualbox-guest-x11.install
+++ b/debian/virtualbox-guest-x11.install
@@ -3,3 +3,5 @@ src/VBox/Additions/x11/Installer/x11config.pl /usr/share/virtualbox
 src/VBox/Additions/x11/Installer/98vboxadd-xclient /etc/X11/Xsession.d
 out/bin/additions/VBoxOGL*.so /usr/lib
 out/bin/additions/VBoxEGL*.so /usr/lib
+
+debian/virtualbox-guest-x11.files/00vboxvideo.conf /usr/lib/virtualbox/additions
diff --git a/debian/virtualbox-guest-x11.links b/debian/virtualbox-guest-x11.links
new file mode 100644
index 0000000..4f5d321
--- /dev/null
+++ b/debian/virtualbox-guest-x11.links
@@ -0,0 +1,4 @@
+/usr/lib/VBoxOGL.so /usr/lib/virtualbox/additions/libGL.so.1
+/usr/lib/VBoxOGL.so /usr/lib/virtualbox/additions/libGL.so
+/usr/lib/VBoxEGL.so /usr/lib/virtualbox/additions/libEGL.so.1
+/usr/lib/VBoxEGL.so /usr/lib/virtualbox/additions/libEGL.so
diff --git a/debian/virtualbox-guest-x11.postinst b/debian/virtualbox-guest-x11.postinst
index 748d03a..2e3bcff 100644
--- a/debian/virtualbox-guest-x11.postinst
+++ b/debian/virtualbox-guest-x11.postinst
@@ -2,7 +2,24 @@
 
 set -e
 
+ARCH=`dpkg --print-architecture`
+
 if [ "$1" = "configure" ]; then
+
+        if [ "$ARCH" = "amd64" ]; then
+            update-alternatives --force \
+                --install /etc/ld.so.conf.d/x86_64-linux-gnu_GL.conf x86_64-linux-gnu_gl_conf /usr/lib/virtualbox/additions/00vboxvideo.conf 8605
+
+            update-alternatives --force \
+               --install /etc/ld.so.conf.d/x86_64-linux-gnu_EGL.conf x86_64-linux-gnu_egl_conf /usr/lib/virtualbox/additions/00vboxvideo.conf 8605
+        else
+            update-alternatives --force \
+               --install /etc/ld.so.conf.d/i386-linux-gnu_GL.conf i386-linux-gnu_gl_conf /usr/lib/virtualbox/additions/00vboxvideo.conf 8605
+
+            update-alternatives --force \
+               --install /etc/ld.so.conf.d/i386-linux-gnu_EGL.conf i386-linux-gnu_egl_conf /usr/lib/virtualbox/additions/00vboxvideo.conf 8605
+        fi
+
 	ldconfig
 fi
 
diff --git a/debian/virtualbox-guest-x11.prerm b/debian/virtualbox-guest-x11.prerm
new file mode 100644
index 0000000..d1ec441
--- /dev/null
+++ b/debian/virtualbox-guest-x11.prerm
@@ -0,0 +1,16 @@
+#!/bin/sh
+set -e
+
+ARCH=`dpkg --print-architecture`
+
+case "$1" in
+	remove)
+            update-alternatives --remove x86_64-linux-gnu_gl_conf /usr/lib/virtualbox/additions/00vboxvideo.conf
+            update-alternatives --remove x86_64-linux-gnu_egl_conf /usr/lib/virtualbox/additions/00vboxvideo.conf
+            update-alternatives --remove i386-linux-gnu_gl_conf /usr/lib/virtualbox/additions/00vboxvideo.conf
+            update-alternatives --remove i386-linux-gnu_egl_conf /usr/lib/virtualbox/additions/00vboxvideo.conf
+	    ldconfig
+	;;
+
+esac
+##DEBHELPER##

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-virtualbox/virtualbox.git