diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2014-06-03 11:40:42 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2014-06-03 11:40:42 +0000 |
commit | 6fa5539d2b47239c5829fc6a3631fa8d9fc7f677 (patch) | |
tree | 4cf0cc0f09736838820415d1296d8f5590ea16e9 | |
parent | d4713623ebb976a3b8b04b54370d575507adb998 (diff) | |
download | alpine_aports-6fa5539d2b47239c5829fc6a3631fa8d9fc7f677.tar.bz2 alpine_aports-6fa5539d2b47239c5829fc6a3631fa8d9fc7f677.tar.xz alpine_aports-6fa5539d2b47239c5829fc6a3631fa8d9fc7f677.zip |
testing/xf86-video-virtualbox: add some fixes for musl
but those are not all
-rw-r--r-- | testing/xf86-video-virtualbox/APKBUILD | 23 | ||||
-rw-r--r-- | testing/xf86-video-virtualbox/LocalConfig.kmk | 1 | ||||
-rw-r--r-- | testing/xf86-video-virtualbox/musl-fix-headers.patch | 10 | ||||
-rw-r--r-- | testing/xf86-video-virtualbox/musl-no-glibc.patch | 23 | ||||
-rw-r--r-- | testing/xf86-video-virtualbox/musl-sched_yield.patch | 32 |
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 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=xf86-video-virtualbox | 2 | pkgname=xf86-video-virtualbox |
3 | pkgdesc="Xorg Virtual box video driver" | 3 | pkgdesc="Xorg Virtual box video driver" |
4 | pkgver=4.3.6 | 4 | pkgver=4.3.8 |
5 | _ver=${pkgver/_rc/_RC} | 5 | _ver=${pkgver/_rc/_RC} |
6 | pkgrel=0 | 6 | pkgrel=0 |
7 | arch="all" | 7 | arch="all" |
@@ -15,10 +15,11 @@ makedepends=" | |||
15 | source="http://download.virtualbox.org/virtualbox/$_ver/VirtualBox-$_ver.tar.bz2 | 15 | source="http://download.virtualbox.org/virtualbox/$_ver/VirtualBox-$_ver.tar.bz2 |
16 | uclibc-gnu_linux.patch | 16 | uclibc-gnu_linux.patch |
17 | futimens.patch | 17 | futimens.patch |
18 | uclibc-spawn.patch | ||
19 | xf86-video-virtualbox-4-makeself-check.patch | 18 | xf86-video-virtualbox-4-makeself-check.patch |
19 | musl-no-glibc.patch | ||
20 | LocalConfig.kmk | 20 | LocalConfig.kmk |
21 | " | 21 | " |
22 | # uclibc-spawn.patch | ||
22 | 23 | ||
23 | _builddir="$srcdir/VirtualBox-${_ver}" | 24 | _builddir="$srcdir/VirtualBox-${_ver}" |
24 | 25 | ||
@@ -64,21 +65,21 @@ package() { | |||
64 | "$pkgdir"/usr/lib/xorg/modules/drivers/vboxvideo_drv.so | 65 | "$pkgdir"/usr/lib/xorg/modules/drivers/vboxvideo_drv.so |
65 | } | 66 | } |
66 | 67 | ||
67 | md5sums="4bc874039f169215152fb40ca5062784 VirtualBox-4.3.6.tar.bz2 | 68 | md5sums="422ab09b7eb9c0564b55a6a0a6e6678f VirtualBox-4.3.8.tar.bz2 |
68 | 072ee2114b3771e7bdbff5211f342755 uclibc-gnu_linux.patch | 69 | 072ee2114b3771e7bdbff5211f342755 uclibc-gnu_linux.patch |
69 | 10f65154d3ff17d88fad5ed384e20276 futimens.patch | 70 | 10f65154d3ff17d88fad5ed384e20276 futimens.patch |
70 | cbf8efac5a1bfc3ac7c97f875b03e678 uclibc-spawn.patch | ||
71 | 44efb3c4be214daa453a317d527f1f30 xf86-video-virtualbox-4-makeself-check.patch | 71 | 44efb3c4be214daa453a317d527f1f30 xf86-video-virtualbox-4-makeself-check.patch |
72 | c9eeb26fa65a0cf2c086a724cded4932 LocalConfig.kmk" | 72 | a66c27f91349d9c9ae8304905b855fd6 musl-no-glibc.patch |
73 | sha256sums="c547e1e32e0b06fba9ee4ca7842f8ddee8e94c64aab17c2b0d0793f0caccbb27 VirtualBox-4.3.6.tar.bz2 | 73 | eedb57172f97829c2ad53fdb970a1c68 LocalConfig.kmk" |
74 | sha256sums="ffabd8735bdc80753cec29d01b499769f41e083f37a3f58b3055f19d3b1b9641 VirtualBox-4.3.8.tar.bz2 | ||
74 | 1bf547f849bf325e443f74ce7fbfb3657d9b2918b4c888efac304eac929a0fae uclibc-gnu_linux.patch | 75 | 1bf547f849bf325e443f74ce7fbfb3657d9b2918b4c888efac304eac929a0fae uclibc-gnu_linux.patch |
75 | deaa739129ec23a05d5aa43ad8af3e93086ca340696fde3e5d1539e1c7347adb futimens.patch | 76 | deaa739129ec23a05d5aa43ad8af3e93086ca340696fde3e5d1539e1c7347adb futimens.patch |
76 | 3f7dc48be48e22357ae5e22387bc1799365732b32e44bb931fb18a17ebc68084 uclibc-spawn.patch | ||
77 | 31ddafbeef6d35696d76de06988412f888fd5403854952bb00ceab99f5ed4966 xf86-video-virtualbox-4-makeself-check.patch | 77 | 31ddafbeef6d35696d76de06988412f888fd5403854952bb00ceab99f5ed4966 xf86-video-virtualbox-4-makeself-check.patch |
78 | cb8fa480b7d7be939a24bf7dd860d8cb9a90a203c416c0dbc74fab1231a9a2eb LocalConfig.kmk" | 78 | 3f1c59fbd4e9fb2a6d2777c9f5979735fe77cd564293bde1edb3017255e5b164 musl-no-glibc.patch |
79 | sha512sums="8cb540a825afa5f6069ad2bb155e825af4a222f6d20c5e653bf6bbbb07dfbc4d122640da5f249b72f1aa34f8afd92ef41c525911db30090a2d108b9609da4a38 VirtualBox-4.3.6.tar.bz2 | 79 | 5ec9b53a113af1c37edf320be8a2f5f688b4afce7c5a065d785bea8c95645d8b LocalConfig.kmk" |
80 | sha512sums="0bc00254733befee6ba864b9c88e0ddedb5949fff884313b72bbedeaefb572fd129a8d16b179612acef9b53fc3d2203ac775656d6c941d94a77bb944fdd66903 VirtualBox-4.3.8.tar.bz2 | ||
80 | d2bba9de80c40bc258b025a8e3395a4b0b7781d70d5528993f0fff57e9fc015306b483d4da14e22aed3f188ffda8685aa51e13943f48c17ae18a2a66d15d7bbb uclibc-gnu_linux.patch | 81 | d2bba9de80c40bc258b025a8e3395a4b0b7781d70d5528993f0fff57e9fc015306b483d4da14e22aed3f188ffda8685aa51e13943f48c17ae18a2a66d15d7bbb uclibc-gnu_linux.patch |
81 | 1da850bc30399ecde501eba5403ef1add1ae108d38394b01cd7f5cdf0462b855793d564d3adc1f770983b36529d77f3f7b0269fb65152468084a0a44c38e1638 futimens.patch | 82 | 1da850bc30399ecde501eba5403ef1add1ae108d38394b01cd7f5cdf0462b855793d564d3adc1f770983b36529d77f3f7b0269fb65152468084a0a44c38e1638 futimens.patch |
82 | 626953a557c1ae81047ed04a9909fc11c588dc7c1f7cd20b9f8917624cba7e53bd1c16825e361600980a4c85f0aab9cc2561d695b232cb02783cdb16573858f9 uclibc-spawn.patch | ||
83 | 7f60a857213b1b045247f5a041ebed60099f0f634b7d843bd85062eb4cf8504e8d5907b43df852dc49465248e2cbe3d998acefeb676113ca9a38e72da6d926a7 xf86-video-virtualbox-4-makeself-check.patch | 83 | 7f60a857213b1b045247f5a041ebed60099f0f634b7d843bd85062eb4cf8504e8d5907b43df852dc49465248e2cbe3d998acefeb676113ca9a38e72da6d926a7 xf86-video-virtualbox-4-makeself-check.patch |
84 | d3e587ab4f08970065f847f48da4dc97e7b1f7a81b5efb7aa4df17f3f0927749e9672154bc97ed205907d57e6c2761ce7dd2a1a4776f3d8409d7e147cb079a43 LocalConfig.kmk" | 84 | d79032d0a7a098e5e63c9a11cce278322cc2ecd75a996dc11096a738d43cecc84abb5de25b32b4409164d08a77541bcc00a53e7e62624880756c7e8fb238b447 musl-no-glibc.patch |
85 | 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 @@ | |||
1 | VBOX_WITH_TESTCASES := | 1 | VBOX_WITH_TESTCASES := |
2 | VBOX_WITH_TESTSUITE := | 2 | VBOX_WITH_TESTSUITE := |
3 | VBOX_GCC_WERR := | ||
3 | 4 | ||
4 | KBUILD_MSG_STYLE := brief | 5 | KBUILD_MSG_STYLE := brief |
5 | 6 | ||
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 @@ | |||
1 | --- ./src/VBox/Runtime/r3/linux/sysfs.cpp.orig | ||
2 | +++ ./src/VBox/Runtime/r3/linux/sysfs.cpp | ||
3 | @@ -40,7 +40,6 @@ | ||
4 | |||
5 | #include <unistd.h> | ||
6 | #include <stdio.h> | ||
7 | -#include <sys/sysctl.h> | ||
8 | #include <sys/stat.h> | ||
9 | #include <sys/fcntl.h> | ||
10 | #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 @@ | |||
1 | --- ./src/VBox/Runtime/r3/linux/thread-affinity-linux.cpp.orig | ||
2 | +++ ./src/VBox/Runtime/r3/linux/thread-affinity-linux.cpp | ||
3 | @@ -32,6 +32,8 @@ | ||
4 | # define _GNU_SOURCE | ||
5 | #endif | ||
6 | #include <features.h> | ||
7 | + | ||
8 | +#if defined(__GLIBC__) | ||
9 | #if __GLIBC_PREREQ(2,4) | ||
10 | |||
11 | #include <sched.h> | ||
12 | @@ -87,6 +89,11 @@ | ||
13 | |||
14 | return VINF_SUCCESS; | ||
15 | } | ||
16 | + | ||
17 | +#else | ||
18 | +# include "../../generic/RTThreadGetAffinity-stub-generic.cpp" | ||
19 | +# include "../../generic/RTThreadSetAffinity-stub-generic.cpp" | ||
20 | +#endif | ||
21 | |||
22 | #else | ||
23 | # 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 @@ | |||
1 | --- ./src/VBox/Runtime/r3/posix/thread2-posix.cpp.orig | ||
2 | +++ ./src/VBox/Runtime/r3/posix/thread2-posix.cpp | ||
3 | @@ -66,7 +66,7 @@ | ||
4 | #elif defined(RT_OS_SOLARIS) || defined(RT_OS_HAIKU) | ||
5 | sched_yield(); | ||
6 | #else | ||
7 | - if (!pthread_yield()) | ||
8 | + if (!sched_yield()) | ||
9 | #endif | ||
10 | { | ||
11 | LogFlow(("RTThreadSleep: returning %Rrc (cMillies=%d)\n", VINF_SUCCESS, cMillies)); | ||
12 | @@ -105,7 +105,7 @@ | ||
13 | #elif defined(RT_OS_SOLARIS) || defined(RT_OS_HAIKU) | ||
14 | sched_yield(); | ||
15 | #else | ||
16 | - if (!pthread_yield()) | ||
17 | + if (!sched_yield()) | ||
18 | #endif | ||
19 | return VINF_SUCCESS; | ||
20 | } | ||
21 | @@ -131,10 +131,8 @@ | ||
22 | #endif | ||
23 | #ifdef RT_OS_DARWIN | ||
24 | pthread_yield_np(); | ||
25 | -#elif defined(RT_OS_SOLARIS) || defined(RT_OS_HAIKU) | ||
26 | - sched_yield(); | ||
27 | #else | ||
28 | - pthread_yield(); | ||
29 | + sched_yield(); | ||
30 | #endif | ||
31 | #if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86) | ||
32 | u64TS = ASMReadTSC() - u64TS; | ||