Re: [PR PATCH] [Updated] Qualcomm updates

[JamiKettunen <JamiKettunen@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1598 bytes --]

There is an updated pull request by JamiKettunen against master on the void-packages repository

https://github.com/JamiKettunen/void-packages qcom-updates
https://github.com/void-linux/void-packages/pull/31435

Qualcomm updates
<!-- Mark items with [x] where applicable -->

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/31435.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qcom-updates-31435.patch --]
[-- Type: text/x-diff, Size: 6290 bytes --]

From 01b93c552743c35a6fa130e09c3c8050115f0495 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Wed, 24 Mar 2021 20:17:55 +0200
Subject: [PATCH 1/4] New package: libqrtr-glib-1.0.0

---
 common/shlibs                 |  1 +
 srcpkgs/libqrtr-glib-devel    |  1 +
 srcpkgs/libqrtr-glib/template | 29 +++++++++++++++++++++++++++++
 3 files changed, 31 insertions(+)
 create mode 120000 srcpkgs/libqrtr-glib-devel
 create mode 100644 srcpkgs/libqrtr-glib/template

diff --git a/common/shlibs b/common/shlibs
index 179fe27443be..564009bb7093 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4012,3 +4012,4 @@ libbasu.so.0 basu-0.2.0_1
 libXcomp.so.3 nx-libs-3.5.99.24_1
 libXcompshad.so.3 nx-libs-3.5.99.24_1
 libNX_X11.so.6 nx-libs-3.5.99.24_1
+libqrtr-glib.so.0 libqrtr-glib-1.0.0_1
diff --git a/srcpkgs/libqrtr-glib-devel b/srcpkgs/libqrtr-glib-devel
new file mode 120000
index 000000000000..8e551037c5e7
--- /dev/null
+++ b/srcpkgs/libqrtr-glib-devel
@@ -0,0 +1 @@
+libqrtr-glib
\ No newline at end of file
diff --git a/srcpkgs/libqrtr-glib/template b/srcpkgs/libqrtr-glib/template
new file mode 100644
index 000000000000..875ade48578b
--- /dev/null
+++ b/srcpkgs/libqrtr-glib/template
@@ -0,0 +1,29 @@
+# Template file for 'libqrtr-glib'
+pkgname=libqrtr-glib
+version=1.0.0
+revision=1
+build_style=gnu-configure
+build_helper=gir
+configure_args="--disable-static
+ $(vopt_enable introspection)"
+hostmakedepends="pkg-config"
+makedepends="glib-devel"
+short_desc="Qualcomm IPC Router protocol helper library"
+maintainer="Jami Kettunen <jami.kettunen@protonmail.com>"
+license="GPL-2.0-or-later, LGPL-2.1-or-later"
+homepage="https://gitlab.freedesktop.org/mobile-broadband/libqrtr-glib"
+distfiles="${FREEDESKTOP_SITE}/libqmi/${pkgname}-${version}.tar.xz"
+checksum=30d879b2ade6f8f461def3a677755db5c0238babf688d5c83c03b3e6abe35cee
+build_options="gir"
+build_options_default="gir"
+
+libqrtr-glib-devel_package() {
+	depends="${makedepends} ${sourcepkg}-${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+		vmove usr/share
+	}
+}

From 5e89ef356e4e59bffe34d02d1516ad7ac3b87dc0 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Tue, 1 Jun 2021 00:36:41 +0300
Subject: [PATCH 2/4] libqmi: enable support for QRTR.

This allows for communication with Qualcomm modems present on more
recent SoCs such as the Snapdragon 835 (MSM8998).
---
 srcpkgs/libqmi/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libqmi/template b/srcpkgs/libqmi/template
index ef48674f5b96..8b5387d9460b 100644
--- a/srcpkgs/libqmi/template
+++ b/srcpkgs/libqmi/template
@@ -1,13 +1,13 @@
 # Template file for 'libqmi'
 pkgname=libqmi
 version=1.28.6
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper=gir
-configure_args="--disable-static --enable-mbim-qmux
+configure_args="--disable-static --enable-mbim-qmux --enable-qrtr
  $(vopt_enable introspection)"
 hostmakedepends="pkg-config"
-makedepends="glib-devel libgudev-devel libmbim-devel"
+makedepends="glib-devel libgudev-devel libmbim-devel libqrtr-glib-devel"
 short_desc="QMI modem protocol helper library"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"

From fe4df4eba22f5726f0143d73f18c84adc4a5f847 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Tue, 1 Jun 2021 00:07:10 +0300
Subject: [PATCH 3/4] ModemManager: enable qcom-soc plugin.

This allows ModemManager to work with the modem on Qualcomm based
boards.
---
 srcpkgs/ModemManager/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ModemManager/template b/srcpkgs/ModemManager/template
index 30b5dc01c066..51cc3097d643 100644
--- a/srcpkgs/ModemManager/template
+++ b/srcpkgs/ModemManager/template
@@ -1,12 +1,12 @@
 # Template file for 'ModemManager'
 pkgname=ModemManager
 version=1.16.6
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--disable-static --with-polkit=permissive
- --with-udev-base-dir=/usr/lib/udev $(vopt_enable gir introspection)
- $(vopt_enable gir vala)"
+ --with-udev-base-dir=/usr/lib/udev --enable-plugin-qcom-soc
+ $(vopt_enable gir introspection) $(vopt_enable gir vala)"
 hostmakedepends="pkg-config autoconf $(vopt_if gir vala-devel)
  glib-devel libxslt-devel"
 makedepends="libglib-devel libgudev-devel polkit-devel libqmi-devel

From b580d707cae31098065dd126fc532799900d462b Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Sun, 6 Jun 2021 04:18:15 +0300
Subject: [PATCH 4/4] linux-firmware: subpackage for Qualcomm SoCs.

---
 srcpkgs/linux-firmware-qcom     |  1 +
 srcpkgs/linux-firmware/template | 13 +++++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)
 create mode 120000 srcpkgs/linux-firmware-qcom

diff --git a/srcpkgs/linux-firmware-qcom b/srcpkgs/linux-firmware-qcom
new file mode 120000
index 000000000000..9a0010a89de1
--- /dev/null
+++ b/srcpkgs/linux-firmware-qcom
@@ -0,0 +1 @@
+linux-firmware
\ No newline at end of file
diff --git a/srcpkgs/linux-firmware/template b/srcpkgs/linux-firmware/template
index 66358c052182..badeb3735118 100644
--- a/srcpkgs/linux-firmware/template
+++ b/srcpkgs/linux-firmware/template
@@ -1,7 +1,7 @@
 # Template file for 'linux-firmware'
 pkgname=linux-firmware
 version=20210511
-revision=1
+revision=2
 depends="${pkgname}-amd>=${version}_${revision} ${pkgname}-network>=${version}_${revision}"
 short_desc="Binary firmware blobs for the Linux kernel"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
@@ -13,7 +13,8 @@ python_version=3
 nostrip=yes
 
 subpackages="linux-firmware-amd linux-firmware-broadcom
- linux-firmware-intel linux-firmware-nvidia linux-firmware-network"
+ linux-firmware-intel linux-firmware-nvidia linux-firmware-network
+ linux-firmware-qcom"
 
 do_install() {
 	make install FIRMWAREDIR=/usr/lib/firmware DESTDIR=$DESTDIR
@@ -94,3 +95,11 @@ linux-firmware-network_package() {
 		vmove usr/lib/firmware/qca
 	}
 }
+
+linux-firmware-qcom_package() {
+	short_desc+=" - Qualcomm SoC blobs"
+	nostrip=yes
+	pkg_install() {
+		vmove usr/lib/firmware/qcom
+	}
+}