From 49a9ac25d68e6b3f7f4944ecec14d23775a72fa570a41c70e7c55b84d7a7f49b Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Mon, 4 Apr 2016 05:41:02 +0000 Subject: [PATCH] Accepting request 383712 from home:lwfinger:branches:Virtualization Fix libGL.so.1 problem OBS-URL: https://build.opensuse.org/request/show/383712 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=248 --- vbox_prevent_wrong_SONAME.patch | 13 +++++++++++++ virtualbox.changes | 7 +++++++ virtualbox.spec | 5 ++++- 3 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 vbox_prevent_wrong_SONAME.patch diff --git a/vbox_prevent_wrong_SONAME.patch b/vbox_prevent_wrong_SONAME.patch new file mode 100644 index 0000000..a31b20b --- /dev/null +++ b/vbox_prevent_wrong_SONAME.patch @@ -0,0 +1,13 @@ +Index: VirtualBox-5.0.17/src/VBox/Additions/common/crOpenGL/Makefile.kmk +=================================================================== +--- VirtualBox-5.0.17.orig/src/VBox/Additions/common/crOpenGL/Makefile.kmk ++++ VirtualBox-5.0.17/src/VBox/Additions/common/crOpenGL/Makefile.kmk +@@ -227,7 +227,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 diff --git a/virtualbox.changes b/virtualbox.changes index 8250246..b5d5d27 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Apr 4 00:01:12 UTC 2016 - Larry.Finger@lwfinger.net + +- Fix problem with SONAME for VBoxOGL.so. With the Oracle code, it is libGL.so.1 rather than VBoxOGL.so.1. + Thanks to Max Lin for notifying me about the problem. + This fix adds file "vbox_prevent_wrong_SONAME.patch" + ------------------------------------------------------------------- Thu Mar 31 16:49:11 UTC 2016 - Larry.Finger@lwfinger.net diff --git a/virtualbox.spec b/virtualbox.spec index 53282ad..c27b98b 100644 --- a/virtualbox.spec +++ b/virtualbox.spec @@ -85,6 +85,8 @@ Patch108: virtualbox-snpritnf-buffer-overflow.patch Patch109: vbox-usb-warning.diff # Upgrade sources from r106108 to r106140 Patch110: VirtualBox-5.0.17-r106108-r106140.patch +# Prevent Guest Additions from creating wrong SONAME +Patch111: vbox_prevent_wrong_SONAME.patch # BuildRequires: LibVNCServer-devel BuildRequires: SDL-devel @@ -106,7 +108,7 @@ BuildRequires: kbuild >= 0.1.9998svn2689 BuildRequires: kernel-syms BuildRequires: libcap-devel BuildRequires: libcurl-devel -BuildRequires: libgsoap-devel +#BuildRequires: libgsoap-devel BuildRequires: libidl-devel BuildRequires: libopenssl-devel BuildRequires: libqt4-devel @@ -316,6 +318,7 @@ This package contains icons for guest desktop files that were created on the des %patch108 -p1 %patch109 -p1 %patch110 -p0 +%patch111 -p1 #copy user manual cp %{SOURCE1} UserManual.pdf #copy kbuild config