From 865ff8dca655f2dcafecc9be5ecdd150141f9575 Mon Sep 17 00:00:00 2001
From: Mighty <mightymb17@gmail.com>
Date: Thu, 24 Mar 2022 14:48:03 +0530
Subject: [PATCH] device-samsung-espresso3g: remove GPU support and hacks (MR
 3027)

---
 .../device-samsung-espresso3g/APKBUILD        | 30 +++----------------
 .../device-samsung-espresso3g/deviceinfo      |  2 +-
 .../device-samsung-espresso3g/xorg.conf       | 12 --------
 3 files changed, 5 insertions(+), 39 deletions(-)
 delete mode 100644 device/community/device-samsung-espresso3g/xorg.conf

diff --git a/device/community/device-samsung-espresso3g/APKBUILD b/device/community/device-samsung-espresso3g/APKBUILD
index 3025a61b4..526cd0d81 100644
--- a/device/community/device-samsung-espresso3g/APKBUILD
+++ b/device/community/device-samsung-espresso3g/APKBUILD
@@ -4,15 +4,15 @@
 pkgname=device-samsung-espresso3g
 pkgdesc="Samsung Galaxy Tab 2 (7.0 inch)"
 pkgver=3
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
 options="!check !archcheck"
 depends="postmarketos-base postmarketos-update-kernel linux-samsung-espresso3g mkbootimg"
 makedepends="devicepkg-dev"
-source="deviceinfo xorg.conf"
-subpackages="$pkgname-nonfree-firmware:nonfree_firmware $pkgname-nonfree-userland:nonfree_userland"
+source="deviceinfo"
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -28,28 +28,6 @@ nonfree_firmware() {
 	mkdir "$subpkgdir"
 }
 
-nonfree_userland() {
-	# Patched wlroots is also necessary for accelerated phosh and sway.
-	# See https://gitlab.com/antoni.aloytorrens/p-wlroots and https://gitlab.com/postmarketOS/pmaports/-/merge_requests/2573.
-	# Unfortunately, such workarounds are not accepted in pmOS.
-	pkgdesc="$pkgdesc (GPU userspace libraries)"
-	depends="mesa-pvr-dri-classic sgx-ddk-um sgx-ddk-um-openrc sgx-ddk-um-ti443x"
-	mkdir "$subpkgdir"
-}
-
-phosh() {
-	install_if="$pkgname postmarketos-ui-phosh"
-	install -Dm644 "$srcdir"/rootston.ini \
-			"$subpkgdir"/usr/share/phosh/phoc.ini
-}
-
-x11() {
-	install_if="$pkgname xorg-server"
-	install -Dm644 "$srcdir"/xorg.conf \
-		"$subpkgdir"/etc/X11/xorg.conf.d/99-modesetting.conf
-}
-
 sha512sums="
-41897ea67a1773023269a37aab57dc6a60e6804319ae329ce355cac464809c16699262dca1f4b1895b01e9e20bfc640ce3577ac0703a33ba2201555e4d0f28f9  deviceinfo
-41f0d61da6f5029be51396fdcdc91aa241c47825adc32cc03f81d1c2ada633f1e293a03dd3ed75a7e8c3e2d960aec889ecdb3af7db5f106444c06f4f6c45debd  xorg.conf
+dbf180ad55042899074ea71d2c50754f2b8c9a12becdffc8fd52794b36c5c5ee2038e5074be66cbc53068d2ac7abae5b22ae3585b17caf9e179101c9101f6d57  deviceinfo
 "
diff --git a/device/community/device-samsung-espresso3g/deviceinfo b/device/community/device-samsung-espresso3g/deviceinfo
index 2af814467..1447ece52 100644
--- a/device/community/device-samsung-espresso3g/deviceinfo
+++ b/device/community/device-samsung-espresso3g/deviceinfo
@@ -17,7 +17,7 @@ deviceinfo_keyboard="false"
 deviceinfo_external_storage="true"
 deviceinfo_screen_width="1024"
 deviceinfo_screen_height="600"
-deviceinfo_gpu_accelerated="true"
+deviceinfo_gpu_accelerated="false"
 
 # Bootloader related
 deviceinfo_flash_method="heimdall-bootimg"
diff --git a/device/community/device-samsung-espresso3g/xorg.conf b/device/community/device-samsung-espresso3g/xorg.conf
deleted file mode 100644
index 350823c43..000000000
--- a/device/community/device-samsung-espresso3g/xorg.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-Section "Device"
-  Identifier "DSI-1"
-  Driver "modesetting"
-  Option "kmsdev" "/dev/dri/by-path/platform-omapdrm.0-card"
-  Option "AccelMethod" "none"
-  Option "Atomic" "on"
-  Option "VariableRefresh" "on"
-EndSection
-
-Section "ServerFlags"
-  Option "AutoAddGPU" "false"
-EndSection