From 9d6a3540ad2ea94d4680e4e3e9f5dd20e3812ca7 Mon Sep 17 00:00:00 2001
From: Danct12 <danct12@disroot.org>
Date: Thu, 8 Aug 2019 20:47:54 +0700
Subject: [PATCH] device-pine-pinetab: change compose key to meta on pinetab
 keyboard (!552)

Signed-off-by: Danct12 <danct12@disroot.org>
---
 device/device-pine-pinetab/99-pinetab-keyboard.hwdb |  2 ++
 device/device-pine-pinetab/APKBUILD                 | 13 +++++++++++--
 .../device-pine-pinetab.post-install                |  5 +++++
 3 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 device/device-pine-pinetab/99-pinetab-keyboard.hwdb
 create mode 100644 device/device-pine-pinetab/device-pine-pinetab.post-install

diff --git a/device/device-pine-pinetab/99-pinetab-keyboard.hwdb b/device/device-pine-pinetab/99-pinetab-keyboard.hwdb
new file mode 100644
index 000000000..579f99dc5
--- /dev/null
+++ b/device/device-pine-pinetab/99-pinetab-keyboard.hwdb
@@ -0,0 +1,2 @@
+evdev:input:b0003v17EFp6018*
+ KEYBOARD_KEY_70065=leftmeta
diff --git a/device/device-pine-pinetab/APKBUILD b/device/device-pine-pinetab/APKBUILD
index f9dc96f15..72df5f908 100644
--- a/device/device-pine-pinetab/APKBUILD
+++ b/device/device-pine-pinetab/APKBUILD
@@ -2,7 +2,7 @@
 pkgname="device-pine-pinetab"
 pkgdesc="Pine64 Pinetab"
 pkgver=0.1
-pkgrel=3
+pkgrel=4
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -10,10 +10,12 @@ options="!check !archcheck"
 depends="postmarketos-base linux-postmarketos-allwinner u-boot-pine64 uboot-tools mesa-git mesa-git-glapi mesa-git-gl mesa-git-egl mesa-git-dri-lima mesa-git-dri-kmsro mesa-git-gbm mesa-git-gles"
 makedepends="devicepkg-dev"
 subpackages="$pkgname-sway"
+install="$pkgname.post-install"
 source="
 	deviceinfo
 	uboot-script.cmd
 	sway.conf
+	99-pinetab-keyboard.hwdb
 "
 
 build() {
@@ -39,11 +41,18 @@ sway() {
 
 package() {
 	devicepkg_package $startdir $pkgname
+
+	# U-Boot
 	install -Dm644 "$srcdir"/boot.scr \
 		"$pkgdir"/boot/boot.scr
+
+	# Fix for the meta key on v1 keyboard dock, probably not needed on newer revisions
+	install -Dm644 "$srcdir"/99-pinetab-keyboard.hwdb \
+		"$pkgdir"/etc/udev/hwdb.d/99-pinetab-keyboard.hwdb
 }
 
 
 sha512sums="78b3414f198f2efbfcb12d6240e26a34cd48f00f75a0469c57c372a84aaac75a8f5ddd23f8cb1c16b9a9de6b2a11a8f537a1cd486f75dfbce213541f6890211b  deviceinfo
 8f15bb62704ad5379c6f77c5ea766e69587a11829539cc339b486b72e248e04cc6202b505f12846f6537f259412f7749ce50d0b15227da182afe17fe7dd303e5  uboot-script.cmd
-9e71c61bfa72b60e749c4dc04f17eb59d25de822765e81e65c937d6be5236d3951a652b69a1ab973abe6add9f34705be5dbaa98bbfa25daf7504dd50b28524c2  sway.conf"
+9e71c61bfa72b60e749c4dc04f17eb59d25de822765e81e65c937d6be5236d3951a652b69a1ab973abe6add9f34705be5dbaa98bbfa25daf7504dd50b28524c2  sway.conf
+8d1ef04911f1cfa7eda8185f4f4d807af23105a7c8f23d8c18f02afeccd8ab124de70c2e2760c154a3128fe3793447039fb0abf37aa496f597d27051e275033e  99-pinetab-keyboard.hwdb"
diff --git a/device/device-pine-pinetab/device-pine-pinetab.post-install b/device/device-pine-pinetab/device-pine-pinetab.post-install
new file mode 100644
index 000000000..5628bc03c
--- /dev/null
+++ b/device/device-pine-pinetab/device-pine-pinetab.post-install
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+# We'll update the hwdb so that the meta key gets fixed
+echo "UPDATING HWDB..."
+udevadm hwdb --update