Wed Mar 20 00:06:15 PDT 2013

2 files changed, 251 insertions, 5 deletions

diff --git a/libre/virtualbox-libre/18-system-xorg.patch b/libre/virtualbox-libre/18-system-xorg.patch
new file mode 100644
index 000000000..c527f7f20
--- /dev/null
+++ b/libre/virtualbox-libre/18-system-xorg.patch
@@ -0,0 +1,245 @@
+diff -Nur VirtualBox-4.2.10.orig/src/VBox/Additions/common/crOpenGL/Makefile.kmk VirtualBox-4.2.10/src/VBox/Additions/common/crOpenGL/Makefile.kmk
+--- VirtualBox-4.2.10.orig/src/VBox/Additions/common/crOpenGL/Makefile.kmk	2013-03-19 18:55:28.774951223 +0000
++++ VirtualBox-4.2.10/src/VBox/Additions/common/crOpenGL/Makefile.kmk	2013-03-19 18:58:06.337193736 +0000
+@@ -63,18 +63,12 @@
+ VBoxOGL_INCS           = .
+ if1of ($(KBUILD_TARGET), linux solaris freebsd)
+  VBoxOGL_INCS     += \
+-	$(VBOX_PATH_X11_ROOT)/libXdamage-1.1 \
+-	$(VBOX_PATH_X11_ROOT)/libXcomposite-0.4.0 \
+-	$(VBOX_PATH_X11_ROOT)/libXext-1.3.1 \
+-	$(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)/xextproto-7.1.1 \
+-	$(VBOX_PATH_X11_ROOT)/xproto-7.0.18 \
++	/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 \
++	/usr/include/libdrm
+  VBoxOGL_DEFS     += VBOX_NO_NATIVEGL
+ endif
+ 
+diff -Nur VirtualBox-4.2.10.orig/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk VirtualBox-4.2.10/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk
+--- VirtualBox-4.2.10.orig/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk	2013-03-19 18:55:28.778284533 +0000
++++ VirtualBox-4.2.10/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk	2013-03-19 18:56:00.468064457 +0000
+@@ -40,8 +40,8 @@
+ 	VBoxGuestR3LibShared
+ ifndef VBOX_ONLY_TESTSUITE
+  if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd)
+-  LIBRARIES += \
+-  	VBoxGuestR3LibXFree86
++#  LIBRARIES += \
++#  	VBoxGuestR3LibXFree86
+  endif
+ endif
+ LIBRARIES.win.amd64 += VBoxGuestR3Lib-x86 VBoxGuestR3LibShared-x86
+diff -Nur VirtualBox-4.2.10.orig/src/VBox/Additions/x11/Makefile.kmk VirtualBox-4.2.10/src/VBox/Additions/x11/Makefile.kmk
+--- VirtualBox-4.2.10.orig/src/VBox/Additions/x11/Makefile.kmk	2013-03-19 18:55:28.974949837 +0000
++++ VirtualBox-4.2.10/src/VBox/Additions/x11/Makefile.kmk	2013-03-19 18:56:00.468064457 +0000
+@@ -17,6 +17,10 @@
+ SUB_DEPTH = ../../../..
+ include $(KBUILD_PATH)/subheader.kmk
+ 
++ifn1of ($(XSERVER_VERSION), 13 14 15 16 17 18 19 110 111)
++ XSERVER_VERSION := 17
++endif
++
+ # Include sub-makefiles.
+ if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris)
+  include $(PATH_SUB_CURRENT)/VBoxClient/Makefile.kmk
+diff -Nur VirtualBox-4.2.10.orig/src/VBox/Additions/x11/vboxmouse/Makefile.kmk VirtualBox-4.2.10/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
+--- VirtualBox-4.2.10.orig/src/VBox/Additions/x11/vboxmouse/Makefile.kmk	2013-03-19 18:55:28.818284256 +0000
++++ VirtualBox-4.2.10/src/VBox/Additions/x11/vboxmouse/Makefile.kmk	2013-03-19 18:56:00.468064457 +0000
+@@ -29,7 +29,6 @@
+ # vboxmouse_drv
+ #
+ if1of ($(KBUILD_TARGET), linux)
+- SYSMODS += vboxmouse_drv
+  vboxmouse_drv_TEMPLATE = VBOXGUESTR3XF86MOD
+  vboxmouse_drv_DEFS.linux = linux
+  vboxmouse_drv_DEFS.x86 += __i386__
+@@ -69,7 +68,6 @@
+ #
+ # vboxmouse_drv_70
+ #
+-DLLS += vboxmouse_drv_70
+ vboxmouse_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxmouse_drv_70_DEFS = \
+ 	XFree86Server IN_MODULE XFree86Module XFree86LOADER XINPUT XORG_7X IN_XF86_MODULE DONT_DEFINE_WRAPPERS NO_ANSIC
+@@ -85,7 +83,6 @@
+ #
+ # vboxmouse_drv_71
+ #
+-DLLS += vboxmouse_drv_71
+ vboxmouse_drv_71_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxmouse_drv_71_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
+ vboxmouse_drv_71_INCS := \
+@@ -100,7 +97,6 @@
+ #
+ # vboxmouse_drv_13
+ #
+-DLLS += vboxmouse_drv_13
+ vboxmouse_drv_13_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxmouse_drv_13_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
+ vboxmouse_drv_13_INCS := \
+@@ -114,7 +110,6 @@
+ #
+ # vboxmouse_drv_14
+ #
+-DLLS += vboxmouse_drv_14
+ vboxmouse_drv_14_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxmouse_drv_14_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
+ vboxmouse_drv_14_INCS := \
+@@ -128,7 +123,6 @@
+ #
+ # vboxmouse_drv_15
+ #
+-DLLS += vboxmouse_drv_15
+ vboxmouse_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxmouse_drv_15_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
+ vboxmouse_drv_15_INCS := \
+@@ -142,7 +136,6 @@
+ #
+ # vboxmouse_drv_16
+ #
+-DLLS += vboxmouse_drv_16
+ vboxmouse_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxmouse_drv_16_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
+ vboxmouse_drv_16_INCS := \
+diff -Nur VirtualBox-4.2.10.orig/src/VBox/Additions/x11/vboxvideo/Makefile.kmk VirtualBox-4.2.10/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
+--- VirtualBox-4.2.10.orig/src/VBox/Additions/x11/vboxvideo/Makefile.kmk	2013-03-19 18:55:28.974949837 +0000
++++ VirtualBox-4.2.10/src/VBox/Additions/x11/vboxvideo/Makefile.kmk	2013-03-19 18:56:00.468064457 +0000
+@@ -53,7 +53,6 @@
+ # vboxvideo_drv
+ #
+ if1of ($(KBUILD_TARGET), linux)
+- SYSMODS += vboxvideo_drv
+ endif   # target linux
+ vboxvideo_drv_TEMPLATE = VBOXGUESTR3XF86MOD
+ vboxvideo_drv_DEFS.linux = linux
+@@ -128,7 +127,6 @@
+ #         base keywords instead of using .solaris or .linux.
+ #         Also it is *important* to use := and not = when deriving a property.
+ #
+-DLLS += vboxvideo_drv_70
+ vboxvideo_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD
+ if1of ($(KBUILD_TARGET), linux)
+  vboxvideo_drv_70_CFLAGS += \
+@@ -149,7 +147,6 @@
+ #
+ # vboxvideo_drv_71
+ #
+-DLLS += vboxvideo_drv_71
+ vboxvideo_drv_71_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxvideo_drv_71_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
+ vboxvideo_drv_71_DEFS := $(vboxvideo_70_DEFS) XORG_VERSION_CURRENT=700100000
+@@ -164,7 +161,6 @@
+ #
+ # vboxvideo_drv_13
+ #
+-DLLS += vboxvideo_drv_13
+ vboxvideo_drv_13_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxvideo_drv_13_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
+ vboxvideo_drv_13_DEFS := $(vboxvideo_13_DEFS) XORG_VERSION_CURRENT=100300000
+@@ -178,7 +174,6 @@
+ #
+ # vboxvideo_drv_14
+ #
+-DLLS += vboxvideo_drv_14
+ vboxvideo_drv_14_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxvideo_drv_14_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
+ vboxvideo_drv_14_DEFS := $(vboxvideo_13_DEFS) XORG_VERSION_CURRENT=100400000
+@@ -192,7 +187,6 @@
+ #
+ # vboxvideo_drv_15
+ #
+-DLLS += vboxvideo_drv_15
+ vboxvideo_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxvideo_drv_15_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
+ vboxvideo_drv_15_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100503000
+@@ -213,7 +207,6 @@
+ #
+ # vboxvideo_drv_16
+ #
+-DLLS += vboxvideo_drv_16
+ vboxvideo_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxvideo_drv_16_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
+ vboxvideo_drv_16_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100600000
+@@ -227,7 +220,6 @@
+ #
+ # vboxvideo_drv_17
+ #
+-DLLS += vboxvideo_drv_17
+ vboxvideo_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxvideo_drv_17_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
+ vboxvideo_drv_17_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100699000
+@@ -241,7 +233,6 @@
+ #
+ # vboxvideo_drv_18
+ #
+-DLLS += vboxvideo_drv_18
+ vboxvideo_drv_18_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxvideo_drv_18_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
+ vboxvideo_drv_18_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100800000
+@@ -255,7 +246,6 @@
+ #
+ # vboxvideo_drv_19
+ #
+-DLLS += vboxvideo_drv_19
+ vboxvideo_drv_19_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxvideo_drv_19_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
+ vboxvideo_drv_19_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100900000
+@@ -269,7 +259,6 @@
+ #
+ # 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_15_DEFS) XORG_VERSION_CURRENT=101000000
+@@ -283,7 +272,6 @@
+ #
+ # vboxvideo_drv_111
+ #
+-DLLS += vboxvideo_drv_111
+ vboxvideo_drv_111_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxvideo_drv_111_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
+ vboxvideo_drv_111_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101100000
+@@ -297,7 +285,6 @@
+ #
+ # vboxvideo_drv_112
+ #
+-DLLS += vboxvideo_drv_112
+ vboxvideo_drv_112_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxvideo_drv_112_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
+ vboxvideo_drv_112_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101200000
+@@ -341,6 +328,23 @@
+ endif
+ 
+ 
++vboxvideo_drv_$(XSERVER_VERSION)_NAME := vboxvideo_drv
++vboxvideo_drv_$(XSERVER_VERSION)_INCS := \
++	/usr/include/xorg \
++	/usr/include/x11 \
++	/usr/include/pixman-1 \
++	/usr/include/X11/dri \
++	/usr/include/drm \
++	/usr/include/libdrm
++vboxvideo_drv_$(XSERVER_VERSION)_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
++DLLS += vboxvideo_drv_$(XSERVER_VERSION)
++
++# required for lenny backports
++ifeq ($(XSERVER_VERSION),14)
++	vboxvideo_drv_$(XSERVER_VERSION)_INCS += $(VBOX_PATH_X11_XORG_1_4)/xorg
++endif
++
++
+ # Check the undefined symbols in the X.Org modules against lists of allowed
+ # symbols.  Not very elegant, but it will catch problems early.
+ 
diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD
index a83e20ab4..3619c0c1b 100644
--- a/libre/virtualbox-libre/PKGBUILD
+++ b/libre/virtualbox-libre/PKGBUILD
@@ -13,7 +13,7 @@ pkgname=('virtualbox-libre'
          'virtualbox-libre-sdk'
          'virtualbox-libre-guest-utils')
 pkgver=4.2.10
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL' 'custom')
@@ -22,7 +22,7 @@ makedepends=('alsa-lib'
              'cdrkit'
              'curl'
              'dev86'
-             'gsoap'
+             'gsoap=2.8.11-1'
              'iasl'
              'jdk7-openjdk'
              'libidl2'
@@ -43,7 +43,7 @@ makedepends=('alsa-lib'
              'sdl'
              'sdl_ttf'
              'vde2'
-             'xalan-c')
+             'xalan-c' 'xorg-server-devel' 'xf86driproto' 'libxcomposite')
 [[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc')
 source=("http://download.virtualbox.org/virtualbox/$pkgver/VirtualBox-$pkgver.tar.bz2"
         '10-vboxdrv.rules'
@@ -53,6 +53,7 @@ source=("http://download.virtualbox.org/virtualbox/$pkgver/VirtualBox-$pkgver.ta
         'vboxweb.service'
         '001-vboxdrv-reference.patch'
         '002-change_default_driver_dir.patch'
+        '18-system-xorg.patch'
         'os_blag_64.png'
         'os_blag.png'
         'os_dragora_64.png'
@@ -81,6 +82,7 @@ md5sums=('99349df34caacdecbb7cf3908631c3f3'
          'bc9efed88e0469cd7fc460d5a5cd7b4b'
          'f4e4c7895ede9c524109589bf16ae660'
          '97e193f050574dd272a38e5ee5ebe62b'
+         '4da461f8c90caa123b47c62479f426b4'
          '8538dba8686d7449cb481c9bae9d722a'
          '545c925b46f2ac95e5f8ae407fad101a'
          'f6416f509c2e5460e4dc624e0a57f3c1'
@@ -183,7 +185,6 @@ package_virtualbox-libre() {
     cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin"
     install -dm755 "$pkgdir"/usr/{bin,lib/virtualbox/components,share/virtualbox/nls,share/virtualbox/rdesktop-vrdp-keymaps}
 
-
     #Binaries and Wrapper with Launchers
     install -m 0755 VBox.sh "$pkgdir/usr/bin/VBox"
 
@@ -315,7 +316,7 @@ package_virtualbox-libre-guest-utils(){
         "$pkgdir"/usr/bin/VBoxClient-all
     install -m755 -D "$srcdir"/VirtualBox-$pkgver/src/VBox/Additions/x11/Installer/vboxclient.desktop \
         "$pkgdir"/etc/xdg/autostart/vboxclient.desktop
-    install -D vboxvideo_drv_113.so \
+    install -D vboxvideo_drv.so \
         "$pkgdir/usr/lib/xorg/modules/drivers/vboxvideo.so"
     install -d "$pkgdir/usr/lib/xorg/modules/dri"
     install -m755 VBoxOGL*.so "$pkgdir/usr/lib"