gp-peak: Add support for osk-sdl and audio (#1243)

* gp-peak: Add support for osk-sdl
* gp-peak: Move non-kernel files to device-gp-peak
* gp-peak: Add audio support
Manually trigger the udev rules for audio devices and add the default user to the audio group

aports/device/device-gp-peak/APKBUILD

@@ -2,14 +2,18 @@
 pkgname="device-gp-peak"
 pkgdesc="Geeksphone Peak"
 pkgver=0.1
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="noarch"
 options="!check"
 depends="linux-gp-peak mkbootimg mesa-dri-swrast msm-fb-refresher"
 makedepends="devicepkg-dev"
-source="deviceinfo"
+source="
+	deviceinfo
+	device-gp-peak.start
+	fb.modes
+"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -17,6 +21,11 @@ build() {
 
 package() {
 	devicepkg_package $startdir $pkgname
+
+	install -Dm755 "$srcdir"/$pkgname.start "$pkgdir"/etc/local.d/$pkgname.start
+	install -Dm644 "$srcdir"/fb.modes "$pkgdir"/etc/fb.modes
 }
 
-sha512sums="e245f9f7b54c5286331b434b1c929a34c74567f51e61c5792856f91293f44d047b82632f0327fd961ec9ee6b6843483329744f009eb201f017cf05299ab233eb  deviceinfo"
+sha512sums="e245f9f7b54c5286331b434b1c929a34c74567f51e61c5792856f91293f44d047b82632f0327fd961ec9ee6b6843483329744f009eb201f017cf05299ab233eb  deviceinfo
+b77fc5191c07bf2b6a5bf5e702351f8de024a6f15d3726c88da1ab2e3d8185cbb468acbea533d07bf595855d53ab8bcd3a48fd9f35d55b78981f1ae23d44bbd8  device-gp-peak.start
+3a2c1c53ec67d40639920ace68ebf13ecff5966a8f94a603f625e01e5f403178c511c21c6de841837e256b714045e7c90cc0cb62537a9f0a536ad4b390f9c3c3  fb.modes"

aports/device/linux-gp-peak/linux-gp-peak.start → aports/device/device-gp-peak/device-gp-peak.start

 #!/bin/sh
 udevadm test /devices/virtual/graphics/fb0
 udevadm test /devices/virtual/input/input2/event2
+udevadm test /devices/platform/soc-audio/sound/card0/controlC0
+udevadm test /devices/platform/soc-audio/sound/card0/pcmC0D0c
+udevadm test /devices/platform/soc-audio/sound/card0/pcmC0D0p

aports/device/device-gp-peak/fb.modes

+mode "540x960-0"
+    # D: 0.001 MHz, H: 0.001 kHz, V: 0.000 Hz
+    geometry 540 960 540 960 16
+    timings 898000000 75 129 4 8 5 4
+    rgba 8/16,8/8,8/0,8/24
+endmode

aports/device/linux-gp-peak/APKBUILD

@@ -2,7 +2,7 @@
 
 pkgname="linux-gp-peak"
 pkgver=3.0.21
-pkgrel=1
+pkgrel=2
 pkgdesc="Peak kernel fork"
 arch="armhf"
 _carch="arm"
@@ -24,7 +24,6 @@ source="
 	compiler-gcc6.h
 	00_fix_return_address.patch
 	01_timeconst_fix.patch
-	linux-gp-peak.start
 "
 builddir="$srcdir/${_repository}-${_commit}"
 
@@ -85,13 +84,10 @@ package() {
 	make ARCH="$_carch" CC="${CC:-gcc}" \
 		KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-postmarketOS" \
 		INSTALL_MOD_PATH="$pkgdir" modules_install
-
-	install -Dm755 "$srcdir"/$pkgname.start "$pkgdir"/etc/local.d/$pkgname.start
 }
 
 sha512sums="e643530bc4e8540284820af137d300d8bf12fa352200095757a64e8e34a71d6e8892bf5887a988404864866751fb8fcac9e89b4429a76be59aeae670d04d533d  linux-gp-peak-f02b7a6f10b257b0452d3de47e19e55836e57613.tar.gz
 577601feac4432540352d7ff147136d27e340f6a0798838deecbf9ae92f787afa6eb59e2ce0e08793e0912fccfc9e0e9f717069375555ac5e25978413736ce6c  config-gp-peak.armhf
 d80980e9474c82ba0ef1a6903b434d8bd1b092c40367ba543e72d2c119301c8b2d05265740e4104ca1ac5d15f6c4aa49e8776cb44264a9a28dc551e0d1850dcc  compiler-gcc6.h
 ea1d3b5a234fa565e3c1a792de48f4fc4e6023d281d303c8e319c7ef28edc5739ab0e4dea0139a41f0a5c7d03e27921ccaa214fd0ac5c72245a094ce60128864  00_fix_return_address.patch
-a2bb98fb8d988bbb659cae00fbaca360828300e9b98b90aed5ee0dd839c3f740696df4094a9021b813cbada06820d115aabed581a47cdd2c947e8d853c20b145  01_timeconst_fix.patch
-92af13735f82c343f2f4224f8ca452a3a2d73ea7633c67cbda4a0d0243eb35b779186f9af01a1638ee5da3f2b5114b48faa071fe0b777edf823ebcd0a5bfa9e7  linux-gp-peak.start"
+a2bb98fb8d988bbb659cae00fbaca360828300e9b98b90aed5ee0dd839c3f740696df4094a9021b813cbada06820d115aabed581a47cdd2c947e8d853c20b145  01_timeconst_fix.patch"

aports/main/postmarketos-base/APKBUILD

 pkgname=postmarketos-base
 pkgver=3
-pkgrel=12
+pkgrel=13
 pkgdesc="Meta package for minimal postmarketOS base"
 url="https://github.com/postmarketOS"
 arch="noarch"
@@ -66,4 +66,4 @@ sha512sums="38dc75c0ed32b76dccd3d8e7e8173e8b7d91847cf2b07123f376b95af46b4f89798b
 3ceeee37f558e7c95ad973692b6a437f997e6b46c3d1c2257ddfb1529a5633477373aa123c7f08164e818daae50acb203d151379f27ca11bd458809e6a0d4de7  swapfile
 f5cc0f1265955d2646e5f099dd4b5d4c287945bfc18c16044db57670d456f55c678fc11cc59e6dab3fa340832ce869d516302a3a35c13518539ed0cedca51819  swapfile.init
 e0d2d48b82a03239a4c0a00acaf83e00d397c23a8d7c71053d4e2a383357c22dcedef9e81b0e12a1d7514e1fdbe0bb3eb82613d18b29034a7ce5447f13c84a53  swapfile.conf
-0fc71832f3a7c7493ed24ddbd673a4115c4f12905c4c4e178cc8dfb1e1ec32ef7de05e1840497e302c352bd17af61559ee69abc4827aba6de1e8784937f883fd  postmarketos-base.post-install"
+76f0410cf51a991d1c2caacc1a7ea6b7b1075fad7405167a82fd1e980b2c00b840991374b0799fb29fbd53d81a61cbbdaac2f915c9d5696cd84c6f4de28c5cb2  postmarketos-base.post-install"

aports/main/postmarketos-base/postmarketos-base.post-install

@@ -75,7 +75,7 @@ sed -i 's/# %wheel ALL=(ALL) ALL/%wheel ALL=(ALL) ALL/' /etc/sudoers
 
 # Add user to video group for proper framebuffer permissions
 username="$(getent passwd 1000 | cut -d ":" -f 1)"
-usermod -a -G video "$username"
+usermod -a -G video,audio "$username"
 
 # Set chrony to quickly correct system time on first boot, if necessary
 if ! grep -q "makestep" /etc/chrony/chrony.conf; then