[-- Attachment #1: Type: text/plain, Size: 1219 bytes --] There is a new pull request by unspecd against master on the void-packages repository https://github.com/unspecd/void-packages pkg/broadcom-wl-dkms https://github.com/void-linux/void-packages/pull/35025 broadcom-wl-dkms: fix patch_args <!-- Uncomment relevant sections and delete options which are not applicable --> #### Testing the changes - I tested the changes in this PR: **NO** <!-- #### 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 [skip CI](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-musl) - I built this PR locally for these architectures (if supported. mark crossbuilds): Fixes #35024, but it is a temporary solution. A patch file from https://github.com/void-linux/void-packages/pull/35025.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-pkg/broadcom-wl-dkms-35025.patch --] [-- Type: text/x-diff, Size: 824 bytes --] From e4ed59011b623347a715c965d8a75b1fa190f9cc Mon Sep 17 00:00:00 2001 From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com> Date: Thu, 13 Jan 2022 17:52:40 +1100 Subject: [PATCH] broadcom-wl-dkms: fix patch_args --- srcpkgs/broadcom-wl-dkms/template | 2 ++ 1 file changed, 2 insertions(+) diff --git a/srcpkgs/broadcom-wl-dkms/template b/srcpkgs/broadcom-wl-dkms/template index 55bc9c0e1d36..505fffe3fabf 100644 --- a/srcpkgs/broadcom-wl-dkms/template +++ b/srcpkgs/broadcom-wl-dkms/template @@ -15,6 +15,8 @@ short_desc="Broadcom proprietary wireless drivers for Linux - DKMS kernel module dkms_modules="wl ${version}" depends="dkms" +patch_args="-lNp1" + case "$XBPS_TARGET_MACHINE" in i686*) distfiles="https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/hybrid-v35-nodebug-pcoem-${version//./_}.tar.gz"
[-- Attachment #1: Type: text/plain, Size: 260 bytes --] New comment by ericonr on void-packages repository https://github.com/void-linux/void-packages/pull/35025#issuecomment-1013932098 Comment: A proper fix should be possible by applying the patch with the permissive flag and then creating a new diff from that.
[-- Attachment #1: Type: text/plain, Size: 1224 bytes --] There is an updated pull request by unspecd against master on the void-packages repository https://github.com/unspecd/void-packages pkg/broadcom-wl-dkms https://github.com/void-linux/void-packages/pull/35025 broadcom-wl-dkms: fix patch_args <!-- Uncomment relevant sections and delete options which are not applicable --> #### Testing the changes - I tested the changes in this PR: **NO** <!-- #### 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 [skip CI](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-musl) - I built this PR locally for these architectures (if supported. mark crossbuilds): Fixes #35024, but it is a temporary solution. A patch file from https://github.com/void-linux/void-packages/pull/35025.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-pkg/broadcom-wl-dkms-35025.patch --] [-- Type: text/x-diff, Size: 2849 bytes --] From 9dc013fdb1475c9f47249b623152a2d67c643aaf Mon Sep 17 00:00:00 2001 From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com> Date: Thu, 13 Jan 2022 17:52:40 +1100 Subject: [PATCH] broadcom-wl-dkms: fix whitespace in patches --- .../broadcom-wl-dkms/patches/linux-4.15.patch | 46 +++++++++---------- .../broadcom-wl-dkms/patches/linux-5.10.patch | 2 +- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/srcpkgs/broadcom-wl-dkms/patches/linux-4.15.patch b/srcpkgs/broadcom-wl-dkms/patches/linux-4.15.patch index 38f82e0deaa0..9fcd7176b50a 100644 --- a/srcpkgs/broadcom-wl-dkms/patches/linux-4.15.patch +++ b/srcpkgs/broadcom-wl-dkms/patches/linux-4.15.patch @@ -1,44 +1,44 @@ --- a/src/wl/sys/wl_linux.c 2018-01-31 11:33:26.000000000 +0100 +++ b/src/wl/sys/wl_linux.c 2018-01-31 15:27:18.000000000 +0100 @@ -93,7 +93,11 @@ - - #include <wlc_wowl.h> - + + #include <wlc_wowl.h> + +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) - static void wl_timer(ulong data); + static void wl_timer(ulong data); +#else +static void wl_timer(struct timer_list *tl); +#endif - static void _wl_timer(wl_timer_t *t); - static struct net_device *wl_alloc_linux_if(wl_if_t *wlif); - + static void _wl_timer(wl_timer_t *t); + static struct net_device *wl_alloc_linux_if(wl_if_t *wlif); + @@ -2301,9 +2305,17 @@ - } - - static void + } + + static void +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) - wl_timer(ulong data) + wl_timer(ulong data) +#else +wl_timer(struct timer_list *tl) +#endif - { + { +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) - wl_timer_t *t = (wl_timer_t *)data; + wl_timer_t *t = (wl_timer_t *)data; +#else + wl_timer_t *t = from_timer(t, tl, timer); +#endif - - if (!WL_ALL_PASSIVE_ENAB(t->wl)) - _wl_timer(t); + + if (!WL_ALL_PASSIVE_ENAB(t->wl)) + _wl_timer(t); @@ -2355,7 +2367,11 @@ - - bzero(t, sizeof(wl_timer_t)); - + + bzero(t, sizeof(wl_timer_t)); + +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) - init_timer(&t->timer); - t->timer.data = (ulong) t; - t->timer.function = wl_timer; + init_timer(&t->timer); + t->timer.data = (ulong) t; + t->timer.function = wl_timer; +#else + timer_setup(&t->timer, wl_timer, 0); +#endif - t->wl = wl; + t->wl = wl; diff --git a/srcpkgs/broadcom-wl-dkms/patches/linux-5.10.patch b/srcpkgs/broadcom-wl-dkms/patches/linux-5.10.patch index c52e0c36ccab..53514bf020a1 100644 --- a/srcpkgs/broadcom-wl-dkms/patches/linux-5.10.patch +++ b/srcpkgs/broadcom-wl-dkms/patches/linux-5.10.patch @@ -117,7 +117,7 @@ diff -u -r src/wl/sys/wl_linux.c src/wl/sys/wl_linux.c goto done2; } -- if (segment_eq(get_fs(), KERNEL_DS)) +- if (segment_eq(get_fs(), KERNEL_DS)) - buf = ioc.buf; - - else if (ioc.buf) {
[-- Attachment #1: Type: text/plain, Size: 1224 bytes --] There is an updated pull request by unspecd against master on the void-packages repository https://github.com/unspecd/void-packages pkg/broadcom-wl-dkms https://github.com/void-linux/void-packages/pull/35025 broadcom-wl-dkms: fix patch_args <!-- Uncomment relevant sections and delete options which are not applicable --> #### Testing the changes - I tested the changes in this PR: **NO** <!-- #### 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 [skip CI](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-musl) - I built this PR locally for these architectures (if supported. mark crossbuilds): Fixes #35024, but it is a temporary solution. A patch file from https://github.com/void-linux/void-packages/pull/35025.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-pkg/broadcom-wl-dkms-35025.patch --] [-- Type: text/x-diff, Size: 2849 bytes --] From 76c257aa91a3657f702bd6bf1b049c1fbb367b23 Mon Sep 17 00:00:00 2001 From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com> Date: Thu, 13 Jan 2022 17:52:40 +1100 Subject: [PATCH] broadcom-wl-dkms: fix whitespace in patches --- .../broadcom-wl-dkms/patches/linux-4.15.patch | 46 +++++++++---------- .../broadcom-wl-dkms/patches/linux-5.10.patch | 2 +- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/srcpkgs/broadcom-wl-dkms/patches/linux-4.15.patch b/srcpkgs/broadcom-wl-dkms/patches/linux-4.15.patch index 38f82e0deaa0..9fcd7176b50a 100644 --- a/srcpkgs/broadcom-wl-dkms/patches/linux-4.15.patch +++ b/srcpkgs/broadcom-wl-dkms/patches/linux-4.15.patch @@ -1,44 +1,44 @@ --- a/src/wl/sys/wl_linux.c 2018-01-31 11:33:26.000000000 +0100 +++ b/src/wl/sys/wl_linux.c 2018-01-31 15:27:18.000000000 +0100 @@ -93,7 +93,11 @@ - - #include <wlc_wowl.h> - + + #include <wlc_wowl.h> + +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) - static void wl_timer(ulong data); + static void wl_timer(ulong data); +#else +static void wl_timer(struct timer_list *tl); +#endif - static void _wl_timer(wl_timer_t *t); - static struct net_device *wl_alloc_linux_if(wl_if_t *wlif); - + static void _wl_timer(wl_timer_t *t); + static struct net_device *wl_alloc_linux_if(wl_if_t *wlif); + @@ -2301,9 +2305,17 @@ - } - - static void + } + + static void +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) - wl_timer(ulong data) + wl_timer(ulong data) +#else +wl_timer(struct timer_list *tl) +#endif - { + { +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) - wl_timer_t *t = (wl_timer_t *)data; + wl_timer_t *t = (wl_timer_t *)data; +#else + wl_timer_t *t = from_timer(t, tl, timer); +#endif - - if (!WL_ALL_PASSIVE_ENAB(t->wl)) - _wl_timer(t); + + if (!WL_ALL_PASSIVE_ENAB(t->wl)) + _wl_timer(t); @@ -2355,7 +2367,11 @@ - - bzero(t, sizeof(wl_timer_t)); - + + bzero(t, sizeof(wl_timer_t)); + +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) - init_timer(&t->timer); - t->timer.data = (ulong) t; - t->timer.function = wl_timer; + init_timer(&t->timer); + t->timer.data = (ulong) t; + t->timer.function = wl_timer; +#else + timer_setup(&t->timer, wl_timer, 0); +#endif - t->wl = wl; + t->wl = wl; diff --git a/srcpkgs/broadcom-wl-dkms/patches/linux-5.10.patch b/srcpkgs/broadcom-wl-dkms/patches/linux-5.10.patch index c52e0c36ccab..53514bf020a1 100644 --- a/srcpkgs/broadcom-wl-dkms/patches/linux-5.10.patch +++ b/srcpkgs/broadcom-wl-dkms/patches/linux-5.10.patch @@ -117,7 +117,7 @@ diff -u -r src/wl/sys/wl_linux.c src/wl/sys/wl_linux.c goto done2; } -- if (segment_eq(get_fs(), KERNEL_DS)) +- if (segment_eq(get_fs(), KERNEL_DS)) - buf = ioc.buf; - - else if (ioc.buf) {
[-- Attachment #1: Type: text/plain, Size: 162 bytes --] New comment by ericonr on void-packages repository https://github.com/void-linux/void-packages/pull/35025#issuecomment-1013951115 Comment: Appreciated, thanks!
[-- Attachment #1: Type: text/plain, Size: 1033 bytes --] There's a merged pull request on the void-packages repository broadcom-wl-dkms: fix whitespace in patches https://github.com/void-linux/void-packages/pull/35025 Description: <!-- Uncomment relevant sections and delete options which are not applicable --> #### Testing the changes - I tested the changes in this PR: **NO** <!-- #### 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 [skip CI](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-musl) - I built this PR locally for these architectures (if supported. mark crossbuilds): Fixes #35024