diff --git a/srcpkgs/broadcom-wl-dkms/patches/002-gcc-4.9.patch b/srcpkgs/broadcom-wl-dkms/patches/002-gcc-4.9.patch index ec354cecdbb..ae2090e4698 100644 --- a/srcpkgs/broadcom-wl-dkms/patches/002-gcc-4.9.patch +++ b/srcpkgs/broadcom-wl-dkms/patches/002-gcc-4.9.patch @@ -1,10 +1,10 @@ https://github.com/voidlinux/xbps-packages/issues/412 ---- a/Makefile 2014-05-21 12:47:46.915833131 +0200 -+++ b/Makefile 2014-05-21 12:48:54.027409879 +0200 -@@ -126,6 +126,8 @@ EXTRA_CFLAGS += -I$(src)/src/wl/sy - EXTRA_CFLAGS += -I$(src)/src/shared/bcmwifi/include - #EXTRA_CFLAGS += -DBCMDBG_ASSERT +--- a/Makefile ++++ b/Makefile +@@ -145,6 +145,8 @@ ifeq "$(GE_49)" "1" + EXTRA_CFLAGS += -Wno-date-time + endif +EXTRA_CFLAGS += -Wno-date-time + diff --git a/srcpkgs/broadcom-wl-dkms/patches/016-linux-6.1.patch b/srcpkgs/broadcom-wl-dkms/patches/016-linux-6.1.patch index 721967d275c..3e435ff1673 100644 --- a/srcpkgs/broadcom-wl-dkms/patches/016-linux-6.1.patch +++ b/srcpkgs/broadcom-wl-dkms/patches/016-linux-6.1.patch @@ -1,7 +1,6 @@ -diff -Nurp -u -r a/src/wl/sys/wl_cfg80211_hybrid.c b/src/wl/sys/wl_cfg80211_hybrid.c ---- a/src/wl/sys/wl_cfg80211_hybrid.c 2022-12-12 00:23:30.821615599 +0000 -+++ b/src/wl/sys/wl_cfg80211_hybrid.c 2022-12-12 00:35:47.854975024 +0000 -@@ -105,14 +105,28 @@ static s32 wl_cfg80211_get_tx_power(stru +--- a/src/wl/sys/wl_cfg80211_hybrid.c ++++ b/src/wl/sys/wl_cfg80211_hybrid.c +@@ -108,14 +108,28 @@ static s32 wl_cfg80211_get_tx_power(stru static s32 wl_cfg80211_get_tx_power(struct wiphy *wiphy, s32 *dbm); #endif @@ -32,7 +31,7 @@ diff -Nurp -u -r a/src/wl/sys/wl_cfg80211_hybrid.c b/src/wl/sys/wl_cfg80211_hybr static s32 wl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *dev, u8 key_idx, bool pairwise, const u8 *mac_addr, struct key_params *params); static s32 wl_cfg80211_del_key(struct wiphy *wiphy, struct net_device *dev, -@@ -1161,7 +1175,12 @@ static s32 wl_cfg80211_get_tx_power(stru +@@ -1166,7 +1180,12 @@ static s32 wl_cfg80211_get_tx_power(stru return err; } @@ -46,7 +45,7 @@ diff -Nurp -u -r a/src/wl/sys/wl_cfg80211_hybrid.c b/src/wl/sys/wl_cfg80211_hybr static s32 wl_cfg80211_config_default_key(struct wiphy *wiphy, struct net_device *dev, u8 key_idx, bool unicast, bool multicast) -@@ -1186,7 +1205,12 @@ wl_cfg80211_config_default_key(struct wi +@@ -1191,7 +1210,12 @@ wl_cfg80211_config_default_key(struct wi return 0; } @@ -60,7 +59,7 @@ diff -Nurp -u -r a/src/wl/sys/wl_cfg80211_hybrid.c b/src/wl/sys/wl_cfg80211_hybr static s32 wl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *dev, u8 key_idx, bool pairwise, const u8 *mac_addr, struct key_params *params) -@@ -1307,7 +1331,11 @@ wl_cfg80211_add_key(struct wiphy *wiphy, +@@ -1312,7 +1336,11 @@ wl_cfg80211_add_key(struct wiphy *wiphy, return err; } @@ -73,7 +72,7 @@ diff -Nurp -u -r a/src/wl/sys/wl_cfg80211_hybrid.c b/src/wl/sys/wl_cfg80211_hybr static s32 wl_cfg80211_del_key(struct wiphy *wiphy, struct net_device *dev, u8 key_idx, bool pairwise, const u8 *mac_addr) -@@ -1350,7 +1378,13 @@ wl_cfg80211_del_key(struct wiphy *wiphy, +@@ -1355,7 +1383,13 @@ wl_cfg80211_del_key(struct wiphy *wiphy, return err; } diff --git a/srcpkgs/broadcom-wl-dkms/patches/017-linux-6.12.patch b/srcpkgs/broadcom-wl-dkms/patches/017-linux-6.12.patch index e66ed88c96e..e7285f59457 100644 --- a/srcpkgs/broadcom-wl-dkms/patches/017-linux-6.12.patch +++ b/srcpkgs/broadcom-wl-dkms/patches/017-linux-6.12.patch @@ -1,5 +1,5 @@ ---- a/src/wl/sys/wl_linux.c 2024-12-24 11:31:38.237305891 +0100 -+++ b/src/wl/sys/wl_linux.c 2024-12-24 11:32:20.157335411 +0100 +--- a/src/wl/sys/wl_linux.c ++++ b/src/wl/sys/wl_linux.c @@ -56,7 +56,11 @@ #include #include diff --git a/srcpkgs/broadcom-wl-dkms/patches/018-linux613.patch b/srcpkgs/broadcom-wl-dkms/patches/018-linux613.patch new file mode 100644 index 00000000000..6a17169bf0c --- /dev/null +++ b/srcpkgs/broadcom-wl-dkms/patches/018-linux613.patch @@ -0,0 +1,28 @@ +From 5788a19e88aac78e6b2ec8bef7cb094fc14cfbf0 Mon Sep 17 00:00:00 2001 +From: Joan Bruguera Micó +Date: Sat, 12 Oct 2024 11:54:40 +0000 +Subject: [PATCH] Tentative patch for broadcom-wl 6.30.223.271 driver for Linux + 6.13-rc1 + +The net/lib80211.h header has been removed by commit +"wifi: ipw2x00/lib80211: move remaining lib80211 into libipw" +(Johannes Berg, 7 Oct 2024). +The header does not appear to be actually used anywhere, so remove it. + + #include + #include +--- + src/include/linuxver.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/src/include/linuxver.h ++++ b/src/include/linuxver.h +@@ -147,7 +147,7 @@ typedef irqreturn_t(*FN_ISR) (int irq, v + #include + #endif + +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29) && LINUX_VERSION_CODE < KERNEL_VERSION(6, 13, 0) + #include + #endif + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29) diff --git a/srcpkgs/broadcom-wl-dkms/patches/019-linux614.patch b/srcpkgs/broadcom-wl-dkms/patches/019-linux614.patch new file mode 100644 index 00000000000..d78a3a6c567 --- /dev/null +++ b/srcpkgs/broadcom-wl-dkms/patches/019-linux614.patch @@ -0,0 +1,32 @@ +From: Eduard Bloch +Date: Sun, 16 Mar 2025 16:13:08 +0100 +Subject: Prepare for 6.14.0-rc6 + +--- + src/wl/sys/wl_cfg80211_hybrid.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +--- a/src/wl/sys/wl_cfg80211_hybrid.c ++++ b/src/wl/sys/wl_cfg80211_hybrid.c +@@ -102,7 +102,9 @@ static s32 wl_cfg80211_set_tx_power(stru + enum tx_power_setting type, s32 dbm); + #endif + +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 14, 0) ++static s32 wl_cfg80211_get_tx_power(struct wiphy *wiphy, struct wireless_dev *wdev, u32 /*link_id*/, s32 *dbm); ++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0) + static s32 wl_cfg80211_get_tx_power(struct wiphy *wiphy, struct wireless_dev *wdev, s32 *dbm); + #else + static s32 wl_cfg80211_get_tx_power(struct wiphy *wiphy, s32 *dbm); +@@ -1157,7 +1159,9 @@ wl_cfg80211_set_tx_power(struct wiphy *w + return err; + } + +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 14, 0) ++static s32 wl_cfg80211_get_tx_power(struct wiphy *wiphy, struct wireless_dev *wdev, u32 /*link_id*/, s32 *dbm) ++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0) + static s32 wl_cfg80211_get_tx_power(struct wiphy *wiphy, struct wireless_dev *wdev, s32 *dbm) + #else + static s32 wl_cfg80211_get_tx_power(struct wiphy *wiphy, s32 *dbm) diff --git a/srcpkgs/broadcom-wl-dkms/template b/srcpkgs/broadcom-wl-dkms/template index ac26cf6da25..84a9d7ce06a 100644 --- a/srcpkgs/broadcom-wl-dkms/template +++ b/srcpkgs/broadcom-wl-dkms/template @@ -1,7 +1,7 @@ # Template file for 'broadcom-wl-dkms' pkgname=broadcom-wl-dkms version=6.30.223.271 -revision=16 +revision=17 archs="i686* x86_64*" create_wrksrc=yes depends="dkms"