[VirtualBox/f24] Add VirtualBox-5.0.22-guest_soname.patch, do not hack SONAME for
commit 30ff3c1501eedd79dd68406bf5f9cb8775acc9b8
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sun Jun 26 03:44:59 2016 +0100
Add VirtualBox-5.0.22-guest_soname.patch, do not hack SONAME for
VBoxOGL and VBoxEGL in guest-additions.
VirtualBox-5.0.22-guest_soname.patch | 19 +++++++++++++++++++
VirtualBox.spec | 18 ++++++++++++------
2 files changed, 31 insertions(+), 6 deletions(-)
---
diff --git a/VirtualBox-5.0.22-guest_soname.patch b/VirtualBox-5.0.22-guest_soname.patch
new file mode 100644
index 0000000..7d0255c
--- /dev/null
+++ b/VirtualBox-5.0.22-guest_soname.patch
@@ -0,0 +1,19 @@
+Do not change SONAME in Linux for VBoxOGL and VBoxEGL
+--- ./src/VBox/Additions/common/crOpenGL/Makefile.kmk.orig 2016-06-24 20:01:44.794134277
+0100
++++ ./src/VBox/Additions/common/crOpenGL/Makefile.kmk 2016-06-24 20:01:54.994262126
+0100
+@@ -227,7 +227,6 @@ if1of ($(KBUILD_TARGET), linux solaris f
+ dl
+ endif
+ else
+- VBoxOGL_SONAME.linux = libGL.so.1
+ VBoxOGL_LDFLAGS.linux += -Wl,-e,LibMain
+ endif
+ endif
+@@ -711,7 +710,6 @@ VBoxEGL_TEMPLATE = VBOXCROGLR3GUES
+ VBoxEGL_SOURCES = egl.c
+ VBoxEGL_INCS = $(VBOX_PATH_X11_ROOT)/mesa-11.0.7
+ VBoxEGL_LIBS = $(VBOX_LIB_OGL) $(VBOX_LIB_IPRT_GUEST_R3_SHARED)
+-VBoxEGL_SONAME.linux = libEGL.so.1
+
+ include $(FILE_KBUILD_SUB_FOOTER)
+
diff --git a/VirtualBox.spec b/VirtualBox.spec
index 26e43bc..10943b3 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -26,7 +26,7 @@
Name: VirtualBox
Version: 5.0.22
#Release: 6%%{?prerel:.%%{prerel}}%%{?dist}
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
Group: Development/Tools
@@ -49,12 +49,14 @@ Patch26: VirtualBox-4.3.0-no-bundles.patch
Patch27: VirtualBox-gcc.patch
# from Debian
Patch28: 02-gsoap-build-fix.patch
-# Upstream patch and I also added some fixes for gcc6
+# Upstream patches
Patch30: changeset_trunk_59959.diff
Patch31: changeset_trunk_59960.diff
-# just applied to Fedora 24+
+# I added some fixes for gcc6 just applied to Fedora 24+
Patch33: VirtualBox-gcc6-fixes.patch
+# just applied to Fedora 25+
Patch34: VirtualBox-5.0.16-glibc.patch
+Patch35: VirtualBox-5.0.22-guest_soname.patch
BuildRequires: kBuild >= 0.1.9998
@@ -204,9 +206,8 @@ rm -r tools/
rm -r src/VBox/Additions/x11/x11include/
rm -r src/VBox/Additions/x11/x11stubs/
#rm -r src/VBox/GuestHost/OpenGL/include/GL
-
-#rm include/VBox/HostServices/glext.h
-#rm include/VBox/HostServices/glxext.h
+rm include/VBox/HostServices/glext.h
+rm include/VBox/HostServices/glxext.h
#rm include/VBox/HostServices/wglext.h
#rm -rf src/libs/liblzf-3.4/
@@ -235,6 +236,7 @@ rm -r src/libs/zlib-1.2.8/
%if 0%{?fedora} > 24
%patch34 -p1 -b .glibc
%endif
+%patch35 -p1 -b .soname
# CRLF->LF
sed -i 's/\r//' COPYING
@@ -677,6 +679,10 @@ fi
%{_datadir}/%{name}-kmod-%{version}
%changelog
+* Fri Jun 24 2016 Sérgio Basto <sergio(a)serjux.com> - 5.0.22-2
+- Add VirtualBox-5.0.22-guest_soname.patch, do not hack SONAME for
+ VBoxOGL and VBoxEGL in guest-additions.
+
* Fri Jun 24 2016 Sérgio Basto <sergio(a)serjux.com> - 5.0.22-1
- Update VirtualBox to 5.0.22