From ebee4faa5f7d0df521f0bb06c23e0ef1dc7d21a0 Mon Sep 17 00:00:00 2001
From: Stefan Hansson <newbyte@postmarketos.org>
Date: Thu, 11 Jan 2024 21:14:25 +0100
Subject: [PATCH] device-sony-sirius: remove Weston configuration (MR 4713)

The only relevant backend available for Weston nowadays is the DRM one, so
remove this unnecessary config.
---
 device/testing/device-sony-sirius/APKBUILD   | 14 +++-----------
 device/testing/device-sony-sirius/weston.ini |  5 -----
 2 files changed, 3 insertions(+), 16 deletions(-)
 delete mode 100644 device/testing/device-sony-sirius/weston.ini

diff --git a/device/testing/device-sony-sirius/APKBUILD b/device/testing/device-sony-sirius/APKBUILD
index 47c817d73..ec49b7492 100644
--- a/device/testing/device-sony-sirius/APKBUILD
+++ b/device/testing/device-sony-sirius/APKBUILD
@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-sony-sirius
-pkgver=2
-pkgrel=2
+pkgver=3
+pkgrel=0
 pkgdesc="Sony Xperia Z2 device package"
 url="https://postmarketos.org"
 arch="armv7"
@@ -12,11 +12,10 @@ depends="
 	postmarketos-base
 "
 makedepends="devicepkg-dev"
-subpackages="$pkgname-weston $pkgname-x11 $pkgname-nonfree-firmware:nonfree_firmware"
+subpackages="$pkgname-x11 $pkgname-nonfree-firmware:nonfree_firmware"
 source="
 	deviceinfo
 	modules-initfs
-	weston.ini
 	99-touch.rules
 	modules-load.conf
 	brcmfmac4339-sdio.txt
@@ -44,12 +43,6 @@ x11() {
 	mkdir "$subpkgdir"
 }
 
-weston() {
-	install_if="$pkgname weston"
-	install -Dm644 "$srcdir"/weston.ini \
-		"$subpkgdir"/etc/xdg/weston/weston.ini
-}
-
 nonfree_firmware() {
 	pkgdesc="Wifi/GPU firmware"
 	depends="linux-firmware-brcm linux-firmware-cypress firmware-qcom-adreno-a330"
@@ -59,7 +52,6 @@ nonfree_firmware() {
 sha512sums="
 3e856f1832ea0e2836545d3e6c1765134c9117d41e7b12ff5d43282aef6c295f02f812629f78c695483a5dd8c1287bf6bad0b4ee16c19e86ddcaa42e0f449acb  deviceinfo
 a6580d63105978aac1ee13098bdee1d98528dba671889199ba79264c40750807fecd3d526471fb77abd55fa0fec21c8fea1d0fd6d4fb5afd2b306bc98ef1a0d7  modules-initfs
-de794566118f1744d068a94e6a75b61d43f6749a4b0871a5270fa7a2048164d609c71fcffa61845c2a7dd4cb5fbeb72c0e4f8b73b382f36d6ff0bcc9b8a5ae25  weston.ini
 ec5e26e60a77e74befabf5cc3f85a2636ce07261e725c0a051999d321ddec056f307001ba659c91e403770ac99d38b3160fd46e235c467fefc03d0901452314d  99-touch.rules
 35a5dbd90eef6c567822f1a805c6adf620bb9c6c9c2e1755407409c2fab044baa40dda9e526c45108b4a2bbf43e0ad67e3dd90c35f6a6c6e29ec5930f2d1c4a7  modules-load.conf
 b99a1bc0d430a261b6ab0b5ea12f2e996ab24ece6fe40ff57357697f4db976394c655a7c7a63e7c985f6356126a6b1d920eb0077817cb65ae18250f404282a68  brcmfmac4339-sdio.txt
diff --git a/device/testing/device-sony-sirius/weston.ini b/device/testing/device-sony-sirius/weston.ini
deleted file mode 100644
index 72039ae30..000000000
--- a/device/testing/device-sony-sirius/weston.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[core]
-xwayland=true
-backend=drm-backend.so
-[shell]
-background-image=/usr/share/wallpapers/postmarketos.jpg