[wl-kmod] Add patch for kernel >= 5.17 - fixes RFBZ#6260
by Nicolas Viéville
commit c89e5d9808189084cf2f48b9040b4b00939bd180
Author: Nicolas Viéville <nicolas.vieville(a)uphf.fr>
Date: Sat Apr 2 12:48:15 2022 +0200
Add patch for kernel >= 5.17 - fixes RFBZ#6260
wl-kmod-021_kernel_5.17_adaptation.patch | 78 ++++++++++++++++++++++++++++++++
wl-kmod.spec | 7 ++-
2 files changed, 84 insertions(+), 1 deletion(-)
---
diff --git a/wl-kmod-021_kernel_5.17_adaptation.patch b/wl-kmod-021_kernel_5.17_adaptation.patch
new file mode 100644
index 0000000..89dc158
--- /dev/null
+++ b/wl-kmod-021_kernel_5.17_adaptation.patch
@@ -0,0 +1,78 @@
+diff -Naur hybrid-v35_64-nodebug-pcoem-6_30_223_271.orig/src/wl/sys/wl_iw.h hybrid-v35_64-nodebug-pcoem-6_30_223_271-021_kernel_5.17_adaptation/src/wl/sys/wl_iw.h
+--- hybrid-v35_64-nodebug-pcoem-6_30_223_271.orig/src/wl/sys/wl_iw.h 2020-12-29 18:29:39.463940664 +0100
++++ hybrid-v35_64-nodebug-pcoem-6_30_223_271-021_kernel_5.17_adaptation/src/wl/sys/wl_iw.h 2022-04-01 10:25:05.515054893 +0200
+@@ -70,7 +70,9 @@
+ #define WL_IW_RSSI_EXCELLENT -57
+ #define WL_IW_RSSI_INVALID 0
+ #define MAX_WX_STRING 80
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 17, 0)
+ #define isprint(c) bcm_isprint(c)
++#endif
+ #define WL_IW_SET_ACTIVE_SCAN (SIOCIWFIRSTPRIV+1)
+ #define WL_IW_GET_RSSI (SIOCIWFIRSTPRIV+3)
+ #define WL_IW_SET_PASSIVE_SCAN (SIOCIWFIRSTPRIV+5)
+diff -Naur hybrid-v35_64-nodebug-pcoem-6_30_223_271.orig/src/wl/sys/wl_linux.c hybrid-v35_64-nodebug-pcoem-6_30_223_271-021_kernel_5.17_adaptation/src/wl/sys/wl_linux.c
+--- hybrid-v35_64-nodebug-pcoem-6_30_223_271.orig/src/wl/sys/wl_linux.c 2020-12-29 21:55:44.899067286 +0100
++++ hybrid-v35_64-nodebug-pcoem-6_30_223_271-021_kernel_5.17_adaptation/src/wl/sys/wl_linux.c 2022-04-01 10:00:24.985252480 +0200
+@@ -638,7 +638,11 @@
+ WL_ERROR(("wl%d: Error setting MAC ADDRESS\n", unit));
+ }
+ #endif
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 17, 0)
+ bcopy(&wl->pub->cur_etheraddr, dev->dev_addr, ETHER_ADDR_LEN);
++#else
++ dev_addr_mod(dev, 0, &wl->pub->cur_etheraddr, ETHER_ADDR_LEN);
++#endif
+
+ online_cpus = 1;
+
+@@ -1862,7 +1866,11 @@
+
+ WL_LOCK(wl);
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 17, 0)
+ bcopy(sa->sa_data, dev->dev_addr, ETHER_ADDR_LEN);
++#else
++ dev_addr_mod(dev, 0, sa->sa_data, ETHER_ADDR_LEN);
++#endif
+ err = wlc_iovar_op(wl->wlc, "cur_etheraddr", NULL, 0, sa->sa_data, ETHER_ADDR_LEN,
+ IOV_SET, (WL_DEV_IF(dev))->wlcif);
+ WL_UNLOCK(wl);
+@@ -3054,7 +3062,11 @@
+ else
+ dev->type = ARPHRD_IEEE80211_RADIOTAP;
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 17, 0)
+ bcopy(wl->dev->dev_addr, dev->dev_addr, ETHER_ADDR_LEN);
++#else
++ dev_addr_mod(dev, 0, wl->dev->dev_addr, ETHER_ADDR_LEN);
++#endif
+
+ #if defined(WL_USE_NETDEV_OPS)
+ dev->netdev_ops = &wl_netdev_monitor_ops;
+@@ -3335,8 +3347,12 @@
+ static ssize_t
+ wl_proc_read(struct file *filp, char __user *buffer, size_t length, loff_t *offp)
+ {
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 17, 0))
++ wl_info_t * wl = pde_data(file_inode(filp));
++#else
+ wl_info_t * wl = PDE_DATA(file_inode(filp));
+ #endif
++#endif
+ int bcmerror, len;
+ int to_user = 0;
+ char tmp[8];
+@@ -3392,8 +3408,12 @@
+ static ssize_t
+ wl_proc_write(struct file *filp, const char __user *buff, size_t length, loff_t *offp)
+ {
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 17, 0))
++ wl_info_t * wl = pde_data(file_inode(filp));
++#else
+ wl_info_t * wl = PDE_DATA(file_inode(filp));
+ #endif
++#endif
+ int from_user = 0;
+ int bcmerror;
+
diff --git a/wl-kmod.spec b/wl-kmod.spec
index d84f60f..a56103c 100644
--- a/wl-kmod.spec
+++ b/wl-kmod.spec
@@ -10,7 +10,7 @@
Name: wl-kmod
Version: 6.30.223.271
-Release: 40%{?dist}
+Release: 41%{?dist}
Summary: Kernel module for Broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -38,6 +38,7 @@ Patch16: wl-kmod-017_fix_gcc_fallthrough_warning.patch
Patch17: wl-kmod-018_kernel_5.6_adaptations.patch
Patch18: wl-kmod-019_kernel_5.9_segment_eq_removed.patch
Patch19: wl-kmod-020_kernel_5.10_get_set_fs_removed.patch
+Patch20: wl-kmod-021_kernel_5.17_adaptation.patch
# needed for plague to make sure it builds for i586 and i686
ExclusiveArch: i686 x86_64
@@ -98,6 +99,7 @@ pushd %{name}-%{version}-src
%patch17 -p1 -b .kernel_5.6_adaptations.patch
%patch18 -p1 -b .kernel_5.9_segment_eq_removed
%patch19 -p1 -b .kernel_5.10_get_set_fs_removed
+%patch20 -p1 -b .kernel_5.17_adaptation
# Manual patching to build for RHEL - inspired by CentOS wl-kmod.spec
# Actually works for RHEL 6.x and 7.x
@@ -287,6 +289,9 @@ chmod 0755 $RPM_BUILD_ROOT%{kmodinstdir_prefix}*%{kmodinstdir_postfix}/* || :
rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Apr 01 2022 Nicolas Viéville <nicolas.vieville(a)uphf.fr> - 6.30.223.271-41
+- Add patch for kernel >= 5.17 - fixes RFBZ#6260
+
* Thu Feb 10 2022 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 6.30.223.271-40
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
2 years, 7 months
[chromium-freeworld] Enable v4l2_codec for aarch64
by Leigh Scott
commit df6460981e9858ffa4c6fb71f01e04fd7d197d2e
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sat Apr 2 10:07:37 2022 +0100
Enable v4l2_codec for aarch64
chromium-freeworld.spec | 1 +
1 file changed, 1 insertion(+)
---
diff --git a/chromium-freeworld.spec b/chromium-freeworld.spec
index f844dde..dc36888 100644
--- a/chromium-freeworld.spec
+++ b/chromium-freeworld.spec
@@ -361,6 +361,7 @@ gn_arg use_system_wayland_scanner=true
gn_arg use_bundled_weston=false
%ifarch aarch64
+gn_arg use_v4l2_codec=true
gn_arg 'target_cpu="arm64"'
%endif
2 years, 7 months
[intel-media-driver/f36] rebuilt
by Nicolas Chauvet
commit f0174146ce5f128875aaca8d872724461c30e7d6
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Apr 1 19:03:56 2022 +0200
rebuilt
intel-media-driver.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/intel-media-driver.spec b/intel-media-driver.spec
index 9299095..c3a262a 100644
--- a/intel-media-driver.spec
+++ b/intel-media-driver.spec
@@ -2,7 +2,7 @@
Name: intel-media-driver
Version: 22.1.1
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: The Intel Media Driver for VAAPI
License: MIT and BSD
URL: https://github.com/intel/media-driver
@@ -94,6 +94,9 @@ rm -rf %{buildroot}%{_libdir}/pkgconfig
%changelog
+* Fri Apr 01 2022 Nicolas Chauvet <kwizart(a)gmail.com> - 22.1.1-4
+- rebuilt
+
* Mon Mar 28 2022 Leigh Scott <leigh123linux(a)gmail.com> - 22.1.1-3
- rebuilt
2 years, 7 months
[intel-media-driver] Update to 22.3.1
by Nicolas Chauvet
commit 81fadd02e8d8e9a0b66412a7697107064f5cfca7
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Apr 1 19:06:49 2022 +0200
Update to 22.3.1
intel-media-driver.spec | 7 +++++--
sources | 2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/intel-media-driver.spec b/intel-media-driver.spec
index c3a262a..792fba7 100644
--- a/intel-media-driver.spec
+++ b/intel-media-driver.spec
@@ -1,8 +1,8 @@
#global pre .pre8
Name: intel-media-driver
-Version: 22.1.1
-Release: 4%{?dist}
+Version: 22.3.1
+Release: 1%{?dist}
Summary: The Intel Media Driver for VAAPI
License: MIT and BSD
URL: https://github.com/intel/media-driver
@@ -94,6 +94,9 @@ rm -rf %{buildroot}%{_libdir}/pkgconfig
%changelog
+* Fri Apr 01 2022 Nicolas Chauvet <kwizart(a)gmail.com> - 22.3.1-1
+- Update to 22.3.1
+
* Fri Apr 01 2022 Nicolas Chauvet <kwizart(a)gmail.com> - 22.1.1-4
- rebuilt
diff --git a/sources b/sources
index bb74f35..4e7a3e6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (intel-media-22.1.1.tar.gz) = 8ab0e5671d90d00b94c42ae6ef7712d20ba6fcd0e67a55a9daa1193ffc8c78455a02c7d3730e8d865ab15e3659e761898da6142348d16f04614a01dc75ae1260
+SHA512 (intel-media-22.3.1.tar.gz) = 286f974a11546f8541429230330c5bd514c5eb372d3278461a132fb236f19908aa544a44010e52981bb942573ab6c2047c8c03471517182e2daf2da87b0eb74f
2 years, 7 months
[intel-media-driver] rebuilt
by Nicolas Chauvet
commit d421879df74d09aa7ddbdee3369c6b58f6196cbf
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Apr 1 19:03:56 2022 +0200
rebuilt
intel-media-driver.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/intel-media-driver.spec b/intel-media-driver.spec
index 9299095..c3a262a 100644
--- a/intel-media-driver.spec
+++ b/intel-media-driver.spec
@@ -2,7 +2,7 @@
Name: intel-media-driver
Version: 22.1.1
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: The Intel Media Driver for VAAPI
License: MIT and BSD
URL: https://github.com/intel/media-driver
@@ -94,6 +94,9 @@ rm -rf %{buildroot}%{_libdir}/pkgconfig
%changelog
+* Fri Apr 01 2022 Nicolas Chauvet <kwizart(a)gmail.com> - 22.1.1-4
+- rebuilt
+
* Mon Mar 28 2022 Leigh Scott <leigh123linux(a)gmail.com> - 22.1.1-3
- rebuilt
2 years, 7 months
[qt5-qtwebengine-freeworld] Enable libicu on EL9+
by Xavier Bachelot
commit 4f1f430e47b532137454787e0c21f07a7d59002b
Author: Xavier Bachelot <xavier(a)bachelot.org>
Date: Fri Apr 1 17:02:39 2022 +0200
Enable libicu on EL9+
qt5-qtwebengine-freeworld.spec | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/qt5-qtwebengine-freeworld.spec b/qt5-qtwebengine-freeworld.spec
index 801e23e..f52b083 100644
--- a/qt5-qtwebengine-freeworld.spec
+++ b/qt5-qtwebengine-freeworld.spec
@@ -29,8 +29,8 @@
%endif
%endif
-%if 0%{?fedora} > 32
-# need libicu >= 65, only currently available on f33+
+%if 0%{?fedora} > 32 || 0%{?rhel} > 8
+# need libicu >= 65, only currently available on f33+ and EL9+
%global use_system_libicu 1
%endif
@@ -61,7 +61,7 @@
Summary: Qt5 - QtWebEngine components (freeworld version)
Name: qt5-qtwebengine-freeworld
Version: 5.15.8
-Release: 4%{?dist}
+Release: 5%{?dist}
%global major_minor %(echo %{version} | cut -d. -f-2)
%global major %(echo %{version} | cut -d. -f1)
@@ -464,6 +464,9 @@ echo "%{_libdir}/%{name}" \
%changelog
+* Fri Apr 01 2022 Xavier Bachelot <xavier(a)bachelot.org> - 5.15.8-5
+- Enable libicu on EL9+
+
* Sat Feb 26 2022 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 5.15.8-4
- Switch to bundled FFmpeg on F36+, FFmpeg 5 not currently supported
2 years, 7 months
