From 2455a3bb21ea9e75c6c1fcd914142e33d933e74e Mon Sep 17 00:00:00 2001
From: Oliver Smith <ollieparanoid@postmarketos.org>
Date: Mon, 3 Aug 2020 10:06:34 +0200
Subject: [PATCH] planet-geminipda: remove hybris

---
 .../40-hwcomposer.conf                        |  5 -----
 .../testing/device-planet-geminipda/APKBUILD  | 20 ++++---------------
 2 files changed, 4 insertions(+), 21 deletions(-)
 delete mode 100644 device/testing/device-planet-geminipda/40-hwcomposer.conf

diff --git a/device/testing/device-planet-geminipda/40-hwcomposer.conf b/device/testing/device-planet-geminipda/40-hwcomposer.conf
deleted file mode 100644
index 03b8e38e0..000000000
--- a/device/testing/device-planet-geminipda/40-hwcomposer.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-Section "Device"
-    Identifier      "HWComposer device"
-    Driver          "hwcomposer"
-    Option          "Rotate" "CCW"
-EndSection
diff --git a/device/testing/device-planet-geminipda/APKBUILD b/device/testing/device-planet-geminipda/APKBUILD
index e3d148aa4..0eff2af69 100644
--- a/device/testing/device-planet-geminipda/APKBUILD
+++ b/device/testing/device-planet-geminipda/APKBUILD
@@ -1,8 +1,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-planet-geminipda
 pkgdesc="Gemini PDA"
-pkgver=0.1
-pkgrel=4
+pkgver=0.2
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -11,9 +11,7 @@ depends="postmarketos-base linux-planet-geminipda mkbootimg"
 makedepends="devicepkg-dev"
 source="deviceinfo
 	10-geminipda-loopback-device.sh
-	20-fbdev.conf
-	40-hwcomposer.conf"
-subpackages="$pkgname-hybris"
+	20-fbdev.conf"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -29,16 +27,6 @@ package() {
 		"$pkgdir"/etc/X11/xorg.conf.d/20-fbdev.conf
 }
 
-hybris() {
-	depends="lxc-android
-		libhybris-7.1 libhybris-egl libhybris-gles libhybris-libwayland-egl
-		xf86-video-hwcomposer xf86-video-hwcomposer-7.1"
-
-	install -Dm644 "$srcdir"/40-hwcomposer.conf \
-		"$subpkgdir"/etc/X11/xorg.conf.d/40-hwcomposer.conf
-}
-
 sha512sums="5b5f057ba5a6b9b4cfdd5f1123bcb9679ddda1246d633f025b11cdfd4990125747063cab942eac11d7fe06b0116d2dbfa9de9464e7a39038621cbc48f1e6602c  deviceinfo
 a8b6623a0a8bea1ab3e28582f203426e42aed477be9ca1d6147d090f9f9d080a69c262a47f9dd5cd8ce99a9bf64912d902dc881f97967873466ebe73d9bba587  10-geminipda-loopback-device.sh
-07bda3435dffec7f8e8e158266cb619fb41c6b04a49a605e76fa88bc33be3cb27fdc54c8664be0738bab2c7a8054ce3d7563036323bf04762dcf735064ac10a2  20-fbdev.conf
-785bd225025fb73900dca06b70b2d62fdf4145d1c035b1b03fb0f82a10cc09eff63ec551ead4e1ee780a6b6f348c3f82fd068f6efa6f4e34205600d752f38913  40-hwcomposer.conf"
+07bda3435dffec7f8e8e158266cb619fb41c6b04a49a605e76fa88bc33be3cb27fdc54c8664be0738bab2c7a8054ce3d7563036323bf04762dcf735064ac10a2  20-fbdev.conf"