Bump to 6.1.12 and rework build to avoid compiling the GAs

3 files changed, 11 insertions, 61 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c6e21bce51bf..d38bb3f4060d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = virtualbox-guest-dkms-vmsvga
 	pkgdesc = VirtualBox Guest kernel modules sources (VMSVGA resize and multi-head fix)
-	pkgver = 6.1.10
-	pkgrel = 4
+	pkgver = 6.1.12
+	pkgrel = 1
 	url = https://virtualbox.org/
 	arch = x86_64
 	license = GPL
@@ -17,12 +17,10 @@ pkgbase = virtualbox-guest-dkms-vmsvga
 	conflicts = virtualbox-archlinux-source
 	conflicts = virtualbox-guest-dkms
 	conflicts = virtualbox-guest-source
-	source = https://download.virtualbox.org/virtualbox/6.1.10/VirtualBox-6.1.10.tar.bz2
-	source = LocalConfig.kmk
+	source = https://download.virtualbox.org/virtualbox/6.1.12/VirtualBox-6.1.12.tar.bz2
 	source = vboxvmsvga.desktop
 	source = virtualbox-guest-dkms-vmsvga.conf
-	sha256sums = 37d8b30c0be82a50c858f3fc70cde967882239b6212bb32e138d3615b423c477
-	sha256sums = 2be313b98bffde482aad93b00c419f1d5f7645fd9e6053175ffb0d925067f96a
+	sha256sums = 05eff0321daa72f6d00fb121a6b4211f39964778823806fa0b7b751667dec362
 	sha256sums = 4404a95eb6f5c30683625e870fe7a26e562200c2220728d0c14151dbf9667e36
 	sha256sums = edd0492f0706e03169cdf3654658ea650687c30967ca5e32fde19d43e3dd4e5e
 
diff --git a/LocalConfig.kmk b/LocalConfig.kmk
deleted file mode 100644
index b413859931a9..000000000000
--- a/LocalConfig.kmk
+++ /dev/null
@@ -1,36 +0,0 @@
-# do not build test cases
-VBOX_WITH_TESTCASES :=
-VBOX_WITH_TESTSUITE :=
-VBOX_WITH_VALIDATIONKIT :=
-
-# no legacy X.org - use KMS
-VBOX_USE_SYSTEM_XORG_HEADERS = 1
-VBOX_NO_LEGACY_XORG_X11 = 1
-
-# archlinux path
-VBOX_WITH_ORIGIN :=
-VBOX_PATH_APP_PRIVATE_ARCH := /usr/lib/virtualbox
-VBOX_PATH_SHARED_LIBS := $(VBOX_PATH_APP_PRIVATE_ARCH)
-VBOX_WITH_RUNPATH := $(VBOX_PATH_APP_PRIVATE_ARCH)
-VBOX_PATH_APP_PRIVATE := /usr/share/virtualbox
-VBOX_PATH_APP_DOCS := /usr/share/doc/virtualbox
-VBOX_PATH_PACKAGE_DOCS := $(VBOX_PATH_APP_DOCS)
-VBOX_BLD_PYTHON = python
-VBOX_JAVA_HOME = /usr/lib/jvm/java-7-openjdk
-
-# do not fail on warning
-VBOX_GCC_WERR =
-VBOX_GCC_WARN =
-
-# fix gsoap missing zlib include and produce errors with --as-needed
-VBOX_GSOAP_CXX_LIBS := gsoapssl++ z
-
-# use system xorg and gl headers
-VBOX_USE_SYSTEM_XORG_HEADERS = 1
-VBOX_USE_SYSTEM_GL_HEADERS = 1
-
-# no update request. update are handled via pacman
-VBOX_WITH_UPDATE_REQUEST := 0
-
-# build shared library
-VBOX_GUI_WITH_SHARED_LIBRARY = 1
diff --git a/PKGBUILD b/PKGBUILD
index b0c52e2ad151..8b743ad022f0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: William Turner <willtur.will@gmail.com>
 
 pkgname=virtualbox-guest-dkms-vmsvga
-pkgver=6.1.10
-pkgrel=4
+pkgver=6.1.12
+pkgrel=1
 pkgdesc='VirtualBox Guest kernel modules sources (VMSVGA resize and multi-head fix)'
 arch=('x86_64')
 url='https://virtualbox.org/'
@@ -16,21 +16,12 @@ conflicts=('virtualbox-archlinux-source'
            'virtualbox-guest-dkms'
            'virtualbox-guest-source')
 source=("https://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2"
-        'LocalConfig.kmk'
         'vboxvmsvga.desktop'
         'virtualbox-guest-dkms-vmsvga.conf')
-sha256sums=('37d8b30c0be82a50c858f3fc70cde967882239b6212bb32e138d3615b423c477'
-            '2be313b98bffde482aad93b00c419f1d5f7645fd9e6053175ffb0d925067f96a'
+sha256sums=('05eff0321daa72f6d00fb121a6b4211f39964778823806fa0b7b751667dec362'
             '4404a95eb6f5c30683625e870fe7a26e562200c2220728d0c14151dbf9667e36'
             'edd0492f0706e03169cdf3654658ea650687c30967ca5e32fde19d43e3dd4e5e')
 
-prepare() {
-  cd "VirtualBox-$pkgver"
-
-  cp "$srcdir/LocalConfig.kmk" .
-  echo "VBOX_GCC_OPT=$CXXFLAGS" >> LocalConfig.kmk
-}
-
 build() {
   cd "VirtualBox-$pkgver"
 
@@ -39,18 +30,15 @@ build() {
     --only-additions \
     --disable-kmods \
     --with-makeself=/usr/bin/echo
-
-  source ./env.sh
-  kmk
 }
 
 package() {
-  source "VirtualBox-$pkgver/env.sh"
-  cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions"
+  cd "VirtualBox-$pkgver"
+
+  source ./env.sh
 
   # dkms modules
-  install -d -m0755 "$pkgdir/usr/src"
-  cp -r src "$pkgdir/usr/src/vboxguest-${pkgver}_OSE"
+  src/VBox/Additions/linux/export_modules.sh --folder "$pkgdir/usr/src/vboxguest-${pkgver}_OSE"
   echo 'obj-m = vboxguest/ vboxsf/ vboxvideo/' > "$pkgdir/usr/src/vboxguest-${pkgver}_OSE/Makefile"
   sed "s/@VERSION@/$pkgver/" "$srcdir/$pkgname.conf" > "$pkgdir/usr/src/vboxguest-${pkgver}_OSE/dkms.conf"