From b8d769b1fb3d55769bd3aa5a84e544fa47b92baa Mon Sep 17 00:00:00 2001
From: Joel Selvaraj <foss@joelselvaraj.com>
Date: Tue, 28 Apr 2026 01:07:25 -0500
Subject: [PATCH] firmware-google-blueline: depend on qca fw and update fw path

Depend on upstream qca firmware for bluetooth and update fw paths as per
upstream kernel changes.

Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/8446>
---
 .../testing/firmware-google-blueline/APKBUILD | 20 ++++++-------
 .../firmware-google-blueline/firmware.files   | 28 +++++++++----------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/device/testing/firmware-google-blueline/APKBUILD b/device/testing/firmware-google-blueline/APKBUILD
index 0bb11f79b..f54ce672e 100644
--- a/device/testing/firmware-google-blueline/APKBUILD
+++ b/device/testing/firmware-google-blueline/APKBUILD
@@ -2,28 +2,28 @@
 # Co-Maintainer: Casey Connolly <kcxt@postmarketos.org>
 maintainer="Victoria Brekenfeld <postmarketos@drakulix.de>"
 pkgname=firmware-google-blueline
-pkgver=1
-pkgrel=1
+pkgver=2
+pkgrel=0
 pkgdesc="Firmware for Google Pixel 3 (blueline)"
-url="https://gitlab.com/phodina/firmware-google-blueline"
 # Suggested by Caleb as it has working Wifi
 url="https://gitlab.com/sdm845-mainline/firmware-google-pixel3"
 arch="aarch64"
-depends="linux-firmware-qcom linux-firmware-ath10k"
+depends="linux-firmware-qca linux-firmware-qcom linux-firmware-ath10k"
 license="proprietary"
 options="!check !strip !archcheck !tracedeps pmb:cross-native"
 
-_commit="7deb5f8e0b0499a80ea85dfc7941351c77e7738c"
+_commit="2a15e29129a607ee066b3950c578aab64e9bd82a"
 
-source="firmware-google-blueline-$_commit.tar.gz::https://gitlab.com/phodina/firmware-google-blueline/-/archive/$_commit/firmware-google-blueline-$_commit.tar.gz
+source="firmware-google-pixel3-$_commit.tar.gz::https://gitlab.com/sdm845-mainline/firmware-google-pixel3/-/archive/$_commit/firmware-google-pixel3-$_commit.tar.gz
 	firmware.files"
 
-builddir="$srcdir/firmware-google-blueline-$_commit"
+builddir="$srcdir/firmware-google-pixel3-$_commit"
 
 package() {
 
 	while IFS="" read -r _i || [ -n "$_i" ]; do
-		install -Dm644 "$_i" "$pkgdir/$_i"
+		[ ! -d $(dirname $_i) ] && mkdir -p $(dirname $_i)
+		install -Dm644 "$builddir/$_i" "$pkgdir/usr/$_i"
 	done < "$srcdir/firmware.files"
 
 	# TODO: Do we need these? If so put them into correct paths and into
@@ -36,6 +36,6 @@ package() {
 }
 
 sha512sums="
-a556672e5c463a6421c97da679819e8a7d327194d56f7c02eac03dbbb9d34117331a8bdcb71e0e9fd6b965129ae0788db76d8c34c436a26bf5e030e57d01fab7  firmware-google-blueline-7deb5f8e0b0499a80ea85dfc7941351c77e7738c.tar.gz
-4fb96f0cda7cac67bb31afdb86fbc6d587d51318fc0b377f37af794423e185bdcba5304670cc53bd618cf8839db6cc1ed7a1d84ba149df817bc2e345b2787694  firmware.files
+ada19a0bda67e91cfed337045cc2b95505914e4732491d28fb6d8e38318bd51822222b12ed0337509da5d20fce5b592f9736b5039e67bfeaa7ac9de4109a9453  firmware-google-pixel3-2a15e29129a607ee066b3950c578aab64e9bd82a.tar.gz
+05114af30b7207c76bd3f217abbb6cd2e45be22419d19dee5405bc25810664e009c24ebc03f5364874b99f2ce09f2f664624fb506219934494f53de769b6da02  firmware.files
 "
diff --git a/device/testing/firmware-google-blueline/firmware.files b/device/testing/firmware-google-blueline/firmware.files
index aa725d317..ba8086d2a 100644
--- a/device/testing/firmware-google-blueline/firmware.files
+++ b/device/testing/firmware-google-blueline/firmware.files
@@ -1,15 +1,15 @@
 ./lib/firmware/postmarketos/qca/crbtfw21.tlv
-./lib/firmware/qcom/sdm845/pixel3/a630_zap.mbn
-./lib/firmware/qcom/sdm845/pixel3/adsp.mbn
-./lib/firmware/qcom/sdm845/pixel3/adspr.jsn
-./lib/firmware/qcom/sdm845/pixel3/adspua.jsn
-./lib/firmware/qcom/sdm845/pixel3/cdsp.mbn
-./lib/firmware/qcom/sdm845/pixel3/cdspr.jsn
-./lib/firmware/qcom/sdm845/pixel3/ipa_fws.mbn
-./lib/firmware/qcom/sdm845/pixel3/mba.mbn
-./lib/firmware/qcom/sdm845/pixel3/modem.mbn
-./lib/firmware/qcom/sdm845/pixel3/modemr.jsn
-./lib/firmware/qcom/sdm845/pixel3/modemuw.jsn
-./lib/firmware/qcom/sdm845/pixel3/slpi.mbn
-./lib/firmware/qcom/sdm845/pixel3/venus.mbn
-./lib/firmware/qcom/sdm845/pixel3/wlanmdsp.mbn
+./lib/firmware/qcom/sdm845/Google/blueline/a630_zap.mbn
+./lib/firmware/qcom/sdm845/Google/blueline/adsp.mbn
+./lib/firmware/qcom/sdm845/Google/blueline/adspr.jsn
+./lib/firmware/qcom/sdm845/Google/blueline/adspua.jsn
+./lib/firmware/qcom/sdm845/Google/blueline/cdsp.mbn
+./lib/firmware/qcom/sdm845/Google/blueline/cdspr.jsn
+./lib/firmware/qcom/sdm845/Google/blueline/ipa_fws.mbn
+./lib/firmware/qcom/sdm845/Google/blueline/mba.mbn
+./lib/firmware/qcom/sdm845/Google/blueline/modem.mbn
+./lib/firmware/qcom/sdm845/Google/blueline/modemr.jsn
+./lib/firmware/qcom/sdm845/Google/blueline/modemuw.jsn
+./lib/firmware/qcom/sdm845/Google/blueline/slpi.mbn
+./lib/firmware/qcom/sdm845/Google/blueline/venus.mbn
+./lib/firmware/qcom/sdm845/Google/blueline/wlanmdsp.mbn