device/testing/device-asus-sparrow/APKBUILD

@@ -2,7 +2,7 @@
 pkgname=device-asus-sparrow
 pkgdesc="ASUS ZenWatch 2"
 pkgver=2
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -10,6 +10,7 @@ options="!check !archcheck"
 depends="
 	mkbootimg
 	postmarketos-base
+	soc-qcom-msm8226
 "
 makedepends="devicepkg-dev"
 subpackages="

device/testing/device-fairphone-fp2/APKBUILD

@@ -2,7 +2,7 @@
 pkgname=device-fairphone-fp2
 pkgdesc="Fairphone 2"
 pkgver=8
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -11,7 +11,7 @@ depends="
 	lk2nd-msm8974
 	mkbootimg
 	postmarketos-base
-	swclock-offset
+	soc-qcom-msm8974
 	"
 makedepends="devicepkg-dev"
 source="

device/testing/device-htc-m8/APKBUILD

@@ -2,7 +2,7 @@
 pkgname=device-htc-m8
 pkgdesc="HTC One M8"
 pkgver=1
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -10,6 +10,7 @@ options="!check !archcheck"
 depends="
 	mkbootimg
 	postmarketos-base
+	soc-qcom-msm8974
 "
 makedepends="devicepkg-dev"
 subpackages="

device/testing/device-htc-memul/APKBUILD

@@ -2,7 +2,7 @@
 pkgname=device-htc-memul
 pkgdesc="HTC One Mini 2"
 pkgver=5
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -11,6 +11,7 @@ depends="
 	lk2nd-msm8226-htc-memul
 	mkbootimg
 	postmarketos-base
+	soc-qcom-msm8226
 	"
 makedepends="devicepkg-dev"
 subpackages="

device/testing/device-huawei-sturgeon/APKBUILD

@@ -2,7 +2,7 @@
 pkgname=device-huawei-sturgeon
 pkgdesc="Huawei Watch"
 pkgver=2
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -10,6 +10,7 @@ options="!check !archcheck"
 depends="
 	mkbootimg
 	postmarketos-base
+	soc-qcom-msm8226
 "
 makedepends="devicepkg-dev"
 source="

device/testing/device-lg-hammerhead/20-gsk-gpu-workaround.sh

-#!/bin/sh
-# New GTK renderer does not work well
-export GSK_RENDERER=gl

device/testing/device-lg-hammerhead/APKBUILD

 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-lg-hammerhead
-pkgver=9
+pkgver=10
 pkgrel=0
 pkgdesc="Google Nexus 5"
 url="https://postmarketos.org"
@@ -11,7 +11,7 @@ depends="
 	lk2nd-msm8974-lg-hammerhead
 	mkbootimg
 	postmarketos-base
-	swclock-offset
+	soc-qcom-msm8974
 "
 makedepends="devicepkg-dev"
 subpackages="
@@ -21,7 +21,6 @@ subpackages="
 	$pkgname-nonfree-firmware:nonfree_firmware"
 source="
 	10-unl0kr.conf
-	20-gsk-gpu-workaround.sh
 	bt-module-deps.conf
 	deviceinfo
 	modules-initfs
@@ -36,8 +35,6 @@ build() {
 
 package() {
 	devicepkg_package $startdir $pkgname
-	install -Dm755 "$srcdir"/20-gsk-gpu-workaround.sh \
-		"$pkgdir"/etc/profile.d/20-gsk-gpu-workaround.sh
 }
 
 unl0kr() {
@@ -84,7 +81,6 @@ nonfree_firmware() {
 
 sha512sums="
 f700af3145b79d1ef9edfb22982899b25cabfb212f9620dcbd3a2e6f44b5ad591e0a66056c6fcd66c3fde89a2b5f551e8a8fe2e65cf0e2a48adec57c027d7825  10-unl0kr.conf
-b0ff3cf868380481638cce975688eb622e50d4a45a877892e087789ad7f292f8723de1fbf3da2af445adad31df99d7976c31dcf4f685a046b644b38aa109067d  20-gsk-gpu-workaround.sh
 6cef5f8ae1785ac16e6fe84bfc861ac50cdfb94db35d764f44a25c960e123cb82f6e56f45362a5340c62a3d5ac225f2689afd4f6964cb88305a0892ba44214f0  bt-module-deps.conf
 8d7f99d6b498dce2e61a7c1632770172c81d9be9a9b178d1742e17ca738ec301468e35cb24e1eeac6dcc23a16f3d5c64bbeaa1520908134d90adabc468661911  deviceinfo
 fd639faebbee2c0c2c227710678376e0d039b7d96a62103f7ba7e6304d7060023f09064918e93a125465d20d125c0334225680521a7aeae5a43d77d7360c180c  modules-initfs

device/testing/device-lg-lenok/APKBUILD

@@ -2,7 +2,7 @@
 pkgname=device-lg-lenok
 pkgdesc="LG G Watch R"
 pkgver=4
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -10,6 +10,7 @@ options="!check !archcheck"
 depends="
 	mkbootimg
 	postmarketos-base
+	soc-qcom-msm8226
 	"
 makedepends="devicepkg-dev"
 subpackages="

device/testing/device-motorola-falcon/APKBUILD

@@ -2,12 +2,12 @@
 pkgname=device-motorola-falcon
 pkgdesc="Moto G (2013)"
 pkgver=2
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
 options="!check !archcheck"
-depends="postmarketos-base mkbootimg"
+depends="postmarketos-base mkbootimg soc-qcom-msm8226"
 makedepends="devicepkg-dev"
 subpackages="
 	$pkgname-kernel-downstream:kernel_downstream

device/testing/device-motorola-peregrine/APKBUILD

@@ -2,12 +2,12 @@
 pkgname=device-motorola-peregrine
 pkgdesc="Moto G 4G (2013)"
 pkgver=2
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
 options="!check !archcheck"
-depends="mkbootimg postmarketos-base"
+depends="mkbootimg postmarketos-base soc-qcom-msm8226"
 makedepends="devicepkg-dev"
 subpackages="
 	$pkgname-kernel-downstream:kernel_downstream

device/testing/device-oneplus-bacon/APKBUILD

 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-oneplus-bacon
 pkgver=4
-pkgrel=1
+pkgrel=2
 pkgdesc="OnePlus One"
 url="https://postmarketos.org"
 arch="armv7"
@@ -10,6 +10,7 @@ depends="
 	lk2nd-msm8974
 	mkbootimg
 	postmarketos-base
+	soc-qcom-msm8974
 	"
 makedepends="devicepkg-dev"
 subpackages="

device/testing/device-postmarketos-trailblazer/APKBUILD

@@ -2,7 +2,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-postmarketos-trailblazer
 pkgdesc="postmarketOS Trailblazer generic ARM64"
-pkgver=8
+pkgver=9
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -17,6 +17,7 @@ depends="
 	linux-firmware-ath11k
 	linux-firmware-ath12k
 	linux-firmware-qca
+	linux-firmware-rtw88
 	rmtfs
 	pd-mapper
 	tqftpserv
@@ -42,5 +43,5 @@ package() {
 
 sha512sums="
 255f7477ad35723cdfdac91969d3facd4879cb858dbcaf990abe11a0ff2e975941ba98e5e10dd243765f15539c9aee18242cd31b9438008846867c703e98c421  deviceinfo
-031f635b0cd4a9b9789c332a7677496c2ea68b138cba03a5bfea2d98d5241b05c99343600018a221fbfd61af63e048ba13ddf0d016b15429af89eeb5e21ea404  modules-initfs
+74aba456b82a649e053955eb2baf3e610b9f4bc69ee5c16a798bd0934d2a984cd1a03a0b9467a6f6fec5cdb9e4cc5d2915a295679ce60cabe4f620adb3d0fe36  modules-initfs
 "

device/testing/device-postmarketos-trailblazer/modules-initfs

@@ -8,7 +8,6 @@ edt-ft5x06
 gcc-sm6115
 goodix
 gpi
-gpi
 gpio_vibra
 i2c-hid-of
 i2c-qcom-geni
@@ -24,18 +23,20 @@ nvmem_qfprom
 onboard-usb-dev
 panel-samsung-s6d7aa0
 panel-samsung-sofef00
+panel_sitronix_st7703
 panel-visionox-rm69299
 phy-qcom-eusb2-repeater
 phy-qcom-qmp-combo
-phy-qcom-snps-eusb2
 phy-qcom-qmp-pcie
 phy-qcom-qmp-ufs
 phy-qcom-qmp-usb
-phy-qcom-qmp-usb
 phy-qcom-qmp-usbc
 phy-qcom-qusb2
-phy-qcom-qusb2
+phy-qcom-snps-eusb2
+phy_sun6i_mipi_dphy
 pinctrl-sm6115
+pwm_bl
+pwm_sun4i
 qcom-apcs-ipc-mailbox
 qcom_glink
 qcom_glink_rpm
@@ -49,11 +50,18 @@ qnoc-qcm2290
 qnoc-sm6115
 rmi_core
 rmi_i2c
-rpmpd
 rpm-proc
+rpmpd
 rpmsg_core
 smd-rpm
 smem
+sun4i_drm
+sun4i_i2s
+sun4i_tcon
+sun6i_dma
+sun6i_mipi_dsi
+sun8i_mixer
+sun8i_tcon_top
 tcpm
 typec
 udc-core

device/testing/device-samsung-hlte/APKBUILD

@@ -2,7 +2,7 @@
 pkgname=device-samsung-hlte
 pkgdesc="Samsung Galaxy Note 3"
 pkgver=3
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -11,7 +11,7 @@ depends="
 	linux-postmarketos-qcom-msm8974
 	mkbootimg
 	postmarketos-base
-	swclock-offset
+	soc-qcom-msm8974
 "
 makedepends="devicepkg-dev"
 subpackages="

device/testing/device-samsung-klte/APKBUILD

@@ -2,7 +2,7 @@
 pkgname=device-samsung-klte
 pkgdesc="Samsung Galaxy S5 (G900F/G9006/G9008/G9009W)"
 pkgver=9
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -12,6 +12,7 @@ depends="
 	mkbootimg
 	postmarketos-base
 	swclock-offset
+	soc-qcom-msm8974
 "
 makedepends="devicepkg-dev"
 subpackages="

device/testing/device-samsung-matisselte/APKBUILD

@@ -2,12 +2,17 @@
 pkgname=device-samsung-matisselte
 pkgdesc="Samsung Galaxy Tab 4 10.1 LTE"
 pkgver=2
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
 options="!check !archcheck"
-depends="postmarketos-base linux-postmarketos-qcom-msm8226 mkbootimg"
+depends="
+	linux-postmarketos-qcom-msm8226
+	mkbootimg
+	postmarketos-base
+	soc-qcom-msm8226
+	"
 makedepends="devicepkg-dev"
 source="deviceinfo"
 

device/testing/device-samsung-milletwifi/APKBUILD

@@ -2,12 +2,17 @@
 pkgname=device-samsung-milletwifi
 pkgdesc="Samsung Galaxy Tab 4 8.0 Wi-Fi"
 pkgver=2
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
 options="!check !archcheck"
-depends="linux-postmarketos-qcom-msm8226 mkbootimg postmarketos-base"
+depends="
+	linux-postmarketos-qcom-msm8226
+	mkbootimg
+	postmarketos-base
+	soc-qcom-msm8226
+	"
 makedepends="devicepkg-dev"
 source="deviceinfo modules-initfs"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"

device/testing/device-sony-amami/APKBUILD

 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-sony-amami
 pkgver=4
-pkgrel=5
+pkgrel=6
 pkgdesc="Sony Xperia Z1 Compact"
 url="https://postmarketos.org"
 arch="armv7"
 license="MIT"
-depends="postmarketos-base mkbootimg mdss-fb-init-hack"
+depends="
+	mdss-fb-init-hack
+	mkbootimg
+	postmarketos-base
+	soc-qcom-msm8974
+"
 makedepends="devicepkg-dev"
 subpackages="
 	$pkgname-kernel-downstream:kernel_downstream

device/testing/device-sony-castor/APKBUILD

 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-sony-castor
 pkgver=3
-pkgrel=4
+pkgrel=5
 pkgdesc="Sony Xperia Z2 Tablet"
 url="https://postmarketos.org"
 arch="armv7"
@@ -10,6 +10,7 @@ depends="
 	linux-postmarketos-qcom-msm8974
 	mkbootimg
 	postmarketos-base
+	soc-qcom-msm8974
 "
 makedepends="devicepkg-dev"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"

device/testing/device-sony-leo/APKBUILD

@@ -3,7 +3,7 @@
 pkgname=device-sony-leo
 pkgdesc="Sony Xperia Z3"
 pkgver=2
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -13,6 +13,7 @@ depends="
 	mkbootimg
 	msm-fb-refresher
 	postmarketos-base
+	soc-qcom-msm8974
 "
 makedepends="devicepkg-dev"
 subpackages="