Hello community, here is the log from the commit of package virtualbox for openSUSE:Factory checked in at 2012-09-29 15:37:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/virtualbox (Old) and /work/SRC/openSUSE:Factory/.virtualbox.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "virtualbox", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/virtualbox/virtualbox.changes 2012-06-28 17:16:47.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.virtualbox.new/virtualbox.changes 2012-09-29 15:37:07.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Sep 27 07:47:14 UTC 2012 - [email protected] + +- Add virtualbox-kernel-3.6.patch to fix compilation with 3.6 kernel + +------------------------------------------------------------------- @@ -4 +9 @@ -- let it build with all versions of openjkd +- let it build with all versions of openjdk New: ---- virtualbox-kernel-3.6.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virtualbox.spec ++++++ --- /var/tmp/diff_new_pack.conFmn/_old 2012-09-29 15:37:11.000000000 +0200 +++ /var/tmp/diff_new_pack.conFmn/_new 2012-09-29 15:37:11.000000000 +0200 @@ -130,6 +130,8 @@ Patch103: vbox-disable-updates.diff #use pie/fPIE for setuid binaries (bnc#743143) Patch104: vbox-fpie.diff +# Fix compilation with kernel 3.6, upstream r42784 +Patch105: virtualbox-kernel-3.6.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: pwdutils permissions Requires: %{name}-host-kmp = %version @@ -252,6 +254,7 @@ %patch101 %patch103 %patch104 -p1 +%patch105 -p1 #copy user manual %__cp %{S:1} UserManual.pdf #copy kbuild config ++++++ virtualbox-kernel-3.6.patch ++++++ --- 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 =================================================================== -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
