testing/xf86-video-virtualbox: add some fixes for musl

but those are not all

5 files changed, 78 insertions, 11 deletions

diff --git a/testing/xf86-video-virtualbox/APKBUILD b/testing/xf86-video-virtualbox/APKBUILD
index ea1761d8e1..a87c439903 100644
--- a/testing/xf86-video-virtualbox/APKBUILD
+++ b/testing/xf86-video-virtualbox/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-virtualbox
 pkgdesc="Xorg Virtual box video driver"
-pkgver=4.3.6
+pkgver=4.3.8
 _ver=${pkgver/_rc/_RC}
 pkgrel=0
 arch="all"
@@ -15,10 +15,11 @@ makedepends="
 source="http://download.virtualbox.org/virtualbox/$_ver/VirtualBox-$_ver.tar.bz2
 	uclibc-gnu_linux.patch
 	futimens.patch
-	uclibc-spawn.patch
 	xf86-video-virtualbox-4-makeself-check.patch
+	musl-no-glibc.patch
 	LocalConfig.kmk
 	"
+#	uclibc-spawn.patch
 
 _builddir="$srcdir/VirtualBox-${_ver}"
 
@@ -64,21 +65,21 @@ package() {
 		"$pkgdir"/usr/lib/xorg/modules/drivers/vboxvideo_drv.so
 }
 
-md5sums="4bc874039f169215152fb40ca5062784  VirtualBox-4.3.6.tar.bz2
+md5sums="422ab09b7eb9c0564b55a6a0a6e6678f  VirtualBox-4.3.8.tar.bz2
 072ee2114b3771e7bdbff5211f342755  uclibc-gnu_linux.patch
 10f65154d3ff17d88fad5ed384e20276  futimens.patch
-cbf8efac5a1bfc3ac7c97f875b03e678  uclibc-spawn.patch
 44efb3c4be214daa453a317d527f1f30  xf86-video-virtualbox-4-makeself-check.patch
-c9eeb26fa65a0cf2c086a724cded4932  LocalConfig.kmk"
-sha256sums="c547e1e32e0b06fba9ee4ca7842f8ddee8e94c64aab17c2b0d0793f0caccbb27  VirtualBox-4.3.6.tar.bz2
+a66c27f91349d9c9ae8304905b855fd6  musl-no-glibc.patch
+eedb57172f97829c2ad53fdb970a1c68  LocalConfig.kmk"
+sha256sums="ffabd8735bdc80753cec29d01b499769f41e083f37a3f58b3055f19d3b1b9641  VirtualBox-4.3.8.tar.bz2
 1bf547f849bf325e443f74ce7fbfb3657d9b2918b4c888efac304eac929a0fae  uclibc-gnu_linux.patch
 deaa739129ec23a05d5aa43ad8af3e93086ca340696fde3e5d1539e1c7347adb  futimens.patch
-3f7dc48be48e22357ae5e22387bc1799365732b32e44bb931fb18a17ebc68084  uclibc-spawn.patch
 31ddafbeef6d35696d76de06988412f888fd5403854952bb00ceab99f5ed4966  xf86-video-virtualbox-4-makeself-check.patch
-cb8fa480b7d7be939a24bf7dd860d8cb9a90a203c416c0dbc74fab1231a9a2eb  LocalConfig.kmk"
-sha512sums="8cb540a825afa5f6069ad2bb155e825af4a222f6d20c5e653bf6bbbb07dfbc4d122640da5f249b72f1aa34f8afd92ef41c525911db30090a2d108b9609da4a38  VirtualBox-4.3.6.tar.bz2
+3f1c59fbd4e9fb2a6d2777c9f5979735fe77cd564293bde1edb3017255e5b164  musl-no-glibc.patch
+5ec9b53a113af1c37edf320be8a2f5f688b4afce7c5a065d785bea8c95645d8b  LocalConfig.kmk"
+sha512sums="0bc00254733befee6ba864b9c88e0ddedb5949fff884313b72bbedeaefb572fd129a8d16b179612acef9b53fc3d2203ac775656d6c941d94a77bb944fdd66903  VirtualBox-4.3.8.tar.bz2
 d2bba9de80c40bc258b025a8e3395a4b0b7781d70d5528993f0fff57e9fc015306b483d4da14e22aed3f188ffda8685aa51e13943f48c17ae18a2a66d15d7bbb  uclibc-gnu_linux.patch
 1da850bc30399ecde501eba5403ef1add1ae108d38394b01cd7f5cdf0462b855793d564d3adc1f770983b36529d77f3f7b0269fb65152468084a0a44c38e1638  futimens.patch
-626953a557c1ae81047ed04a9909fc11c588dc7c1f7cd20b9f8917624cba7e53bd1c16825e361600980a4c85f0aab9cc2561d695b232cb02783cdb16573858f9  uclibc-spawn.patch
 7f60a857213b1b045247f5a041ebed60099f0f634b7d843bd85062eb4cf8504e8d5907b43df852dc49465248e2cbe3d998acefeb676113ca9a38e72da6d926a7  xf86-video-virtualbox-4-makeself-check.patch
-d3e587ab4f08970065f847f48da4dc97e7b1f7a81b5efb7aa4df17f3f0927749e9672154bc97ed205907d57e6c2761ce7dd2a1a4776f3d8409d7e147cb079a43  LocalConfig.kmk"
+d79032d0a7a098e5e63c9a11cce278322cc2ecd75a996dc11096a738d43cecc84abb5de25b32b4409164d08a77541bcc00a53e7e62624880756c7e8fb238b447  musl-no-glibc.patch
+a126ef0182caca3fcbe5d12947cd63a6a729280127f5ead874b5ae0d1fe5f3aadd538b639bfd0d738f95048c25027761f47374e91b585b78e1d5a65ec98a5c23  LocalConfig.kmk"
diff --git a/testing/xf86-video-virtualbox/LocalConfig.kmk b/testing/xf86-video-virtualbox/LocalConfig.kmk
index 788faa240b..ce47ec7854 100644
--- a/testing/xf86-video-virtualbox/LocalConfig.kmk
+++ b/testing/xf86-video-virtualbox/LocalConfig.kmk
@@ -1,5 +1,6 @@
 VBOX_WITH_TESTCASES     :=
 VBOX_WITH_TESTSUITE     :=
+VBOX_GCC_WERR		:=
 
 KBUILD_MSG_STYLE        := brief
 
diff --git a/testing/xf86-video-virtualbox/musl-fix-headers.patch b/testing/xf86-video-virtualbox/musl-fix-headers.patch
new file mode 100644
index 0000000000..8eaa63c1f8
--- /dev/null
+++ b/testing/xf86-video-virtualbox/musl-fix-headers.patch
@@ -0,0 +1,10 @@
+--- ./src/VBox/Runtime/r3/linux/sysfs.cpp.orig
++++ ./src/VBox/Runtime/r3/linux/sysfs.cpp
+@@ -40,7 +40,6 @@
+ 
+ #include <unistd.h>
+ #include <stdio.h>
+-#include <sys/sysctl.h>
+ #include <sys/stat.h>
+ #include <sys/fcntl.h>
+ #include <errno.h>
diff --git a/testing/xf86-video-virtualbox/musl-no-glibc.patch b/testing/xf86-video-virtualbox/musl-no-glibc.patch
new file mode 100644
index 0000000000..65372f5d9d
--- /dev/null
+++ b/testing/xf86-video-virtualbox/musl-no-glibc.patch
@@ -0,0 +1,23 @@
+--- ./src/VBox/Runtime/r3/linux/thread-affinity-linux.cpp.orig
++++ ./src/VBox/Runtime/r3/linux/thread-affinity-linux.cpp
+@@ -32,6 +32,8 @@
+ # define _GNU_SOURCE
+ #endif
+ #include <features.h>
++
++#if defined(__GLIBC__)
+ #if __GLIBC_PREREQ(2,4)
+ 
+ #include <sched.h>
+@@ -87,6 +89,11 @@
+ 
+     return VINF_SUCCESS;
+ }
++
++#else
++# include "../../generic/RTThreadGetAffinity-stub-generic.cpp"
++# include "../../generic/RTThreadSetAffinity-stub-generic.cpp"
++#endif
+ 
+ #else
+ # include "../../generic/RTThreadGetAffinity-stub-generic.cpp"
diff --git a/testing/xf86-video-virtualbox/musl-sched_yield.patch b/testing/xf86-video-virtualbox/musl-sched_yield.patch
new file mode 100644
index 0000000000..08ca79cb9b
--- /dev/null
+++ b/testing/xf86-video-virtualbox/musl-sched_yield.patch
@@ -0,0 +1,32 @@
+--- ./src/VBox/Runtime/r3/posix/thread2-posix.cpp.orig
++++ ./src/VBox/Runtime/r3/posix/thread2-posix.cpp
+@@ -66,7 +66,7 @@
+ #elif defined(RT_OS_SOLARIS) || defined(RT_OS_HAIKU)
+         sched_yield();
+ #else
+-        if (!pthread_yield())
++        if (!sched_yield())
+ #endif
+         {
+             LogFlow(("RTThreadSleep: returning %Rrc (cMillies=%d)\n", VINF_SUCCESS, cMillies));
+@@ -105,7 +105,7 @@
+ #elif defined(RT_OS_SOLARIS) || defined(RT_OS_HAIKU)
+         sched_yield();
+ #else
+-        if (!pthread_yield())
++        if (!sched_yield())
+ #endif
+             return VINF_SUCCESS;
+     }
+@@ -131,10 +131,8 @@
+ #endif
+ #ifdef RT_OS_DARWIN
+     pthread_yield_np();
+-#elif defined(RT_OS_SOLARIS) || defined(RT_OS_HAIKU)
+-    sched_yield();
+ #else
+-    pthread_yield();
++    sched_yield();
+ #endif
+ #if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
+     u64TS = ASMReadTSC() - u64TS;