From 8d2a1a417dcfce2e7caf7892b11539370f414826 Mon Sep 17 00:00:00 2001
From: Oliver Smith <ollieparanoid@bitmessage.ch>
Date: Fri, 6 Oct 2017 18:19:47 +0000
Subject: [PATCH] Automatically install X11 and mesa dependencies (using
 install_if) (#696)

* device-qemu-amd64: subpackages for x11 and mesa
* postmarketos-base: add x11 subpackage
---
 device/device-qemu-amd64/APKBUILD | 16 ++++++++++++++--
 main/postmarketos-base/APKBUILD   | 17 +++++++++++++++--
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/device/device-qemu-amd64/APKBUILD b/device/device-qemu-amd64/APKBUILD
index 6a9918e05..9fcf346f0 100644
--- a/device/device-qemu-amd64/APKBUILD
+++ b/device/device-qemu-amd64/APKBUILD
@@ -1,13 +1,13 @@
 pkgname=device-qemu-amd64
 pkgver=1
-pkgrel=5
+pkgrel=6
 pkgdesc="Simulated device in qemu with an x86 platform"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
 depends="linux-postmarketos"
 makedepends=""
-subpackages=""
+subpackages="$pkgname-mesa $pkgname-x11"
 source="deviceinfo interfaces"
 options="!check"
 
@@ -18,5 +18,17 @@ package() {
 		"$pkgdir"/etc/network/interfaces
 }
 
+mesa() {
+	install_if="$pkgname mesa-glapi"
+	depends="mesa-dri-swrast"
+	mkdir "$subpkgdir"
+}
+
+x11() {
+	install_if="$pkgname xorg-server"
+	depends="xf86-video-qxl"
+	mkdir "$subpkgdir"
+}
+
 sha512sums="511fe8d2f1e4cf90d96a321568220ecf98bffd44b96339b200633a4f3c45b6b58e646c0971f82fbcd9829e4b66e62942a6ecc55ea03dd228ab76984b0ff0b92d  deviceinfo
 d510ca304066840aa5e6c4fc71ded1b7e83012c93837fa39e37bdb873b3636230030d56f7aa50c93fc688f563cb4cb96c02ad333bbc45a400c1ebee1792a9dd4  interfaces"
diff --git a/main/postmarketos-base/APKBUILD b/main/postmarketos-base/APKBUILD
index fe00532ea..6a0f50b2e 100644
--- a/main/postmarketos-base/APKBUILD
+++ b/main/postmarketos-base/APKBUILD
@@ -1,6 +1,6 @@
 pkgname=postmarketos-base
 pkgver=3
-pkgrel=4
+pkgrel=5
 pkgdesc="Meta package for minimal postmarketOS base"
 url="https://github.com/postmarketOS"
 arch="noarch"
@@ -21,7 +21,7 @@ depends="
 	wpa_supplicant"
 makedepends=""
 install="$pkgname.post-install"
-subpackages=""
+subpackages="$pkgname-x11"
 source="
 	sudoers
 	firmwareload.sh
@@ -51,6 +51,19 @@ package() {
 		"$pkgdir"/etc/init.d/swapfile
 
 }
+
+x11() {
+	install_if="$pkgname xorg-server"
+	depends="
+		libinput
+		xf86-input-evdev
+		xf86-input-keyboard
+		xf86-input-libinput
+		xf86-input-mouse
+		xf86-video-fbdev"
+	mkdir "$subpkgdir"
+}
+
 sha512sums="c6de3b44bc45b9f9c641a7e34c69a481ee39b99ac0251cd28f2b3aae49c1a8d1ca448f4936b7942b1a8b8f7c18a5415c938098765ed8cf08456543800160e64b  sudoers
 38dc75c0ed32b76dccd3d8e7e8173e8b7d91847cf2b07123f376b95af46b4f89798b24f45302a0726fdc1cf253aecaac140f431735ac5c6511553f790badd0af  firmwareload.sh
 0b098828080055d3646ea54891cb0e1b578cbc30f5e16f7284f2814c08192f18079a38fb686d192715ae6a3d2cd6625d9e3cf99f234a6f0d94088bb0cb2ce43d  50-firmware.rules