commit virtualbox-ose for openSUSE:Factory
Hello community, here is the log from the commit of package virtualbox-ose for openSUSE:Factory checked in at Sat Nov 20 12:23:10 CET 2010. -------- --- virtualbox-ose/virtualbox-ose.changes 2010-11-12 10:03:15.000000000 +0100 +++ /mounts/work_src_done/STABLE/virtualbox-ose/virtualbox-ose.changes 2010-11-19 20:07:21.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Nov 19 19:06:48 UTC 2010 - coolo@novell.com + +- take patch from upstream to fix build with 2.6.37 + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- vbox-kernel-2637.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virtualbox-ose.spec ++++++ --- /var/tmp/diff_new_pack.pX2S4b/_old 2010-11-20 12:23:03.000000000 +0100 +++ /var/tmp/diff_new_pack.pX2S4b/_new 2010-11-20 12:23:03.000000000 +0100 @@ -40,7 +40,7 @@ # ExclusiveArch: %ix86 x86_64 Version: 3.2.10 -Release: 2 +Release: 3 Summary: VirtualBox OSE is an Emulator License: GPLv2+ Group: System/Emulators/PC @@ -80,6 +80,7 @@ #PATCH-FIX-OPENSUSE Do not include build dates on binaries, makes build-compare happier Patch100: vbox-no-build-dates.diff Patch101: vbox-default-os-type.diff +Patch102: vbox-kernel-2637.diff # BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: pwdutils permissions @@ -172,6 +173,7 @@ %patch99 -p1 %patch100 %patch101 +%patch102 -p1 #copy user manual %__cp %{S:1} ./UserManual.pdf ++++++ vbox-kernel-2637.diff ++++++ From: changeset 33754 Additions/linux/drm: Linux 2.6.37 fix Index: VirtualBox-3.2.10_OSE/src/VBox/Additions/linux/drm/vboxvideo_drm.c =================================================================== --- VirtualBox-3.2.10_OSE.orig/src/VBox/Additions/linux/drm/vboxvideo_drm.c 2010-10-08 22:09:04.000000000 +0200 +++ VirtualBox-3.2.10_OSE/src/VBox/Additions/linux/drm/vboxvideo_drm.c 2010-11-19 19:25:23.241211252 +0100 @@ -78,8 +78,11 @@ static struct drm_driver driver = { /* .driver_features = DRIVER_USE_MTRR, */ .load = vboxvideo_driver_load, .reclaim_buffers = drm_core_reclaim_buffers, + /* As of Linux 2.65.37, always the internal functions are used. */ +#if LINUX_VERSION_CODE < KERNEL_VERSION (2, 6, 37) .get_map_ofs = drm_core_get_map_ofs, .get_reg_ofs = drm_core_get_reg_ofs, +#endif .fops = { .owner = THIS_MODULE, .open = drm_open, ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de