rtl88x2bu-openhd-dkms-git: fix build on recent kernels

openhd-git/.SRCINFO

@@ -1,7 +1,7 @@
 pkgbase = openhd-git
 	pkgdesc = Open-source digital FPV system
-	pkgver = 2.5.0.beta3.r381.gf559237
-	pkgrel = 2
+	pkgver = 2.5.3.r23.gb9ed014
+	pkgrel = 1
 	url = https://openhdfpv.org
 	arch = any
 	license = GPL3
@@ -22,7 +22,9 @@ pkgbase = openhd-git
 	conflicts = openhd
 	source = git+https://github.com/OpenHD/OpenHD.git
 	source = 0001-fix-compile-on-gcc-13.patch
+	source = 0002-fix-compile-on-gcc-13.patch
 	sha256sums = SKIP
-	sha256sums = f5353f5411a41833a050cee54d9b461261c8a68eb9051547830960d06c0c0733
+	sha256sums = 7637ec59e85b4616d05d1f0c81a10fca921473b4b124c04e6506213718bb205a
+	sha256sums = 118befc82ae46153b407ea66fdf7ee4bc0043cb0d36308e124703da1d01f8a79
 
 pkgname = openhd-git

openhd-git/0001-fix-compile-on-gcc-13.patch

@@ -1,26 +1,26 @@
-From f15c889cf40d7c96a01af1e12f443b14c27872ba Mon Sep 17 00:00:00 2001
+From f1111ce46894d3b51434e33a6f3461318dade5fd Mon Sep 17 00:00:00 2001
 From: Rihards Skuja <rihards@skuja.eu>
-Date: Fri, 3 Nov 2023 15:41:01 +0200
+Date: Thu, 29 Feb 2024 11:40:31 +0200
 Subject: [PATCH] fix compile on gcc 13
 
 Without the header compilation fails with a bunch of
 "'uint8_t' does not name a type" errors.
 ---
- src/HelperSources/StringHelper.hpp | 1 +
+ wifibroadcast/src/HelperSources/StringHelper.hpp | 1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/src/HelperSources/StringHelper.hpp b/src/HelperSources/StringHelper.hpp
-index f00bf9c..1e8e774 100644
---- a/src/HelperSources/StringHelper.hpp
-+++ b/src/HelperSources/StringHelper.hpp
-@@ -9,6 +9,7 @@
- #include <sstream>
+diff --git a/wifibroadcast/src/HelperSources/StringHelper.hpp b/wifibroadcast/src/HelperSources/StringHelper.hpp
+index 056b12d..9d16c94 100644
+--- a/wifibroadcast/src/HelperSources/StringHelper.hpp
++++ b/wifibroadcast/src/HelperSources/StringHelper.hpp
+@@ -6,6 +6,7 @@
+ #define OSDTESTER_STRINGHELPER_H
+ 
  #include <array>
- #include <vector>
 +#include <cstdint>
- 
- class StringHelper {
-  public:
+ #include <sstream>
+ #include <string>
+ #include <vector>
 -- 
-2.42.1
+2.44.0
 

openhd-git/0002-fix-compile-on-gcc-13.patch

@@ -0,0 +1,24 @@
+From 79b881d9007d44023ab1c6c4d91c0933a1bc934f Mon Sep 17 00:00:00 2001
+From: Rihards Skuja <rihards@skuja.eu>
+Date: Thu, 29 Feb 2024 11:52:22 +0200
+Subject: [PATCH] fix compile on gcc 13
+
+---
+ OpenHD/ohd_common/inc/openhd_util.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/OpenHD/ohd_common/inc/openhd_util.h b/OpenHD/ohd_common/inc/openhd_util.h
+index 9890eaa3..6c4b1ba5 100644
+--- a/OpenHD/ohd_common/inc/openhd_util.h
++++ b/OpenHD/ohd_common/inc/openhd_util.h
+@@ -1,6 +1,7 @@
+ #ifndef OPENHD_UTIL_H
+ #define OPENHD_UTIL_H
+ 
++#include <cstdint>
+ #include <optional>
+ #include <string>
+ #include <vector>
+-- 
+2.44.0
+

openhd-git/PKGBUILD

@@ -2,8 +2,8 @@
 
 pkgname=openhd-git
 _reponame=OpenHD
-pkgver=2.5.0.beta3.r381.gf559237
-pkgrel=2
+pkgver=2.5.3.r23.gb9ed014
+pkgrel=1
 pkgdesc='Open-source digital FPV system'
 arch=(any)
 url='https://openhdfpv.org'
@@ -16,9 +16,10 @@ optdepends=(
 )
 provides=("${pkgname%-git}")
 conflicts=("${pkgname%-git}")
-source=("git+https://github.com/OpenHD/$_reponame.git" "0001-fix-compile-on-gcc-13.patch")
+source=("git+https://github.com/OpenHD/$_reponame.git" "0001-fix-compile-on-gcc-13.patch" "0002-fix-compile-on-gcc-13.patch")
 sha256sums=('SKIP'
-            'f5353f5411a41833a050cee54d9b461261c8a68eb9051547830960d06c0c0733')
+            '7637ec59e85b4616d05d1f0c81a10fca921473b4b124c04e6506213718bb205a'
+            '118befc82ae46153b407ea66fdf7ee4bc0043cb0d36308e124703da1d01f8a79')
 
 pkgver() {
 	cd "$_reponame"
@@ -28,7 +29,8 @@ pkgver() {
 prepare() {
 	cd "$_reponame"
 	git submodule update --init --recursive
-	patch -d 'OpenHD/lib/wifibroadcast' -p1 -i "$srcdir/0001-fix-compile-on-gcc-13.patch"
+	patch -d 'OpenHD/ohd_interface/lib/wifibroadcast' -p1 -i "$srcdir/0001-fix-compile-on-gcc-13.patch"
+	patch -p1 -i "$srcdir/0002-fix-compile-on-gcc-13.patch"
 }
 
 build() {

rtl8812au-openhd-dkms-git/.SRCINFO

@@ -1,7 +1,7 @@
 pkgbase = rtl8812au-openhd-dkms-git
 	pkgdesc = Realtek RTL88xxAU WiFi USB driver (with OpenHD patches)
-	pkgver = 5.2.20.2.r804.g4515487
-	pkgrel = 2
+	pkgver = 5.2.20.2.r849.gf21bbe9
+	pkgrel = 3
 	url = https://github.com/OpenHD/rtl8812au
 	arch = any
 	license = GPL2
@@ -9,6 +9,8 @@ pkgbase = rtl8812au-openhd-dkms-git
 	depends = dkms
 	depends = bc
 	source = git+https://github.com/OpenHD/rtl8812au.git
+	source = 0001-Update-beacon-change-signature-to-fix-build-on-recen.patch
 	sha256sums = SKIP
+	sha256sums = b26147fda4d78d8cc8f7d5f5d331e43a1ffeecb5596e703e3da6a7461a0fd7b2
 
 pkgname = rtl8812au-openhd-dkms-git

rtl8812au-openhd-dkms-git/0001-Update-beacon-change-signature-to-fix-build-on-recen.patch

@@ -0,0 +1,49 @@
+From 08165cf5c1cb5186b4a1e04fe29eaf3ab6cf4c05 Mon Sep 17 00:00:00 2001
+From: Rihards Skuja <rihards@skuja.eu>
+Date: Thu, 29 Feb 2024 12:23:32 +0200
+Subject: [PATCH] Update beacon change signature to fix build on recent kernels
+
+---
+ os_dep/linux/ioctl_cfg80211.c | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/os_dep/linux/ioctl_cfg80211.c b/os_dep/linux/ioctl_cfg80211.c
+index c26bb07..facfd33 100644
+--- a/os_dep/linux/ioctl_cfg80211.c
++++ b/os_dep/linux/ioctl_cfg80211.c
+@@ -4600,24 +4600,24 @@ static int cfg80211_rtw_start_ap(struct wiphy *wiphy, struct net_device *ndev,
+ 	return ret;
+ }
+ 
+-static int cfg80211_rtw_change_beacon(struct wiphy *wiphy, struct net_device *ndev, struct cfg80211_beacon_data *info)
++static int cfg80211_rtw_change_beacon(struct wiphy *wiphy, struct net_device *ndev, struct cfg80211_ap_update *info)
+ {
+ 	int ret = 0;
+ 	_adapter *adapter = (_adapter *)rtw_netdev_priv(ndev);
+ 
+ 	RTW_INFO(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
+ 
+-	ret = rtw_add_beacon(adapter, info->head, info->head_len, info->tail, info->tail_len);
++	ret = rtw_add_beacon(adapter, info->beacon.head, info->beacon.head_len, info->beacon.tail, info->beacon.tail_len);
+ 
+         // In cases like WPS, the proberesp and assocresp IEs vary from the beacon, and need to be explicitly set
+         if(ret == 0) {
+-                if(info->proberesp_ies && info->proberesp_ies_len > 0) {
+-                        rtw_cfg80211_set_mgnt_wpsp2pie(ndev, (char *)info->proberesp_ies,
+-                                info->proberesp_ies_len, 0x2/*PROBE_RESP*/);
++                if(info->beacon.proberesp_ies && info->beacon.proberesp_ies_len > 0) {
++                        rtw_cfg80211_set_mgnt_wpsp2pie(ndev, (char *)info->beacon.proberesp_ies,
++                                info->beacon.proberesp_ies_len, 0x2/*PROBE_RESP*/);
+                 }
+-                if(info->assocresp_ies && info->assocresp_ies_len > 0) {
+-                        rtw_cfg80211_set_mgnt_wpsp2pie(ndev, (char *)info->assocresp_ies,
+-                                info->assocresp_ies_len, 0x4/*ASSOC_RESP*/);
++                if(info->beacon.assocresp_ies && info->beacon.assocresp_ies_len > 0) {
++                        rtw_cfg80211_set_mgnt_wpsp2pie(ndev, (char *)info->beacon.assocresp_ies,
++                                info->beacon.assocresp_ies_len, 0x4/*ASSOC_RESP*/);
+                 }
+         }
+ 
+-- 
+2.44.0
+

rtl8812au-openhd-dkms-git/PKGBUILD

@@ -2,23 +2,28 @@
 
 pkgname=rtl8812au-openhd-dkms-git
 _modname=88XXau_ohd
-pkgver=5.2.20.2.r804.g4515487
+pkgver=5.2.20.2.r849.gf21bbe9
 _pkgver=5.2.20.2
-pkgrel=2
+pkgrel=3
 pkgdesc='Realtek RTL88xxAU WiFi USB driver (with OpenHD patches)'
 arch=(any)
 url='https://github.com/OpenHD/rtl8812au'
 license=(GPL2)
 depends=('dkms' 'bc')
 makedepends=('git')
-source=('git+https://github.com/OpenHD/rtl8812au.git')
-sha256sums=('SKIP')
+source=('git+https://github.com/OpenHD/rtl8812au.git' '0001-Update-beacon-change-signature-to-fix-build-on-recen.patch')
+sha256sums=('SKIP' 'b26147fda4d78d8cc8f7d5f5d331e43a1ffeecb5596e703e3da6a7461a0fd7b2')
 
 pkgver() {
 	cd "${srcdir}/rtl8812au"
 	printf '%s.r%s.g%s' "${_pkgver}" "$(git rev-list --count HEAD)" "$(git rev-parse --short=7 HEAD)"
 }
 
+prepare() {
+	cd "${srcdir}/rtl8812au"
+	patch -p1 -i "$srcdir/0001-Update-beacon-change-signature-to-fix-build-on-recen.patch"
+}
+
 package() {
 	cd "${srcdir}/rtl8812au"
 	mkdir -p "${pkgdir}/usr/src/${_modname}-${pkgver}"

rtl88x2bu-openhd-dkms-git/.SRCINFO

@@ -1,7 +1,7 @@
 pkgbase = rtl88x2bu-openhd-dkms-git
 	pkgdesc = Realtek RTL88x2BU WiFi USB driver (with OpenHD patches)
-	pkgver = 5.13.1.r214.g7a54b83
-	pkgrel = 2
+	pkgver = 5.13.1.r222.gaad91d6
+	pkgrel = 3
 	url = https://github.com/OpenHD/rtl88x2bu
 	arch = any
 	license = GPL2
@@ -9,6 +9,8 @@ pkgbase = rtl88x2bu-openhd-dkms-git
 	depends = dkms
 	depends = bc
 	source = git+https://github.com/OpenHD/rtl88x2bu.git
+	source = 0001-Update-beacon-change-signature-to-fix-build-on-recen.patch
 	sha256sums = SKIP
+	sha256sums = 24f7ce0d221b12cd61d9b89608babba379dcfa97d298e71d50669e10ba619645
 
 pkgname = rtl88x2bu-openhd-dkms-git

rtl88x2bu-openhd-dkms-git/0001-Update-beacon-change-signature-to-fix-build-on-recen.patch

@@ -0,0 +1,34 @@
+From bc7c89d0bb4294165879261cc54555bf40267947 Mon Sep 17 00:00:00 2001
+From: Rihards Skuja <rihards@skuja.eu>
+Date: Thu, 29 Feb 2024 12:37:52 +0200
+Subject: [PATCH] Update beacon change signature to fix build on recent kernels
+
+---
+ os_dep/linux/ioctl_cfg80211.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/os_dep/linux/ioctl_cfg80211.c b/os_dep/linux/ioctl_cfg80211.c
+index 30b1f66..302cdde 100644
+--- a/os_dep/linux/ioctl_cfg80211.c
++++ b/os_dep/linux/ioctl_cfg80211.c
+@@ -5404,14 +5404,15 @@ exit:
+ }
+ 
+ static int cfg80211_rtw_change_beacon(struct wiphy *wiphy, struct net_device *ndev,
+-		struct cfg80211_beacon_data *info)
++		struct cfg80211_ap_update *info)
+ {
+ 	int ret = 0;
+ 	_adapter *adapter = (_adapter *)rtw_netdev_priv(ndev);
+ 
+ 	RTW_INFO(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
+ 
+-	ret = rtw_add_beacon(adapter, info->head, info->head_len, info->tail, info->tail_len);
++	ret = rtw_add_beacon(adapter, info->beacon.head, info->beacon.head_len,
++			     info->beacon.tail, info->beacon.tail_len);
+ 
+ 	return ret;
+ }
+-- 
+2.44.0
+

rtl88x2bu-openhd-dkms-git/PKGBUILD

@@ -2,23 +2,29 @@
 
 pkgname=rtl88x2bu-openhd-dkms-git
 _modname=88x2bu_ohd
-pkgver=5.13.1.r214.g7a54b83
+pkgver=5.13.1.r222.gaad91d6
 _pkgver=5.13.1
-pkgrel=2
+pkgrel=3
 pkgdesc='Realtek RTL88x2BU WiFi USB driver (with OpenHD patches)'
 arch=(any)
 url='https://github.com/OpenHD/rtl88x2bu'
 license=(GPL2)
 depends=(dkms bc)
 makedepends=(git)
-source=('git+https://github.com/OpenHD/rtl88x2bu.git')
-sha256sums=('SKIP')
+source=('git+https://github.com/OpenHD/rtl88x2bu.git' '0001-Update-beacon-change-signature-to-fix-build-on-recen.patch')
+sha256sums=('SKIP'
+            '24f7ce0d221b12cd61d9b89608babba379dcfa97d298e71d50669e10ba619645')
 
 pkgver() {
 	cd "${srcdir}/rtl88x2bu"
 	printf '%s.r%s.g%s' "${_pkgver}" "$(git rev-list --count HEAD)" "$(git rev-parse --short=7 HEAD)"
 }
 
+prepare() {
+	cd "${srcdir}/rtl88x2bu"
+	patch -p1 -i "$srcdir/0001-Update-beacon-change-signature-to-fix-build-on-recen.patch"
+}
+
 package() {
 	cd "${srcdir}/rtl88x2bu"
 	mkdir -p "${pkgdir}/usr/src/${_modname}-${pkgver}"