From d0e7661a0b99ecc85f6a83528f1508b2bea8ded6 Mon Sep 17 00:00:00 2001
From: Stefan Hansson <newbyte@postmarketos.org>
Date: Thu, 11 Jan 2024 21:24:47 +0100
Subject: [PATCH] device-raspberry-pi3: 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-raspberry-pi3/APKBUILD   | 14 +++-----------
 device/testing/device-raspberry-pi3/weston.ini |  6 ------
 2 files changed, 3 insertions(+), 17 deletions(-)
 delete mode 100644 device/testing/device-raspberry-pi3/weston.ini

diff --git a/device/testing/device-raspberry-pi3/APKBUILD b/device/testing/device-raspberry-pi3/APKBUILD
index d89a1443b..7c5762359 100644
--- a/device/testing/device-raspberry-pi3/APKBUILD
+++ b/device/testing/device-raspberry-pi3/APKBUILD
@@ -1,8 +1,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-raspberry-pi3
 pkgdesc="Raspberry Pi 3B/3B+"
-pkgver=0.2
-pkgrel=5
+pkgver=0.3
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -10,8 +10,7 @@ options="!check !archcheck"
 depends="postmarketos-base raspberrypi-bootloader linux-rpi bluetooth-raspberry-pi"
 makedepends="devicepkg-dev"
 install="$pkgname.post-install $pkgname.post-upgrade"
-subpackages="$pkgname-weston"
-source="deviceinfo modules-initfs config.txt usercfg.txt cmdline.txt 95-vchiq-permissions.rules weston.ini networkmanager.conf"
+source="deviceinfo modules-initfs config.txt usercfg.txt cmdline.txt 95-vchiq-permissions.rules networkmanager.conf"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -28,12 +27,6 @@ package() {
 		"$pkgdir"/etc/NetworkManager/conf.d/10-rpi3.conf
 }
 
-weston() {
-	install_if="$pkgname weston"
-	install -Dm644 "$srcdir"/weston.ini \
-		"$subpkgdir"/etc/xdg/weston/weston.ini
-}
-
 sha512sums="
 dc77ec14629e3821544fd660b4353dd0c104b7320508d71c7f87afc85263b35ae716964cfda114a3db07a9799f03443a6db874411aba1f3b06dd3eaa33d60500  deviceinfo
 e3515cf9f41807917eac1f7663e0131bd18783824facf15f2bb0381635bf6d9a0c334f3786b6fb76d01469de6449878c871f8b747f45e9e3cee77699905cf319  modules-initfs
@@ -41,6 +34,5 @@ ba195d9345fa4f4aee38cbc945b02f5bf13bd7e255124de006b4d04bc78c846c8c6b85268816f8a8
 a8e57535523d0f78e9d2ac1ac31b097a1a25468e3c910290647a60c862e631a4b4de94a5f6e4de999e1b9f70e67653a886967200856287dbc819b9f3ac16c548  usercfg.txt
 ae3de0b8fec07d3a283dc3c06bf8678eec1e65c9faf0b7f4fdc9fb92751e324d1f8e2fb224dbbf561b7e5a6fb34769bfa1657858375f74b101a130d78e0737e2  cmdline.txt
 7e5505cb07d5b4a81bd28443d508336b5c547356538f1c06f91ed93ad0d7d456d4f74f1d24df5a2e08c17e74f0a66607352ac4874e967e9a91dfec9522d2d58d  95-vchiq-permissions.rules
-320a466009c5abb416f70a60b45b3403ef1d1b4ac68a762c8028cd4615d537c48d906afe101e7335907a0274cc25b0b9b547e02ee69950e6792a7b54759c7cd9  weston.ini
 0f79016bf717dea43830962f524deae8d1cedc274376e40bd912ebe63208c5b1c3b7a5aa14379da19020c587dbd5588df2f0066ca1540070a226983a43e4159b  networkmanager.conf
 "
diff --git a/device/testing/device-raspberry-pi3/weston.ini b/device/testing/device-raspberry-pi3/weston.ini
deleted file mode 100644
index 775e344c7..000000000
--- a/device/testing/device-raspberry-pi3/weston.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[core]
-xwayland=true
-backend=drm-backend.so
-
-[shell]
-background-image=/usr/share/wallpapers/postmarketos.jpg