gentoo auto-resync : 15:10:2023 - 16:00:49

4 files changed, 98 insertions, 2 deletions

diff --git a/sys-firmware/Manifest.gz b/sys-firmware/Manifest.gz
index 3b7608c47251..e739f8e7a97f 100644
--- a/sys-firmware/Manifest.gz
+++ b/sys-firmware/Manifest.gz
diff --git a/sys-firmware/alsa-firmware/Manifest b/sys-firmware/alsa-firmware/Manifest
index 3ad4851646bd..df709ad60e36 100644
--- a/sys-firmware/alsa-firmware/Manifest
+++ b/sys-firmware/alsa-firmware/Manifest
@@ -1,4 +1,5 @@
 AUX 52-usx2yaudio.rules 971 BLAKE2B 1a8b0bf26b61694c95cbfd50e20096255dc0cf8c77b4f5bcf155ae6d163aaa1b6e8a658c864fc2391f5743b8f3a2702e7c03f1fcd7cab12877c5a5d607a42d56 SHA512 5c3ac0e03a496384ea58f6da479c932cb2d2f91f110703d71d0bea60329ebfba8a1a0e78eb951c9854b7fe0dcc9943d10f436fe9acd04848ea780e90ac274f17
+AUX alsa-firmware-1.2.4-musl.patch 3548 BLAKE2B 69ee4671fde7ba4a7ec4bea1cef47ab7d8e7832b4248b2d96d7d0ca597fbb2693836a86a39764a81a418db0519af1f095cb4bdf06f41b3cefe7a584a0aa1cad1 SHA512 1412f1ac9f7a46e46bfca58400447b035fa901060a1f05799fb21d107b38179067bdea038038177dd7a096c4a322fe3e1cd760b53e51bd9a430c0ce6acb3d45f
 DIST alsa-firmware-1.2.4.tar.bz2 5154366 BLAKE2B 0f844f6cc4859b72635f24d347b4c790469aee39aa60d9addb2c168dcf06b48e7e3cbba26ff21c7e1f5aa355641eec7ab934cb09bfac8ca116a6ac6a7db9d548 SHA512 041f54744fe30fa94781968c89c77ab9073fc9a828014d07a0f7e0f11c4185ace6846d5d2a313fcca6e9cda6e4837fd6f62e883b0fdb0a4e30a8c18ba7b2e05d
-EBUILD alsa-firmware-1.2.4-r1.ebuild 3104 BLAKE2B e5839ec51a9bbb8e1d927995bc231f01aabe88693c1f1f0277ef691ce9a6060e6558f918ad7759d11a6620133673e189596b1d03cf96a537bdd1debb309f4925 SHA512 4f1b950dd421d58c9528834c71a79991bce197bd31e8cf78d1ecb3101d474b0056c10c0e2b676b49b738fb554c2d14a9ea4a9600b85513bbef3303c8e8eb0870
+EBUILD alsa-firmware-1.2.4-r1.ebuild 3155 BLAKE2B 0f11b2e761f10a1855c6bd7e3f006f3a3f3921b4470b7058a6aec988542d3565a6d3d05f65d8da2b7ae638130877ce8db9161d9c5d1f98d95e52866001f3bf9f SHA512 1f389b54106c17e8475609eabd41ece9b77641faf0e7b9e390cd9c75e7e1b9f5ea7f5fb915c0ca6ca2bc617f4dc02a5ae7354ee2f40293ff2ee4a9ca53bcee3a
 MISC metadata.xml 313 BLAKE2B f1eccef496092b0e6328f31cf7f443d2bb42f01d26c19b55958cf8c1efc447075ed6fca6b853214b4bf368dec9412f2a6a46ddc496db41a0e1d90c3abed0b9aa SHA512 5781ce008415af2b24bb0c25c083732182e127ec7ee3556347c9f6c2e48ffd039708b4c31708c57edda62ba61b5b00ad9ed69f42432c7eb227e4c5d4c678ac0c
diff --git a/sys-firmware/alsa-firmware/alsa-firmware-1.2.4-r1.ebuild b/sys-firmware/alsa-firmware/alsa-firmware-1.2.4-r1.ebuild
index 083ccfce06fc..16c478503529 100644
--- a/sys-firmware/alsa-firmware/alsa-firmware-1.2.4-r1.ebuild
+++ b/sys-firmware/alsa-firmware/alsa-firmware-1.2.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -39,6 +39,10 @@ RDEPEND="alsa_cards_usb-usx2y? ( sys-apps/fxload )
 
 DOCS="README"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.2.4-musl.patch
+)
+
 src_configure() {
 	econf --with-hotplug-dir=/lib/firmware
 }
diff --git a/sys-firmware/alsa-firmware/files/alsa-firmware-1.2.4-musl.patch b/sys-firmware/alsa-firmware/files/alsa-firmware-1.2.4-musl.patch
new file mode 100644
index 000000000000..836575331735
--- /dev/null
+++ b/sys-firmware/alsa-firmware/files/alsa-firmware-1.2.4-musl.patch
@@ -0,0 +1,91 @@
+https://github.com/alsa-project/alsa-firmware/pull/10
+
+From 09da9c869fa177acca17d63ac5fc3b3217683918 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sun, 15 Oct 2023 13:28:36 +0100
+Subject: [PATCH] Use stdint.h types
+
+u_int_* aren't standard, but uint* are. Use those instead for musl compat.
+
+Bug: https://bugs.gentoo.org/832969
+Signed-off-by: Sam James <sam@gentoo.org>
+---
+ hdsploader/digiface_firmware.dat        | 4 +++-
+ hdsploader/digiface_firmware_rev11.dat  | 4 +++-
+ hdsploader/multiface_firmware.dat       | 4 +++-
+ hdsploader/multiface_firmware_rev11.dat | 4 +++-
+ hdsploader/tobin.c                      | 3 ++-
+ 5 files changed, 14 insertions(+), 5 deletions(-)
+
+diff --git a/hdsploader/digiface_firmware.dat b/hdsploader/digiface_firmware.dat
+index 9ac946a..9643e8e 100644
+--- a/hdsploader/digiface_firmware.dat
++++ b/hdsploader/digiface_firmware.dat
+@@ -1,5 +1,7 @@
++#include <stdint.h>
++
+ /* stored in little-endian */
+-static u_int32_t digiface_firmware[24413] = {
++static uint32_t digiface_firmware[24413] = {
+ 0xffffffff, 0x66aa9955, 0x8001000c, 0xe0000000, 0x8006800c, 0xb0000000,
+ 0x8004800c, 0xb4fc0100, 0x8003000c, 0x00000000, 0x8001000c, 0x90000000,
+ 0x8004000c, 0x00000000, 0x8001000c, 0x80000000, 0x0002000c, 0x581a000a,
+diff --git a/hdsploader/digiface_firmware_rev11.dat b/hdsploader/digiface_firmware_rev11.dat
+index 2930017..adffd82 100644
+--- a/hdsploader/digiface_firmware_rev11.dat
++++ b/hdsploader/digiface_firmware_rev11.dat
+@@ -1,5 +1,7 @@
++#include <stdint.h>
++
+ /* stored in little-endian */
+-static u_int32_t digiface_firmware_rev11[24413] = {
++static uint32_t digiface_firmware_rev11[24413] = {
+ 0xffffffff, 0x66aa9955, 0x8001000c, 0xe0000000, 0x8006800c, 0xb0000000,
+ 0x8004800c, 0xb4fc0100, 0x8003000c, 0x00000000, 0x8001000c, 0x90000000,
+ 0x8004000c, 0x00000000, 0x8001000c, 0x80000000, 0x0002000c, 0x581a000a,
+diff --git a/hdsploader/multiface_firmware.dat b/hdsploader/multiface_firmware.dat
+index 6c4813d..f95c1b3 100644
+--- a/hdsploader/multiface_firmware.dat
++++ b/hdsploader/multiface_firmware.dat
+@@ -1,5 +1,7 @@
++#include <stdint.h>
++
+ /* stored in little-endian */
+-static u_int32_t multiface_firmware[24413] = {
++static uint32_t multiface_firmware[24413] = {
+ 0xffffffff, 0x66aa9955, 0x8001000c, 0xe0000000, 0x8006800c, 0xb0000000,
+ 0x8004800c, 0xb4fc0100, 0x8003000c, 0x00000000, 0x8001000c, 0x90000000,
+ 0x8004000c, 0x00000000, 0x8001000c, 0x80000000, 0x0002000c, 0x581a000a,
+diff --git a/hdsploader/multiface_firmware_rev11.dat b/hdsploader/multiface_firmware_rev11.dat
+index 057f53e..16de278 100644
+--- a/hdsploader/multiface_firmware_rev11.dat
++++ b/hdsploader/multiface_firmware_rev11.dat
+@@ -1,5 +1,7 @@
++#include <stdint.h>
++
+ /* stored in little-endian */
+-static u_int32_t multiface_firmware_rev11[24413] = {
++static uint32_t multiface_firmware_rev11[24413] = {
+ 0xffffffff, 0x66aa9955, 0x8001000c, 0xe0000000, 0x8006800c, 0xb0000000,
+ 0x8004800c, 0xb4fc0100, 0x8003000c, 0x00000000, 0x8001000c, 0x90000000,
+ 0x8004000c, 0x00000000, 0x8001000c, 0x80000000, 0x0002000c, 0x581a000a,
+diff --git a/hdsploader/tobin.c b/hdsploader/tobin.c
+index 2d76220..8d67b2b 100644
+--- a/hdsploader/tobin.c
++++ b/hdsploader/tobin.c
+@@ -1,5 +1,6 @@
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <stdint.h>
+ #include <unistd.h>
+ #include <endian.h>
+ 
+@@ -8,7 +9,7 @@
+ #include "multiface_firmware.dat"
+ #include "multiface_firmware_rev11.dat"
+ 
+-int write_bin_file(u_int32_t *array, const char *filename)
++int write_bin_file(uint32_t *array, const char *filename)
+ {
+ 	FILE *out;
+