[PR PATCH] sof-firmware: update to 2.2

[PR PATCH] sof-firmware: update to 2.2

[cinerea0]

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

There is a new pull request by cinerea0 against master on the void-packages repository

https://github.com/cinerea0/void-packages sof
https://github.com/void-linux/void-packages/pull/38408

sof-firmware: update to 2.2
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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/38408.patch is attached

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

From 1d7fe28d780fb97a1350cda85057ba4864c8cf49 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 1 Aug 2022 11:29:05 -0400
Subject: [PATCH] sof-firmware: update to 2.2

---
 srcpkgs/sof-firmware/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/sof-firmware/template b/srcpkgs/sof-firmware/template
index 5436fb1db1ef..1baa460fb16a 100644
--- a/srcpkgs/sof-firmware/template
+++ b/srcpkgs/sof-firmware/template
@@ -1,6 +1,6 @@
 # Template file for 'sof-firmware'
 pkgname=sof-firmware
-version=2.1.1
+version=2.2
 revision=1
 archs="i686* x86_64*"
 wrksrc="sof-bin-${version}"
@@ -11,13 +11,13 @@ maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="BSD-3-Clause"
 homepage="https://thesofproject.github.io/latest/index.html"
 distfiles="https://github.com/thesofproject/sof-bin/archive/refs/tags/v${version}.tar.gz"
-checksum=97c51c03bfb0a8cfc0a33d795e051e8f0608a3bfb3e07cd84de6fd7e9511f208
+checksum=10dcb24359011a8d3614723a29fb85944b2d98aece107fe5ed87f04c00e0e771
 
 do_install() {
 	vmkdir usr/lib/firmware/intel/sof
 	vmkdir usr/lib/firmware/intel/sof-tplg
-	rsync -a "v${version%.*}.x/sof-v${version}/" "${DESTDIR}/usr/lib/firmware/intel/sof"
-	rsync -a "v${version%.*}.x/sof-tplg-v${version}/" "${DESTDIR}/usr/lib/firmware/intel/sof-tplg"
+	rsync -a "v${version}.x/sof-v${version}/" "${DESTDIR}/usr/lib/firmware/intel/sof"
+	rsync -a "v${version}.x/sof-tplg-v${version}/" "${DESTDIR}/usr/lib/firmware/intel/sof-tplg"
 
 	vlicense LICENCE.NXP
 }

Re: sof-firmware: update to 2.2

[abenson]

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

New comment by abenson on void-packages repository

https://github.com/void-linux/void-packages/pull/38408#issuecomment-1201455831

Comment:
Can you update `sof-tools` as well?

Re: sof-firmware: update to 2.2

[classabbyamp]

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/38408#issuecomment-1201459508

Comment:
#37712

does this supercede #38214 ?

Re: sof-firmware: update to 2.2

[cinerea0]

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

New comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/38408#issuecomment-1201465110

Comment:
> Can you update sof-tools as well?

That's a weird one. As Abby linked (#37712), their team didn't make the fixes Johnnynator was looking for, and I'm trying to find out what's still broken on their end and how to best communicate that. If you'd like I can put the update (without expanding the archs) in this PR, and work on fixing the issues separately for a revbump.

> does this supercede

Yes, because the commit history there is messy.

Re: sof-firmware: update to 2.2

[classabbyamp]

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/38408#issuecomment-1201906168

Comment:
> If you'd like I can put the update (without expanding the archs) in this PR, and work on fixing the issues separately for a revbump.

fine by me either way. do they need to be version-synced or anything?

Re: [PR PATCH] [Updated] sof-firmware: update to 2.2

[cinerea0]

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

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

https://github.com/cinerea0/void-packages sof
https://github.com/void-linux/void-packages/pull/38408

sof-firmware: update to 2.2
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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/38408.patch is attached

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

From 1d7fe28d780fb97a1350cda85057ba4864c8cf49 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 1 Aug 2022 11:29:05 -0400
Subject: [PATCH 1/2] sof-firmware: update to 2.2

---
 srcpkgs/sof-firmware/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/sof-firmware/template b/srcpkgs/sof-firmware/template
index 5436fb1db1ef..1baa460fb16a 100644
--- a/srcpkgs/sof-firmware/template
+++ b/srcpkgs/sof-firmware/template
@@ -1,6 +1,6 @@
 # Template file for 'sof-firmware'
 pkgname=sof-firmware
-version=2.1.1
+version=2.2
 revision=1
 archs="i686* x86_64*"
 wrksrc="sof-bin-${version}"
@@ -11,13 +11,13 @@ maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="BSD-3-Clause"
 homepage="https://thesofproject.github.io/latest/index.html"
 distfiles="https://github.com/thesofproject/sof-bin/archive/refs/tags/v${version}.tar.gz"
-checksum=97c51c03bfb0a8cfc0a33d795e051e8f0608a3bfb3e07cd84de6fd7e9511f208
+checksum=10dcb24359011a8d3614723a29fb85944b2d98aece107fe5ed87f04c00e0e771
 
 do_install() {
 	vmkdir usr/lib/firmware/intel/sof
 	vmkdir usr/lib/firmware/intel/sof-tplg
-	rsync -a "v${version%.*}.x/sof-v${version}/" "${DESTDIR}/usr/lib/firmware/intel/sof"
-	rsync -a "v${version%.*}.x/sof-tplg-v${version}/" "${DESTDIR}/usr/lib/firmware/intel/sof-tplg"
+	rsync -a "v${version}.x/sof-v${version}/" "${DESTDIR}/usr/lib/firmware/intel/sof"
+	rsync -a "v${version}.x/sof-tplg-v${version}/" "${DESTDIR}/usr/lib/firmware/intel/sof-tplg"
 
 	vlicense LICENCE.NXP
 }

From aef92386640da40609c792201fb4587193e8674f Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 1 Aug 2022 22:30:12 -0400
Subject: [PATCH 2/2] sof-tools: update to 2.2

---
 srcpkgs/sof-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sof-tools/template b/srcpkgs/sof-tools/template
index ecd8c553e5b1..1a9c17885b98 100644
--- a/srcpkgs/sof-tools/template
+++ b/srcpkgs/sof-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'sof-tools'
 pkgname=sof-tools
-version=1.9.2
+version=2.2
 revision=1
 # https://github.com/thesofproject/sof/issues/4902
 archs="x86_64"
@@ -14,7 +14,7 @@ maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="BSD-3-Clause"
 homepage="https://thesofproject.github.io/latest/index.html"
 distfiles="https://github.com/thesofproject/sof/archive/refs/tags/v${version}.tar.gz"
-checksum=77fc2200f96c565b18b5975fc2ac19c54a93e83502f13b4f782567e5c44f45da
+checksum=d3b1cbf3dfbbf82f906c373cf0446efe53815414ff5635eece9b605741765a37
 
 post_install() {
 	vlicense ../LICENCE

Re: sof-firmware: update to 2.2

[cinerea0]

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

New comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/38408#issuecomment-1201945881

Comment:
I'm not sure, but I'd prefer not to risk something going wrong by them being out of sync.

Re: [PR PATCH] [Merged]: sof-firmware & sof-tools: update to 2.2

[ericonr]

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

There's a merged pull request on the void-packages repository

sof-firmware & sof-tools: update to 2.2
https://github.com/void-linux/void-packages/pull/38408

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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
-->

Re: sof-firmware & sof-tools: update to 2.2

[mayhair]

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

New comment by mayhair on void-packages repository

https://github.com/void-linux/void-packages/pull/38408#issuecomment-1225863386

Comment:
 > > does this supercede
> 
> Yes, because the commit history there is messy.
hehe, i'm still quite new to git. anyway thank you for doing it in a better way 👍​
i'll be closing my pull request

Re: sof-firmware & sof-tools: update to 2.2

[mayhair]

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

New comment by mayhair on void-packages repository

https://github.com/void-linux/void-packages/pull/38408#issuecomment-1225863386

Comment:
 > > does this supercede
> 
> Yes, because the commit history there is messy.

hehe, i'm still quite new to git. anyway thank you for doing it in a better way 👍​
i'll be closing my pull request

[PR PATCH] sof-firmware & sof-tools: update to 2.2.

[mayhair]

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

There is a new pull request by mayhair against master on the void-packages repository

https://github.com/mayhair/void-packages master
https://github.com/void-linux/void-packages/pull/38214

sof-firmware & sof-tools: update to 2.2.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
-->


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

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

From 59088a85899261173e498acc64a7fd2846c25bee Mon Sep 17 00:00:00 2001
From: Mahaer Mahmud <mahaer.mahmud@gmail.com>
Date: Sat, 23 Jul 2022 19:47:29 +0500
Subject: [PATCH 1/2] updated sof-firmware and sof-tools to v2.2

---
 srcpkgs/sof-firmware/template | 4 ++--
 srcpkgs/sof-tools/template    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/sof-firmware/template b/srcpkgs/sof-firmware/template
index 5436fb1db1ef..9e84f25f38f6 100644
--- a/srcpkgs/sof-firmware/template
+++ b/srcpkgs/sof-firmware/template
@@ -1,6 +1,6 @@
 # Template file for 'sof-firmware'
 pkgname=sof-firmware
-version=2.1.1
+version=2.2
 revision=1
 archs="i686* x86_64*"
 wrksrc="sof-bin-${version}"
@@ -11,7 +11,7 @@ maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="BSD-3-Clause"
 homepage="https://thesofproject.github.io/latest/index.html"
 distfiles="https://github.com/thesofproject/sof-bin/archive/refs/tags/v${version}.tar.gz"
-checksum=97c51c03bfb0a8cfc0a33d795e051e8f0608a3bfb3e07cd84de6fd7e9511f208
+checksum=10dcb24359011a8d3614723a29fb85944b2d98aece107fe5ed87f04c00e0e771
 
 do_install() {
 	vmkdir usr/lib/firmware/intel/sof
diff --git a/srcpkgs/sof-tools/template b/srcpkgs/sof-tools/template
index ecd8c553e5b1..1a9c17885b98 100644
--- a/srcpkgs/sof-tools/template
+++ b/srcpkgs/sof-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'sof-tools'
 pkgname=sof-tools
-version=1.9.2
+version=2.2
 revision=1
 # https://github.com/thesofproject/sof/issues/4902
 archs="x86_64"
@@ -14,7 +14,7 @@ maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="BSD-3-Clause"
 homepage="https://thesofproject.github.io/latest/index.html"
 distfiles="https://github.com/thesofproject/sof/archive/refs/tags/v${version}.tar.gz"
-checksum=77fc2200f96c565b18b5975fc2ac19c54a93e83502f13b4f782567e5c44f45da
+checksum=d3b1cbf3dfbbf82f906c373cf0446efe53815414ff5635eece9b605741765a37
 
 post_install() {
 	vlicense ../LICENCE

From 4b7aeb7faaf8258e268ee22f499f1a3904931c2a Mon Sep 17 00:00:00 2001
From: Mahaer Mahmud <mahaer.mahmud@gmail.com>
Date: Sat, 23 Jul 2022 20:13:07 +0500
Subject: [PATCH 2/2] corrected mistake in the packages sof-firmware, sof-tools

---
 srcpkgs/sof-firmware/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sof-firmware/template b/srcpkgs/sof-firmware/template
index 9e84f25f38f6..c73242aa5809 100644
--- a/srcpkgs/sof-firmware/template
+++ b/srcpkgs/sof-firmware/template
@@ -16,8 +16,8 @@ checksum=10dcb24359011a8d3614723a29fb85944b2d98aece107fe5ed87f04c00e0e771
 do_install() {
 	vmkdir usr/lib/firmware/intel/sof
 	vmkdir usr/lib/firmware/intel/sof-tplg
-	rsync -a "v${version%.*}.x/sof-v${version}/" "${DESTDIR}/usr/lib/firmware/intel/sof"
-	rsync -a "v${version%.*}.x/sof-tplg-v${version}/" "${DESTDIR}/usr/lib/firmware/intel/sof-tplg"
+	rsync -a "v${version%}.x/sof-v${version}/" "${DESTDIR}/usr/lib/firmware/intel/sof"
+	rsync -a "v${version%}.x/sof-tplg-v${version}/" "${DESTDIR}/usr/lib/firmware/intel/sof-tplg"
 
 	vlicense LICENCE.NXP
 }

Re: sof-firmware & sof-tools: update to 2.2.

[cinerea0]

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

New comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/38214#issuecomment-1193240606

Comment:
There's already a PR open for sof-tools that's working on getting it to build on all archs: https://github.com/void-linux/void-packages/pull/37712.

Re: sof-firmware & sof-tools: update to 2.2.

[mayhair]

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

New comment by mayhair on void-packages repository

https://github.com/void-linux/void-packages/pull/38214#issuecomment-1225864493

Comment:
resolved by #38408