diff --git a/rtl8812au-openhd-dkms-git/.SRCINFO b/rtl8812au-openhd-dkms-git/.SRCINFO index 97aa46c..553b90a 100644 --- a/rtl8812au-openhd-dkms-git/.SRCINFO +++ b/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.r878.gc070e02 - pkgrel = 5 + pkgrel = 6 url = https://github.com/OpenHD/rtl8812au arch = any license = GPL2 @@ -9,8 +9,6 @@ pkgbase = rtl8812au-openhd-dkms-git depends = dkms depends = bc source = git+https://github.com/OpenHD/rtl8812au.git - source = fix-6.9.0-build.patch sha256sums = SKIP - sha256sums = a527f89fecb9fbf8249e2e72859560f4381376873bb8a408047870df07a8d79b pkgname = rtl8812au-openhd-dkms-git diff --git a/rtl8812au-openhd-dkms-git/PKGBUILD b/rtl8812au-openhd-dkms-git/PKGBUILD index 509034f..1664d3a 100644 --- a/rtl8812au-openhd-dkms-git/PKGBUILD +++ b/rtl8812au-openhd-dkms-git/PKGBUILD @@ -4,26 +4,21 @@ pkgname=rtl8812au-openhd-dkms-git _modname=88XXau_ohd pkgver=5.2.20.2.r878.gc070e02 _pkgver=5.2.20.2 -pkgrel=5 +pkgrel=6 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' 'fix-6.9.0-build.patch') -sha256sums=('SKIP' 'a527f89fecb9fbf8249e2e72859560f4381376873bb8a408047870df07a8d79b') +source=('git+https://github.com/OpenHD/rtl8812au.git') +sha256sums=('SKIP') 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/fix-6.9.0-build.patch" -} - package() { cd "${srcdir}/rtl8812au" mkdir -p "${pkgdir}/usr/src/${_modname}-${pkgver}" diff --git a/rtl8812au-openhd-dkms-git/fix-6.9.0-build.patch b/rtl8812au-openhd-dkms-git/fix-6.9.0-build.patch deleted file mode 100644 index 0c3bc33..0000000 --- a/rtl8812au-openhd-dkms-git/fix-6.9.0-build.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/os_dep/linux/ioctl_cfg80211.c b/os_dep/linux/ioctl_cfg80211.c -index e26dbda..b47021d 100644 ---- a/os_dep/linux/ioctl_cfg80211.c -+++ b/os_dep/linux/ioctl_cfg80211.c -@@ -408,7 +408,9 @@ u8 rtw_cfg80211_ch_switch_notify(_adapter *adapter, u8 ch, u8 bw, u8 offset, u8 - if (ret != _SUCCESS) - goto exit; - --#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0)) -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 9, 0)) -+ cfg80211_ch_switch_notify(adapter->pnetdev, &chdef, 0); -+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0)) - cfg80211_ch_switch_notify(adapter->pnetdev, &chdef, 0, 0); - #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 2)) - cfg80211_ch_switch_notify(adapter->pnetdev, &chdef, 0);