main/tinydm: depend on elogind

Fix error when trying to start tinydm without elogind-openrc installed: Service `tinydm' needs non existent service `elogind'
main/powersupply: update to 0.4.0 (MR 1772)
2020-12-02 16:49:49 +01:00 · 2020-12-02 17:31:47 +03:00 · 2020-12-02 12:56:28 +01:00 · 2020-12-02 12:33:55 +01:00 · 2020-12-02 11:55:04 +01:00 · 2020-12-02 11:39:48 +01:00
81 changed files with 1854 additions and 406 deletions
@@ -8,7 +8,7 @@ fi

 pkgname=busybox-static-aarch64
 pkgver=1.32.0
-pkgrel=4
+pkgrel=7

 _arch="aarch64"
 _mirror="http://dl-2.alpinelinux.org/alpine/"
@@ -31,4 +31,4 @@ package() {
 	rm .PKGINFO .SIGN.*
 }

-sha512sums="c101e490becccf14381bece807738bf29827d53f7d803b198068f7ecf420d46b77701185da98faa3cc19ea2b6a2ac6b564665e0dedb5aa56cb59f1a4931f278b  busybox-static-1.32.0-r4-aarch64-edge.apk"
+sha512sums="1eb1f0950d50d53848c63cf03481486435cb7b3b504307412e54e92361f8b103d0c57a97b003ba5c74e615cbd01118e4c25f419f195db345c94242cbad363dc5  busybox-static-1.32.0-r7-aarch64-edge.apk"
@@ -8,7 +8,7 @@ fi

 pkgname=busybox-static-armhf
 pkgver=1.32.0
-pkgrel=4
+pkgrel=7

 _arch="armhf"
 _mirror="http://dl-2.alpinelinux.org/alpine/"
@@ -31,4 +31,4 @@ package() {
 	rm .PKGINFO .SIGN.*
 }

-sha512sums="52acbc4b39adf80b5c31cc221aee96666327803c1b5eb70377e245b3cdc4da05bd81d095b4a8e7d01a8c2e379198e5ae4df0c7d21dc7fa6a7843b3e64460b382  busybox-static-1.32.0-r4-armhf-edge.apk"
+sha512sums="f5ccbc2a5f46dabebccb68b5a2fa86bc225f4c243a755abb0673e2a5723962edf359f0d75acd20d0bae17f5e58a14cb00c60b6a22092face054c6105878b149b  busybox-static-1.32.0-r7-armhf-edge.apk"
@@ -8,7 +8,7 @@ fi

 pkgname=busybox-static-armv7
 pkgver=1.32.0
-pkgrel=4
+pkgrel=7

 _arch="armv7"
 _mirror="http://dl-2.alpinelinux.org/alpine/"
@@ -31,4 +31,4 @@ package() {
 	rm .PKGINFO .SIGN.*
 }

-sha512sums="fcc7619f591b44992b03268dff2c0cfade24577bcb277006794c628f8de7093107a0c191f320e7d2e307aa0680be3b93d2e433a1d1527c035f966ecdb8ed7b0f  busybox-static-1.32.0-r4-armv7-edge.apk"
+sha512sums="96db60049d4c7cd8d98dab7ff6a00243f44ccf17dfd85f55d763d3ac0276eb82a6e34e90129985ebdff5ac74ed8c8814b4b8750a41e1f2cc654b2ee7ee7650d0  busybox-static-1.32.0-r7-armv7-edge.apk"
@@ -1,66 +0,0 @@
-From b36fd572e6cbe63dca6fbedd91f17d2797524eaa Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Tue, 17 Nov 2020 10:35:40 +0000
-Subject: [PATCH 40/40] opts: move -fpartial-inlining from -O2 to -O3 or
- higher.
-
-We have observed strange behavior from the inliner on mips and on
-s390x when the new partial inlining feature is enabled.
---
- gcc/doc/invoke.texi | 5 +++--
- gcc/opts.c          | 2 +-
- 2 files changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index 01e67e97491..6c4c2937b8f 100644
--- a/gcc/doc/invoke.texi
-+++ b/gcc/doc/invoke.texi
-@@ -9212,7 +9212,6 @@ also turns on the following optimization flags:
- -flra-remat @gol
- -foptimize-sibling-calls @gol
- -foptimize-strlen @gol
--fpartial-inlining @gol
- -fpeephole2 @gol
- -freorder-blocks-algorithm=stc @gol
- -freorder-blocks-and-partition  -freorder-functions @gol
-@@ -9234,7 +9233,8 @@ NOTE: In Alpine Linux, @option{-D_FORTIFY_SOURCE=2} is
- set by default, and is activated when @option{-O} is set to 2 or higher.
- This enables additional compile-time and run-time checks for several libc
- functions.  To disable, specify either @option{-U_FORTIFY_SOURCE} or
-@option{-D_FORTIFY_SOURCE=0}.
-+@option{-D_FORTIFY_SOURCE=0}.  Additionally, @option{-fpartial-inlining}
-+is only activated when @option{-O} is set to 3 or higher.
- 
- @item -O3
- @opindex O3
-@@ -9246,6 +9246,7 @@ by @option{-O2} and also turns on the following optimization flags:
- -fipa-cp-clone
- -floop-interchange @gol
- -floop-unroll-and-jam @gol
-+-fpartial-inlining @gol
- -fpeel-loops @gol
- -fpredictive-commoning @gol
- -fsplit-loops @gol
-diff --git a/gcc/opts.c b/gcc/opts.c
-index 73162528938..1d0d997eda2 100644
--- a/gcc/opts.c
-+++ b/gcc/opts.c
-@@ -492,7 +492,6 @@ static const struct default_options default_options_table[] =
-     { OPT_LEVELS_2_PLUS, OPT_fisolate_erroneous_paths_dereference, NULL, 1 },
-     { OPT_LEVELS_2_PLUS, OPT_flra_remat, NULL, 1 },
-     { OPT_LEVELS_2_PLUS, OPT_foptimize_sibling_calls, NULL, 1 },
-    { OPT_LEVELS_2_PLUS, OPT_fpartial_inlining, NULL, 1 },
-     { OPT_LEVELS_2_PLUS, OPT_fpeephole2, NULL, 1 },
-     { OPT_LEVELS_2_PLUS, OPT_freorder_functions, NULL, 1 },
-     { OPT_LEVELS_2_PLUS, OPT_frerun_cse_after_loop, NULL, 1 },
-@@ -530,6 +529,7 @@ static const struct default_options default_options_table[] =
-     { OPT_LEVELS_3_PLUS, OPT_fipa_cp_clone, NULL, 1 },
-     { OPT_LEVELS_3_PLUS, OPT_floop_interchange, NULL, 1 },
-     { OPT_LEVELS_3_PLUS, OPT_floop_unroll_and_jam, NULL, 1 },
-+    { OPT_LEVELS_3_PLUS, OPT_fpartial_inlining, NULL, 1 },
-     { OPT_LEVELS_3_PLUS, OPT_fpeel_loops, NULL, 1 },
-     { OPT_LEVELS_3_PLUS, OPT_fpredictive_commoning, NULL, 1 },
-     { OPT_LEVELS_3_PLUS, OPT_fsplit_loops, NULL, 1 },
-- 
-2.29.2
-
@@ -31,7 +31,7 @@ pkgver=10.2.1_pre0
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""

 pkgname=gcc-aarch64
-pkgrel=2
+pkgrel=3
 pkgdesc="Stage2 cross-compiler for aarch64"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -221,12 +221,9 @@ source="https://dev.alpinelinux.org/~nenolod/gcc-10.2.1.tar.xz
 	0037-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
 	0038-gcc-go-link-to-libucontext.patch
 	0039-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
-	0040-opts-move-fpartial-inlining-from-O2-to-O3-or-higher.patch
 	0041-dlang-support-musl-1.2.0.patch
 	"

-#	gcc-4.8-build-args.patch
-
 # we build out-of-tree
 _gccdir="$srcdir"/gcc-${_pkgbase:-$pkgver}
 _gcclibdir="/usr/lib/gcc/$CTARGET/${_pkgbase:-$pkgver}"
@@ -699,5 +696,4 @@ f7582eaa9b6f421652b6705e28a22ba68210ea7e32d3c468e86b481a26bf391c86146e1a3ee4dda5
 c7d48b3657d37fbaef0696c96f858819bbe5469d7387e99db890eb925703dbeaf11858fdf2ecd556ac85d766c739374d71c5509f5e2fba88eb427cf93e9fdcc0  0037-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
 1e85dd650a43ce96d489f77e37fd247186e4e1fe2d088be991c3ff8233c923408137d94b72788ebc2ddcac8873c6f326a92138790ab0281722c67cce400f76cc  0038-gcc-go-link-to-libucontext.patch
 c93e8b0797c54483174b77f942e932eeb832c0784af9948ead7d8d95ca6392ffe3edee0740e835cf3d9310904718384e846a882284c21ccf26a055f8f940a874  0039-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
-ff74dbf6a3e10f6abececdce57672e76cca8f8a92f67ed495ae2631265402fed74e9b567fc35ad16d2a62449ca4074b6868ebbc56c68b9cecf8e686018f26554  0040-opts-move-fpartial-inlining-from-O2-to-O3-or-higher.patch
 eb2d8e432206250a4c4682305390883343e3c8285ac26701a910c1418b6ba5b3681612db846eb298fd47f0163772403340a348b719af751afe410742d6e92472  0041-dlang-support-musl-1.2.0.patch"
@@ -1,66 +0,0 @@
-From b36fd572e6cbe63dca6fbedd91f17d2797524eaa Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Tue, 17 Nov 2020 10:35:40 +0000
-Subject: [PATCH 40/40] opts: move -fpartial-inlining from -O2 to -O3 or
- higher.
-
-We have observed strange behavior from the inliner on mips and on
-s390x when the new partial inlining feature is enabled.
---
- gcc/doc/invoke.texi | 5 +++--
- gcc/opts.c          | 2 +-
- 2 files changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index 01e67e97491..6c4c2937b8f 100644
--- a/gcc/doc/invoke.texi
-+++ b/gcc/doc/invoke.texi
-@@ -9212,7 +9212,6 @@ also turns on the following optimization flags:
- -flra-remat @gol
- -foptimize-sibling-calls @gol
- -foptimize-strlen @gol
--fpartial-inlining @gol
- -fpeephole2 @gol
- -freorder-blocks-algorithm=stc @gol
- -freorder-blocks-and-partition  -freorder-functions @gol
-@@ -9234,7 +9233,8 @@ NOTE: In Alpine Linux, @option{-D_FORTIFY_SOURCE=2} is
- set by default, and is activated when @option{-O} is set to 2 or higher.
- This enables additional compile-time and run-time checks for several libc
- functions.  To disable, specify either @option{-U_FORTIFY_SOURCE} or
-@option{-D_FORTIFY_SOURCE=0}.
-+@option{-D_FORTIFY_SOURCE=0}.  Additionally, @option{-fpartial-inlining}
-+is only activated when @option{-O} is set to 3 or higher.
- 
- @item -O3
- @opindex O3
-@@ -9246,6 +9246,7 @@ by @option{-O2} and also turns on the following optimization flags:
- -fipa-cp-clone
- -floop-interchange @gol
- -floop-unroll-and-jam @gol
-+-fpartial-inlining @gol
- -fpeel-loops @gol
- -fpredictive-commoning @gol
- -fsplit-loops @gol
-diff --git a/gcc/opts.c b/gcc/opts.c
-index 73162528938..1d0d997eda2 100644
--- a/gcc/opts.c
-+++ b/gcc/opts.c
-@@ -492,7 +492,6 @@ static const struct default_options default_options_table[] =
-     { OPT_LEVELS_2_PLUS, OPT_fisolate_erroneous_paths_dereference, NULL, 1 },
-     { OPT_LEVELS_2_PLUS, OPT_flra_remat, NULL, 1 },
-     { OPT_LEVELS_2_PLUS, OPT_foptimize_sibling_calls, NULL, 1 },
-    { OPT_LEVELS_2_PLUS, OPT_fpartial_inlining, NULL, 1 },
-     { OPT_LEVELS_2_PLUS, OPT_fpeephole2, NULL, 1 },
-     { OPT_LEVELS_2_PLUS, OPT_freorder_functions, NULL, 1 },
-     { OPT_LEVELS_2_PLUS, OPT_frerun_cse_after_loop, NULL, 1 },
-@@ -530,6 +529,7 @@ static const struct default_options default_options_table[] =
-     { OPT_LEVELS_3_PLUS, OPT_fipa_cp_clone, NULL, 1 },
-     { OPT_LEVELS_3_PLUS, OPT_floop_interchange, NULL, 1 },
-     { OPT_LEVELS_3_PLUS, OPT_floop_unroll_and_jam, NULL, 1 },
-+    { OPT_LEVELS_3_PLUS, OPT_fpartial_inlining, NULL, 1 },
-     { OPT_LEVELS_3_PLUS, OPT_fpeel_loops, NULL, 1 },
-     { OPT_LEVELS_3_PLUS, OPT_fpredictive_commoning, NULL, 1 },
-     { OPT_LEVELS_3_PLUS, OPT_fsplit_loops, NULL, 1 },
-- 
-2.29.2
-
@@ -31,7 +31,7 @@ pkgver=10.2.1_pre0
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""

 pkgname=gcc-armhf
-pkgrel=2
+pkgrel=3
 pkgdesc="Stage2 cross-compiler for armhf"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -221,12 +221,9 @@ source="https://dev.alpinelinux.org/~nenolod/gcc-10.2.1.tar.xz
 	0037-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
 	0038-gcc-go-link-to-libucontext.patch
 	0039-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
-	0040-opts-move-fpartial-inlining-from-O2-to-O3-or-higher.patch
 	0041-dlang-support-musl-1.2.0.patch
 	"

-#	gcc-4.8-build-args.patch
-
 # we build out-of-tree
 _gccdir="$srcdir"/gcc-${_pkgbase:-$pkgver}
 _gcclibdir="/usr/lib/gcc/$CTARGET/${_pkgbase:-$pkgver}"
@@ -699,5 +696,4 @@ f7582eaa9b6f421652b6705e28a22ba68210ea7e32d3c468e86b481a26bf391c86146e1a3ee4dda5
 c7d48b3657d37fbaef0696c96f858819bbe5469d7387e99db890eb925703dbeaf11858fdf2ecd556ac85d766c739374d71c5509f5e2fba88eb427cf93e9fdcc0  0037-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
 1e85dd650a43ce96d489f77e37fd247186e4e1fe2d088be991c3ff8233c923408137d94b72788ebc2ddcac8873c6f326a92138790ab0281722c67cce400f76cc  0038-gcc-go-link-to-libucontext.patch
 c93e8b0797c54483174b77f942e932eeb832c0784af9948ead7d8d95ca6392ffe3edee0740e835cf3d9310904718384e846a882284c21ccf26a055f8f940a874  0039-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
-ff74dbf6a3e10f6abececdce57672e76cca8f8a92f67ed495ae2631265402fed74e9b567fc35ad16d2a62449ca4074b6868ebbc56c68b9cecf8e686018f26554  0040-opts-move-fpartial-inlining-from-O2-to-O3-or-higher.patch
 eb2d8e432206250a4c4682305390883343e3c8285ac26701a910c1418b6ba5b3681612db846eb298fd47f0163772403340a348b719af751afe410742d6e92472  0041-dlang-support-musl-1.2.0.patch"
@@ -1,66 +0,0 @@
-From b36fd572e6cbe63dca6fbedd91f17d2797524eaa Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Tue, 17 Nov 2020 10:35:40 +0000
-Subject: [PATCH 40/40] opts: move -fpartial-inlining from -O2 to -O3 or
- higher.
-
-We have observed strange behavior from the inliner on mips and on
-s390x when the new partial inlining feature is enabled.
---
- gcc/doc/invoke.texi | 5 +++--
- gcc/opts.c          | 2 +-
- 2 files changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index 01e67e97491..6c4c2937b8f 100644
--- a/gcc/doc/invoke.texi
-+++ b/gcc/doc/invoke.texi
-@@ -9212,7 +9212,6 @@ also turns on the following optimization flags:
- -flra-remat @gol
- -foptimize-sibling-calls @gol
- -foptimize-strlen @gol
--fpartial-inlining @gol
- -fpeephole2 @gol
- -freorder-blocks-algorithm=stc @gol
- -freorder-blocks-and-partition  -freorder-functions @gol
-@@ -9234,7 +9233,8 @@ NOTE: In Alpine Linux, @option{-D_FORTIFY_SOURCE=2} is
- set by default, and is activated when @option{-O} is set to 2 or higher.
- This enables additional compile-time and run-time checks for several libc
- functions.  To disable, specify either @option{-U_FORTIFY_SOURCE} or
-@option{-D_FORTIFY_SOURCE=0}.
-+@option{-D_FORTIFY_SOURCE=0}.  Additionally, @option{-fpartial-inlining}
-+is only activated when @option{-O} is set to 3 or higher.
- 
- @item -O3
- @opindex O3
-@@ -9246,6 +9246,7 @@ by @option{-O2} and also turns on the following optimization flags:
- -fipa-cp-clone
- -floop-interchange @gol
- -floop-unroll-and-jam @gol
-+-fpartial-inlining @gol
- -fpeel-loops @gol
- -fpredictive-commoning @gol
- -fsplit-loops @gol
-diff --git a/gcc/opts.c b/gcc/opts.c
-index 73162528938..1d0d997eda2 100644
--- a/gcc/opts.c
-+++ b/gcc/opts.c
-@@ -492,7 +492,6 @@ static const struct default_options default_options_table[] =
-     { OPT_LEVELS_2_PLUS, OPT_fisolate_erroneous_paths_dereference, NULL, 1 },
-     { OPT_LEVELS_2_PLUS, OPT_flra_remat, NULL, 1 },
-     { OPT_LEVELS_2_PLUS, OPT_foptimize_sibling_calls, NULL, 1 },
-    { OPT_LEVELS_2_PLUS, OPT_fpartial_inlining, NULL, 1 },
-     { OPT_LEVELS_2_PLUS, OPT_fpeephole2, NULL, 1 },
-     { OPT_LEVELS_2_PLUS, OPT_freorder_functions, NULL, 1 },
-     { OPT_LEVELS_2_PLUS, OPT_frerun_cse_after_loop, NULL, 1 },
-@@ -530,6 +529,7 @@ static const struct default_options default_options_table[] =
-     { OPT_LEVELS_3_PLUS, OPT_fipa_cp_clone, NULL, 1 },
-     { OPT_LEVELS_3_PLUS, OPT_floop_interchange, NULL, 1 },
-     { OPT_LEVELS_3_PLUS, OPT_floop_unroll_and_jam, NULL, 1 },
-+    { OPT_LEVELS_3_PLUS, OPT_fpartial_inlining, NULL, 1 },
-     { OPT_LEVELS_3_PLUS, OPT_fpeel_loops, NULL, 1 },
-     { OPT_LEVELS_3_PLUS, OPT_fpredictive_commoning, NULL, 1 },
-     { OPT_LEVELS_3_PLUS, OPT_fsplit_loops, NULL, 1 },
-- 
-2.29.2
-
@@ -31,7 +31,7 @@ pkgver=10.2.1_pre0
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""

 pkgname=gcc-armv7
-pkgrel=2
+pkgrel=3
 pkgdesc="Stage2 cross-compiler for armv7"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -221,12 +221,9 @@ source="https://dev.alpinelinux.org/~nenolod/gcc-10.2.1.tar.xz
 	0037-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
 	0038-gcc-go-link-to-libucontext.patch
 	0039-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
-	0040-opts-move-fpartial-inlining-from-O2-to-O3-or-higher.patch
 	0041-dlang-support-musl-1.2.0.patch
 	"

-#	gcc-4.8-build-args.patch
-
 # we build out-of-tree
 _gccdir="$srcdir"/gcc-${_pkgbase:-$pkgver}
 _gcclibdir="/usr/lib/gcc/$CTARGET/${_pkgbase:-$pkgver}"
@@ -699,5 +696,4 @@ f7582eaa9b6f421652b6705e28a22ba68210ea7e32d3c468e86b481a26bf391c86146e1a3ee4dda5
 c7d48b3657d37fbaef0696c96f858819bbe5469d7387e99db890eb925703dbeaf11858fdf2ecd556ac85d766c739374d71c5509f5e2fba88eb427cf93e9fdcc0  0037-gcc-go-undef-SETCONTEXT_CLOBBERS_TLS-in-proc.c.patch
 1e85dd650a43ce96d489f77e37fd247186e4e1fe2d088be991c3ff8233c923408137d94b72788ebc2ddcac8873c6f326a92138790ab0281722c67cce400f76cc  0038-gcc-go-link-to-libucontext.patch
 c93e8b0797c54483174b77f942e932eeb832c0784af9948ead7d8d95ca6392ffe3edee0740e835cf3d9310904718384e846a882284c21ccf26a055f8f940a874  0039-gcc-go-Disable-printing-of-unaccessible-ppc64-struct.patch
-ff74dbf6a3e10f6abececdce57672e76cca8f8a92f67ed495ae2631265402fed74e9b567fc35ad16d2a62449ca4074b6868ebbc56c68b9cecf8e686018f26554  0040-opts-move-fpartial-inlining-from-O2-to-O3-or-higher.patch
 eb2d8e432206250a4c4682305390883343e3c8285ac26701a910c1418b6ba5b3681612db846eb298fd47f0163772403340a348b719af751afe410742d6e92472  0041-dlang-support-musl-1.2.0.patch"
@@ -7,7 +7,7 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 fi

 pkgname=musl-aarch64
-pkgver=1.2.2_pre3
+pkgver=1.2.2_pre4
 pkgrel=0
 arch="x86_64"
 subpackages="musl-dev-aarch64:package_dev"
@@ -55,5 +55,5 @@ package_dev() {
 	done
 }

-sha512sums="15e9e83d1707d5e1bcad5f17bfc99750c9a7de4e748a1d2ae6b54be3e90bc0a3e7b717dcf1094b9882a58b07eece15beb12a59d23b1520b23ebc55daddbd2f17  musl-1.2.2_pre3-r0-aarch64-edge.apk
-4d63ef57a75257203f80231de0382af043d5800185a92ff5e1817728fc58e894320201f75a801f0f13bf880f724065a6218fb2f87cf24ddc0b288979a480d481  musl-dev-1.2.2_pre3-r0-aarch64-edge.apk"
+sha512sums="bc5497960ec11eb2c5e0edc65fa735f458f2f02cfade99798a626f837a2a3832054f6f5c2c16357fc2b0630bc16ccf270141096b1e39350d286174546195c286  musl-1.2.2_pre4-r0-aarch64-edge.apk
+f1e056cef4bc2484920ead14cf39ee5faa0f36d978a083e18b2ba35f0f11e625b893ff6a87d71a18ab095b585d1d1aef2043bbffafc9322b87f7face3a2dcef1  musl-dev-1.2.2_pre4-r0-aarch64-edge.apk"
@@ -7,7 +7,7 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 fi

 pkgname=musl-armhf
-pkgver=1.2.2_pre3
+pkgver=1.2.2_pre4
 pkgrel=0
 arch="x86_64"
 subpackages="musl-dev-armhf:package_dev"
@@ -55,5 +55,5 @@ package_dev() {
 	done
 }

-sha512sums="0559ce69f9482a3c17e4e60c48e0e9cc71f5cc0be230178c4e48d354db40e8d5f013d3d3d4cccaebafd23bfe3612644f58a20d1beb13a8c7c2613e9c0d191a49  musl-1.2.2_pre3-r0-armhf-edge.apk
-3c20be72dfc798dc33494d508f3f9260a6fb388004b23706a6a1f6dbd7da32864ced1a479b0a1c884c4540f7d12f855132eda14dc93147255cd532d998ce5cb7  musl-dev-1.2.2_pre3-r0-armhf-edge.apk"
+sha512sums="eb7ca92a4b16450ccf815f8187494735ac71b3854c37912232cd0b68158afcc04eea976916b29df0d66591477d923612d0998b004bfa3b26fae859c0ee8739e2  musl-1.2.2_pre4-r0-armhf-edge.apk
+867cfe8a7874d68f8705c0761901bd5c1f81f19f79a8de62550b362b832bae17f07e6f8134949aeec153ed410742d10dd559c55a6dc030a0d8188582d42cd702  musl-dev-1.2.2_pre4-r0-armhf-edge.apk"
@@ -7,7 +7,7 @@ if [ -z "$(type -t arch_to_hostspec)" ]; then
 fi

 pkgname=musl-armv7
-pkgver=1.2.2_pre3
+pkgver=1.2.2_pre4
 pkgrel=0
 arch="x86_64"
 subpackages="musl-dev-armv7:package_dev"
@@ -55,5 +55,5 @@ package_dev() {
 	done
 }

-sha512sums="4a85ffb30f238655855aa8c1d37f8ad36bad2b52cac9fbce36dbbd34726640bd0a144030c991ec2c8c8478c4d8e8fe0a26448da93c255158a0655667105374ff  musl-1.2.2_pre3-r0-armv7-edge.apk
-9a1399736966f3bcacfd3dc48a096e4eaf8f32fcccdbda24aa57ff45f015f2d3525615a0163c48dcddbb368c6bb9e9b5326f52fb252f3fd5455ee32e56516451  musl-dev-1.2.2_pre3-r0-armv7-edge.apk"
+sha512sums="cbd1d0ac4f2f4f40597719122b435c266ca6db0ed38420783e7bfd318e1ca93deedeb55f421224122d4803caed601c8b39b8cc9668efd35b313c9ab61ef52087  musl-1.2.2_pre4-r0-armv7-edge.apk
+e67cd46a884d9204b0bf69f25a4a3cb7104b84dc7dbed1cd7cea57114f8d2bc70aa28359912fe349e74bd675c158dff51a36ab9c2286ebc0ecfb3ec17f14d1f5  musl-dev-1.2.2_pre4-r0-armv7-edge.apk"
@@ -1,7 +1,7 @@
 # Maintainer: Minecrell <minecrell@minecrell.net>
 pkgname=soc-qcom-msm8916
 pkgdesc="Common package for Qualcomm MSM8916 devices"
-pkgver=9
+pkgver=10
 pkgrel=0
 url="https://postmarketos.org"
 license="BSD-3-Clause"
@@ -10,7 +10,7 @@ options="!check !archcheck !tracedeps pmb:cross-native"
 depends="mesa-dri-gallium $pkgname-ucm"
 subpackages="$pkgname-ucm $pkgname-modem"

-_ucm_commit="c34a73dc0714834d2d2ff5ae304e20b7d93c4c98"
+_ucm_commit="174c39580db41f3b895c6262dc747c283a0e5e3c"
 source="$pkgname-$_ucm_commit.tar.gz::https://github.com/msm8916-mainline/alsa-ucm-conf/archive/$_ucm_commit.tar.gz
 	q6voiced.conf
 	"
@@ -41,5 +41,5 @@ modem() {
 	install -Dm644 q6voiced.conf "$subpkgdir"/etc/conf.d/q6voiced
 }

-sha512sums="498a6303dd3b9e2467f8a2935dd49a261334cc87d43c65c87f0b82a4c23db44ec1ff9f5891b93f30942a8077ef2a80638a5095e71af299cc359e857e81829e4c  soc-qcom-msm8916-c34a73dc0714834d2d2ff5ae304e20b7d93c4c98.tar.gz
+sha512sums="ee92bff4fdab39f5f58a149eff7ad9a06a98fe700cbc6604ec2696ba7794aa9e5753de631d27c2f1f9dcb2ed968dc8f459dbf1daa21e3bde82844930b1995ceb  soc-qcom-msm8916-174c39580db41f3b895c6262dc747c283a0e5e3c.tar.gz
 3a4a9322839d4b3ef9d79668a37840a9f444954759ae3c512e694051d2f9a2573db42ad6c4c1a5c75eeb861232a27ba1a8cef9b503decd54ead25a96e3dd6f98  q6voiced.conf"
@@ -2,8 +2,9 @@
 # Maintainer: Martijn Braam <martijn@brixit.nl>
 # Co-Maintainer: Luca Weiss <luca@z3ntu.xyz>
 # Co-Maintainer: Bart Ribbers <bribbers@disroot.org>
+# Co-Maintainer: Clayton Craft <clayton@craftyguy.net>
 pkgname=device-pine64-pinephone
-pkgver=0.13
+pkgver=0.14
 pkgrel=0
 pkgdesc="PINE64 PinePhone"
 url="https://postmarketos.org"
@@ -109,7 +110,7 @@ b53cc6f2531854cc9c1e4c334185a20551d64c8675ee8a8eaa03b99d80808fad421a0f6e99e5be21
 ccbc83b84b5028bc2c8e526759004ce71b50b2675ecffee98f5676c70a3332197a231ff9d2fd46444dd3c0a637ec08ce6125b18240fe6bfc13f624a15192e648  gpsd_device-hook.sh
 7dc2b7c20b4a2b15f597a6417bd01797643dad84a3683b0dee648e030fb6326e9d020307643fdcdf1bb43fc44af9975697e417003bd359610bae2d8ce614fc00  90-modem-eg25.rules
 e852b48a687f9b2a0eca444aa3d00a1818aead9f5e5d28e070b51c9d6f8ec648e66f1d88e2bfa94d74533f9ffb9aacc1703da2a06693f85fa04ff97fd7528012  PinePhone.conf
-c3abc45269fb135075f5e227161c68ac234775b87fcf224385c5f40123108bf87e1351a1f1ec6786e964f493129511b8363070116a9a451e53cd7b17b3a76cc8  HiFi.conf
-cd58ad8bc667aff3bb429e01eec4460f4e69c83dc53c0b717bf00112d64ded51a63a8e7359393669eb9ef03f78619e43c742c6153df8426a5b1beca11b3ebd90  VoiceCall.conf
+420c0053c7eb115065a2a30ce7e669f05bda0dd7f416633e4917ed50db46a52ce0b613b2452bcd12d2813cf0401b0a1b489306b0f0e77e5b46a2a2e46368d6a2  HiFi.conf
+5bb910286b2e224aaee0bc08d18d75d9d6466f6c83ef8939036cf0f6aba6a8bcb56d114002d88eb6ed8266d03ee599fbac2f5b43e786b86b7c2eda10547a3878  VoiceCall.conf
 db57bd1613ae988a05df86fa962352145f480e1a4e5a0ff921e734cf35ecd755b7f14775a70bb31a7e875813cbc7a4722202cf76023f1b15862bbd5390d0b757  eg25.initd
 fa063e2863afc48e627acc1a5b213a81499ba1dd30325f74f118a44e3964aec7e597b1f4bd318b7cf5bf14f27daf88e6ad9fc277ab106cbbe1189fdcc650d5c1  setup-modem.sh"
@@ -37,9 +37,10 @@ SectionVerb {
 		cset "name='AIF2 ADC Mixer AIF1 DA0 Capture Switch' off"
 	]

+        DisableSequence [
+        ]
+
 	Value {
-		PlaybackPCM "hw:${CardId},0"
-		CapturePCM "hw:${CardId},0"
 	}
 }

@@ -41,9 +41,10 @@ SectionVerb {
 		cset "name='AIF2 ADC Mixer AIF1 DA0 Capture Switch' off"
 	]

+        DisableSequence [
+        ]
+
 	Value {
-		PlaybackPCM "hw:${CardId},0"
-		CapturePCM "hw:${CardId},0"
 		PlaybackRate 8000
 	}
 }
@@ -0,0 +1,53 @@
+# Reference: <https://postmarketos.org/devicepkg>
+pkgname=device-asus-z010d
+pkgdesc="Asus Zenfone Max ZC550KL"
+pkgver=1
+pkgrel=0
+url="https://postmarketos.org"
+license="MIT"
+arch="aarch64"
+options="!check !archcheck"
+depends="postmarketos-base mkbootimg soc-qcom-msm8916"
+makedepends="devicepkg-dev"
+source="deviceinfo"
+subpackages="
+	$pkgname-kernel-mainline:kernel_mainline
+	$pkgname-kernel-mainline-modem:kernel_mainline_modem
+	$pkgname-nonfree-firmware:nonfree_firmware
+	$pkgname-nonfree-firmware-modem:nonfree_firmware_modem
+"
+
+build() {
+	devicepkg_build $startdir $pkgname
+}
+
+package() {
+	devicepkg_package $startdir $pkgname
+}
+
+kernel_mainline() {
+	pkgdesc="Close to mainline kernel (no modem, audio routed directly)"
+	depends="linux-postmarketos-qcom-msm8916"
+	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
+}
+
+kernel_mainline_modem() {
+	pkgdesc="Close to mainline kernel (non-free modem, audio routed through ADSP)"
+	depends="linux-postmarketos-qcom-msm8916 soc-qcom-msm8916-modem"
+	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
+}
+
+nonfree_firmware() {
+	pkgdesc="GPU/WiFi/BT/Video(/Modem) firmware"
+	depends="linux-firmware-qcom firmware-asus-z010d-venus firmware-asus-z010d-wcnss"
+	mkdir "$subpkgdir"
+}
+
+nonfree_firmware_modem() {
+	pkgdesc="Modem firmware"
+	depends="firmware-asus-z010d-modem"
+	install_if="$pkgname-nonfree-firmware $pkgname-kernel-mainline-modem"
+	mkdir "$subpkgdir"
+}
+
+sha512sums="5fbbed9d045c1ce73930174f5c87f30b6e5f80cac1d130bf20c321487fcbb2b5be803c76b22c37de2b26a17705bfd18da6f5d65152c8bb5df7760c4ea98e2aa3  deviceinfo"
@@ -0,0 +1,35 @@
+# Reference: <https://postmarketos.org/deviceinfo>
+# Please use double quotes only. You can source this file in shell scripts.
+
+deviceinfo_format_version="0"
+deviceinfo_name="Asus Zenfone Max ZC550KL"
+deviceinfo_manufacturer="Asus"
+deviceinfo_codename="asus-z010d"
+deviceinfo_year="2016"
+deviceinfo_dtb="qcom/msm8916-asus-z010d"
+deviceinfo_append_dtb="true"
+deviceinfo_modules_initfs=""
+deviceinfo_arch="aarch64"
+
+# Device related
+deviceinfo_chassis="handset"
+deviceinfo_keyboard="false"
+deviceinfo_external_storage="true"
+deviceinfo_screen_width="720"
+deviceinfo_screen_height="1280"
+deviceinfo_getty="ttyMSM0;115200"
+
+# MSM DRM cannot take over the framebuffer from the bootloader at the moment
+deviceinfo_no_framebuffer="true"
+
+# Bootloader related
+deviceinfo_flash_method="fastboot"
+deviceinfo_kernel_cmdline="earlycon console=ttyMSM0,115200 PMOS_NO_OUTPUT_REDIRECT"
+deviceinfo_generate_bootimg="true"
+deviceinfo_flash_offset_base="0x80000000"
+deviceinfo_flash_offset_kernel="0x00080000"
+deviceinfo_flash_offset_ramdisk="0x02000000"
+deviceinfo_flash_offset_second="0x00f00000"
+deviceinfo_flash_offset_tags="0x01e00000"
+deviceinfo_flash_pagesize="2048"
+deviceinfo_flash_sparse="true"
@@ -2,7 +2,7 @@
 pkgname=device-htc-leo
 pkgdesc="HTC HD2"
 pkgver=0.1
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -18,4 +18,10 @@ build() {
 package() {
 	devicepkg_package $startdir $pkgname
 }
+
+nonfree_firmware() {
+	pkgdesc="Wifi firmware"
+	depends="firmware-aosp-broadcom-wlan"
+	mkdir "$subpkgdir"
+}
 sha512sums="be7a9638313f9376460bc3f5b6b35038ecdb16e37369cec32771e457c0a081a1b9dff699adcdff317d3f47ebfc04d4563800b390fae3e5807bd350efbba4acd9  deviceinfo"
@@ -2,12 +2,15 @@
 pkgname=device-samsung-klte
 pkgdesc="Samsung Galaxy S5"
 pkgver=0.3
-pkgrel=12
+pkgrel=13
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
 options="!check !archcheck"
-depends="postmarketos-base mkbootimg"
+depends="
+	mkbootimg
+	postmarketos-base
+	"
 makedepends="devicepkg-dev"
 subpackages="
 	$pkgname-kernel-downstream:kernel_downstream
@@ -36,7 +39,12 @@ package() {

 kernel_downstream() {
 	pkgdesc="Display, touchscreen, Wi-Fi works (see device table for details)"
-	depends="linux-samsung-klte cpufrequtils msm-fb-refresher"
+	depends="
+		cpufrequtils
+		dropbear
+		linux-samsung-klte
+		msm-fb-refresher
+		"
 	install="$pkgname-kernel-downstream.post-install"

 	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
@@ -59,7 +67,7 @@ kernel_downstream() {
 }

 kernel_mainline() {
-	pkgdesc="Close to mainline; for kernel development only (most features aren't working)"
+	pkgdesc="Close to mainline kernel. Display, touchscreen, Wi-Fi works. Work in progress!"
 	depends="linux-postmarketos-qcom-msm8974 mesa-dri-gallium"
 	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
 }
@@ -78,7 +86,7 @@ downstream_firmware() {

 mainline_firmware() {
 	pkgdesc="Firmware packages for klte mainline kernel"
-	depends="firmware-adreno"
+	depends="firmware-adreno firmware-samsung-klte"
 	install_if="$pkgname-kernel-mainline $pkgname-nonfree-firmware"
 	mkdir "$subpkgdir"
 }
@@ -8,3 +8,8 @@ rc-update -q add deferred-initcalls sysinit
 if ! grep -q "i wlan0" /etc/conf.d/wpa_supplicant ; then
 	sed -i 's/-Dwext,nl80211/-Dwext,nl80211 -i wlan0/' /etc/conf.d/wpa_supplicant
 fi
+
+# Replace sshd with dropbear (workaround for sshd failure on downstream
+# kernels, see issue #808 https://gitlab.com/postmarketOS/pmaports/-/issues/808 )
+rc-update -q del sshd default
+rc-update -q add dropbear default
@@ -0,0 +1,42 @@
+pkgname=firmware-asus-z010d
+pkgver=1
+pkgrel=0
+pkgdesc="Firmware for Asus Zenfone Max ZC550KL"
+url="https://github.com/devajithvs/asus-z010d-firmware"
+subpackages="$pkgname-modem $pkgname-venus $pkgname-wcnss"
+arch="aarch64"
+license="proprietary"
+options="!check !strip !archcheck"
+
+_tag="v0.1"
+_repo="firmware-max"
+
+source="$pkgname-$_tag.tar.gz::https://gitlab.com/camillathechicken/$_repo/-/archive/$_tag/$_repo-$_tag.tar.gz"
+builddir="$srcdir/$_repo-$_tag"
+
+_fwdir="/lib/firmware/postmarketos"
+
+package() {
+	# parent package is empty
+	mkdir -p "$pkgdir"
+}
+
+modem() {
+	pkgdesc="Asus Zenfone Max ZC550KL modem firmware"
+	install -Dm644 "$builddir"/mba.mbn -t "$subpkgdir/$_fwdir"
+	install -Dm644 "$builddir"/modem.* -t "$subpkgdir/$_fwdir"
+}
+
+venus() {
+	pkgdesc="Asus Zenfone Max ZC550KL video firmware"
+	install -Dm644 "$builddir"/venus.* -t "$subpkgdir/$_fwdir"/qcom/venus-1.8
+}
+
+wcnss() {
+	pkgdesc="Asus Zenfone Max ZC550KL WiFi/BT firmware"
+	cd "$builddir"
+	install -Dm644 wcnss.* -t "$subpkgdir/$_fwdir"
+	install -Dm644 WCNSS_* -t "$subpkgdir/$_fwdir"/wlan/prima
+}
+
+sha512sums="870c4835de86aac68f29249d6f1545dc8b9ccdb4c3a19ed19eb3429c5d0ab40ed3ffceba36bf54b69a9e3ca2170fde66b2e357a8686580865bfa38e8b99e0cd6  firmware-asus-z010d-v0.1.tar.gz"
@@ -3,7 +3,7 @@

 pkgname=linux-htc-leo
 pkgver=3.0.4
-pkgrel=0
+pkgrel=1
 pkgdesc="HTC HD2 kernel fork"
 arch="armv7"
 _carch="arm"
@@ -49,5 +49,5 @@ package() {
 	downstreamkernel_package "$builddir" "$pkgdir" "$_carch" "$_flavor" "$_outdir"
 }
 sha512sums="5f324b69ff30284c0aabf16f9580726470eb54ce7edf6066e22d41d92e8be05085f9fb38fddeceee9cec4fb30cd68dda51585ff73ffbd4d52b154956aa81603e  linux-htc-leo-fb2ba086ea96647f38539664ebf0aa6eca61d7bb.tar.gz
-b4e0b06f16c1a950e9b95296b647a234cba5edc55701cd74297dd92d12c309d7a8b681022edd8e8e2fed739412a2af1b81210ccfcaa90090c3a83f017e41f760  config-htc-leo.armv7
+0dad1c7347d45885a54aae5781045d991b094e61e8cd78809897154aae89f1c0de2efed5238279eff5aa9fa204ee50196509ac5857594a244423173e1aa6d58f  config-htc-leo.armv7
 4166bdd725a00577c1319f1103ad802fc4699da3b5aae247c77b035880d21925d16c4faece72e93f59c933774dd912fc08082b07af03a90b664b7fa2865a61bc  01-fix-compiler-path.patch"
@@ -1376,7 +1376,7 @@ CONFIG_BCMDHD_GOOGLE=y
 # CONFIG_ATH_COMMON is not set
 # CONFIG_BCM4329 is not set
 CONFIG_BCMDHD=y
-CONFIG_BCMDHD_FW_PATH="/system/vendor/firmware/fw_bcmdhd.bin"
+CONFIG_BCMDHD_FW_PATH="/lib/firmware/postmarketos/bcmdhd/bcm4329/fw_bcm4329.bin"
 CONFIG_BCMDHD_NVRAM_PATH="/proc/calibration"
 CONFIG_DHD_USE_STATIC_BUF=y
 # CONFIG_DHD_USE_SCHED_SCAN is not set
@@ -3,7 +3,7 @@
 # Kernel config based on: arch/arm64/configs/vince_defconfig

 pkgname=linux-xiaomi-vince
-pkgver=4.9.236
+pkgver=4.9.245
 pkgrel=1
 pkgdesc="Xiaomi Redmi Note 5 Plus kernel fork"
 arch="aarch64"
@@ -12,11 +12,11 @@ _flavor="xiaomi-vince"
 url="https://kernel.org"
 license="GPL-2.0-only"
 options="!strip !check !tracedeps pmb:cross-native"
-makedepends="sed gcc-arm-none-eabi bash bc bison devicepkg-dev flex openssl-dev perl"
+makedepends="sed gcc-armv7 bash bc bison devicepkg-dev flex openssl-dev perl"

 # Source
 _repository="M0Rf30/kernel_xiaomi_vince"
-_commit="1c360dbfc792d1ef2761a74036e6db0d83cfcba1"
+_commit="674b72dc7c02c8cdd6cbc4e86ecf15b8222212cc"
 _config="config-$_flavor.$arch"
 source="$pkgname-$_commit.tar.gz::https://github.com/$_repository/archive/$_commit.tar.gz
 	$_config
@@ -45,5 +45,5 @@ package() {
 		INSTALL_MOD_PATH="$pkgdir" modules_install
 }

-sha512sums="627301618b515b81cdeb3ef956129ddaacc68d34c8cf6da84b60f6924283d423f4251092613cf2450099996c2fa89fe3a4bfd1f752ae8d62b35f22c192dfe690  linux-xiaomi-vince-1c360dbfc792d1ef2761a74036e6db0d83cfcba1.tar.gz
-95c12dff223bdea9d1bcc6aaab37a166967bfefd2874b8658465d1386d2ef61a5e9fd2f765f24d31b5a4c787a3136461205640f9f1232095ce8bc7fca244025b  config-xiaomi-vince.aarch64"
+sha512sums="0579f804509f1f670b0ab233de23689bcd0975e2040623d7ee27e8fcb60f5b20a548423fc45ea2e30c6305b49ad5806525265099fd68ac2e7025a1cffa80abd6  linux-xiaomi-vince-674b72dc7c02c8cdd6cbc4e86ecf15b8222212cc.tar.gz
+5ce1263f527a3d6284a57fb4b21682af251523e8746cac81afecfd5b65b05ddf299adf0c42f5cd10c81072db914e76ebee03ba37fb89b078af6cbb30c727f2d8  config-xiaomi-vince.aarch64"
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 4.9.224 Kernel Configuration
+# Linux/arm64 4.9.245 Kernel Configuration
 #
 CONFIG_ARM64=y
 CONFIG_64BIT=y
@@ -46,7 +46,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
 # CONFIG_COMPILE_TEST is not set
-CONFIG_LOCALVERSION="-Dark-Ages-Décimo"
+CONFIG_LOCALVERSION="-Dark-Ages-Último"
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_DEFAULT_HOSTNAME="(none)"
 CONFIG_SWAP=y
@@ -570,7 +570,7 @@ CONFIG_KUSER_HELPERS=y
 CONFIG_SYSVIPC_COMPAT=y
 CONFIG_KEYS_COMPAT=y
 CONFIG_COMPAT_VDSO=y
-CONFIG_CROSS_COMPILE_ARM32="arm-none-eabi-"
+CONFIG_CROSS_COMPILE_ARM32="armv7-alpine-linux-musleabihf-"

 #
 # Power management options
@@ -637,12 +637,7 @@ CONFIG_CPU_FREQ_GOV_ONDEMAND=y
 # CONFIG_CPU_FREQ_GOV_INTERACTIVE is not set
 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
 CONFIG_CPU_BOOST=y
-CONFIG_DSBOOST=y
-CONFIG_INPUT_BOOST_DURATION=64
-CONFIG_COOLDOWN_BOOST_DURATION=3000
-CONFIG_INPUT_STUNE_BOOST=15
-CONFIG_COOLDOWN_STUNE_BOOST=12
-CONFIG_SCHED_STUNE_BOOST=12
+# CONFIG_DSBOOST is not set
 CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
 CONFIG_CPU_FREQ_GOV_PIXEL_SMURFUTIL=y

@@ -0,0 +1,47 @@
+# Contributor: Bart Ribbers <bribbers@disroot.org>
+# Maintainer: Bart Ribbers <bribbers@disroot.org>
+pkgname=neochat
+pkgver=0_git20201121
+pkgrel=0
+_commit="14e58ca358803d8a10dfa2bd846037c8f351e791"
+pkgdesc="A client for Matrix, the decentralized communication protocol"
+url="https://invent.kde.org/network/neochat/"
+# armhf blocked by extra-cmake-modules
+arch="all !armhf"
+license="GPL-2.0-or-later AND GPL-3.0-only AND GPL-3.0-or-later AND BSD-2-Clause"
+depends="
+	kirigami2
+	kitemmodels
+	"
+makedepends="
+	extra-cmake-modules
+	cmark-dev
+	kconfig-dev
+	kcoreaddons-dev
+	ki18n-dev
+	kirigami2-dev
+	knotifications-dev
+	libquotient-dev
+	qt5-qtbase-dev
+	qt5-qtdeclarative-dev
+	qt5-qtkeychain-dev
+	qt5-qtmultimedia-dev
+	qt5-qtquickcontrols2-dev
+	qt5-qtsvg-dev
+	"
+source="https://invent.kde.org/network/neochat/-/archive/$_commit/neochat-$_commit.tar.gz"
+options="!check" # No tests
+builddir="$srcdir/neochat-$_commit"
+
+build() {
+	cmake -B build \
+		-DCMAKE_BUILD_TYPE=None \
+		-DCMAKE_INSTALL_PREFIX=/usr
+	cmake --build build
+}
+
+package() {
+	DESTDIR="$pkgdir" cmake --build build --target install
+}
+
+sha512sums="561e7aec76b5cafde6068b40d3b52d8d00b5f68f9aefd2df53b6df4f519959e202d282b33bea36c9443d0fe712cf308232496686636c0ea582b1a681b44c12d5  neochat-14e58ca358803d8a10dfa2bd846037c8f351e791.tar.gz"
@@ -1,31 +0,0 @@
-# Maintainer: Luca Weiss <luca@z3ntu.xyz>
-pkgname=dbus-test-runner
-pkgver=15.04.0_git20180109
-_commit="86d63d119566974bd841cacd3202599b3b1a845d"
-pkgrel=2
-pkgdesc="A small little utility to run a couple of executables under a new DBus session for testing"
-url="https://launchpad.net/dbus-test-runner"
-arch="x86_64"
-license="GPL-3.0-only"
-depends="dbus"
-makedepends="gnome-common automake autoconf intltool libtool dbus-glib-dev"
-source="$pkgname-$_commit.tar.gz::https://github.com/ubports/dbus-test-runner/archive/$_commit.tar.gz
-	werror.patch"
-options="!check"
-builddir="$srcdir/$pkgname-$_commit"
-
-build() {
-	export CFLAGS="${CFLAGS:-} -Wno-error=deprecated -Wno-error=deprecated-declarations"
-	./autogen.sh \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--libexecdir=/usr/lib
-	make
-}
-
-package() {
-	make DESTDIR="$pkgdir" install
-}
-sha512sums="89189a6df11a69e7ace97805fe6238515838731fabf00972f0e607612fbd057c5178b5899a93420b89943f39962d2cf8c87d36d439fb06d1c4cd70518cb623ae  dbus-test-runner-86d63d119566974bd841cacd3202599b3b1a845d.tar.gz
-89c0ae015b8b691a3874b84faafff17c1a9c371afe9d076aac73ef50eaf91d9f02b87916537deb18f37bf25d1be752a0aca288ad6e0ebb997577b708b4c4c716  werror.patch"
@@ -1,84 +0,0 @@
-diff --git a/libdbustest/Makefile.am b/libdbustest/Makefile.am
-index d76ff52..d048a83 100644
--- a/libdbustest/Makefile.am
-+++ b/libdbustest/Makefile.am
-@@ -40,7 +40,7 @@ libdbustest_la_CFLAGS = \
- 	-DBUSTLE_DUAL_MONITOR="\"$(pkgdatadir)/dbus-test-bustle-handler\"" \
- 	-DWATCHDOG="\"$(pkglibexecdir)/dbus-test-watchdog\"" \
- 	-DG_LOG_DOMAIN=\"libdbustest\" \
-	-Wall -Werror -Wextra
-+	-Wall -Wextra
- 
- libdbustest_la_LIBADD = \
- 	libdbustest-generated.la \
-@@ -59,7 +59,7 @@ libdbustest_generated_la_CFLAGS = \
- 	$(DBUS_TEST_RUNNER_CFLAGS) \
- 	-I$(builddir) \
- 	-DG_LOG_DOMAIN=\"libdbustest\" \
-	-Wall -Werror
-+	-Wall
- 
- libdbustest_generated_la_SOURCES = \
- 	dbus-mock-iface.h \
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 24a3f1f..7c44544 100644
--- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -6,7 +6,7 @@ dbus_test_runner_CFLAGS  = $(DBUS_TEST_RUNNER_CFLAGS) \
- 	$(COVERAGE_CFLAGS) \
- 	-I$(top_srcdir) \
- 	-DDEFAULT_SESSION_CONF="\"$(datadir)/dbus-test-runner/session.conf\"" \
-	-Wall -Werror -Wextra
-+	-Wall -Wextra
- dbus_test_runner_LDADD   = $(DBUS_TEST_RUNNER_LIBS) \
- 	$(top_builddir)/libdbustest/libdbustest.la
- dbus_test_runner_LDFLAGS = $(COVERAGE_LDFLAGS)
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index 7eccc63..4f4aad9 100644
--- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -245,7 +245,7 @@ test_own_name_SOURCES = \
- 	test-own-name.c
- test_own_name_CFLAGS = \
- 	$(DBUS_TEST_RUNNER_CFLAGS) \
-	-Wall -Werror
-+	-Wall
- test_own_name_LDADD = \
- 	$(DBUS_TEST_RUNNER_LIBS)
- 
-@@ -253,7 +253,7 @@ test_check_name_SOURCES = \
- 	test-check-name.c
- test_check_name_CFLAGS = \
- 	$(DBUS_TEST_RUNNER_CFLAGS) \
-	-Wall -Werror
-+	-Wall
- test_check_name_LDADD = \
- 	$(DBUS_TEST_RUNNER_LIBS)
- 
-@@ -351,7 +351,7 @@ test_libdbustest_CFLAGS = \
- 	-I$(top_srcdir) \
- 	-DSESSION_CONF="\"$(top_srcdir)/data/session.conf\"" \
- 	-DGETNAME_PATH="\"$(abs_builddir)/test-libdbustest-getname\"" \
-	-Wall -Werror
-+	-Wall
- test_libdbustest_LDADD = \
- 	$(DBUS_TEST_RUNNER_LIBS) \
- 	$(top_builddir)/libdbustest/libdbustest.la
-@@ -360,7 +360,7 @@ test_libdbustest_getname_SOURCES = \
- 	test-libdbustest-getname.c
- test_libdbustest_getname_CFLAGS = \
- 	$(DBUS_TEST_RUNNER_CFLAGS) \
-	-Wall -Werror
-+	-Wall
- test_libdbustest_getname_LDADD = \
- 	$(DBUS_TEST_RUNNER_LIBS)
- 
-@@ -389,7 +389,7 @@ test_libdbustest_mock_CFLAGS = \
- 	-I$(top_srcdir) \
- 	-DSESSION_CONF="\"$(top_srcdir)/data/session.conf\"" \
- 	-DGETNAME_PATH="\"$(abs_builddir)/test-libdbustest-getname\"" \
-	-Wall -Werror
-+	-Wall
- test_libdbustest_mock_LDADD = \
- 	$(DBUS_TEST_RUNNER_LIBS) \
- 	$(top_builddir)/libdbustest/libdbustest.la
@@ -5,9 +5,9 @@
 _flavor=postmarketos-allwinner
 _config="config-$_flavor.$CARCH"
 pkgname=linux-$_flavor
-pkgver=5.9.8_git20201117
+pkgver=5.9.10_git20201123
 pkgrel=0
-_tag="orange-pi-5.9-20201117-1927"
+_tag="orange-pi-5.9-20201123-0250"
 pkgdesc="Kernel fork with Pine64 patches (megi's tree, slightly patched)"
 arch="aarch64"
 _carch="arm64"
@@ -76,7 +76,7 @@ dev() {
 		INSTALL_HDR_PATH="$subpkgdir"/usr
 }

-sha512sums="4aef259ad83920b96b5cf4fde8a6c691c5ba166d39ed47671a58183fbc3a96bc8c47150121cea6a0f0f0d811ae06e66ced814175ff4e900452dfef13df92c0ae  linux-postmarketos-allwinner-orange-pi-5.9-20201117-1927.tar.gz
+sha512sums="2fc654070d93352f383d777859e65529ca92c3258ffcb629150d4ac85a2156f7eb030bb8c4906d3ea4b3aba55087afbbd8f18dcd5f0bc53b1956704730f2800d  linux-postmarketos-allwinner-orange-pi-5.9-20201123-0250.tar.gz
 0006b939af9c2af70266e9dc5a5b527a57cdd1abf9b6ca55c43254637519b166af88ead4f97a36b1607f96c711b287b0ba08769b5b2314407cfb41f087c50172  config-postmarketos-allwinner.aarch64
 6b96dcdca84f0581d1f6354dfb752ef382b2a70793e881233e71c2af0c58d0eed965be7a494308a639e2e9035e46535f659e0c1721c0e3b8444a2ac981d7dc99  0001-dts-add-dontbeevil-pinephone-devkit.patch
 5cd62667ebe1d5213d5d89423fe2a810c55fa84a238790af5f087b31cee3a3db66bcaba14001c345731bc1212060f74c0629433403be2485a5bbd4f0dd1c4f65  0002-dts-add-pinetab-dev-old-display-panel.patch
@@ -4,8 +4,8 @@ _config="config-$_flavor.$CARCH"

 pkgname=linux-$_flavor
 pkgver=5.9.0_rc4
-pkgrel=0
-_commit="0aa15376cf66e41bb980b24a388cdf2dcb770a68"
+pkgrel=1
+_commit="2d11e1d8eee79e884286ba200829f227d5ba1f1a"
 pkgdesc="Kernel close to mainline with extra patches for Qualcomm MSM8974 devices"
 arch="armv7"
 _carch="arm"
@@ -49,5 +49,5 @@ package() {
 		"$pkgdir/usr/share/kernel/$_flavor/kernel.release"
 }

-sha512sums="77e13b23fdbaf36cc91b3c55b9c5f9f7bec6c5c31c6d255daad18e0c1e27176218d465a03c449bd3678f7cb37b5a21970145fc6a8dac5400f9eb318281157f47  linux-postmarketos-0aa15376cf66e41bb980b24a388cdf2dcb770a68.tar.gz
-8c918d1fa9fdda74829b7df5d3b9fb91536e8430e9d689d0eb515336cba5bf0ac09f0d0810bac6331ef76ecb5cdb119a9c20d1c10ee22234513ee5bee2cc1fa5  config-postmarketos-qcom-msm8974.armv7"
+sha512sums="953727752af25fc8fa41201ebcf25363512f32e3d6d81afc4046c86719911c0b221bfff0d0f5631157f2b242918a6fee686b701bb74d8d28ec56cc41b482be9a  linux-postmarketos-2d11e1d8eee79e884286ba200829f227d5ba1f1a.tar.gz
+b746e9d3ee4541b6e2e08fa30e6064624c92a125675cb6b57ff072b82e8f927ddba0d476b7ba57cb657fcc1cb6dd5d5c4781cd27983d7427244b7f1338e121f8  config-postmarketos-qcom-msm8974.armv7"
@@ -2,10 +2,10 @@
 # Automatically generated file; DO NOT EDIT.
 # Linux/arm 5.9.0-rc4 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="gcc (Alpine 10.2.0) 10.2.0"
+CONFIG_CC_VERSION_TEXT="gcc (Alpine 10.2.1_pre0) 10.2.1 20201113"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=100200
-CONFIG_LD_VERSION=234000000
+CONFIG_GCC_VERSION=100201
+CONFIG_LD_VERSION=235010000
 CONFIG_CLANG_VERSION=0
 CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_CC_HAS_ASM_INLINE=y
@@ -1240,6 +1240,7 @@ CONFIG_DEV_COREDUMP=y
 # CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
 # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
 CONFIG_GENERIC_CPU_AUTOPROBE=y
+CONFIG_SOC_BUS=y
 CONFIG_REGMAP=y
 CONFIG_REGMAP_I2C=y
 CONFIG_REGMAP_SPI=y
@@ -1877,6 +1878,7 @@ CONFIG_NET_VENDOR_QLOGIC=y
 CONFIG_NET_VENDOR_QUALCOMM=y
 # CONFIG_QCA7000_SPI is not set
 # CONFIG_QCA7000_UART is not set
+CONFIG_QCOM_BAM_DMUX=m
 # CONFIG_QCOM_EMAC is not set
 # CONFIG_RMNET is not set
 CONFIG_NET_VENDOR_RDC=y
@@ -2744,7 +2746,7 @@ CONFIG_POWER_SUPPLY_HWMON=y
 # CONFIG_CHARGER_SBS is not set
 # CONFIG_MANAGER_SBS is not set
 # CONFIG_BATTERY_BQ27XXX is not set
-# CONFIG_BATTERY_MAX17040 is not set
+CONFIG_BATTERY_MAX17040=m
 # CONFIG_BATTERY_MAX17042 is not set
 # CONFIG_CHARGER_MAX8903 is not set
 # CONFIG_CHARGER_LP8727 is not set
@@ -5163,7 +5165,7 @@ CONFIG_QCOM_SMD_RPM=y
 CONFIG_QCOM_SMEM_STATE=y
 CONFIG_QCOM_SMP2P=y
 CONFIG_QCOM_SMSM=y
-# CONFIG_QCOM_SOCINFO is not set
+CONFIG_QCOM_SOCINFO=y
 CONFIG_QCOM_WCNSS_CTRL=y
 # CONFIG_QCOM_APR is not set
 # end of Qualcomm SoC drivers
@@ -1,7 +1,7 @@
 # Maintainer: Oliver Smith <ollieparaoid@postmarketos.org>
 pkgname=mobile-config-firefox
-pkgver=1.0.1
-pkgrel=2
+pkgver=2.0.0
+pkgrel=0
 pkgdesc="Firefox tweaks for mobile and privacy"
 url="https://gitlab.com/postmarketOS/mobile-config-firefox"
 source="
@@ -26,5 +26,5 @@ build() {
 package() {
 	make DESTDIR="$pkgdir" install
 }
-sha512sums="9bfa3ea6c4f74153a58e2c7bb1ed6472b09b04c7fd9f43583cce5d03a1cbb9e1fcf3d66fd3bd12b12c6114f4fca2d65d98499f2f17ff0cc79287c837b1a27495  mobile-config-firefox-1.0.1.tar.bz2
+sha512sums="bf61f1a163bfd7603cb3f1e73f23bed7dfbd1f2c6d994be085ba8bc2e49ab592f35d451b6f9521c9638d690d98aaa3f538504ff3c9fd07729234c14ec93cf758  mobile-config-firefox-2.0.0.tar.bz2
 b99713e30add88f532870430a3c9122faf7e932356cdbe1faa571b661088ce00665a5e499f1873688e58c014b741235571b67efa3df2228b5f3e39972d6f35e3  distro_links.html"
@@ -1,7 +1,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=postmarketos-ui-plasma-mobile
 pkgver=3.1
-pkgrel=1
+pkgrel=2
 pkgdesc="(Wayland) Mobile variant of KDE Plasma (does not run without hardware acceleration, allows only numeric passwords!)"
 url="https://wiki.postmarketos.org/wiki/Plasma_Mobile"
 arch="noarch !armhf !x86" # armhf: pmaports#75, x86: aports#11807
@@ -41,9 +41,9 @@ _pmb_recommends="breeze-gtk
 	koko
 	kpeoplesink
 	kpeoplevcard
+	megapixels
 	mobile-config-firefox
 	plasma-angelfish
-	plasma-camera
 	plasma-dialer
 	plasma-phonebook
 	postmarketos-artwork-wallpapers
@@ -90,7 +90,10 @@ extras() {
 		buho
 		calindori
 		kaidan
+		kalk
+		kclock
 		ktrip
+		kweather
 		nota
 		okular-mobile
 		vvave
@@ -1,7 +1,7 @@
 # Maintainer: Martijn Braam <martijn@brixit.nl>
 pkgname=powersupply
-pkgver=0.3.3
-pkgrel=1
+pkgver=0.4.0
+pkgrel=0
 pkgdesc="GTK3 tool for displaying battery and power info"
 url="https://gitlab.com/MartijnBraam/powersupply"
 arch="noarch"
@@ -25,4 +25,4 @@ package() {
 		"$pkgdir"/usr/share/icons/hicolor/scalable/apps/nl.brixit.powersupply.svg

 }
-sha512sums="e894b9409f9a7558bd4b4786346a4a88ee7a01c4651f762e51f05e2b5ff5e2bb1b173787ec8d38096d12fec4a5a213c0a88587e6a4b53db72c0eae79d672804c  powersupply-0.3.3.tar.gz"
+sha512sums="db3ee1a1ed2e349db5af4d77a86ee51ef6f6e43c064d6d24ec88551f91e0a0d3c9abed0d80604f91c7f5293f3b5dbae1c03da5b5d616f6f74d5d3d827839b5c0  powersupply-0.4.0.tar.gz"
@@ -3,7 +3,7 @@ pkgname=qt5-qtsystems
 pkgver=0_git20190103
 _commit="e3332ee38d27a134cef6621fdaf36687af1b6f4a"
 pkgrel=1
-arch="x86_64"
+arch="all"
 url='http://qt-project.org/'
 license="LGPL-2.1-only AND LGPL-3.0-only AND GPL-3.0-only AND Qt-GPL-exception-1.0"
 pkgdesc="Qt Systems"
@@ -1,17 +1,18 @@
 # Maintainer: Oliver Smith <ollieparaoid@postmarketos.org>
 pkgname=tinydm
 pkgver=1.0.2
-pkgrel=0
+pkgrel=1
 pkgdesc="Tiny Display Manager"
 url="https://postmarketos.org"
 source="https://gitlab.com/postmarketOS/tinydm/-/archive/$pkgver/tinydm-$pkgver.tar.bz2"
 arch="noarch"
 license="GPL-3.0-or-later"
 options="!check" # No tests
-depends="autologin $pkgname-openrc"
+depends="autologin elogind $pkgname-openrc"
 subpackages="$pkgname-openrc"

 prepare() {
+	depends="elogind-openrc"
 	default_prepare

 	# default user in pmOS has a UID of 10000
@@ -0,0 +1,54 @@
+# Forked from Alpine Linux
+pkgname=dino
+pkgver=9999_git20201123
+pkgrel=0
+# feature/handy branch
+_commit="9b522a6f30c43765a667519a56f68b579c54b6af"
+pkgdesc="Modern Jabber/XMPP client"
+url="https://dino.im"
+arch="all"
+license="GPL-3.0-only"
+makedepends="
+	glib-dev
+	glib-networking
+	gtk+3.0-dev
+	gpgme-dev
+	libgee-dev
+	libsignal-protocol-c-dev
+	libgcrypt-dev
+	libhandy1-dev
+	libsoup-dev
+	sqlite-dev
+	libqrencode-dev
+	cmake
+	vala
+	ninja
+"
+subpackages="$pkgname-lang"
+source="
+	https://github.com/dino/dino/archive/$_commit.tar.gz
+	bump-signal-version.patch
+	"
+builddir="$srcdir/$pkgname-$_commit"
+build() {
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--localstatedir=/var \
+		--with-tests
+	make
+}
+
+check() {
+	build/xmpp-vala-test
+	build/signal-protocol-vala-test
+}
+
+package() {
+	make DESTDIR="$pkgdir" install
+}
+sha512sums="019c9088ccaef18f6befcbc5bfe374ca44a45ce97f43a76cbc42bc53885cd6af7a7ff68d05961342c2683e3a93876a18be8527b4ba6cc7e59711249ff96c79bd  9b522a6f30c43765a667519a56f68b579c54b6af.tar.gz
+838ccba8d97db8bc43de26afd259e4bdaf3afea786bf40a7ed9ae63f4fb7c2190e8bf6de7b41880602113df87831d01467547f8bfd1f88b50d35287822cb5f4c  bump-signal-version.patch"
@@ -0,0 +1,13 @@
+diff --git a/plugins/signal-protocol/CMakeLists.txt b/plugins/signal-protocol/CMakeLists.txt
+index 400de03..0d776de 100644
+--- a/plugins/signal-protocol/CMakeLists.txt
+++ b/plugins/signal-protocol/CMakeLists.txt
+@@ -32,7 +32,7 @@ if(NOT BUILD_LIBSIGNAL_IN_TREE)
+     # libsignal-protocol-c has a history of breaking compatibility on the patch level
+     # we'll have to check compatibility for every new release
+     # distro maintainers may update this dependency after compatibility tests
+-    find_package(SignalProtocol 2.3.2 REQUIRED)
+    find_package(SignalProtocol 2.3.3 REQUIRED)
+ else()
+     add_subdirectory(libsignal-protocol-c EXCLUDE_FROM_ALL)
+     set_property(TARGET curve25519 PROPERTY POSITION_INDEPENDENT_CODE ON)
@@ -0,0 +1,63 @@
+# Forked from Alpine to apply Purism's mobile patches
+pkgname=geary
+pkgver=9999_git20201126
+pkgrel=0
+_commit="7644e034c4034658305c23008db8d12dcf01a9c9"
+pkgdesc="Geary is an email application built around conversations"
+url="https://wiki.gnome.org/Apps/Geary"
+# libhandy is not available on s390x or mips
+arch="all !s390x !mips !mips64"
+license="LGPL-2.1-or-later AND CC-BY-3.0 AND BSD-2-Clause"
+depends="iso-codes dbus:org.freedesktop.Secrets"
+makedepends="
+	appstream-glib-dev
+	enchant2-dev
+	folks-dev
+	gcr-dev
+	glib-dev
+	gmime-dev
+	gnome-online-accounts-dev
+	gspell-dev
+	gtk+3.0-dev
+	iso-codes-dev
+	itstool
+	json-glib-dev
+	libcanberra-dev
+	libgee-dev
+	libhandy1-dev
+	libnotify-dev
+	libpeas-dev
+	libsecret-dev
+	libxml2-dev
+	meson
+	sqlite-dev
+	vala
+	webkit2gtk-dev
+	ytnef-dev
+	"
+checkdepends="
+	desktop-file-utils
+	ibus
+	xvfb-run
+	"
+options="!check" # https://gitlab.gnome.org/GNOME/geary/-/issues/776
+subpackages="$pkgname-lang $pkgname-doc"
+source="https://source.puri.sm/Librem5/geary/-/archive/$_commit/geary-$_commit.tar.gz"
+builddir="$srcdir/$pkgname-$_commit"
+
+build() {
+	abuild-meson \
+		-Dlibunwind_optional=true \
+		. output
+	meson compile ${JOBS:+-j ${JOBS}} -C output
+}
+
+check() {
+	xvfb-run meson test --no-rebuild -v -C output
+}
+
+package() {
+	DESTDIR="$pkgdir" meson install --no-rebuild -C output
+}
+
+sha512sums="bd208108f6f22864422daf26a0a689f4100d30c1eadbac31bb67b8cd897faf5353064b5af99f8b74882d794cf3050483e84ffddc356bc1768cff2dabd0358054  geary-7644e034c4034658305c23008db8d12dcf01a9c9.tar.gz"
@@ -0,0 +1,27 @@
+# Forked from Alpine, because it's missing for armv7
+
+pkgname=libevdev
+pkgver=1.10.0
+pkgrel=0
+pkgdesc="Kernel Evdev Device Wrapper Library"
+url="https://www.freedesktop.org/wiki/Software/libevdev"
+arch="armv7"
+license="MIT"
+options="!check"  # Requires CONFIG_INPUT_UINPUT in kernel
+makedepends="meson python3 linux-headers doxygen"
+subpackages="$pkgname-dev $pkgname-doc"
+source="https://freedesktop.org/software/libevdev/libevdev-$pkgver.tar.xz"
+
+build() {
+	abuild-meson \
+		-Dtests=disabled \
+		-Ddocumentation=enabled \
+		. output
+	meson compile ${JOBS:+-j ${JOBS}} -C output
+}
+
+package() {
+	DESTDIR="$pkgdir" meson install --no-rebuild -C output
+}
+
+sha512sums="94ab4ee7e0854c41a491d8e4713baa95ae66dd337b41823011c0913aa1c72e8bbf8b808d5936c2ef456af794b6d3a5cd7cd0515fbd1d06dd1b7ba19275bd928f  libevdev-1.10.0.tar.xz"
@@ -0,0 +1,47 @@
+# Forked from Alpine: missing for armv7, just like xorg-server
+# https://postmarketos.org/edge/2020/12/01/xorg-server-moved/
+
+pkgname=libinput
+pkgver=1.16.4
+pkgrel=0
+pkgdesc="Library for handling input devices"
+url="https://www.freedesktop.org/wiki/Software/libinput"
+arch="armv7"
+license="MIT"
+makedepends="eudev-dev libevdev-dev meson mtdev-dev"
+checkdepends="diffutils bash"
+subpackages="
+	$pkgname-dev
+	$pkgname-doc
+	$pkgname-libs
+	$pkgname-zsh-completion
+	"
+source="https://freedesktop.org/software/libinput/libinput-$pkgver.tar.xz"
+options="!check"
+
+build() {
+	abuild-meson \
+		-Ddocumentation=false \
+		-Dlibwacom=false \
+		-Ddebug-gui=false \
+		-Dtests=false builddir/
+	meson compile ${JOBS:+-j ${JOBS}} -C builddir/
+}
+
+check() {
+	meson test --no-rebuild -v -C builddir
+}
+
+package() {
+	DESTDIR="$pkgdir" meson install --no-rebuild -C builddir
+}
+
+libs() {
+	default_libs
+
+	mv "$pkgdir"/usr/lib/udev "$subpkgdir"/usr/lib
+	mkdir -p "$subpkgdir"/usr/share/
+	mv "$pkgdir"/usr/share/libinput "$subpkgdir"/usr/share
+}
+
+sha512sums="a95a3bcf58a9298946d15f4f2fd93dc5807d3042f8797950a1ffd96d3c979b55a764f035a9f7680d0ea400b033698c322eb61a4387dbc280db6110ffd3e137ee  libinput-1.16.4.tar.xz"
@@ -0,0 +1,46 @@
+# Forked from Alpine
+# https://postmarketos.org/edge/2020/12/01/xorg-server-moved/
+
+pkgname=libxfont2
+pkgver=2.0.4
+pkgrel=0
+pkgdesc="X.Org X11 libXfont2 runtime library"
+url="https://www.x.org"
+arch="armhf armv7 aarch64"
+license="MIT"
+options="!check"  # No test suite.
+makedepends="$depends_dev libfontenc-dev freetype-dev zlib-dev xtrans
+	util-macros autoconf automake libtool xorgproto"
+subpackages="$pkgname-dev"
+source="https://www.x.org/pub/individual/lib/libXfont2-$pkgver.tar.bz2"
+builddir="$srcdir/libXfont2-$pkgver"
+
+# secfixes:
+#   2.0.3-r0:
+#     - CVE-2017-16611
+
+prepare() {
+	default_prepare
+	autoreconf -vif
+}
+
+build() {
+	cd "$builddir"
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--localstatedir=/var \
+		--disable-static \
+		--without-fop
+	make
+}
+
+package() {
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
+}
+
+sha512sums="7cf6c58e520e48e24fc4f05fec760fcbeaaac0cedeed57dded262c855e1515cc34cd033222945a0b016f6857b83009fc2a6946c7d632c2f7bb0060f8e8a8a106  libXfont2-2.0.4.tar.bz2"
@@ -0,0 +1,44 @@
+From 44932947cb3c6cfbded0ba48c1133f95fdfa0c1f Mon Sep 17 00:00:00 2001
+From: Dylan Van Assche <me@dylanvanassche.be>
+Date: Fri, 27 Nov 2020 19:54:46 +0100
+Subject: [PATCH] build: Allow elogind for suspend/resume support
+
+Added elogind to supported suspend/resume hooks. Upstreaming at https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/merge_requests/407
+---
+ configure.ac | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index e3c9a4f8..032c4c4c 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -248,13 +248,14 @@ dnl
+ 
+ PKG_CHECK_MODULES(LIBSYSTEMD, [libsystemd >= 209],[have_libsystemd=yes],[have_libsystemd=no])
+ PKG_CHECK_MODULES(LIBSYSTEMD_LOGIN, [libsystemd-login >= 183],[have_libsystemd_login=yes],[have_libsystemd_login=no])
+PKG_CHECK_MODULES(LIBELOGIND, [libelogind >= 209], [have_elogind=yes], [have_elogind=no])
+ AC_ARG_WITH(systemd-suspend-resume,
+             AS_HELP_STRING([--with-systemd-suspend-resume=no|yes],
+                            [Enable systemd suspend/resume support [[default=auto]]]),,
+             [with_systemd_suspend_resume=auto])
+ 
+ if test "x$with_systemd_suspend_resume" = "xauto"; then
+-    if test "x$have_libsystemd" = "xyes" || test "x$have_libsystemd_login" = "xyes"; then
+    if test "x$have_libsystemd" = "xyes" || test "x$have_libsystemd_login" = "xyes" || test "x$have_elogind" = "xyes"; then
+         with_systemd_suspend_resume=yes
+     else
+         with_systemd_suspend_resume=no
+@@ -263,8 +264,8 @@ fi
+ 
+ case $with_systemd_suspend_resume in
+     yes)
+-        if test "x$have_libsystemd" = "xno" && test "x$have_libsystemd_login" = "xno"; then
+-		    AC_MSG_ERROR(libsystemd or libsystemd-login development headers are required)
+        if test "x$have_libsystemd" = "xno" && test "x$have_libsystemd_login" = "xno" && test "x$have_elogind" = "xno"; then
+		    AC_MSG_WARN(libsystemd, libsystemd-login or elogind must be available at runtime for suspend/resume support)
+ 	    fi
+         AC_DEFINE(WITH_SYSTEMD_SUSPEND_RESUME, 1, [Define if you have systemd suspend-resume support])
+         ;;
+-- 
+2.25.1
+
@@ -0,0 +1,27 @@
+From 94ea3cd9ec1e59071a29ca6ed33386bf50c6355d Mon Sep 17 00:00:00 2001
+From: Dylan Van Assche <me@dylanvanassche.be>
+Date: Fri, 27 Nov 2020 20:08:47 +0100
+Subject: [PATCH] broadband-modem: Do not send ATH during probing
+
+ATH (AT hangup) rejects an incoming call during probing. This is a hack,
+needs improvement, but suggested by the maintainer: https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/issues/194
+---
+ src/mm-broadband-modem.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/mm-broadband-modem.c b/src/mm-broadband-modem.c
+index 97c60b68..9e55b011 100644
+--- a/src/mm-broadband-modem.c
+++ b/src/mm-broadband-modem.c
+@@ -7607,7 +7607,7 @@ modem_voice_check_support (MMIfaceModemVoice *self,
+ 
+     /* Check ATH support */
+     mm_base_modem_at_command (MM_BASE_MODEM (self),
+-                              "H",
+                              "I",
+                               3,
+                               FALSE,
+                               (GAsyncReadyCallback)ath_format_check_ready,
+-- 
+2.25.1
+
@@ -0,0 +1,28 @@
+From 9a4e5a7c2da36288cd66c1500dcd0e1ba844c9cc Mon Sep 17 00:00:00 2001
+From: Dylan Van Assche <me@dylanvanassche.be>
+Date: Wed, 25 Nov 2020 19:58:25 +0100
+Subject: [PATCH] serial-parsers: do not fail to detect a valid response with a
+ call or text incoming
+
+Upstreaming at
+https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/merge_requests/406
+---
+ src/mm-serial-parsers.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/mm-serial-parsers.c b/src/mm-serial-parsers.c
+index b511302e..248cc685 100644
+--- a/src/mm-serial-parsers.c
+++ b/src/mm-serial-parsers.c
+@@ -108,7 +108,7 @@ mm_serial_parser_v1_new (void)
+ 
+     parser = g_slice_new (MMSerialParserV1);
+ 
+-    parser->regex_ok = g_regex_new ("\\r\\nOK(\\r\\n)+$", flags, 0, NULL);
+    parser->regex_ok = g_regex_new ("\\r\\nOK(\\r\\n)+", flags, 0, NULL);
+     parser->regex_connect = g_regex_new ("\\r\\nCONNECT.*\\r\\n", flags, 0, NULL);
+     parser->regex_sms = g_regex_new ("\\r\\n>\\s*$", flags, 0, NULL);
+     parser->regex_cme_error = g_regex_new ("\\r\\n\\+CME ERROR:\\s*(\\d+)\\r\\n$", flags, 0, NULL);
+-- 
+2.25.1
+
@@ -2,8 +2,8 @@

 pkgname=modemmanager
 pkgver=9999
-_pkgver=1.14.6
-pkgrel=0
+_pkgver=1.14.8
+pkgrel=2
 pkgdesc="ModemManager library"
 url="http://www.freedesktop.org/wiki/Software/ModemManager"
 arch="armhf armv7 aarch64"
@@ -11,6 +11,8 @@ license="GPL-2.0-or-later AND LGPL-2.1-or-later"
 depends_dev="libmm-glib"
 makedepends="$depends_dev gobject-introspection-dev gtk-doc vala
 	libgudev-dev polkit-dev libmbim-dev libqmi-dev linux-headers"
+# Needed because of patch modifying configure.ac
+makedepends="$makedepends automake autoconf autoconf-archive"
 checkdepends="glib-dev"
 options="!check" # https://bugs.freedesktop.org/show_bug.cgi?id=101197
 subpackages="
@@ -24,8 +26,12 @@ subpackages="
 source="https://www.freedesktop.org/software/ModemManager/ModemManager-$_pkgver.tar.xz
 	$pkgname.rules
 	$pkgname.initd
+	0001-build-Allow-elogind-for-suspend-resume-support.patch
+	0002-broadband-modem-Do-not-send-ATH-during-probing.patch
+	0003-serial-parsers-do-not-fail-to-detect-a-valid-respons.patch
 	rpmsg.patch
-	rpmsg-udev.rules"
+	rpmsg-udev.rules
+	utf16.patch"
 builddir="$srcdir"/ModemManager-$_pkgver

 # Workaround build freeze with QEMU user emulation
@@ -34,7 +40,7 @@ export MAKEFLAGS=-j$JOBS

 build() {
 	# Note: --enable-gtk-doc is disabled to speed up build time
-	./configure \
+	./autogen.sh \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
@@ -45,7 +51,8 @@ build() {
 		--with-polkit=permissive \
 		--disable-static \
 		--with-dbus-sys-dir=/etc/dbus-1/system.d \
-		--enable-vala=yes
+		--enable-vala=yes \
+		--with-systemd-suspend-resume=yes
 	make
 }

@@ -84,8 +91,12 @@ check() {
 	make check
 }

-sha512sums="b55fe9048e76228aba6e4cd3117a9e48cbb50a1a535f675a2356011d932035815616f13092a57167309b5030bfaa006e79342325b6c566b1e86803c247f83c90  ModemManager-1.14.6.tar.xz
+sha512sums="2457214fecd7d4d9fef291f756ef19973b98a05d07721cd57bdaee704cd6b9e96d27f6741bd8d245a0495f1d338e65db12f19b2d9a8dd6a5cddfb050614381c6  ModemManager-1.14.8.tar.xz
 8d736f477649e42c05b34ac55391353c7f0c17138d039e049b16b07624d86fd9968ef1aa14672a63decf8b2c0ae984a34a0770322198b326775efba58f566685  modemmanager.rules
 e2769401c52c3fff0b8057c13c6f7f2e5656c2963239ecbd647a01e66a344f6852cf2ba065358248315945bdf6ebbc4976903565b12ace2d15df6586dcc1de5b  modemmanager.initd
+cdb3bce108f6f31818b0b229fb01da1e9f114c7b6db67648c59714a07c0374700f172858071e6f0c9377957a7bb1cdb005755d88fbd4ca94448c3541e51516b2  0001-build-Allow-elogind-for-suspend-resume-support.patch
+ed830556918d62e68ccd3672c7cb60d17041356071c05480ff0cbaf97d448927ff01d304e85b40b1bfc49faa4af8c07cc7205adc945b436ae324f21259104273  0002-broadband-modem-Do-not-send-ATH-during-probing.patch
+97534f3a9f501a13fad0de7d432d9b2f684bc9639db74d56954d1f314812db66f06b97201ba53ec668f3e1dd924380afc66ef35a4cd2267ad1c526cdcb1c5f08  0003-serial-parsers-do-not-fail-to-detect-a-valid-respons.patch
 64270c00630f3dd73b5e06547e441f5cf8d75b96032da423c4132af2fc84b2c35042800e105c66bae354d61c66b716cc602421ac0ff82f7b4a8f0ce798855e24  rpmsg.patch
-0928a7b658d0eeb37daf40930ea930b266151df743c2c7b1d863bce9447fedb904924a5e673732d5bc765dc2ec6d8f4a2b47bc946575e8f18712c0f7ee81fb73  rpmsg-udev.rules"
+0928a7b658d0eeb37daf40930ea930b266151df743c2c7b1d863bce9447fedb904924a5e673732d5bc765dc2ec6d8f4a2b47bc946575e8f18712c0f7ee81fb73  rpmsg-udev.rules
+7a88ea53600377e4a6bd652fa90036b7d8284dbaeb02c39f79501fc6f1368519291786df2fd8112b9b606da759d6e758be30fe558bab3a85a70e07e366362530  utf16.patch"
@@ -0,0 +1,19 @@
+temp/modemmanager: Fix sending SMS with UTF-16 characters
+
+Upstream: no
+
+Patch recommended by Aleksander Morgado in upstream issue, until a proper
+fix is developed:
+https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/issues/274#note_671679
+
+diff --git a/src/mm-charsets.c b/src/mm-charsets.c
+index 19d1874c4..67b2103cd 100644
+--- a/src/mm-charsets.c
+++ b/src/mm-charsets.c
+@@ -43,7 +43,7 @@ static const CharsetEntry charset_map[] = {
+     { "PCCP437", "CP437",  "CP437",     "CP437//TRANSLIT",     MM_MODEM_CHARSET_PCCP437 },
+     { "PCDN",    "CP850",  "CP850",     "CP850//TRANSLIT",     MM_MODEM_CHARSET_PCDN    },
+     { "HEX",     NULL,     NULL,        NULL,                  MM_MODEM_CHARSET_HEX     },
+-    { "UTF-16",  "UTF16",  "UTF-16BE",  "UTF-16BE//TRANSLIT",  MM_MODEM_CHARSET_UTF16   },
+    { "UTF-16",  "UTF16",  "UTF-16BE",  "UTF-16BE",  MM_MODEM_CHARSET_UTF16   },
+ };
@@ -0,0 +1,34 @@
+# Forked from Alpine
+# https://postmarketos.org/edge/2020/12/01/xorg-server-moved/
+
+pkgname=xauth
+pkgver=1.1
+pkgrel=0
+pkgdesc="X.Org authorization settings program"
+url="http://xorg.freedesktop.org/"
+arch="armhf armv7 aarch64"
+options="!check"  # Requires unpackaged, unmaintained 'cmdtest' package
+license="custom"
+makedepends="libxau-dev libxext-dev libxmu-dev libx11-dev util-macros"
+subpackages="$pkgname-doc"
+source="https://www.x.org/releases/individual/app/xauth-$pkgver.tar.bz2"
+
+build() {
+	cd "$builddir"
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--localstatedir=/var
+	make
+}
+
+package() {
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
+	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
+}
+
+sha512sums="b6ecd59a853a491ef45bf8cfbff63bed36645f81cb79ae9d18458b57f7502bccf92f0d979d3337578518646f680ad379e67b1dac15a927cbb11372733e7a3a0c  xauth-1.1.tar.bz2"
@@ -0,0 +1,38 @@
+# Forked from Alpine: missing in edge for armv7
+
+pkgname=xcb-util-cursor
+pkgver=0.1.3
+pkgrel=2
+pkgdesc="X C-language Binding - cursor library (port of libXcursor)"
+url="https://gitlab.freedesktop.org/xorg/lib/libxcb-cursor"
+arch="armv7"
+license="MIT"
+depends_dev="xcb-util-dev"
+makedepends="$depends_dev m4 util-macros xcb-util-image-dev xcb-util-renderutil-dev"
+checkdepends="check-dev"
+subpackages="$pkgname-dev"
+source="https://xcb.freedesktop.org/dist/xcb-util-cursor-$pkgver.tar.gz
+	"
+
+build() {
+	export CFLAGS="$CFLAGS -std=gnu99"
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--localstatedir=/var
+	make
+}
+
+check() {
+	make check
+}
+
+package() {
+	make DESTDIR="$pkgdir" install
+}
+
+sha512sums="7be0950d9cef455e504ef5ac6c1872cc05bb27d1a8c844e0ddb19d718145ec05891315af6237e46ba615d01edc2d152c8901c8bc644a386d10757352a77fc57f  xcb-util-cursor-0.1.3.tar.gz"
@@ -0,0 +1,45 @@
+# Forked from Alpine
+# https://postmarketos.org/edge/2020/12/01/xorg-server-moved/
+
+pkgname=xcb-util-image
+pkgver=0.4.0
+pkgrel=1
+pkgdesc="X C-language Binding - port of Xlib XImage and XShmImage"
+url="https://xcb.freedesktop.org/"
+arch="armhf armv7 aarch64"
+license="MIT"
+depends=
+depends_dev="xcb-util-dev"
+makedepends="$depends_dev m4 util-macros"
+checkdepends="check-dev"
+install=""
+replaces="xcb-util"
+subpackages="$pkgname-dev"
+source="https://xcb.freedesktop.org/dist/xcb-util-image-$pkgver.tar.gz
+	"
+
+build() {
+	cd "$builddir"
+	export CFLAGS="$CFLAGS -std=gnu99"
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--localstatedir=/var
+	make
+}
+
+check() {
+	cd "$builddir"
+	make check
+}
+
+package() {
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
+}
+
+sha512sums="2e580d205e4a054763146c70d735014c7e018322a43c76b07a306c091dca81b140cbbf6db41252e9204ff742f119b69e143b3fdc1fb13bd9d0b9e8e22eda2cd3  xcb-util-image-0.4.0.tar.gz"
@@ -0,0 +1,43 @@
+# Forked from Alpine
+# https://postmarketos.org/edge/2020/12/01/xorg-server-moved/
+
+pkgname=xcb-util-keysyms
+pkgver=0.4.0
+pkgrel=1
+pkgdesc="X C-language Binding - X constants and keycodes"
+url="https://xcb.freedesktop.org/"
+arch="armhf armv7 aarch64"
+license="MIT"
+depends=
+depends_dev="xcb-util-dev"
+makedepends="$depends_dev m4"
+checkdepends="check-dev"
+install=""
+replaces="xcb-util"
+subpackages="$pkgname-dev"
+source="https://xcb.freedesktop.org/dist/xcb-util-keysyms-$pkgver.tar.gz"
+
+build() {
+	cd "$builddir"
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--localstatedir=/var
+	make
+}
+
+check() {
+	cd "$builddir"
+	make check
+}
+
+package() {
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
+}
+
+sha512sums="d92959e11241e479a8f6c55d2a1f0d507a8e7baa8dd469b01167b6307ed87bba26e0c68808cf0de90ba4d6081aad786276998b9784b81433b4f1cb9054573755  xcb-util-keysyms-0.4.0.tar.gz"
@@ -0,0 +1,43 @@
+# Forked from Alpine
+# https://postmarketos.org/edge/2020/12/01/xorg-server-moved/
+
+pkgname=xcb-util-renderutil
+pkgver=0.3.9
+pkgrel=1
+pkgdesc="X C-language Binding - Convenience functions for XRender extension"
+url="https://xcb.freedesktop.org/"
+arch="armhf armv7 aarch64"
+license="MIT"
+depends=
+depends_dev="xcb-util-dev"
+makedepends="$depends_dev m4 util-macros"
+checkdepends="check-dev"
+install=""
+replaces="xcb-util"
+subpackages="$pkgname-dev"
+source="https://xcb.freedesktop.org/dist/xcb-util-renderutil-$pkgver.tar.gz"
+
+build() {
+	cd "$builddir"
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--localstatedir=/var
+	make
+}
+
+check() {
+	cd "$builddir"
+	make check
+}
+
+package() {
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
+}
+
+sha512sums="c666f9eae18fa3fb603086e86ee4efc66dbed17b696bec637f07ea1334715cee01e03db26340ed3d1338887f4940cd3a435e4df8b36e59f439a0a2b8a0879463  xcb-util-renderutil-0.3.9.tar.gz"
@@ -0,0 +1,43 @@
+# Forked from Alpine
+# https://postmarketos.org/edge/2020/12/01/xorg-server-moved/
+
+pkgname=xcb-util-wm
+pkgver=0.4.1
+pkgrel=1
+pkgdesc="X C-language Binding - helpers for ICCCM and EWMH"
+url="https://xcb.freedesktop.org/"
+arch="armhf armv7 aarch64"
+license="MIT"
+depends=
+depends_dev="xcb-util-dev"
+makedepends="$depends_dev m4 util-macros"
+checkdepends="check"
+install=""
+replaces="xcb-util"
+subpackages="$pkgname-dev"
+source="https://xcb.freedesktop.org/dist/xcb-util-wm-$pkgver.tar.gz"
+
+build() {
+	cd "$builddir"
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--localstatedir=/var
+	make
+}
+
+check() {
+	cd "$builddir"
+	make check
+}
+
+package() {
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
+}
+
+sha512sums="063d852367088a7129aacce95e7d81cb0925b146191e1114171e58f5a65dcb8cc7f4fb5a9ecb49e9da2e2d8be75375f5cfaafc04b756179750e230fb486b9e22  xcb-util-wm-0.4.1.tar.gz"
@@ -0,0 +1,20 @@
+Move startx auth files in /tmp so they are removed on reboot.
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=357736
+The trap patch didn't seem to work on reboot.
+---
+ startx.cpp |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: xinit/startx.cpp
+===================================================================
+--- xinit.orig/startx.cpp
+++ xinit/startx.cpp
+@@ -273,7 +273,7 @@
+     dummy=0
+ 
+     XCOMM create a file with auth information for the server. ':0' is a dummy.
+-    xserverauthfile=$HOME/.serverauth.$$
+    xserverauthfile=`mktemp -p /tmp serverauth.XXXXXXXXXX`
+     trap "rm -f '$xserverauthfile'" HUP INT QUIT ILL TRAP KILL BUS TERM
+     xauth -q -f "$xserverauthfile" << EOF
+ add :$dummy . $mcookie
@@ -0,0 +1,53 @@
+# Forked from Alpine
+# https://postmarketos.org/edge/2020/12/01/xorg-server-moved/
+
+pkgname=xinit
+pkgver=1.4.1
+pkgrel=0
+pkgdesc="X.Org initialisation program"
+url="http://xorg.freedesktop.org"
+arch="armhf armv7 aarch64"
+license="MIT"
+options="!check"  # No test suite.
+subpackages="$pkgname-doc"
+depends="xauth mcookie xmodmap xrdb"
+makedepends="libx11-dev util-macros"
+source="https://www.x.org/releases/individual/app/xinit-$pkgver.tar.bz2
+	06_move_serverauthfile_into_tmp.patch
+	xinitrc
+	xsession.skel
+	Xsession
+	xserverrc"
+
+builddir="$srcdir"/$pkgname-$pkgver
+build() {
+	cd "$builddir"
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--localstatedir=/var \
+		--with-xinitdir=/etc/X11/xinit
+	make
+}
+
+package() {
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
+	chmod +x "$pkgdir"/usr/bin/startx
+	install -m755 -d "$pkgdir"/etc/skel
+	install -m755 -D "$srcdir"/xinitrc "$pkgdir"/etc/X11/xinit/xinitrc
+	install -m755 -D "$srcdir"/Xsession "$pkgdir"/etc/X11/xinit/Xsession
+	install -m755 "$srcdir"/xsession.skel "$pkgdir"/etc/skel/.xsession
+	install -m755 "$srcdir"/xserverrc "$pkgdir"/etc/X11/xinit/xserverrc
+	mkdir -p "$pkgdir"/etc/X11/xinit/xinitrc.d
+}
+
+sha512sums="6cbc5d025a891c419f3f4493381b2fca57a67d78df866d2f16a83426f86bad6eca7f240fac12b25cbcc63df0fec41f625407184e044898602d66483715315340  xinit-1.4.1.tar.bz2
+2296c10a5d74bff42d9642a4787dc3f2b77492fc81174af48dc88cd3c8fa49c7f70147b790d8c82c2df6c910d9d412965999e7a342ca28697a97b5d522669edd  06_move_serverauthfile_into_tmp.patch
+761db2ff2b501724ba8a7fde9df3d93851797a261871af205773159949bd74b4c1ac7c1afe0b816dce03825a5d7165caa474141cfb2ea82408abfe4719775ce0  xinitrc
+448bc6c7987a4735b6584e307cd5c53092b1a338043293f5f110d11818dd1b80508401a3b6f09525c82a16a88f293b37011d8ca112460b0f95d26897e3e0619e  xsession.skel
+b311032a751bb21d6c49ffe1dfc67beb577b5d5bec4a4c12612c4c0f9b9d6d2a07f7435c7d2fe9ab4c318546ee0cb9d4ff3f7ef908e756a818da529e913e667d  Xsession
+f86d96d76bcb340021e7904925f0029f8662e4dfc32489198b3a8695dca069da496539e2287249c763fe9c4d8d5d591fd18fe49a0bee822cbbd0eb712efbb89b  xserverrc"
@@ -0,0 +1,55 @@
+#!/bin/sh
+#
+# X session wrapper
+
+echo "Running X session wrapper"
+
+# Load profile
+for file in /etc/profile "$HOME/.profile" /etc/xprofile "$HOME/.xprofile"; do
+	if [ -f "$file" ]; then
+		echo "Loading profile from $file";
+		. "$file"
+	fi
+done
+
+# Load resources
+for file in /etc/X11/Xresources "$HOME/.Xresources"; do
+	if [ -f "$file" ]; then
+		echo "Loading resource: $file"
+		xrdb -nocpp -merge "$file"
+	fi
+done
+
+# Load keymaps
+use_xkbmap=false
+for file in "/etc/X11/Xkbmap" "$HOME/.Xkbmap"; do
+	if [ -f "$file" ]; then
+		echo "Loading keymap: $file"
+		setxkbmap `cat "$file"` && use_xkbmap=true
+	fi
+done
+
+# Load xmodmap if not using XKB
+if ! $use_xkbmap; then
+	for file in "/etc/X11/Xmodmap" "$HOME/.Xmodmap"; do
+		if [ -f "$file" ]; then
+		   echo "Loading modmap: $file"
+		   xmodmap "$file"
+		fi
+	done
+fi
+
+# Run all system xinitrc shell scripts.
+xinitdir="/etc/X11/xinit/xinitrc.d"
+if [ -d "$xinitdir" ]; then
+	for script in $xinitdir/*; do
+		echo "Loading xinit script $script"
+		if [ -x "$script" -a ! -d "$script" ]; then
+			. "$script"
+		fi
+	done
+fi
+
+echo "X session wrapper complete, running session $@"
+
+exec $@
@@ -0,0 +1,51 @@
+#!/bin/sh
+# $Xorg: xinitrc.cpp,v 1.3 2000/08/17 19:54:30 cpqbld Exp $
+
+userresources=$HOME/.Xresources
+usermodmap=$HOME/.Xmodmap
+xinitdir=/etc/X11
+sysresources=$xinitdir/Xresources
+sysmodmap=$xinitdir/Xmodmap
+
+# merge in defaults and keymaps
+
+if [ -f $sysresources ]; then
+    xrdb -merge $sysresources
+fi
+
+if [ -f $sysmodmap ]; then
+    xmodmap $sysmodmap
+fi
+
+if [ -f $userresources ]; then
+    xrdb -merge $userresources
+fi
+
+if [ -f $usermodmap ]; then
+    xmodmap $usermodmap
+fi
+
+# First try ~/.xinitrc
+if [ -f "$HOME/.xinitrc" ]; then
+	XINITRC="$HOME/.xinitrc"
+	if [ -x $XINITRC ]; then
+		# if the x bit is set on .xinitrc
+		# it means the xinitrc is not a
+		# shell script but something else
+		exec $XINITRC "$@"
+	else
+		exec /bin/sh "$HOME/.xinitrc" "$@"
+	fi
+fi
+
+if [ -d /etc/X11/xinit/xinitrc.d ] ; then
+	for f in /etc/X11/xinit/xinitrc.d/?* ; do
+		[ -x "$f" ] && . "$f"
+	done
+	unset f
+fi
+
+for p in startxfce4 startfluxbox xfce4-terminal \
+		mrxvt urxvt st xterm; do
+	command -v "$p" >/dev/null && exec "$p"
+done
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /usr/bin/X -nolisten tcp "$@"
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+#
+# ~/.xsession
+#
+# Executed by xdm/gdm/kdm at login
+#
+
+/bin/sh -l ~/.xinitrc
+
@@ -0,0 +1,35 @@
+# Forked from Alpine
+# https://postmarketos.org/edge/2020/12/01/xorg-server-moved/
+
+pkgname=xmodmap
+pkgver=1.0.10
+pkgrel=0
+pkgdesc="Utility for modifying keymaps and pointer button mappings in X"
+url="http://xorg.freedesktop.org/"
+arch="armhf armv7 aarch64"
+license="MIT"
+options="!check"  # No test suite.
+depends=""
+makedepends="libx11-dev util-macros"
+subpackages="$pkgname-doc"
+source="https://www.x.org/releases/individual/app/$pkgname-$pkgver.tar.bz2"
+
+build () {
+	cd "$builddir"
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--localstatedir=/var
+	make
+}
+
+package() {
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
+	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
+}
+
+sha512sums="324c7dcef843186088f16b3bc47485eb3c9b4331e56ce43b692deb4bb3d4f4f27512480e91a379cceac8383df920dc5e37cd825246b50b6343291cec48134c04  xmodmap-1.0.10.tar.bz2"
@@ -0,0 +1,29 @@
+From 1efee15daaaf7c7c3ea7f9fd6d5c8ec8605a09c7 Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Thu, 3 Sep 2020 17:50:26 -0600
+Subject: [PATCH] compiler.h: ensure IOPortBase is declared extern on mips
+
+This is needed to fix compilation with -fcommon on GCC, which
+is the default in GCC 10.
+
+Signed-off-by: Ariadne Conill <ariadne@dereferenced.org>
+---
+ hw/xfree86/common/compiler.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h
+index 2b2008b3f..c7d617eb1 100644
+--- a/hw/xfree86/common/compiler.h
+++ b/hw/xfree86/common/compiler.h
+@@ -525,7 +525,7 @@ xf86WriteMmio32Le(__volatile__ void *base, const unsigned long offset,
+ #define PORT_SIZE short
+ #endif
+ 
+-_X_EXPORT unsigned int IOPortBase;      /* Memory mapped I/O port area */
+extern _X_EXPORT unsigned int IOPortBase;      /* Memory mapped I/O port area */
+ 
+ static __inline__ void
+ outb(unsigned PORT_SIZE port, unsigned char val)
+-- 
+2.28.0
+
@@ -0,0 +1,180 @@
+# Forked from Alpine
+# https://postmarketos.org/edge/2020/12/01/xorg-server-moved/
+
+pkgname=xorg-server
+pkgver=1.20.9
+pkgrel=1
+pkgdesc="X.Org X servers"
+url="https://www.x.org/wiki"
+arch="armhf armv7 aarch64"
+license="MIT"
+options="suid !check"
+subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc xvfb $pkgname-xephyr
+	$pkgname-xnest $pkgname-xwayland"
+# the modesetting driver is now shipped with xorg server
+replaces="xf86-video-modesetting"
+depends="
+	font-misc-misc
+	font-cursor-misc
+	xkeyboard-config
+	xkbcomp
+	xinit
+	"
+depends_dev="
+	libepoxy-dev
+	libxfont2-dev
+	mesa-dev
+	libpciaccess-dev
+	"
+makedepends="
+	$depends_dev
+	meson
+	xorgproto
+	xtrans
+	libxshmfence-dev
+	pixman-dev
+	xkbcomp-dev
+	libxkbfile-dev
+	nettle-dev
+	wayland-dev
+	wayland-protocols
+	libdrm-dev
+	libxext-dev
+	libx11-dev
+	libxau-dev
+	eudev-dev
+	libxcb-dev
+	xcb-util-dev
+	xcb-util-image-dev
+	xcb-util-keysyms-dev
+	xcb-util-renderutil-dev
+	xcb-util-wm-dev
+	libxdmcp-dev
+	"
+source="https://www.x.org/releases/individual/xserver/xorg-server-$pkgver.tar.bz2
+	xwayland-glx.patch
+	link-libshadow.patch
+	e50c85f4ebf559a3bac4817b41074c43d4691779.patch
+	0001-compiler.h-ensure-IOPortBase-is-declared-extern-on-m.patch
+	"
+
+# secfixes:
+#   1.20.9-r0:
+#     - CVE-2020-14362
+#     - CVE-2020-14361
+#     - CVE-2020-14346
+#     - CVE-2020-14345
+#   1.20.8-r4:
+#     - CVE-2020-14347
+#   1.20.3-r0:
+#     - CVE-2018-14665
+#   1.19.5-r0:
+#     - CVE-2017-12176
+#     - CVE-2017-12177
+#     - CVE-2017-12178
+#     - CVE-2017-12179
+#     - CVE-2017-12180
+#     - CVE-2017-12181
+#     - CVE-2017-12182
+#     - CVE-2017-12183
+#     - CVE-2017-12184
+#     - CVE-2017-12185
+#     - CVE-2017-12186
+#     - CVE-2017-12187
+#     - CVE-2017-13721
+#     - CVE-2017-13723
+
+prepare() {
+	default_prepare
+	sed -i -e 's/termio.h/termios.h/' hw/xfree86/os-support/xf86_OSlib.h
+}
+
+build() {
+	# xorg modules does not work with the -z now and it seems like we
+	# cannot pass over the linker flag to .so files. so we tweak the
+	# gcc specs.
+	export CFLAGS="$CFLAGS -D_GNU_SOURCE -D__gid_t=gid_t -D__uid_t=uid_t"
+	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
+	_fontroot="/usr/share/fonts"
+
+	abuild-meson \
+		--sysconfdir=/etc/X11 \
+		-Dxorg=true \
+		-Dxephyr=true \
+		-Dxwayland=true \
+		-Dglamor=true \
+		-Dxwayland_eglstream=false \
+		-Dxnest=true \
+		-Ddmx=false \
+		-Dxvfb=true \
+		-Dxwin=false \
+		-Ddefault_font_path=$_fontroot/misc,$_fontroot/100dpi:unscaled,$_fontroot/75dpi:unscaled,$_fontroot/TTF,$_fontroot/Type1 \
+		-Dglx=true \
+		-Dxdmcp=true \
+		-Dxdm-auth-1=true \
+		-Dxcsecurity=true \
+		-Dsecure-rpc=false \
+		-Dipv6=true \
+		-Dxkb_dir=/usr/share/X11/xkb \
+		-Dxkb_output_dir=/var/lib/xkb \
+		-Dos_vendor="${DISTRO_NAME:-Alpine Linux}" \
+		-Dlisten_tcp=false \
+		-Dlisten_unix=true \
+		-Dlisten_local=true \
+		-Dsuid_wrapper=true \
+		-Dpciaccess=true \
+		-Dudev=true \
+		-Dhal=false \
+		-Dsystemd_logind=false \
+		-Ddpms=true \
+		-Ddri1=true \
+		-Ddri2=true \
+		-Ddri3=true \
+		. output
+	meson compile ${JOBS:+-j ${JOBS}} -C output
+}
+
+check() {
+	meson test --no-rebuild -v -C output
+}
+
+package() {
+	DESTDIR="$pkgdir" meson install --no-rebuild -C output
+
+	chmod u+s "$pkgdir"/usr/bin/Xorg
+	ln -s /usr/bin/Xorg "$pkgdir"/usr/bin/X
+
+	# Don't conflict with xf86-input-evdev
+	rm -f "$pkgdir"/usr/share/X11/xorg.conf.d/10-evdev.conf
+
+	install -m755 -d "$pkgdir"/var/lib/xkb
+}
+
+xvfb() {
+	pkgdesc="Virtual Framebuffer 'fake' X server"
+	mkdir -p "$subpkgdir"/usr/bin
+	mv "$pkgdir"/usr/bin/Xvfb "$subpkgdir"/usr/bin/
+}
+
+xephyr() {
+	pkgdesc="kdrive based X Server which targets a window on a host X Server as its framebuffer"
+	mkdir -p "$subpkgdir"/usr/bin
+	mv "$pkgdir"/usr/bin/Xephyr "$subpkgdir"/usr/bin/
+}
+
+xnest() {
+	pkgdesc="A nested Xorg server"
+	mkdir -p "$subpkgdir"/usr/bin
+	mv "$pkgdir"/usr/bin/Xnest "$subpkgdir"/usr/bin/
+}
+
+xwayland() {
+	pkgdesc="run X clients under wayland"
+	mkdir -p "$subpkgdir"/usr/bin
+	mv "$pkgdir"/usr/bin/Xwayland "$subpkgdir"/usr/bin/
+}
+sha512sums="d9b5f93e1b9763a89187d8b272aa7d4ce9709641b8539f4536708af153310e5a4931bffd4229c51a3b0e3b12da7838750aa71b635751fb4c0bb27438cce4e5e6  xorg-server-1.20.9.tar.bz2
+004c9a7d920af8825a311d32433bf64190d45583d57bb20b3c5ef39d8011ced7bf17b73296e56078ca791e6cd923594dacfe3fbf7af7c98934627e34559c85d8  xwayland-glx.patch
+d0f723e6033a77faec118adc64e9d4749270724cbb2b86ca5ff796e1fbaef2d01ebcbb2904d48132b58f3ecf0781b2583744b671b17b7d51a1748f4b461932b0  link-libshadow.patch
+e1a4c630e2bbf9ab47c81d48f2de98e302a0e3d5c2896d07804dc36eef1cd0a4e076bd2ed1be70c0d3b024501e5f540abf1b11548ede74c1af3c82183553a728  e50c85f4ebf559a3bac4817b41074c43d4691779.patch
+a91f861588233c363a7939194d1582114ea216117e5f046b971d6571cb79445ceaaf0a1c6f66781da5b139d9ab8bd260d5dc3ff8c3279410865807561bf4fcee  0001-compiler.h-ensure-IOPortBase-is-declared-extern-on-m.patch"
@@ -0,0 +1,31 @@
+From e50c85f4ebf559a3bac4817b41074c43d4691779 Mon Sep 17 00:00:00 2001
+From: Eric Anholt <eric@anholt.net>
+Date: Fri, 26 Oct 2018 17:47:30 -0700
+Subject: [PATCH] Fix segfault on probing a non-PCI platform device on a system
+ with PCI.
+
+Some Broadcom set-top-box boards have PCI busses, but the GPU is still
+probed through DT.  We would dereference a null busid here in that
+case.
+
+Signed-off-by: Eric Anholt <eric@anholt.net>
+---
+ hw/xfree86/common/xf86platformBus.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c
+index cef47da03d..dadbac6c8f 100644
+--- a/hw/xfree86/common/xf86platformBus.c
+++ b/hw/xfree86/common/xf86platformBus.c
+@@ -289,7 +289,7 @@ xf86platformProbe(void)
+     for (i = 0; i < xf86_num_platform_devices; i++) {
+         char *busid = xf86_platform_odev_attributes(i)->busid;
+ 
+-        if (pci && (strncmp(busid, "pci:", 4) == 0)) {
+        if (pci && busid && (strncmp(busid, "pci:", 4) == 0)) {
+             platform_find_pci_info(&xf86_platform_devices[i], busid);
+         }
+ 
+-- 
+GitLab
+
@@ -0,0 +1,31 @@
+From a530b6e8923f2b9153a773c8618a1e2f41619288 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Tue, 30 Apr 2019 18:01:27 -0400
+Subject: [PATCH] meson: Fix libshadow.so linkage
+
+Don't link against fb, it's the driver's responsibility to load that
+first. Underlinking like this is unpleasant but this matches what
+autotools does.
+
+Fixes: xorg/xserver#540
+---
+ hw/xfree86/dixmods/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/hw/xfree86/dixmods/meson.build b/hw/xfree86/dixmods/meson.build
+index 835d23215..0562b630f 100644
+--- a/hw/xfree86/dixmods/meson.build
+++ b/hw/xfree86/dixmods/meson.build
+@@ -34,7 +34,7 @@ shared_module(
+     c_args: xorg_c_args,
+     dependencies: common_dep,
+     link_whole: libxserver_miext_shadow,
+-    link_with: [fb, e],
+    link_with: e,
+ 
+     install: true,
+     install_dir: module_dir,
+-- 
+2.22.0
+
+
@@ -0,0 +1,419 @@
+diff --git a/hw/xwayland/meson.build b/hw/xwayland/meson.build
+index 36bf213..c8746e5 100644
+--- a/hw/xwayland/meson.build
+++ b/hw/xwayland/meson.build
+@@ -54,6 +54,9 @@ xwayland_glamor = []
+ eglstream_srcs = []
+ if build_glamor
+     srcs += 'xwayland-glamor.c'
+    if build_glx
+        srcs += 'xwayland-glx.c'
+    endif
+     if gbm_dep.found()
+         srcs += 'xwayland-glamor-gbm.c'
+     endif
+@@ -80,10 +83,15 @@ if build_glamor
+     xwayland_glamor += glamor
+ endif
+ 
+wayland_inc = [ inc, ]
+if build_glx
+    wayland_inc += glx_inc
+endif
+
+ executable(
+     'Xwayland',
+     srcs,
+-    include_directories: inc,
+    include_directories: wayland_inc,
+     dependencies: [
+         common_dep,
+         xwayland_dep,
+diff --git a/hw/xwayland/xwayland-glamor.c b/hw/xwayland/xwayland-glamor.c
+index 48e330a..dcfc7f1 100644
+--- a/hw/xwayland/xwayland-glamor.c
+++ b/hw/xwayland/xwayland-glamor.c
+@@ -31,6 +31,9 @@
+ 
+ #include <glamor.h>
+ #include <glamor_context.h>
+#ifdef GLXEXT
+#include "glx_extinit.h"
+#endif
+ 
+ static void
+ glamor_egl_make_current(struct glamor_context *glamor_ctx)
+@@ -262,5 +265,9 @@ xwl_glamor_init(struct xwl_screen *xwl_screen)
+         ErrorF("Failed to initialize glamor Xv extension\n");
+ #endif
+ 
+#ifdef GLXEXT
+    GlxPushProvider(&glamor_provider);
+#endif
+
+     return TRUE;
+ }
+diff --git a/hw/xwayland/xwayland-glx.c b/hw/xwayland/xwayland-glx.c
+new file mode 100644
+index 0000000..71c9aad
+--- /dev/null
+++ b/hw/xwayland/xwayland-glx.c
+@@ -0,0 +1,344 @@
+/*
+ * Copyright © 2019 Red Hat, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *	Adam Jackson <ajax@redhat.com>
+ */
+
+/*
+ * Sets up GLX capabilities based on the EGL capabilities of the glamor
+ * renderer for the screen. Without this you will get whatever swrast
+ * can do, which often does not include things like multisample visuals.
+ */
+
+#include <xwayland-config.h>
+#include "xwayland.h"
+#define MESA_EGL_NO_X11_HEADERS
+// #include <EGL/egl.h>
+#include <epoxy/egl.h>
+#include "glxserver.h"
+#include "glxutil.h"
+#include "compint.h"
+#include <X11/extensions/composite.h>
+#include "glamor_context.h"
+#include "glamor.h"
+
+/* Can't get these from <GL/glx.h> since it pulls in client headers */
+#define GLX_RGBA_BIT		0x00000001
+#define GLX_WINDOW_BIT		0x00000001
+#define GLX_PIXMAP_BIT		0x00000002
+#define GLX_PBUFFER_BIT		0x00000004
+#define GLX_NONE                0x8000
+#define GLX_SLOW_CONFIG         0x8001
+#define GLX_TRUE_COLOR		0x8002
+#define GLX_DIRECT_COLOR	0x8003
+#define GLX_NON_CONFORMANT_CONFIG 0x800D
+#define GLX_DONT_CARE           0xFFFFFFFF
+#define GLX_RGBA_FLOAT_BIT_ARB  0x00000004
+#define GLX_SWAP_UNDEFINED_OML  0x8063
+
+struct egl_config {
+    __GLXconfig base;
+    EGLConfig config;
+};
+
+struct egl_screen {
+    __GLXscreen base;
+    EGLDisplay display;
+    EGLConfig *configs;
+};
+
+static void
+egl_screen_destroy(__GLXscreen *_screen)
+{
+    struct egl_screen *screen = (struct egl_screen *)_screen;
+
+    /* XXX do we leak the fbconfig list? */
+
+    free(screen->configs);
+    __glXScreenDestroy(_screen);
+    free(_screen);
+}
+
+static void
+egl_drawable_destroy(__GLXdrawable *draw)
+{
+    free(draw);
+}
+
+static GLboolean
+egl_drawable_swap_buffers(ClientPtr client, __GLXdrawable *draw)
+{
+    return GL_FALSE;
+}
+
+static void
+egl_drawable_copy_sub_buffer(__GLXdrawable *draw, int x, int y, int w, int h)
+{
+}
+
+static void
+egl_drawable_wait_x(__GLXdrawable *draw)
+{
+    glamor_block_handler(draw->pDraw->pScreen);
+}
+
+static void
+egl_drawable_wait_gl(__GLXdrawable *draw)
+{
+}
+
+static __GLXdrawable *
+egl_create_glx_drawable(ClientPtr client, __GLXscreen *screen,
+                        DrawablePtr draw, XID drawid, int type,
+                        XID glxdrawid, __GLXconfig *modes)
+{
+    __GLXdrawable *ret;
+
+    ret = calloc(1, sizeof *ret);
+    if (!ret)
+        return NULL;
+
+    if (!__glXDrawableInit(ret, screen, draw, type, glxdrawid, modes)) {
+        free(ret);
+        return NULL;
+    }
+
+    ret->destroy = egl_drawable_destroy;
+    ret->swapBuffers = egl_drawable_swap_buffers;
+    ret->copySubBuffer = egl_drawable_copy_sub_buffer;
+    ret->waitX = egl_drawable_wait_x;
+    ret->waitGL = egl_drawable_wait_gl;
+
+    return ret;
+}
+
+/*
+ * TODO:
+ *
+ * - figure out sRGB
+ * - bindToTextureTargets is suspicious
+ * - better channel mask setup
+ * - drawable type masks is suspicious
+ */
+static struct egl_config *
+translate_eglconfig(struct egl_screen *screen, EGLConfig hc,
+                    struct egl_config *chain, Bool direct_color,
+                    Bool double_buffer)
+{
+    EGLint value;
+    struct egl_config *c = calloc(1, sizeof *c);
+
+    if (!c)
+        return chain;
+
+    /* constants.  changing these requires (at least) new EGL extensions */
+    c->base.stereoMode = GL_FALSE;
+    c->base.numAuxBuffers = 0;
+    c->base.level = 0;
+    c->base.transparentAlpha = 0;
+    c->base.transparentIndex = 0;
+    c->base.transparentPixel = GLX_NONE;
+    c->base.visualSelectGroup = 0;
+    c->base.indexBits = 0;
+    c->base.optimalPbufferWidth = 0;
+    c->base.optimalPbufferHeight = 0;
+    c->base.bindToMipmapTexture = 0;
+    c->base.bindToTextureTargets = GLX_DONT_CARE;
+    c->base.sRGBCapable = 0;
+    c->base.swapMethod = GLX_SWAP_UNDEFINED_OML;
+
+    /* this is... suspect */
+    c->base.drawableType = GLX_WINDOW_BIT | GLX_PIXMAP_BIT | GLX_PBUFFER_BIT;
+
+    /* hmm */
+    c->base.bindToTextureRgb = GL_TRUE;
+    c->base.bindToTextureRgba = GL_TRUE;
+
+    /*
+     * glx conformance failure: there's no such thing as accumulation
+     * buffers in EGL.  they should be emulable with shaders and fbos,
+     * but i'm pretty sure nobody's using this feature since it's
+     * entirely software.  note that glx conformance merely requires
+     * that an accum buffer _exist_, not a minimum bitness.
+     */
+    c->base.accumRedBits = 0;
+    c->base.accumGreenBits = 0;
+    c->base.accumBlueBits = 0;
+    c->base.accumAlphaBits = 0;
+
+    /* parametric state */
+    if (direct_color)
+        c->base.visualType = GLX_DIRECT_COLOR;
+    else
+        c->base.visualType = GLX_TRUE_COLOR;
+
+    if (double_buffer)
+        c->base.doubleBufferMode = GL_TRUE;
+    else
+        c->base.doubleBufferMode = GL_FALSE;
+
+    /* direct-mapped state */
+#define GET(attr, slot) \
+    eglGetConfigAttrib(screen->display, hc, attr, &c->base.slot)
+    GET(EGL_RED_SIZE, redBits);
+    GET(EGL_GREEN_SIZE, greenBits);
+    GET(EGL_BLUE_SIZE, blueBits);
+    GET(EGL_ALPHA_SIZE, alphaBits);
+    GET(EGL_BUFFER_SIZE, rgbBits);
+    GET(EGL_DEPTH_SIZE, depthBits);
+    GET(EGL_STENCIL_SIZE, stencilBits);
+    GET(EGL_TRANSPARENT_RED_VALUE, transparentRed);
+    GET(EGL_TRANSPARENT_GREEN_VALUE, transparentGreen);
+    GET(EGL_TRANSPARENT_BLUE_VALUE, transparentBlue);
+    GET(EGL_SAMPLE_BUFFERS, sampleBuffers);
+    GET(EGL_SAMPLES, samples);
+    if (c->base.renderType & GLX_PBUFFER_BIT) {
+        GET(EGL_MAX_PBUFFER_WIDTH, maxPbufferWidth);
+        GET(EGL_MAX_PBUFFER_HEIGHT, maxPbufferHeight);
+        GET(EGL_MAX_PBUFFER_PIXELS, maxPbufferPixels);
+    }
+#undef GET
+
+    /* derived state: config caveats */
+    eglGetConfigAttrib(screen->display, hc, EGL_CONFIG_CAVEAT, &value);
+    if (value == EGL_NONE)
+        c->base.visualRating = GLX_NONE;
+    else if (value == EGL_SLOW_CONFIG)
+        c->base.visualRating = GLX_SLOW_CONFIG;
+    else if (value == EGL_NON_CONFORMANT_CONFIG)
+        c->base.visualRating = GLX_NON_CONFORMANT_CONFIG;
+    /* else panic */
+
+    /* derived state: float configs */
+    c->base.renderType = GLX_RGBA_BIT;
+    if (eglGetConfigAttrib(screen->display, hc, EGL_COLOR_COMPONENT_TYPE_EXT,
+                           &value) == EGL_TRUE) {
+        if (value == EGL_COLOR_COMPONENT_TYPE_FLOAT_EXT) {
+            c->base.renderType = GLX_RGBA_FLOAT_BIT_ARB;
+        }
+        /* else panic */
+    }
+
+    /* map to the backend's config */
+    c->config = hc;
+
+    /*
+     * XXX do something less ugly
+     */
+    if (c->base.renderType == GLX_RGBA_BIT) {
+        if (c->base.rgbBits == 24 || c->base.rgbBits == 32) {
+            c->base.redMask = 0xff0000;
+            c->base.greenMask = 0x00ff00;
+            c->base.blueMask = 0x0000ff;
+            if (c->base.alphaBits)
+                /* assume all remaining bits are alpha */
+                c->base.alphaMask = 0xff000000;
+        }
+    }
+
+    c->base.next = chain ? &chain->base : NULL;
+    return c;
+}
+
+static __GLXconfig *
+egl_mirror_configs(ScreenPtr pScreen, struct egl_screen *screen)
+{
+    int i, j, k, nconfigs;
+    struct egl_config *c = NULL;
+    EGLConfig *host_configs = NULL;
+    Bool offon[] = { FALSE, TRUE };
+
+    eglGetConfigs(screen->display, NULL, 0, &nconfigs);
+    if (!(host_configs = calloc(nconfigs, sizeof *host_configs)))
+        return NULL;
+
+    eglGetConfigs(screen->display, host_configs, nconfigs, &nconfigs);
+
+    /* We walk the EGL configs backwards to make building the
+     * ->next chain easier.
+     */
+    for (i = nconfigs - 1; i > 0; i--)
+        for (j = 0; j < 2; j++) /* direct_color */
+            for (k = 0; k < 2; k++) /* direct_color */
+                c = translate_eglconfig(screen, host_configs[i], c,
+                                        /* direct_color */ offon[j],
+                                        /* double_buffer */ offon[k]
+                                        );
+
+    screen->configs = host_configs;
+    return c ? &c->base : NULL;
+}
+
+static __GLXscreen *
+egl_screen_probe(ScreenPtr pScreen)
+{
+    struct egl_screen *screen;
+    struct xwl_screen *xwl_screen = xwl_screen_get(pScreen);
+    __GLXscreen *base;
+
+    if (enableIndirectGLX)
+        return NULL; /* not implemented */
+
+    if (!(screen = calloc(1, sizeof *screen)))
+        return NULL;
+
+    base = &screen->base;
+    base->destroy = egl_screen_destroy;
+    base->createDrawable = egl_create_glx_drawable;
+    /* base.swapInterval = NULL; */
+
+    screen->display = xwl_screen->glamor_ctx->display;
+
+    __glXInitExtensionEnableBits(screen->base.glx_enable_bits);
+    __glXEnableExtension(base->glx_enable_bits, "GLX_ARB_context_flush_control");
+    __glXEnableExtension(base->glx_enable_bits, "GLX_ARB_create_context");
+    __glXEnableExtension(base->glx_enable_bits, "GLX_ARB_create_context_no_error");
+    __glXEnableExtension(base->glx_enable_bits, "GLX_ARB_create_context_profile");
+    __glXEnableExtension(base->glx_enable_bits, "GLX_ARB_create_context_robustness");
+    __glXEnableExtension(base->glx_enable_bits, "GLX_ARB_fbconfig_float");
+    __glXEnableExtension(base->glx_enable_bits, "GLX_EXT_create_context_es2_profile");
+    __glXEnableExtension(base->glx_enable_bits, "GLX_EXT_create_context_es_profile");
+    __glXEnableExtension(base->glx_enable_bits, "GLX_EXT_fbconfig_packed_float");
+    __glXEnableExtension(base->glx_enable_bits, "GLX_EXT_framebuffer_sRGB");
+    __glXEnableExtension(base->glx_enable_bits, "GLX_EXT_no_config_context");
+    __glXEnableExtension(base->glx_enable_bits, "GLX_EXT_texture_from_pixmap");
+    __glXEnableExtension(base->glx_enable_bits, "GLX_MESA_copy_sub_buffer");
+    // __glXEnableExtension(base->glx_enable_bits, "GLX_SGI_swap_control");
+
+    base->fbconfigs = egl_mirror_configs(pScreen, screen);
+    if (!base->fbconfigs) {
+        free(screen);
+        return NULL;
+    }
+
+    __glXScreenInit(base, pScreen);
+    __glXsetGetProcAddress(eglGetProcAddress);
+
+    return base;
+}
+
+__GLXprovider glamor_provider = {
+    egl_screen_probe,
+    "glamor",
+    NULL
+};
+diff --git a/hw/xwayland/xwayland.h b/hw/xwayland/xwayland.h
+index 0854df4..a4804fe 100644
+--- a/hw/xwayland/xwayland.h
+++ b/hw/xwayland/xwayland.h
+@@ -488,4 +488,9 @@ static inline void xwl_glamor_init_eglstream(struct xwl_screen *xwl_screen)
+ }
+ #endif
+ 
+#ifdef GLXEXT
+#include "glx_extinit.h"
+extern __GLXprovider glamor_provider;
+#endif
+
+ #endif
@@ -0,0 +1,32 @@
+# Forked from Alpine
+# https://postmarketos.org/edge/2020/12/01/xorg-server-moved/
+
+pkgname=xrdb
+pkgver=1.2.0
+pkgrel=1
+pkgdesc="X server resource database utility"
+url="http://xorg.freedesktop.org"
+arch="armhf armv7 aarch64"
+license="MIT"
+options="!check"  # No test suite.
+makedepends="libxmu-dev libx11-dev util-macros"
+subpackages="$pkgname-doc"
+source="https://www.x.org/releases/individual/app/xrdb-$pkgver.tar.bz2"
+
+build() {
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--localstatedir=/var \
+		--with-cpp=/usr/bin/cpp # optional run-time dependency
+	make
+}
+
+package() {
+	make DESTDIR="$pkgdir" install
+}
+
+sha512sums="14e1cdfb2152fb28f1f4641b177ab236648d7e967a95b952bf4cfce8d3e1ef085e85385354e3381aaf644462e8888a1847f755ab4016ecb4cb4a715b001dd2ef  xrdb-1.2.0.tar.bz2"
Author	SHA1	Message	Date
Oliver Smith	d99f243172	main/tinydm: depend on elogind Fix error when trying to start tinydm without elogind-openrc installed: Service `tinydm' needs non existent service `elogind'	2020-12-02 16:49:49 +01:00
Martijn Braam	fdc0731516	main/powersupply: update to 0.4.0 (MR 1772) This fixes a crash when a 3A powersupply is used on the latest kernel	2020-12-02 17:31:47 +03:00
Bart Ribbers	5d1e53493e	main/postmarketos-ui-plasma-mobile: swap plasma-camera for megapixels (MR 1770) Even on the PinePhone KDE community edition Megapixels will be shipped instead of plasma-camera, so let's do the same The resulting package doesn't change, _pmb_recommends is only a pmbootstrap thing, so we don't have to bump pkgrel [ci:skip-vercheck]	2020-12-02 12:56:28 +01:00
Oliver Smith	3cf792d157	temp/xcb-util-cursor: temporarily fork from alpine Make it available for armv7 again. This is the last missing package to build postmarketos-ui-plasma-mobile again, I verified it.	2020-12-02 12:33:55 +01:00
Oliver Smith	3bd9f62da2	temp/libinput: temporarily fork from alpine (+depends) (MR 1771) Make libinput available for armv7 in postmarketOS edge, until it is in Alpine edge again.	2020-12-02 11:55:04 +01:00
Devin Lin	25beffccdd	main/postmarketos-ui-plasma-mobile: add kclock, kweather and kalk to extras subpackage (MR 1769)	2020-12-02 11:39:48 +01:00
Bart Ribbers	c981d35ce6	pine64-pinephone: move from community to main (MR 1752) First actual phone in main 🎉 Fits the requirements for main devices as listed on https://wiki.postmarketos.org/wiki/Device_categorization.	2020-12-02 02:30:13 +01:00
dominduchami	77c0bf245f	device/htc-leo: enable wifi (MR 1767)	2020-12-01 16:58:49 +01:00
Oliver Smith	01d2a8e767	temp/xorg-server: temporarily fork from alpine (+depends) (MR 1768) Add it to pmOS for arm, until they are in Alpine again. Related: https://postmarketos.org/edge/2020/12/01/xorg-server-moved/ [ci:skip-vercheck]: pkgrel doesn't need to be -r0	2020-12-01 15:59:23 +01:00
Oliver Smith	e544c65b7e	cross/musl-*: upgrade to 1.2.2_pre4	2020-12-01 15:43:20 +01:00
Dylan Van Assche	42e857ab79	temp/modemmanager: Fix missing text messages in deep sleep and reduce probing time [ci:skip-build]: already built successfully in CI	2020-11-29 11:50:18 -08:00
Dylan Van Assche	a7b8e0289b	temp/modemmanager: Upgrade to 1.14.8 [ci:skip-build]: already built successfully in CI	2020-11-29 11:50:11 -08:00
clayton craft	15a07ac74c	device-pine64-pinephone: add craftyguy as co-maintainer (MR 1765) I have been working a lot with this device lately, and own one, so it seems appropriate right‽ [ci:skip-build]: already built successfully in CI	2020-11-27 22:20:03 -08:00
clayton craft	4915578771	device-pine64-pinephone: fix audio after pulseaudio upgrade (MR 1765) After pulseaudio 14.0 was released, audio on the pinephone was broken. This applies the relevant config from here to fix it: https://gitlab.manjaro.org/manjaro-arm/packages/community/phosh/alsa-ucm-pinephone/-/commit/c23f92aa4621f04f6ad028201371383d834b2a09 [ci:skip-build]: already built successfully in CI	2020-11-27 22:19:52 -08:00
clayton craft	ca1adb070a	temp/geary: upgrade to git20201126 (MR 1764) The notable change here is a much better folder view on mobile. [ci:skip-build]: already built successfully in CI	2020-11-27 14:37:50 +01:00
devajithvs	03a96f0f28	asus-z010d: new device (MR 1757) Device: Asus Zenfone Max ZC550KL MSM8916 Mainline Kernel Works: - Boots - external sdcard - Wifi/bt - Display - Touchscreen I'm still working on this device. You can expect more things to work in the future.	2020-11-27 14:27:41 +01:00
Minecrell	b3248bfd32	device/community/soc-qcom-msm8916: fix regressions after PA update (MR 1760) New upstream ALSA/PulseAudio release, new UCM regressions - of course! Introduce some new hacks to make the ALSA UCM configurations work again. This fixes weird "Combination of Speaker,Primary Microphone" outputs appearing in the PulseAudio mixer. And while we're at it, some minor improvements/additions: - Default to Speaker/PrimaryMic instead of Headphones/Headset I believe this is just a workaround until headphones detection works properly. - Add UCM configurations for oppo-a51f and lenovo-a6010	2020-11-26 11:45:14 +01:00
Oliver Smith	881a86068d	cross/busybox-static-*: upgrade to 1.32.0-r7	2020-11-26 10:25:15 +01:00
clayton craft	1340cffecf	temp/dino: fork from Alpine to build feature/handy mobile UI branch (MR 1754) This packages the libhandy work in dino's feature/handy branch, which makes the UI quite usable on mobile displays. A couple of windows don't work well yet (e.g., the setting window), but chatting/omemo/file transfer all work pretty well.	2020-11-25 22:36:01 -08:00
Oliver Smith	6e3ddf62d7	main/mobile-config-firefox: upgrade to 2.0.0 (MR 1758)	2020-11-25 22:32:50 +01:00
Oliver Smith	a77d4ed26a	main/linux-postmarketos-allwinner: upgrade to 5.9.10_git20201123 (MR 1755) [ci:skip-build]: already built successfully in CI	2020-11-25 14:31:29 +01:00
Oliver Smith	2faf47adec	cross/gcc-*: upgrade to 10.2.1_pre0-r3	2020-11-25 11:59:13 +01:00
M0Rf30	0a20973d44	linux-xiaomi-vince: Update to 4.9.245 (MR 1749) [ci:skip-build]: already built successfully in CI	2020-11-24 12:00:45 +01:00
Alexey Min	8bc2cacd9f	device-samsung-klte: several small fixes (MR 1746) * Mainline kernel: enable installation of Wi-Fi firmware. Now that we have Wi-Fi support in mainline kernel, use it. * Mainline kernel: adjust description of mainline kernel subpackage; we still cannot recommend it over downstream, but it is not so experimental anymore. * Downstream kernel: add workaround for broken SSH: use dropbear instead of openssh server. See #808 https://gitlab.com/postmarketOS/pmaports/-/issues/808	2020-11-23 11:57:56 +01:00
Bart Ribbers	915d11748a	kde/neochat: new aport (MR 1737)	2020-11-22 11:07:11 +01:00
Bart Ribbers	dcf939622b	temp/geary: fork from Alpine to apply Purism's mobile patches (MR 1358) [ci:skip-build]: already built successfully in CI	2020-11-21 13:54:56 -08:00
Alexey Min	f729822823	linux-postmarketos-qcom-msm8974: improve device support (MR 1745) Battery percentage monitoring support: * lg-hammerhead * samsung-klte Mobile internet support: * fairphone-fp2 QCOM_SOCINFO for querying information from the SoC [ci:skip-build]: already built successfully in CI	2020-11-21 13:52:01 -08:00
Maarten van Gompel	68ef03efbc	temp/modemmanager: Fix sending SMS with UTF-16 characters (MR 1714) Upstream: no Patch recommended by Aleksander Morgado in upstream issue, until a proper fix is developed: https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/issues/274#note_671679	2020-11-21 13:35:29 -08:00
Luca Weiss	a27209ac29	main/qt5-qtsystems: enable all arches (MR 1747) [ci:skip-vercheck]	2020-11-21 17:03:51 +01:00
Luca Weiss	e455700135	main/dbus-test-runner: remove	2020-11-21 12:02:52 +01:00