From 698917095a540c800596b0d37dcdfd73496d8723 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Thu, 1 Feb 2018 18:10:07 +0100
Subject: [vbox-src] build with X support (non-headless)

---
 core/modules/vbox-src/module.build       | 13 +++++++------
 core/modules/vbox-src/module.conf.ubuntu |  1 +
 2 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'core/modules/vbox-src')

diff --git a/core/modules/vbox-src/module.build b/core/modules/vbox-src/module.build
index 09e4aa1d..3fc739c3 100644
--- a/core/modules/vbox-src/module.build
+++ b/core/modules/vbox-src/module.build
@@ -10,28 +10,29 @@ fetch_source() {
 }
 
 build() {
+	[ -n "${KERNEL_HEADERS_DIR}" ] || perror "KERNEL_HEADERS_DIR not set, kernel module present?"
 	cd "${MODULE_WORK_DIR}/src/VirtualBox-${REQUIRED_VBOX_VERSION}" || \
 		perror "Could not cd to '${MODULE_WORK_DIR}/src/VirtualBox-${REQUIRED_VBOX_VERSION}'."
-	[ -n "${KERNEL_HEADERS_DIR}" ] || perror "KERNEL_HEADERS_DIR not set, kernel module present?"
+	local VBOX_BUILD_DIR="${MODULE_WORK_DIR}/src/VirtualBox-${REQUIRED_VBOX_VERSION}/build"
+	mkdir -p "$VBOX_BUILD_DIR" || perror "Failed to mkdir '$VBOX_BUILD_DIR'."
 	./configure \
 		--disable-docs				\
 		--disable-java				\
 		--disable-python			\
 		--disable-libvpx			\
-		--build-headless			\
 		--with-linux="${KERNEL_HEADERS_DIR}"	\
-		--out-path="${MODULE_BUILD_DIR}"	\
+		--out-path="${VBOX_BUILD_DIR}"	\
 			|| perror "'configure' failed."
 
 	# the configure script should have created a file called 'env.sh'
-	source "${MODULE_BUILD_DIR}/env.sh" || perror "Failed to source '${MODULE_BUILD_DIR}/env.sh'."
+	source "${VBOX_BUILD_DIR}/env.sh" || perror "Failed to source '${VBOX_BUILD_DIR}/env.sh'."
 	# copy the LocalConfig.kmk to the build dir to be more LSB-compliant
-	cp "${MODULE_DIR}/LocalConfig.kmk" "${MODULE_BUILD_DIR}" || \
+	cp "${MODULE_DIR}/LocalConfig.kmk" "${VBOX_BUILD_DIR}" || \
 		perror "Failed to cp LocalConfig.kmk to build dir"
 	kmk || perror "Failed to execute 'kmk'."
 
 	# check the generated build directory, use BUILD_PLATFORM_ARCH defined in env.sh
-	local VBOX_RELEASE_BUILD_DIR="${MODULE_BUILD_DIR}/linux.${BUILD_PLATFORM_ARCH}/release"
+	local VBOX_RELEASE_BUILD_DIR="${VBOX_BUILD_DIR}/linux.${BUILD_PLATFORM_ARCH}/release"
 	[ -d "${VBOX_RELEASE_BUILD_DIR}" ] || \
 		perror "No release build dir found under '${VBOX_RELEASE_BUILD_DIR}'. Build failed?"
 
diff --git a/core/modules/vbox-src/module.conf.ubuntu b/core/modules/vbox-src/module.conf.ubuntu
index 477eb8a9..2b9145b2 100644
--- a/core/modules/vbox-src/module.conf.ubuntu
+++ b/core/modules/vbox-src/module.conf.ubuntu
@@ -7,6 +7,7 @@ REQUIRED_INSTALLED_PACKAGES="
 	libsdl1.2-dev
 	libxml2-dev
 	libxmu-dev
+	libxcursor-dev
 	libxinerama-dev
 	libxrandr-dev
 "
-- 
cgit v1.2.3-55-g7522