virtualbox-ose: update to 4.1.10.

srcpkgs/virtualbox-ose/patches/18-system-xorg.patch

@@ -1,277 +0,0 @@
-Description: Build the X.Org driver only for the selected system X Server version.
-Author: Michael Meskes <meskes@debian.org>, Felix Geyer <debfx-pkg@fobos.de>
-
-diff --git a/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk b/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk
---- a/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk
-+++ b/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk
-@@ -40,8 +40,8 @@ LIBRARIES += \
- 	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 --git a/src/VBox/Additions/common/crOpenGL/Makefile.kmk b/src/VBox/Additions/common/crOpenGL/Makefile.kmk
---- a/src/VBox/Additions/common/crOpenGL/Makefile.kmk
-+++ b/src/VBox/Additions/common/crOpenGL/Makefile.kmk
-@@ -63,16 +63,12 @@ VBoxOGL_TEMPLATE       = VBOXCROGLR3GUESTDLL
- 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)/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 \
-+	/usr/include/libdrm
-  VBoxOGL_DEFS     += VBOX_NO_NATIVEGL
- endif
- 
-diff --git a/src/VBox/Additions/x11/Makefile.kmk b/src/VBox/Additions/x11/Makefile.kmk
---- a/src/VBox/Additions/x11/Makefile.kmk
-+++ b/src/VBox/Additions/x11/Makefile.kmk
-@@ -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 --git a/src/VBox/Additions/x11/vboxmouse/Makefile.kmk b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
---- a/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
-+++ b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
-@@ -23,7 +23,6 @@ include	$(KBUILD_PATH)/subheader.kmk
- # vboxmouse_drv
- #
- if1of ($(KBUILD_TARGET), linux)
-- SYSMODS += vboxmouse_drv
-  vboxmouse_drv_TEMPLATE = VBOXGUESTR3XF86MOD
-  vboxmouse_drv_DEFS.linux = linux
-  vboxmouse_drv_DEFS.x86 += __i386__
-@@ -59,7 +58,6 @@ endif
- #
- # 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
-@@ -80,7 +78,6 @@ vboxmouse_drv_70_SOURCES = \
- #
- # vboxmouse_drv_71
- #
--DLLS += vboxmouse_drv_71
- vboxmouse_drv_71_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxmouse_drv_71_DEFS := $(vboxmouse_drv_70_DEFS)
- vboxmouse_drv_71_INCS := \
-@@ -97,7 +94,6 @@ vboxmouse_drv_71_SOURCES = \
- #
- # 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 := \
-@@ -112,7 +108,6 @@ vboxmouse_drv_13_SOURCES = \
- #
- # 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 := \
-@@ -126,7 +121,6 @@ endif
- #
- # 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 := \
-@@ -141,7 +135,6 @@ vboxmouse_drv_15_SOURCES = \
- #
- # 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 := \
-@@ -157,7 +150,6 @@ vboxmouse_drv_16_SOURCES = \
- #
- # vboxmouse_drv_17
- #
--DLLS += vboxmouse_drv_17
- vboxmouse_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxmouse_drv_17_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
- ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
-@@ -177,7 +169,6 @@ vboxmouse_drv_17_SOURCES = \
- #
- # vboxmouse_drv_18
- #
--DLLS += vboxmouse_drv_18
- vboxmouse_drv_18_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxmouse_drv_18_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
- ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
-@@ -197,7 +188,6 @@ vboxmouse_drv_18_SOURCES = \
- #
- # vboxmouse_drv_19
- #
--DLLS += vboxmouse_drv_19
- 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
-@@ -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
- 
- 
-+vboxmouse_drv_$(XSERVER_VERSION)_NAME := vboxmouse_drv
-+vboxmouse_drv_$(XSERVER_VERSION)_INCS := \
-+	/usr/include/x11 \
-+	/usr/include/xorg \
-+	/usr/include/pixman-1
-+DLLS += vboxmouse_drv_$(XSERVER_VERSION)
-+
-+
- # Check the undefined symbols in the X.Org modules against lists of allowed
- # symbols.  Not very elegant, but it will catch problems early.
- ifdef VBOX_WITH_TESTCASES
-diff --git a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
---- a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
-+++ b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
-@@ -22,7 +22,6 @@ include	$(KBUILD_PATH)/subheader.kmk
- # vboxvideo_drv
- #
- if1of ($(KBUILD_TARGET), linux)
-- SYSMODS += vboxvideo_drv
- endif   # target linux
- vboxvideo_drv_TEMPLATE = VBOXGUESTR3XF86MOD
- vboxvideo_drv_DEFS.linux = linux
-@@ -89,7 +88,6 @@ endif   # target linux
- #         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 += \
-@@ -112,7 +110,6 @@ vboxvideo_drv_70_SOURCES  = $(vboxvideo_drv_SOURCES)
- #
- # 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_drv_70_DEFS)
-@@ -127,7 +124,6 @@ vboxvideo_drv_71_SOURCES  = $(vboxvideo_drv_SOURCES)
- #
- # 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_drv_70_DEFS) VBOXVIDEO_13
-@@ -146,7 +142,6 @@ vboxvideo_drv_13_SOURCES = \
- #
- # 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_drv_13_DEFS)
-@@ -165,7 +160,6 @@ vboxvideo_drv_14_SOURCES  = $(vboxvideo_drv_13_SOURCES)
- #
- # 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_drv_13_DEFS) NO_ANSIC PCIACCESS \
-@@ -192,7 +186,6 @@ endif
- #
- # 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_drv_15_DEFS)
-@@ -212,7 +205,6 @@ vboxvideo_drv_16_SOURCES := $(vboxvideo_drv_15_SOURCES)
- #
- # 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_drv_15_DEFS)
-@@ -239,7 +231,6 @@ vboxvideo_drv_17_SOURCES := $(vboxvideo_drv_15_SOURCES)
- #
- # 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_drv_15_DEFS)
-@@ -266,7 +257,6 @@ vboxvideo_drv_18_SOURCES := $(vboxvideo_drv_15_SOURCES)
- #
- # 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_drv_15_DEFS)
-@@ -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
-+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.
- ifdef VBOX_WITH_TESTCASES

srcpkgs/virtualbox-ose/patches/kernel_headers_path.diff

@@ -1,15 +0,0 @@
---- foo.orig/configure.orig	2010-12-22 14:24:16.536609268 +0100
-+++ foo/configure	2010-12-22 14:24:57.939796907 +0100
-@@ -139,11 +139,7 @@ QT4DIR_PKGCONFIG=1
- QT4UIC3DIR="/usr/bin"
- KBUILDDIR="`cd \`dirname $0\`; pwd`/kBuild"
- DEVDIR="`cd \`dirname $0\`; pwd`/tools"
--if [ -d "/lib/modules/`uname -r`/build" ]; then
-- LINUX="/lib/modules/`uname -r`/build"
--else
-- LINUX="/usr/src/linux"
--fi
-+LINUX="/lib/modules/@@XBPS_KERNHDRVER@@/build"
- KCHMVIEWER="kchmviewer"
- LOG="configure.log"
- CNF="AutoConfig.kmk"

srcpkgs/virtualbox-ose/patches/virtualbox-4-makeself-check.patch

@@ -1,10 +0,0 @@
---- foo.org/configure.orig
-+++ foo/configure
-@@ -2527,7 +2527,6 @@
-   check_compiler_h
-   [ "$BUILD_MACHINE" = "amd64" -a $WITH_VMMRAW -eq 1 ] && check_32bit
-   # tools/common/makeself*
--  [ $OSE -ge 1 ] && check_makeself
- fi
- 
- [ -n "$SETUP_WINE" ] && setup_wine

srcpkgs/virtualbox-ose/patches/virtualbox-4-mkisofs-check.patch

@@ -1,10 +0,0 @@
---- foo.orig/configure.orig
-+++ foo/configure
-@@ -2499,7 +2499,6 @@
- # don't check for yasm for the time beeing as 0.40 and 0.50 both have known bugs
- # [ "$OS" != "darwin" ] && check_yasm
- [ "$OS" != "darwin"  ] && check_xsltproc
--[ "$OS" != "darwin"  ] && check_mkisofs
- 
- # the libraries
- [ "$OS" != "darwin"  ] && check_pthread

srcpkgs/virtualbox-ose/template

@@ -1,15 +1,15 @@
 # Template file for 'virtualbox-ose'
 pkgname=virtualbox-ose
-_vbox_distver=4.1.8
+_vbox_distver=4.1.10
 version=${_vbox_distver}
+wrksrc="VirtualBox-${version}"
 patch_args="-Np1"
-wrksrc="VirtualBox-${version}_OSE"
 distfiles="http://download.virtualbox.org/virtualbox/$version/VirtualBox-$version.tar.bz2"
 short_desc="General-purpose full virtualizer for x86 hardware"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://virtualbox.org"
 license="GPL-2, MPL-1.1, CDDL"
-checksum=ef16d6729c9bcc298a33eff636549872dcfe291ac01bfa117cdf7aaf8a4004e0
+checksum=47e3faa607b405ea1d31e65a35984374e44f09f44a0f40607da6a773b31a57bf
 long_desc="
  VirtualBox is a free x86 virtualization solution allowing a wide range of x86
  operating systems such as Windows, DOS, BSD or Linux to run on a Linux system."
@@ -23,8 +23,10 @@ Add_dependency run ${pkgname}-dkms	">=${version}"
 Add_dependency run hicolor-icon-theme
 Add_dependency run desktop-file-utils
 
+Add_dependency build which
 Add_dependency build openssl-devel
 Add_dependency build libcurl-devel
+Add_dependency build libpng-devel
 Add_dependency build SDL-devel
 Add_dependency build qt-devel
 Add_dependency build libXext-devel
@@ -49,22 +51,19 @@ if [ "${XBPS_MACHINE}" = "x86_64" ]; then
 	Add_dependency build gcc-c++-multilib
 fi
 
-do_build()
+do_build() {
-{
+	local _khdrver=$($XBPS_PKGDB_CMD version kernel-headers)
-	_khdrver=$($XBPS_PKGDB_CMD version kernel-headers)
 
-	# Fix path for kernel-headers location.
+	cp ${FILESDIR}/LocalConfig.kmk .
-	sed -i -e "s|@@XBPS_KERNHDRVER@@|${_khdrver}|g" configure
+	./configure --disable-docs --disable-java --enable-vde \
-
+		--disable-python --disable-kmods \
-	# Build.
+		--nofatal --with-linux=/usr/src/kernel-headers-${_khdrver}
-	cp -f ${FILESDIR}/LocalConfig.kmk .
+	sed -i "s|/bin/pwd|/usr/bin/pwd|g" kBuild/env.sh
-	./configure --enable-vde --disable-java --disable-docs
 	source ./env.sh
 	kmk ${makejobs} all
 }
 
-do_install()
+do_install() {
-{
 	local f _osedir _guestdir
 
 	source ./env.sh

srcpkgs/virtualbox-ose/virtualbox-ose-guest.rshlibs

@@ -10,9 +10,7 @@ libc.so.6
 ld-linux-x86-64.so.2
 ld-linux.so.2
 libcrypt.so.1
-libstdc++.so.6
 libm.so.6
-libgcc_s.so.1
 libXcomposite.so.1
 libXdamage.so.1
 libXfixes.so.3

srcpkgs/virtualbox-ose/virtualbox-ose-guest.template

@@ -24,11 +24,10 @@ do_install()
 	install -Dm755 ${wrksrc}/src/VBox/Additions/x11/Installer/vboxclient.desktop \
 		${DESTDIR}/etc/xdg/autostart/vboxclient.desktop
 
-	cd ${wrksrc}/out/linux.$BUILD_PLATFORM_ARCH/release/bin
-	install -D vboxmouse_drv.so \
-		${DESTDIR}/usr/lib/xorg/modules/input/vboxmouse.so
 	cd ${wrksrc}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions
-	install -D vboxvideo_drv.so \
+	install -D vboxmouse_drv_16.so \
+		${DESTDIR}/usr/lib/xorg/modules/input/vboxmouse.so
+	install -D vboxvideo_drv_112.so \
 		${DESTDIR}/usr/lib/xorg/modules/drivers/vboxvideo.so
 	install -d ${DESTDIR}/usr/lib/xorg/modules/dri
 	install -m755 VBoxOGL*.so ${DESTDIR}/usr/lib

srcpkgs/virtualbox-ose/virtualbox-ose.rshlibs

@@ -18,7 +18,6 @@ libQtGui.so.4
 libX11.so.6
 libXmu.so.6
 libXext.so.6
-libpython2.7.so.1.0
 libXcursor.so.1
 libXt.so.6
 libXinerama.so.1