From 55f0db994bf80362b30bbf75e7601b6cc76da6e9 Mon Sep 17 00:00:00 2001
From: Henrik Grimler <henrik@grimler.se>
Date: Sun, 28 Jan 2024 17:07:04 +0100
Subject: [PATCH] device-motorola-thea: avoid overriding udev v4l rule in /etc
 (MR 4768)

Depend on postmarketos-base-downstream-disable-udev-v4l instead, which
symlinks /lib/udev/rules.d/60-persistent-v4l.rules to /dev/null.
---
 device/testing/device-motorola-thea/APKBUILD | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/device/testing/device-motorola-thea/APKBUILD b/device/testing/device-motorola-thea/APKBUILD
index a3afd9eb1..af97cfde2 100644
--- a/device/testing/device-motorola-thea/APKBUILD
+++ b/device/testing/device-motorola-thea/APKBUILD
@@ -1,12 +1,18 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-motorola-thea
 pkgver=2
-pkgrel=1
+pkgrel=2
 pkgdesc="Motorola Moto G 2014"
 url="https://postmarketos.org"
 arch="armv7"
 license="MIT"
-depends="postmarketos-base linux-motorola-titan mkbootimg msm-fb-refresher"
+depends="
+	postmarketos-base
+	postmarketos-base-downstream-disable-udev-v4l
+	linux-motorola-titan
+	mkbootimg
+	msm-fb-refresher
+"
 makedepends="devicepkg-dev"
 install="$pkgname.post-install"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
@@ -23,10 +29,6 @@ package() {
 		"$pkgdir"/etc/udev/rules.d/90-android-touch-dev.rules
 	install -Dm644 "$srcdir"/profile.sh \
 		"$pkgdir"/etc/profile.d/00-$pkgname.sh
-
-	# Disable v4l (video4linux), because without the camera firmware
-	# blobs this makes dev hang with the kernel this device uses (#1033)
-	ln -s /dev/null "$pkgdir"/etc/udev/rules.d/60-persistent-v4l.rules
 }
 
 nonfree_firmware() {