From c8ebd2705eb2300d29063fa804a1f779cb241acb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Barnab=C3=A1s=20Cz=C3=A9m=C3=A1n?= <trabarni@gmail.com>
Date: Wed, 23 Oct 2024 10:43:29 +0200
Subject: [PATCH] msm8974-*: add soc-qcom-msm8974 as a dependency (MR 5732)
---
device/testing/device-fairphone-fp2/APKBUILD | 4 ++--
device/testing/device-htc-m8/APKBUILD | 3 ++-
.../device-lg-hammerhead/20-gsk-gpu-workaround.sh | 3 ---
device/testing/device-lg-hammerhead/APKBUILD | 6 +-----
device/testing/device-oneplus-bacon/APKBUILD | 1 +
device/testing/device-samsung-hlte/APKBUILD | 4 ++--
device/testing/device-samsung-klte/APKBUILD | 3 ++-
device/testing/device-sony-amami/APKBUILD | 9 +++++++--
device/testing/device-sony-castor/APKBUILD | 3 ++-
device/testing/device-sony-leo/APKBUILD | 3 ++-
device/testing/device-sony-sirius/APKBUILD | 3 ++-
11 files changed, 23 insertions(+), 19 deletions(-)
delete mode 100644 device/testing/device-lg-hammerhead/20-gsk-gpu-workaround.sh
diff --git a/device/testing/device-fairphone-fp2/APKBUILD b/device/testing/device-fairphone-fp2/APKBUILD
index bf15890e16f..1a89cb4e8a3 100644
--- a/device/testing/device-fairphone-fp2/APKBUILD
+++ b/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="
diff --git a/device/testing/device-htc-m8/APKBUILD b/device/testing/device-htc-m8/APKBUILD
index afb2c1776b7..1a2b22d139c 100644
--- a/device/testing/device-htc-m8/APKBUILD
+++ b/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="
diff --git a/device/testing/device-lg-hammerhead/20-gsk-gpu-workaround.sh b/device/testing/device-lg-hammerhead/20-gsk-gpu-workaround.sh
deleted file mode 100644
index 7eaa764a19d..00000000000
--- a/device/testing/device-lg-hammerhead/20-gsk-gpu-workaround.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-# New GTK renderer does not work well
-export GSK_RENDERER=gl
diff --git a/device/testing/device-lg-hammerhead/APKBUILD b/device/testing/device-lg-hammerhead/APKBUILD
index dfa97b90a16..baf8f137e89 100644
--- a/device/testing/device-lg-hammerhead/APKBUILD
+++ b/device/testing/device-lg-hammerhead/APKBUILD
@@ -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
diff --git a/device/testing/device-oneplus-bacon/APKBUILD b/device/testing/device-oneplus-bacon/APKBUILD
index 79a8704de92..3c0972563ba 100644
--- a/device/testing/device-oneplus-bacon/APKBUILD
+++ b/device/testing/device-oneplus-bacon/APKBUILD
@@ -10,6 +10,7 @@ depends="
lk2nd-msm8974
mkbootimg
postmarketos-base
+ soc-qcom-msm8974
"
makedepends="devicepkg-dev"
subpackages="
diff --git a/device/testing/device-samsung-hlte/APKBUILD b/device/testing/device-samsung-hlte/APKBUILD
index 25d777f75e9..76cc9bf2cef 100644
--- a/device/testing/device-samsung-hlte/APKBUILD
+++ b/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="
diff --git a/device/testing/device-samsung-klte/APKBUILD b/device/testing/device-samsung-klte/APKBUILD
index c3df38562b9..eafa787d9c2 100644
--- a/device/testing/device-samsung-klte/APKBUILD
+++ b/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="
diff --git a/device/testing/device-sony-amami/APKBUILD b/device/testing/device-sony-amami/APKBUILD
index 62894c20b86..ca2d9956ddf 100644
--- a/device/testing/device-sony-amami/APKBUILD
+++ b/device/testing/device-sony-amami/APKBUILD
@@ -1,12 +1,17 @@
# 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
diff --git a/device/testing/device-sony-castor/APKBUILD b/device/testing/device-sony-castor/APKBUILD
index f6dbcee16ea..3000d563066 100644
--- a/device/testing/device-sony-castor/APKBUILD
+++ b/device/testing/device-sony-castor/APKBUILD
@@ -1,7 +1,7 @@
# 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"
diff --git a/device/testing/device-sony-leo/APKBUILD b/device/testing/device-sony-leo/APKBUILD
index bd1987972fb..d9ff4704e91 100644
--- a/device/testing/device-sony-leo/APKBUILD
+++ b/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="
diff --git a/device/testing/device-sony-sirius/APKBUILD b/device/testing/device-sony-sirius/APKBUILD
index b97a7c7a31e..7fe64f0c783 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=3
-pkgrel=1
+pkgrel=2
pkgdesc="Sony Xperia Z2 device package"
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-x11 $pkgname-nonfree-firmware:nonfree_firmware"
--
GitLab