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

- Add virtualbox-kernel-3.6.patch to fix compilation with 3.6 kernel

Browse Source 
- let it build with all versions of openjdk

OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=100
This commit is contained in:
Ismail Dönmez 2012-09-27 07:57:03 +00:00 committed by Git OBS Bridge
parent 415f264158
commit 9099a819e0
3 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
virtualbox-kernel-3.6.patch Normal file
View File

@ -0,0 +1,14 @@
--- a/src/VBox/Additions/linux/drm/vboxvideo_drm.c (revision 42783)
+++ b/src/VBox/Additions/linux/drm/vboxvideo_drm.c (revision 42784)
@@ -106,7 +106,9 @@
{
/* .driver_features = DRIVER_USE_MTRR, */
.load = vboxvideo_driver_load,
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 6, 0)
.reclaim_buffers = drm_core_reclaim_buffers,
+#endif
/* As of Linux 2.6.37, always the internal functions are used. */
#if LINUX_VERSION_CODE < KERNEL_VERSION (2, 6, 37) && !defined(DRM_RHEL61)
.get_map_ofs = drm_core_get_map_ofs,
Index: vboxvideo_dac.c
===================================================================

7
virtualbox.changes
View File

@ -1,7 +1,12 @@
-------------------------------------------------------------------
Thu Sep 27 07:47:14 UTC 2012 - idonmez@suse.com
- Add virtualbox-kernel-3.6.patch to fix compilation with 3.6 kernel
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jun 26 14:02:32 UTC 2012 - mvyskocil@suse.cz Tue Jun 26 14:02:32 UTC 2012 - mvyskocil@suse.cz
- let it build with all versions of openjkd - let it build with all versions of openjdk
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jun 21 20:01:20 UTC 2012 - mseben@gmail.com Thu Jun 21 20:01:20 UTC 2012 - mseben@gmail.com

3
virtualbox.spec
View File

@ -130,6 +130,8 @@ Patch101: vbox-default-os-type.diff
Patch103: vbox-disable-updates.diff Patch103: vbox-disable-updates.diff
#use pie/fPIE for setuid binaries (bnc#743143) #use pie/fPIE for setuid binaries (bnc#743143)
Patch104: vbox-fpie.diff Patch104: vbox-fpie.diff
# Fix compilation with kernel 3.6, upstream r42784
Patch105: virtualbox-kernel-3.6.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: pwdutils permissions PreReq: pwdutils permissions
Requires: %{name}-host-kmp = %version Requires: %{name}-host-kmp = %version
@ -252,6 +254,7 @@ Development file for %{name}
%patch101 %patch101
%patch103 %patch103
%patch104 -p1 %patch104 -p1
%patch105 -p1
#copy user manual #copy user manual
%__cp %{S:1} UserManual.pdf %__cp %{S:1} UserManual.pdf
#copy kbuild config #copy kbuild config