jengelh/virtualbox
SHA256
1
0
Fork 0
forked from pool/virtualbox
Code Pull Requests Activity

Accepting request 383712 from home:lwfinger:branches:Virtualization

Browse Source 
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
This commit is contained in:
Martin Pluskal 2016-04-04 05:41:02 +00:00 committed by Git OBS Bridge
parent 9d18c0103f
commit 49a9ac25d6
3 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
vbox_prevent_wrong_SONAME.patch Normal file
View File

@ -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

7
virtualbox.changes
View File

@ -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 <mlin@suse.com> 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 Thu Mar 31 16:49:11 UTC 2016 - Larry.Finger@lwfinger.net

5
virtualbox.spec
View File

@ -85,6 +85,8 @@ Patch108: virtualbox-snpritnf-buffer-overflow.patch
Patch109: vbox-usb-warning.diff Patch109: vbox-usb-warning.diff
# Upgrade sources from r106108 to r106140 # Upgrade sources from r106108 to r106140
Patch110: VirtualBox-5.0.17-r106108-r106140.patch 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: LibVNCServer-devel
BuildRequires: SDL-devel BuildRequires: SDL-devel
@ -106,7 +108,7 @@ BuildRequires: kbuild >= 0.1.9998svn2689
BuildRequires: kernel-syms BuildRequires: kernel-syms
BuildRequires: libcap-devel BuildRequires: libcap-devel
BuildRequires: libcurl-devel BuildRequires: libcurl-devel
BuildRequires: libgsoap-devel #BuildRequires: libgsoap-devel
BuildRequires: libidl-devel BuildRequires: libidl-devel
BuildRequires: libopenssl-devel BuildRequires: libopenssl-devel
BuildRequires: libqt4-devel BuildRequires: libqt4-devel
@ -316,6 +318,7 @@ This package contains icons for guest desktop files that were created on the des
%patch108 -p1 %patch108 -p1
%patch109 -p1 %patch109 -p1
%patch110 -p0 %patch110 -p0
%patch111 -p1
#copy user manual #copy user manual
cp %{SOURCE1} UserManual.pdf cp %{SOURCE1} UserManual.pdf
#copy kbuild config #copy kbuild config