packages: VirtualBox/18-system-xorg.patch, VirtualBox/VirtualBox.spec - rel...

[arekm]

Author: arekm                        Date: Sat Sep 10 11:57:51 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 3; update xorg abi and system xorg patch

---- Files affected:
packages/VirtualBox:
   18-system-xorg.patch (1.1 -> 1.2) , VirtualBox.spec (1.384 -> 1.385) 

---- Diffs:

================================================================
Index: packages/VirtualBox/18-system-xorg.patch
diff -u packages/VirtualBox/18-system-xorg.patch:1.1 packages/VirtualBox/18-system-xorg.patch:1.2
--- packages/VirtualBox/18-system-xorg.patch:1.1	Mon Mar 28 18:09:24 2011
+++ packages/VirtualBox/18-system-xorg.patch	Sat Sep 10 13:57:45 2011
@@ -47,7 +47,7 @@
  SUB_DEPTH = ../../../..
  include $(KBUILD_PATH)/subheader.kmk
  
-+ifn1of ($(XSERVER_VERSION), 70 71 13 14 15 16 17 18 19)
++ifn1of ($(XSERVER_VERSION), 13 14 15 16 17 18 19 110)
 + XSERVER_VERSION := 17
 +endif
 +
@@ -137,7 +137,15 @@
  vboxmouse_drv_19_TEMPLATE = VBOXGUESTR3XORGMOD
  vboxmouse_drv_19_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
  ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
-@@ -214,6 +204,14 @@ vboxmouse_drv_19_SOURCES = \
+@@ -217,7 +207,6 @@ vboxmouse_drv_19_SOURCES = \
+ #
+ # vboxmouse_drv_110
+ #
+-DLLS += vboxmouse_drv_110
+ vboxmouse_drv_110_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxmouse_drv_110_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
+ ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
+@@ -234,6 +224,14 @@ vboxmouse_drv_110_SOURCES = \
  	vboxmouse_15.c
  
  
@@ -235,8 +243,16 @@
  vboxvideo_drv_19_TEMPLATE = VBOXGUESTR3XORGMOD
  vboxvideo_drv_19_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
  vboxvideo_drv_19_DEFS := $(vboxvideo_drv_15_DEFS)
-@@ -290,6 +280,23 @@ vboxvideo_drv_19_INCS = \
- vboxvideo_drv_19_SOURCES := $(vboxvideo_drv_15_SOURCES)
+@@ -293,7 +282,6 @@ vboxvideo_drv_19_SOURCES := $(vboxvideo_drv_15_SOURCES)
+ #
+ # vboxvideo_drv_110
+ #
+-DLLS += vboxvideo_drv_110
+ vboxvideo_drv_110_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxvideo_drv_110_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
+ vboxvideo_drv_110_DEFS := $(vboxvideo_drv_15_DEFS)
+@@ -317,6 +306,23 @@ vboxvideo_drv_110_INCS = \
+ vboxvideo_drv_110_SOURCES := $(vboxvideo_drv_15_SOURCES)
  
  
 +vboxvideo_drv_$(XSERVER_VERSION)_NAME := vboxvideo_drv

================================================================
Index: packages/VirtualBox/VirtualBox.spec
diff -u packages/VirtualBox/VirtualBox.spec:1.384 packages/VirtualBox/VirtualBox.spec:1.385
--- packages/VirtualBox/VirtualBox.spec:1.384	Sat Sep 10 12:44:10 2011
+++ packages/VirtualBox/VirtualBox.spec	Sat Sep 10 13:57:45 2011
@@ -33,7 +33,7 @@
 %define		_enable_debug_packages	0
 %endif
 
-%define		rel		2
+%define		rel		3
 %define		pname		VirtualBox
 
 Summary:	VirtualBox - x86 hardware virtualizer
@@ -262,7 +262,7 @@
 Summary(pl.UTF-8):	Sterownik myszy dla systemu gościa w VirtualBoksie
 Group:		X11/Applications
 Requires:	xorg-xserver-server >= 1.0.99.901
-Requires:	xorg-xserver-server(xinput-abi) <= 12.2
+Requires:	xorg-xserver-server(xinput-abi) <= 13.0
 Requires:	xorg-xserver-server(xinput-abi) >= 4.0
 
 %description -n xorg-driver-input-vboxmouse
@@ -278,7 +278,7 @@
 Requires:	Mesa-dri-driver-swrast
 Requires:	xorg-xserver-libdri >= 1.7.4
 Requires:	xorg-xserver-server >= 1.0.99.901
-Requires:	xorg-xserver-server(videodrv-abi) <= 10.0
+Requires:	xorg-xserver-server(videodrv-abi) <= 11.0
 Requires:	xorg-xserver-server(videodrv-abi) >= 2.0
 
 %description -n xorg-driver-video-vboxvideo
@@ -544,12 +544,12 @@
 mv $RPM_BUILD_ROOT{%{_libdir}/%{pname}/VBox.png,%{_pixmapsdir}/virtualbox.png}
 mv $RPM_BUILD_ROOT{%{_libdir}/%{pname},%{_desktopdir}}/virtualbox.desktop
 
-mv $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions/vboxmouse_drv.so,%{_libdir}/xorg/modules/input/vboxmouse_drv.so}
-mv $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions/vboxvideo_drv.so,%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so}
+mv $RPM_BUILD_ROOT{%{_libdir}/%{pname}/vboxmouse_drv.so,%{_libdir}/xorg/modules/input/vboxmouse_drv.so}
+mv $RPM_BUILD_ROOT{%{_libdir}/%{pname}/vboxvideo_drv.so,%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so}
 mv $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions/VBoxOGL.so,%{_libdir}/xorg/modules/dri/vboxvideo_dri.so}
 # xorg other driver versions
-rm -vf $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/vboxmouse_drv*.{o,so}
-rm -vf $RPM_BUILD_ROOT%{_libdir}/%{pname}/additions/vboxvideo_drv*.{o,so}
+rm -vf $RPM_BUILD_ROOT%{_libdir}/%{pname}/vboxmouse_drv*.{o,so}
+rm -vf $RPM_BUILD_ROOT%{_libdir}/%{pname}/vboxvideo_drv*.{o,so}
 
 # XXX: where else to install them that vboxvideo_dri.so finds them? patch with rpath?
 mv $RPM_BUILD_ROOT{%{_libdir}/%{pname}/additions,%{_libdir}}/VBoxOGLarrayspu.so
@@ -942,6 +942,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.385  2011/09/10 11:57:45  arekm
+- rel 3; update xorg abi and system xorg patch
+
 Revision 1.384  2011/09/10 10:44:10  arekm
 - release 2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/VirtualBox/18-system-xorg.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/VirtualBox/VirtualBox.spec?r1=1.384&r2=1.385&f=u