Hello community, here is the log from the commit of package virtualbox-ose for openSUSE:Factory checked in at Wed Mar 17 17:22:05 CET 2010. -------- --- virtualbox-ose/virtualbox-ose.changes 2010-02-26 10:58:43.000000000 +0100 +++ virtualbox-ose/virtualbox-ose.changes 2010-02-27 01:02:06.000000000 +0100 @@ -1,0 +2,7 @@ +Fri Feb 26 17:59:48 UTC 2010 - masterpatricko@gmail.com + +- Use version 1.7 xorg mouse and video drivers on 11.3 +- Build version 1.7 xorg mouse and video drivers against system libraries + (virtualbox-ose-system-xorg17.patch) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- virtualbox-ose-system-xorg17.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virtualbox-ose.spec ++++++ --- /var/tmp/diff_new_pack.U3UmvE/_old 2010-03-17 17:21:13.000000000 +0100 +++ /var/tmp/diff_new_pack.U3UmvE/_new 2010-03-17 17:21:13.000000000 +0100 @@ -49,8 +49,9 @@ %endif # ExclusiveArch: %ix86 x86_64 +%define version_label 3.1.4 Version: 3.1.4 -Release: 2 +Release: 3 Summary: VirtualBox OSE is an Emulator License: GPLv2+ Group: System/Emulators/PC @@ -83,6 +84,7 @@ Patch19: virtualbox-ose-permissions_warning.diff #fix post build checks, could be dropped when we switch to newer gcc Patch20: vbox-ret-in-nonvoid-fnc.diff +Patch21: virtualbox-ose-system-xorg17.patch # BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: pwdutils permissions @@ -173,6 +175,7 @@ %endif %patch19 -p1 %patch20 -p1 +%patch21 %__cp %{SOURCE7} . %build @@ -247,15 +250,19 @@ pushd out/linux.*/release/bin/additions/ %__install -d -m 755 %{buildroot}%{_libdir}/xorg/modules/drivers %__install -d -m 755 %{buildroot}%{_libdir}/xorg/modules/input -%if %suse_version > 1110 +%if %suse_version >= 1130 + %__install -m 755 vboxmouse_drv_17.so %{buildroot}%{_libdir}/xorg/modules/input/vboxmouse_drv.so + %__install -m 755 vboxvideo_drv_17.so %{buildroot}%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so +%else + %if %suse_version == 1120 %__install -m 755 vboxmouse_drv_16.so %{buildroot}%{_libdir}/xorg/modules/input/vboxmouse_drv.so %__install -m 755 vboxvideo_drv_16.so %{buildroot}%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so -%else + %else %if %suse_version == 1110 %__install -m 755 vboxmouse_drv_15.so %{buildroot}%{_libdir}/xorg/modules/input/vboxmouse_drv.so %__install -m 755 vboxvideo_drv_15.so %{buildroot}%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so %else - %if %suse_version >= 1100 + %if %suse_version == 1100 %__install -m 755 vboxmouse_drv_14.so %{buildroot}%{_libdir}/xorg/modules/input/vboxmouse_drv.so %__install -m 755 vboxvideo_drv_14.so %{buildroot}%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so %else @@ -263,6 +270,7 @@ %__install -m 755 vboxvideo_drv_13.so %{buildroot}%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so %endif %endif + %endif %endif # create init scripts directory %__install -d -m 755 %{buildroot}%{_sysconfdir}/init.d ++++++ virtualbox-ose-system-xorg17.patch ++++++ diff -upr ../VirtualBox-3.1.4_OSE-old//src/VBox/Additions/common/crOpenGL/Makefile.kmk ./src/VBox/Additions/common/crOpenGL/Makefile.kmk --- ../VirtualBox-3.1.4_OSE-old//src/VBox/Additions/common/crOpenGL/Makefile.kmk 2010-02-15 18:23:59.152073623 +0000 +++ ./src/VBox/Additions/common/crOpenGL/Makefile.kmk 2010-02-15 18:58:58.872166263 +0000 @@ -67,16 +67,11 @@ VBoxOGL_TEMPLATE = VBOXCROGLR3GUES VBoxOGL_INCS = . if1of ($(KBUILD_TARGET),linux solaris) VBoxOGL_INCS += \ - $(VBOX_PATH_X11_ROOT)/libXdamage-1.1 \ - $(VBOX_PATH_X11_ROOT)/libXcomposite-0.4.0 \ - $(VBOX_PATH_X11_ROOT)/libXfixes-4.0.3 \ - $(VBOX_PATH_X11_ROOT)/damageproto-1.1.0 \ - $(VBOX_PATH_X11_ROOT)/compositeproto-0.4 \ - $(VBOX_PATH_X11_ROOT)/fixesproto-4.0 \ - $(VBOX_PATH_X11_ROOT)/libx11-1.1.5-other \ - $(VBOX_PATH_X11_ROOT)/1.3/xorg \ + /usr/include/X11 \ + /usr/include/xorg \ + /usr/include/pixman-1 \ $(VBOX_MESA_INCS) \ - $(PATH_ROOT)/src/VBox/Additions/x11/x11include/libdrm-2.4.13 + /usr/include/drm VBoxOGL_DEFS += VBOX_NO_NATIVEGL endif diff -upr ../VirtualBox-3.1.4_OSE-old//src/VBox/Additions/x11/vboxmouse/Makefile.kmk ./src/VBox/Additions/x11/vboxmouse/Makefile.kmk --- ../VirtualBox-3.1.4_OSE-old//src/VBox/Additions/x11/vboxmouse/Makefile.kmk 2010-02-15 18:23:49.040084177 +0000 +++ ./src/VBox/Additions/x11/vboxmouse/Makefile.kmk 2010-02-15 19:06:13.736122566 +0000 @@ -174,13 +174,9 @@ vboxmouse_drv_17_TEMPLATE = VBOXGUESTR3X vboxmouse_drv_17_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local vboxmouse_drv_17_INCS := \ - $(VBOX_PATH_X11_ROOT)/inputproto-1.9.99.902 \ - $(VBOX_PATH_X11_ROOT)/libpciaccess-0.10.8 \ - $(VBOX_PATH_X11_ROOT)/pixman-0.16.0 \ - $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \ - $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.99-20090831 \ - $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local \ - $(VBOX_PATH_X11_ROOT)/xproto-7.0.15 \ + /usr/include/X11 \ + /usr/include/xorg \ + /usr/include/pixman-1 \ $(PATH_SUB_CURRENT) vboxmouse_drv_17_SOURCES = \ vboxmouse_15.c diff -upr ../VirtualBox-3.1.4_OSE-old//src/VBox/Additions/x11/vboxvideo/Makefile.kmk ./src/VBox/Additions/x11/vboxvideo/Makefile.kmk --- ../VirtualBox-3.1.4_OSE-old//src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2010-02-15 18:23:49.044072887 +0000 +++ ./src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2010-02-15 18:50:16.512421990 +0000 @@ -247,19 +247,11 @@ vboxvideo_drv_17_CFLAGS := $(vboxvideo_d vboxvideo_drv_17_DEFS := $(vboxvideo_drv_15_DEFS) ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local vboxvideo_drv_17_INCS = \ - $(VBOX_PATH_X11_ROOT)/fontsproto-2.1.0 \ - $(VBOX_PATH_X11_ROOT)/glproto-1.4.10 \ - $(VBOX_PATH_X11_ROOT)/inputproto-1.9.99.902 \ - $(VBOX_PATH_X11_ROOT)/libdrm-2.4.13 \ - $(VBOX_PATH_X11_ROOT)/libpciaccess-0.10.8 \ - $(VBOX_PATH_X11_ROOT)/pixman-0.16.0 \ - $(VBOX_PATH_X11_ROOT)/randrproto-1.3.0 \ - $(VBOX_PATH_X11_ROOT)/renderproto-0.11 \ - $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \ - $(VBOX_PATH_X11_ROOT)/xf86driproto-2.1.0 \ - $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.99-20090831 \ - $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local \ - $(VBOX_PATH_X11_ROOT)/xproto-7.0.15 + /usr/include/X11 \ + /usr/include/xorg \ + /usr/include/pixman-1 \ + /usr/include/X11/dri \ + /usr/include/drm vboxvideo_drv_17_SOURCES := $(vboxvideo_drv_15_SOURCES) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org