11 files changed, 368 insertions, 28 deletions
diff --git a/user/ffmpeg/APKBUILD b/user/ffmpeg/APKBUILD
index 6d6c0627b..acc4cedd9 100644
--- a/user/ffmpeg/APKBUILD
+++ b/user/ffmpeg/APKBUILD
@@ -3,8 +3,8 @@
 # Contributor: Jakub Skrzypnik <j.skrzypnik@openmailbox.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=ffmpeg
-pkgver=4.1
-pkgrel=1
+pkgver=4.1.1
+pkgrel=0
 pkgdesc="Record, convert, and stream audio and video"
 url="https://ffmpeg.org/"
 arch="all"
@@ -101,5 +101,5 @@ libs() {
 	mv "$pkgdir"/usr/lib "$subpkgdir"/usr/
 }
 
-sha512sums="59db7e8a6238048c04c3b0bd5885aea2bf7951f79949fc0659a8d235c4cd809ac0c1a74544a4c218a38c8c739eea76f5ee1231bfb96439487212c6e65591780e  ffmpeg-4.1.tar.xz
+sha512sums="fe72680f1e4ca0b226199d1407803e1de11f00f5a88a23251182172cda4a7369cf1826c4ef86230bf60b0f9ff0d69382da5eeec26574a31eacd9935cf4eeb86f  ffmpeg-4.1.1.tar.xz
 32652e18d4eb231a2e32ad1cacffdf33264aac9d459e0e2e6dd91484fced4e1ca5a62886057b1f0b4b1589c014bbe793d17c78adbaffec195f9a75733b5b18cb  0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch"
diff --git a/user/gpgme/1.12.0-fix-t-tofuinfo.patch b/user/gpgme/1.12.0-fix-t-tofuinfo.patch
new file mode 100644
index 000000000..74ba11050
--- /dev/null
+++ b/user/gpgme/1.12.0-fix-t-tofuinfo.patch
@@ -0,0 +1,100 @@
+From 66376f3e206a1aa791d712fb8577bb3490268f60 Mon Sep 17 00:00:00 2001
+From: Andre Heinecke <aheinecke@gnupg.org>
+Date: Wed, 9 Jan 2019 08:25:21 +0100
+Subject: [PATCH] qt: Use tofu conflict test keys without expiry
+
+* lang/qt/tests/t-tofuinfo.cpp: Use new test keys without
+expiry.
+
+--
+The old keys expired on 2019-01-06.
+
+GnuPG-Bug-Id: T3815
+---
+ lang/qt/tests/t-tofuinfo.cpp | 58 +++++++++++++++++++-----------------
+ 1 file changed, 30 insertions(+), 28 deletions(-)
+
+diff --git a/lang/qt/tests/t-tofuinfo.cpp b/lang/qt/tests/t-tofuinfo.cpp
+index b7161028..2d881069 100644
+--- a/lang/qt/tests/t-tofuinfo.cpp
++++ b/lang/qt/tests/t-tofuinfo.cpp
+@@ -69,46 +69,48 @@ static const char testMsg1[] =
+ 
+ static const char conflictKey1[] = "-----BEGIN PGP PUBLIC KEY BLOCK-----\n"
+ "\n"
+-"mDMEWG+w/hYJKwYBBAHaRw8BAQdAiq1oStvDYg8ZfFs5DgisYJo8dJxD+C/AA21O\n"
+-"K/aif0O0GXRvZnVfY29uZmxpY3RAZXhhbXBsZS5jb22IlgQTFggAPhYhBHoJBLaV\n"
+-"DamYAgoa1L5BwMOl/x88BQJYb7D+AhsDBQkDwmcABQsJCAcCBhUICQoLAgQWAgMB\n"
+-"Ah4BAheAAAoJEL5BwMOl/x88GvwA/0SxkbLyAcshGm2PRrPsFQsSVAfwaSYFVmS2\n"
+-"cMVIw1PfAQDclRH1Z4MpufK07ju4qI33o4s0UFpVRBuSxt7A4P2ZD7g4BFhvsP4S\n"
+-"CisGAQQBl1UBBQEBB0AmVrgaDNJ7K2BSalsRo2EkRJjHGqnp5bBB0tapnF81CQMB\n"
+-"CAeIeAQYFggAIBYhBHoJBLaVDamYAgoa1L5BwMOl/x88BQJYb7D+AhsMAAoJEL5B\n"
+-"wMOl/x88OR0BAMq4/vmJUORRTmzjHcv/DDrQB030DSq666rlckGIKTShAPoDXM9N\n"
+-"0gZK+YzvrinSKZXHmn0aSwmC1/hyPybJPEljBw==\n"
+-"=p2Oj\n"
++"mDMEXDWgpxYJKwYBBAHaRw8BAQdAguVu4qkx8iw4eU+TQ4vvcKG7IdcZvbMhw3Zc\n"
++"npGf0+u0GXRvZnVfY29uZmxpY3RAZXhhbXBsZS5jb22IkAQTFggAOBYhBO6ovNDG\n"
++"nLzbR1TlMJYJ0fjlWbUrBQJcNaCnAhsDBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheA\n"
++"AAoJEJYJ0fjlWbUrLaMBALegwkv2+sEcmKZqxt8JscYvFiEuycv2+rKHaZA0eDoN\n"
++"AP97W4XrJb5x49J5jDDdeko8k00uGqiiuAXJo27/i/phA7g4BFw1oKcSCisGAQQB\n"
++"l1UBBQEBB0Crhw24E2lPBhd/y+ZFotQ/2TrYqkUQqGPmff8ofLziNgMBCAeIeAQY\n"
++"FggAIBYhBO6ovNDGnLzbR1TlMJYJ0fjlWbUrBQJcNaCnAhsMAAoJEJYJ0fjlWbUr\n"
++"/K8BAJWsa+tOZsJw7w5fz6O0We6Xx4Rt17jHf563G6wMcz9+AQDRsedJ7w4zYzS9\n"
++"MFiJQ5aN0NDHMRtDFWAgCunVnJ3OBw==\n"
++"=fZa5\n"
+ "-----END PGP PUBLIC KEY BLOCK-----\n";
+ 
+ static const char conflictKey2[] = "-----BEGIN PGP PUBLIC KEY BLOCK-----\n"
+ "\n"
+-"mDMEWG+xShYJKwYBBAHaRw8BAQdA567gPEPJRpqKnZjlFJMRNUqruRviYMyygfF6\n"
+-"6Ok+ygu0GXRvZnVfY29uZmxpY3RAZXhhbXBsZS5jb22IlgQTFggAPhYhBJ5kRh7E\n"
+-"I98w8kgUcmkAfYFvqqHsBQJYb7FKAhsDBQkDwmcABQsJCAcCBhUICQoLAgQWAgMB\n"
+-"Ah4BAheAAAoJEGkAfYFvqqHsYR0BAOz8JjYB4VvGkt6noLS3F5TLfsedGwQkBCw5\n"
+-"znw/vGZsAQD9DSX+ekwdrN56mNO8ISt5uVS7B1ZQtouNBF+nzcwbDbg4BFhvsUoS\n"
+-"CisGAQQBl1UBBQEBB0BFupW8+Xc1ikab8TJqANjQhvFVh6uLsgcK4g9lZgbGXAMB\n"
+-"CAeIeAQYFggAIBYhBJ5kRh7EI98w8kgUcmkAfYFvqqHsBQJYb7FKAhsMAAoJEGkA\n"
+-"fYFvqqHs15ABALdN3uiV/07cJ3RkNb3WPcijGsto+lECDS11dKEwTMFeAQDx+V36\n"
+-"ocbYC/xEuwi3w45oNqGieazzcD/GBbt8OBk3BA==\n"
+-"=45IR\n"
++"mDMEXDWgixYJKwYBBAHaRw8BAQdAMWOhumYspcvEOTuesOSN4rvnJVOj/6qOWFTu\n"
++"x+wPRra0GXRvZnVfY29uZmxpY3RAZXhhbXBsZS5jb22IkAQTFggAOBYhBA64G88Q\n"
++"NPXztj8ID/FhC7tiGbeRBQJcNaCLAhsDBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheA\n"
++"AAoJEPFhC7tiGbeRUt4A/2hf4Zgz+TYyfeH/4/ZtyL1JuZggqR1s5UopEx2Aiw10\n"
++"AP405KiTd31TJQN8Ru+7bskPu0/mzLZMNkRvBNEdc5kbDLg4BFw1oIsSCisGAQQB\n"
++"l1UBBQEBB0B5NtSrx7wDDKgwUe5Rxz0vRkaWLtyE0KbfE77oPy5DGAMBCAeIeAQY\n"
++"FggAIBYhBA64G88QNPXztj8ID/FhC7tiGbeRBQJcNaCLAhsMAAoJEPFhC7tiGbeR\n"
++"km0BAP8TQwraipqb1pJlLsEgDXeM5Jocz4fuePD78BsOBtORAP9gpCyKXdyJYGlA\n"
++"qjmG356yG6pCK9aPckTZ9IViPiHWCw==\n"
++"=tn3Q\n"
+ "-----END PGP PUBLIC KEY BLOCK-----\n";
+ 
+ static const char conflictMsg1[] = "-----BEGIN PGP MESSAGE-----\n"
+ "\n"
+-"owGbwMvMwCG2z/HA4aX/5W0YT3MlMUTkb2xPSizi6ihlYRDjYJAVU2Sp4mTZNpV3\n"
+-"5QwmLqkrMLWsTCCFDFycAjCR1vcMf4U0Qrs6qzqfHJ9puGOFduLN2nVmhsumxjBE\n"
+-"mdw4lr1ehIWR4QdLuNBpe86PGx1PtNXfVAzm/hu+vfjCp5BVNjPTM9L0eAA=\n"
+-"=MfBD\n"
++"owGbwMvMwCE2jfPij6eRW7UZTwsnMcSYLnT0Ki0uUXD3C1XILFHk6ihlYRDjYJAV\n"
++"U2R5t2LPhWNz9tx2D3lqANPEygTSwcDFKQAT+RjG8M9of873hQrMpinBVwKYv+rq\n"
++"XGmYW+ZcZJ+133KDq+itzlxGhg3L2X/6Khj+2Hd+He+KnXtunF2wNWxl7849e/Sy\n"
++"v6tc+8MBAA==\n"
++"=fZLe\n"
+ "-----END PGP MESSAGE-----\n";
+ 
+ static const char conflictMsg2[] = "-----BEGIN PGP MESSAGE-----\n"
+ "\n"
+-"owGbwMvMwCGWyVDbmL9q4RvG01xJDBH5GyvS8vO5OkpZGMQ4GGTFFFnmpbjJHVG+\n"
+-"b/DJQ6QIppaVCaSQgYtTACaySZHhr/SOPrdFJ89KrcwKY5i1XnflXYf2PK76SafK\n"
+-"tkxXuXzvJAvDX4kCybuqFk3HXCexz2+IrnZ+5X5EqOnuo3ens2cte+uzlhMA\n"
+-"=BIAi\n"
++"owGbwMvMwCH2MZF7d5Lk9omMp4WTGGJMFwZ4lRaXKLj7hSpklihydZSyMIhxMMiK\n"
++"KbLw7ZA+L2Dy9fM2ew5+mCZWJpAOBi5OAZhIUhIjw7bV+xS+cR0quqhmcY2Dl3WW\n"
++"8Ufr+rRNufOPyIdoO6nEXGH47/B+E1+oxS6e5f5n7MJ3aHBO+s345sipGV/4f665\n"
++"9mmiGjsA\n"
++"=8oJA\n"
+ "-----END PGP MESSAGE-----\n";
+ 
+ class TofuInfoTest: public QGpgMETest
+-- 
+2.19.2
+
diff --git a/user/gpgme/APKBUILD b/user/gpgme/APKBUILD
index 21b537848..01f7e6030 100644
--- a/user/gpgme/APKBUILD
+++ b/user/gpgme/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=gpgme
 pkgver=1.12.0
-pkgrel=0
+pkgrel=1
 pkgdesc="GnuPG Made Easy"
 url="https://www.gnupg.org/related_software/gpgme/"
 arch="all"
@@ -10,9 +10,10 @@ arch="all"
 license="(LGPL-3.0+ OR GPL-2.0+) AND LGPL-2.1+ AND MIT AND GPL-3.0+"
 depends="gnupg"
 depends_dev="libgpg-error-dev libassuan-dev qt5-qtbase-dev"
-makedepends="$depends_dev doxygen"
-subpackages="$pkgname-dev $pkgname-doc gpgmepp qgpgme"
-source="ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2"
+makedepends="$depends_dev doxygen python3-dev"
+subpackages="$pkgname-dev $pkgname-doc gpgmepp qgpgme py3-gpg:_py"
+source="https://gnupg.org/ftp/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2
+	1.12.0-fix-t-tofuinfo.patch"
 
 build() {
 	cd "$builddir"
@@ -25,6 +26,7 @@ build() {
 		--infodir=/usr/share/info \
 		--localstatedir=/var
 	make
+	make -C lang/python
 }
 
 check() {
@@ -43,16 +45,19 @@ qgpgme() {
 	mv "$pkgdir"/usr/lib/libqgpgme.so* "$subpkgdir"/usr/lib/
 }
 
-check() {
-	cd "$builddir"
-	make check
-}
-
 gpgmepp() {
 	pkgdesc="C++ bindings for GPGME"
 	mkdir -p "$subpkgdir"/usr/lib
 	mv "$pkgdir"/usr/lib/libgpgmepp.so.* "$subpkgdir"/usr/lib/
 }
 
+_py() {
+	pkgdesc="$pkgdesc (Python bindings)"
+	depends="$pkgname=$pkgver-r$pkgrel python3"
+
+	mkdir -p "$subpkgdir/usr/lib/"
+	mv "$pkgdir/usr/lib/python"* "$subpkgdir/usr/lib/"
+}
 
-sha512sums="c228b3df28377df882be536ada56dc9c73150048a58e591aa4495f89c854af95820152cd60139840f994c249e9c7df50d8b89eb9d6dc4ce02aa80bbfebcdd014  gpgme-1.12.0.tar.bz2"
+sha512sums="c228b3df28377df882be536ada56dc9c73150048a58e591aa4495f89c854af95820152cd60139840f994c249e9c7df50d8b89eb9d6dc4ce02aa80bbfebcdd014  gpgme-1.12.0.tar.bz2
+c8748651021a6ea670329cffb9565b905272b092315e77dc6fa9fa23890f8a55c2159edbfa026e8af961f2ff0c0d524dc8332a2e9a24fce2b37ac7cc4bb88cb3  1.12.0-fix-t-tofuinfo.patch"
diff --git a/user/mesa/APKBUILD b/user/mesa/APKBUILD
index c36074f8a..b5287b1d0 100644
--- a/user/mesa/APKBUILD
+++ b/user/mesa/APKBUILD
@@ -1,11 +1,11 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=mesa
 pkgver=18.3.2
-pkgrel=0
+pkgrel=2
 pkgdesc="Mesa DRI OpenGL library"
 url="https://www.mesa3d.org"
 arch="all"
-license="MIT AND X11 AND SGI-B-2.0 AND BSL-1.0"
+license="MIT AND X11 AND SGI-B-2.0 AND BSL-1.0 AND LGPL-2.1+"
 depends=
 subpackages="$pkgname-dev
 	$pkgname-dri-ati:_dri
@@ -29,6 +29,7 @@ source="https://mesa.freedesktop.org/archive/mesa-$pkgver.tar.xz
 	amdgpu-pthread-header.patch
 	disk_cache-stack-overflow.patch
 	drmdeps.patch
+	fix-non-altivec-ppc32.patch
 	"
 
 _dri_driverdir=/usr/lib/xorg/modules/dri
@@ -47,8 +48,9 @@ x86* | pmmx)
 	_vulkan_drivers="${_vulkan_drivers},intel"
 	subpackages="$subpackages $pkgname-dri-intel:_dri $pkgname-dri-vmwgfx:_dri"
 	;;
-arm*)
+aarch64 | arm*)
 	_gallium_drivers="${_gallium_drivers},vc4"
+	subpackages="$subpackages $pkgname-dri-vc4:_dri"
 	case "$CARCH" in
 	armhf) CFLAGS="$CFLAGS -mfpu=neon";;
 	esac
@@ -221,6 +223,9 @@ _dri() {
 	swrast)
 		_mv_dri swrast_dri kms_swrast_dri && _mv_gpipe swrast
 		;;
+	vc4)
+		_mv_dri vc4_dri
+		;;
 	vmwgfx)
 		_mv_dri vmwgfx_dri && _mv_gpipe vmwgfx
 		;;
@@ -235,4 +240,5 @@ sha512sums="34b66520728d720b1f3d3d63f8ba5c255d57b9e8fe427264419e4163b474df662ff6
 c7d91a660a033df91fac9c557039efc8669f0c26b2d35997d50753938b70d1af0bd110dcab3f8236eafab7d4be5dd7cd128a3e057e67e7e6a38a73fd6a7ef62e  musl-fix-includes.patch
 245d0d64d858dfadeeb544f31f7d0bb6ecb746a7fd5ec99755d679ae1a1eef4198d66473fb24d333eb6786bb8657012771e8285d67f165dc61a031df801947aa  amdgpu-pthread-header.patch
 f40ff04ac73c090c74d1955de6013c5aa41fb77f28b2b82d89cfc1880306a9ca1dde4581592db19f0a0ec6d85032f1ed5d953103ab0d075f9f0b7e459a028c45  disk_cache-stack-overflow.patch
-6800bc62aebfba22a2562c858c27391b47c5675020bd67f040da93ffe4d5d8ac828907a44c7cee6a4ebe63821b58c2515b4012f1f23473670b1de8670426a430  drmdeps.patch"
+6800bc62aebfba22a2562c858c27391b47c5675020bd67f040da93ffe4d5d8ac828907a44c7cee6a4ebe63821b58c2515b4012f1f23473670b1de8670426a430  drmdeps.patch
+71a397cf9937e623d21abacb2726602f1b5165b18543e11fdfdaac748c221aeafbbda790492a2180b590dace9a17c931c1eac199de32e90c3fa3305706a4011f  fix-non-altivec-ppc32.patch"
diff --git a/user/mesa/fix-non-altivec-ppc32.patch b/user/mesa/fix-non-altivec-ppc32.patch
new file mode 100644
index 000000000..846cf5031
--- /dev/null
+++ b/user/mesa/fix-non-altivec-ppc32.patch
@@ -0,0 +1,66 @@
+--- mesa-18.3.2/src/util/u_cpu_detect.c.old	2019-01-17 11:26:23.000000000 +0000
++++ mesa-18.3.2/src/util/u_cpu_detect.c	2019-02-22 19:23:26.620000000 +0000
+@@ -41,6 +41,9 @@
+ #if defined(PIPE_ARCH_PPC)
+ #if defined(PIPE_OS_APPLE)
+ #include <sys/sysctl.h>
++#elif defined(PIPE_OS_LINUX)
++#include <asm/cputable.h>
++#include <linux/auxvec.h>
+ #else
+ #include <signal.h>
+ #include <setjmp.h>
+@@ -92,7 +95,7 @@
+ #endif
+ 
+ 
+-#if defined(PIPE_ARCH_PPC) && !defined(PIPE_OS_APPLE)
++#if defined(PIPE_ARCH_PPC) && !defined(PIPE_OS_APPLE) && !defined(PIPE_OS_LINUX)
+ static jmp_buf  __lv_powerpc_jmpbuf;
+ static volatile sig_atomic_t __lv_powerpc_canjump = 0;
+ 
+@@ -126,7 +129,43 @@
+          util_cpu_caps.has_altivec = 1;
+       }
+    }
+-#else /* !PIPE_OS_APPLE */
++#elif defined(PIPE_OS_LINUX)
++   /* Taken from FFmpeg 4.1.1 (LGPL-2.1+) */
++   // The linux kernel could have the altivec support disabled
++   // even if the cpu has it.
++   int i, ret = 0;
++   int fd = open("/proc/self/auxv", O_RDONLY);
++   unsigned long buf[64] = { 0 };
++   ssize_t count;
++   boolean enable_vsx = TRUE;
++   /* VSX instructions can be explicitly enabled/disabled via GALLIVM_VSX=1 or 0 */
++   char *env_vsx = getenv("GALLIVM_VSX");
++   if (env_vsx && env_vsx[0] == '0') {
++      enable_vsx = FALSE;
++   }
++
++   if (fd < 0)
++      return 0;
++
++   while ((count = read(fd, buf, sizeof(buf))) > 0) {
++      for (i = 0; i < count / sizeof(*buf); i += 2) {
++         if (buf[i] == AT_NULL)
++            goto out;
++         if (buf[i] == AT_HWCAP) {
++            if (buf[i + 1] & PPC_FEATURE_HAS_ALTIVEC)
++               util_cpu_caps.has_altivec = 1;
++#ifdef PPC_FEATURE_HAS_VSX
++            if (enable_vsx && buf[i + 1] & PPC_FEATURE_HAS_VSX)
++               util_cpu_caps.has_vsx = 1;
++#endif
++            goto out;
++         }
++      }
++   }
++
++out:
++   close(fd);
++#else /* !PIPE_OS_APPLE, !PIPE_OS_LINUX */
+    /* not on Apple/Darwin, do it the brute-force way */
+    /* this is borrowed from the libmpeg2 library */
+    signal(SIGILL, sigill_handler);
diff --git a/user/qastools/APKBUILD b/user/qastools/APKBUILD
new file mode 100644
index 000000000..1e35fe052
--- /dev/null
+++ b/user/qastools/APKBUILD
@@ -0,0 +1,43 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=qastools
+pkgver=0.21.0
+pkgrel=0
+pkgdesc="ALSA mixer and utilities for Qt"
+url="https://xwmw.org/qastools/index.html"
+arch="all"
+license="GPL-3.0-only"
+depends="bash"
+makedepends="alsa-lib-dev cmake eudev-dev qt5-qtbase-dev qt5-qtsvg-dev
+	qt5-qttools-dev"
+subpackages="$pkgname-doc $pkgname-lang"
+source="https://downloads.sourceforge.net/qastools/qastools_$pkgver.tar.xz"
+builddir="$srcdir/${pkgname}_${pkgver}"
+langdir="/usr/share/qastools/l10n"
+
+build() {
+	cd "$builddir"
+	if [ "$CBUILD" != "$CHOST" ]; then
+		CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
+	fi
+	cmake \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DBUILD_SHARED_LIBS=True \
+		-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
+		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
+		-DCMAKE_C_FLAGS="$CFLAGS" \
+		${CMAKE_CROSSOPTS}
+	make
+}
+
+check() {
+	cd "$builddir"
+	CTEST_OUTPUT_ON_FAILURE=TRUE ctest
+}
+
+package() {
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
+}
+
+sha512sums="17c837ef508a5bf1853f597abd38c3c950914c8cefe98f83a47a911462e1da11f410e3fe3f8426e3f17a3aac8980ee6459f50de2480120813202b342a1e3509b  qastools_0.21.0.tar.xz"
diff --git a/user/rust/APKBUILD b/user/rust/APKBUILD
index 1921a4306..8534e1112 100644
--- a/user/rust/APKBUILD
+++ b/user/rust/APKBUILD
@@ -115,7 +115,7 @@ build() {
 		codegen-units = 1
 		debuginfo = true
 		debuginfo-lines = true
-		debuginfo-only-std = false
+		debuginfo-only-std = true
 		debuginfo-tools = true
 		use-jemalloc = false
 		backtrace = true
@@ -138,6 +138,7 @@ build() {
 check() {
 	cd "$builddir"
 
+	RUST_BACKTRACE=1 \
 	./x.py test -j ${JOBS:-2} --no-doc --no-fail-fast \
 		src/test/codegen \
 		src/test/codegen-units \
@@ -301,9 +302,9 @@ _mv() {
 	mv "$@"
 }
 sha512sums="d6688711452295c41468af214f036499074d82fbeedc3f03560275219c2fae910e623e38e3210176d86f78ba5533ea098da5ff21532c8ad1a5aac132bb74ee02  rustc-1.31.1-src.tar.xz
-c414a250edcf5b9c390137a01dc728f22e3067adab43f91bc06a4bed7580bf0e6171e4a844167b5c4bc13774c9ef9e33e1f5cab018dac8b3df6d630a9a163e2c  cargo-0.31.0-powerpc64-foxkit-linux-musl.tar.xz
-c6eeb91d7de95401d118d287435ac24e014711f73e86fab7da0a082d7cf03abfe137563cfe6a88b1309cdb0fec11acfceac01cc3bbc2e83650026230ce0cf079  rust-std-1.30.1-powerpc64-foxkit-linux-musl.tar.xz
-f6099a632de0b4201c3d4639a9c32244fb2fccee891af13fc7efdbaf546e37a67c80b0bce92a19ad746349c59a3627fded64ebcace34fb33c2773bb4aa799cfb  rustc-1.30.1-powerpc64-foxkit-linux-musl.tar.xz
+16596561ff87c66f64f4b40602184355d3695822b9b9e6e0e929f340664718698e6f5b378c9162b48f9cb180be5fd8e583e5e51a1c57c1cd55dcc80f468cb509  cargo-0.31.0-powerpc-foxkit-linux-musl.tar.xz
+cdfc7a3d51d66338f31007daafab95570e4e465983add99db7a45f1a3e601588b19e1257fe3e7fcc6b7104ba445add2fa1cda71325a9ab6d196b4ad0dcef2fb5  rust-std-1.30.1-powerpc-foxkit-linux-musl.tar.xz
+190ed9d84513a229f389fc5d1bf0b8e22202bd3b9802330ee2844c436ae13700bdaded091498be4f2c4c65b2f6ef55c1e2db41a918747ac60e8e11e331be2c29  rustc-1.30.1-powerpc-foxkit-linux-musl.tar.xz
 acab7c5ffa73cd83cf3ae23e69d2c05ccc3ca03aa4d5a15179af76f2e75b7c5a1bc8d2969c0a9a4b5ad36a50a8cce283e62db878797be6d0da252b414de004cd  0001-Don-t-pass-CFLAGS-to-the-C-compiler.patch
 f9773277e91e91d0bd6749890b8d332a86522927d90548af02892c6d01b8fbb3b234993eec8e5b8d6a3b6f1cec310a112e274f47f70d30829ca61a0da8d45bb5  0002-Fix-LLVM-build.patch
 9e87964d41e14f70acc1961a0162bbf3ebca73f1c2b2842c3b1c8b65776466c9299d6974fc6b94a4e06547ae8ce638c28cdedf24eeb2616976f9dd727b989c13  0003-Allow-rustdoc-to-work-when-cross-compiling-on-musl.patch
diff --git a/user/wireguard-module-power8-64k/APKBUILD b/user/wireguard-module-power8-64k/APKBUILD
new file mode 100644
index 000000000..09a54843d
--- /dev/null
+++ b/user/wireguard-module-power8-64k/APKBUILD
@@ -0,0 +1,37 @@
+# Contributor: Luis Ressel <aranea@aixah.de>
+# Maintainer: Luis Ressel <aranea@aixah.de>
+# KEEP THIS IN SYNC with the other wireguard-module packages.
+_kflavour="-power8-64k"
+_kver="4.14.88-mc13"
+pkgver=0.0.20190123
+pkgrel=0
+_pkgname="wireguard-module$_kflavour"
+pkgname="$_pkgname-$_kver"
+_pkgreal="WireGuard"
+pkgdesc="Kernel module for the WireGuard VPN, built for easy-kernel"
+url="https://www.wireguard.com/"
+arch="ppc64"
+options="!check !dbg !strip" # no test suite
+license="GPL-2.0-only"
+provides="$_pkgname=$pkgver"
+depends="easy-kernel$_kflavour-modules-$_kver"
+makedepends="easy-kernel$_kflavour-src-$_kver"
+source="https://git.zx2c4.com/WireGuard/snapshot/$_pkgreal-$pkgver.tar.xz"
+builddir="$srcdir/$_pkgreal-$pkgver"
+
+prepare() {
+	cd "$builddir"
+	sed -i -e '/depmod/d' src/Makefile # temporary hack
+}
+
+build() {
+	cd "$builddir"
+	make -C src LDFLAGS="" KERNELDIR="/usr/src/linux-$_kver$_kflavour" module
+}
+
+package() {
+	cd "$builddir"
+	make -C src KERNELDIR="/usr/src/linux-$_kver$_kflavour" INSTALL_MOD_PATH="$pkgdir" module-install
+}
+
+sha512sums="8be40cebabca2a40f98ee10d6fa93708b12b17c6b0eab9aa8b7fab353d78fbd5b280b7b90cb2973cf74a1b9d47c3d250bf3ede6d1318129a45d57e21329b7f59  WireGuard-0.0.20190123.tar.xz"
diff --git a/user/wireguard-module-power8/APKBUILD b/user/wireguard-module-power8/APKBUILD
new file mode 100644
index 000000000..0619c09a4
--- /dev/null
+++ b/user/wireguard-module-power8/APKBUILD
@@ -0,0 +1,37 @@
+# Contributor: Luis Ressel <aranea@aixah.de>
+# Maintainer: Luis Ressel <aranea@aixah.de>
+# KEEP THIS IN SYNC with the other wireguard-module packages.
+_kflavour="-power8"
+_kver="4.14.88-mc13"
+pkgver=0.0.20190123
+pkgrel=0
+_pkgname="wireguard-module$_kflavour"
+pkgname="$_pkgname-$_kver"
+_pkgreal="WireGuard"
+pkgdesc="Kernel module for the WireGuard VPN, built for easy-kernel"
+url="https://www.wireguard.com/"
+arch="ppc64"
+options="!check !dbg !strip" # no test suite
+license="GPL-2.0-only"
+provides="$_pkgname=$pkgver"
+depends="easy-kernel$_kflavour-modules-$_kver"
+makedepends="easy-kernel$_kflavour-src-$_kver"
+source="https://git.zx2c4.com/WireGuard/snapshot/$_pkgreal-$pkgver.tar.xz"
+builddir="$srcdir/$_pkgreal-$pkgver"
+
+prepare() {
+	cd "$builddir"
+	sed -i -e '/depmod/d' src/Makefile # temporary hack
+}
+
+build() {
+	cd "$builddir"
+	make -C src LDFLAGS="" KERNELDIR="/usr/src/linux-$_kver$_kflavour" module
+}
+
+package() {
+	cd "$builddir"
+	make -C src KERNELDIR="/usr/src/linux-$_kver$_kflavour" INSTALL_MOD_PATH="$pkgdir" module-install
+}
+
+sha512sums="8be40cebabca2a40f98ee10d6fa93708b12b17c6b0eab9aa8b7fab353d78fbd5b280b7b90cb2973cf74a1b9d47c3d250bf3ede6d1318129a45d57e21329b7f59  WireGuard-0.0.20190123.tar.xz"
diff --git a/user/wireguard-module/APKBUILD b/user/wireguard-module/APKBUILD
index b1801f7f1..d5c59a7b9 100644
--- a/user/wireguard-module/APKBUILD
+++ b/user/wireguard-module/APKBUILD
@@ -1,10 +1,12 @@
 # Contributor: Luis Ressel <aranea@aixah.de>
 # Maintainer: Luis Ressel <aranea@aixah.de>
-_kernelver="4.14.88-mc13"
+# KEEP THIS IN SYNC with the other wireguard-module packages.
+_kflavour=""
+_kver="4.14.88-mc13"
 pkgver=0.0.20190123
 pkgrel=0
-_pkgname="wireguard-module"
-pkgname="$_pkgname-$_kernelver"
+_pkgname="wireguard-module$_kflavour"
+pkgname="$_pkgname-$_kver"
 _pkgreal="WireGuard"
 pkgdesc="Kernel module for the WireGuard VPN, built for easy-kernel"
 url="https://www.wireguard.com/"
@@ -12,8 +14,8 @@ arch="all"
 options="!check !dbg !strip" # no test suite
 license="GPL-2.0-only"
 provides="$_pkgname=$pkgver"
-depends="easy-kernel-modules-$_kernelver"
-makedepends="easy-kernel-src-$_kernelver"
+depends="easy-kernel$_kflavour-modules-$_kver"
+makedepends="easy-kernel$_kflavour-src-$_kver"
 source="https://git.zx2c4.com/WireGuard/snapshot/$_pkgreal-$pkgver.tar.xz"
 builddir="$srcdir/$_pkgreal-$pkgver"
 
@@ -24,12 +26,12 @@ prepare() {
 
 build() {
 	cd "$builddir"
-	make -C src LDFLAGS="" KERNELDIR="/usr/src/linux-$_kernelver" module
+	make -C src LDFLAGS="" KERNELDIR="/usr/src/linux-$_kver$_kflavour" module
 }
 
 package() {
 	cd "$builddir"
-	make -C src KERNELDIR="/usr/src/linux-$_kernelver" INSTALL_MOD_PATH="$pkgdir" module-install
+	make -C src KERNELDIR="/usr/src/linux-$_kver$_kflavour" INSTALL_MOD_PATH="$pkgdir" module-install
 }
 
 sha512sums="8be40cebabca2a40f98ee10d6fa93708b12b17c6b0eab9aa8b7fab353d78fbd5b280b7b90cb2973cf74a1b9d47c3d250bf3ede6d1318129a45d57e21329b7f59  WireGuard-0.0.20190123.tar.xz"
diff --git a/user/wxwidgets/APKBUILD b/user/wxwidgets/APKBUILD
new file mode 100644
index 000000000..51b93f709
--- /dev/null
+++ b/user/wxwidgets/APKBUILD
@@ -0,0 +1,43 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=wxwidgets
+pkgver=3.1.2
+pkgrel=0
+pkgdesc="C++ library for creating applications"
+url="https://www.wxwidgets.org/"
+arch="all"
+options="!check"  # Test suite requires X11.  Passes on gwyn except wxHTML.
+license="LGPL-2.1-only WITH wx-exception"
+depends=""
+checkdepends="adwaita-icon-theme ttf-liberation"
+makedepends="glu-dev gstreamer-dev gst-plugins-base-dev gtk+3.0-dev
+	libexecinfo-dev libjpeg-turbo-dev libnotify-dev libsecret-dev libsm-dev
+	mesa-dev tiff-dev zlib-dev"
+subpackages="$pkgname-dev $pkgname-lang"
+source="https://github.com/wxWidgets/wxWidgets/releases/download/v$pkgver/wxWidgets-$pkgver.tar.bz2"
+builddir="$srcdir/wxWidgets-$pkgver"
+
+build() {
+	cd "$builddir"
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--localstatedir=/var \
+		--disable-xlocale
+	make
+}
+
+check() {
+	cd "$builddir"
+	make check
+}
+
+package() {
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
+}
+
+sha512sums="e0c6cc58f87c7534be100b098b6db4c5a7a6b7972a8ccc0573dc38cda1b098e1d9f3ea541771173889806f093b4fb5bc0f2b57952eedf907fe7e5d7c01840cf6  wxWidgets-3.1.2.tar.bz2"