update to driver v5.2.9

4 files changed, 36 insertions, 42 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6acac21d5954..967d7081e020 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,18 @@
 pkgbase = rtl8812au-dkms-git
-	pkgdesc = A kernel module for Realtek 8812au network cards with dkms support
-	pkgver = r47.2a9bbb7
+	pkgdesc = rtl8812AU chipset driver with firmware v5.2.9
+	pkgver = 5.2.9
 	pkgrel = 1
-	url = https://github.com/gnab/rtl8812au
-	install = rtl8812au-dkms-git.install
-	arch = any
-	license = GPL
+	url = https://github.com/zebulon2/rtl8812au-driver-5.2.9/tree/txpower
+	arch = i686
+	arch = x86_64
+	license = GPL2
 	makedepends = git
 	depends = dkms
-	source = git+https://github.com/gnab/rtl8812au.git
+	conflicts = rtl8812au
+	source = git+https://github.com/zebulon2/rtl8812au-driver-5.2.9.git#branch=txpower
 	source = dkms.conf
 	sha256sums = SKIP
-	sha256sums = 6d4ea7322b1ccdcd9351232e2e49f10ef93b93bfc2034f494cdd256d0b3bd8c0
+	sha256sums = ac5685acf0457773a6a8f83ef2ec84184be3bf26e6472e4b76e31d660964eb6d
 
 pkgname = rtl8812au-dkms-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 631bc0ba738b..b21f4606e789 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,32 +1,36 @@
-# Maintainer: Simon Hanna <simon DOT hanna (at) serve-me (dOt) info>
+# Maintainer: zebulon <zeb (at)zebulon(dot)org(dot)uk>
+# Contributor: NovaMoon <novamoon1 (at)gmail(dot)com>
 
 pkgname=rtl8812au-dkms-git
 _pkgbase=rtl8812au
-pkgver=r47.2a9bbb7
+pkgver=5.2.9
 pkgrel=1
-pkgdesc="A kernel module for Realtek 8812au network cards with dkms support"
-url="https://github.com/gnab/rtl8812au"
-license=("GPL")
-arch=('any')
-makedepends=('git')
+pkgdesc="rtl8812AU chipset driver with firmware v5.2.9"
+arch=('i686' 'x86_64')
+url="https://github.com/zebulon2/rtl8812au-driver-5.2.9/tree/txpower"
+license=('GPL2')
 depends=('dkms')
-source=("git+https://github.com/gnab/rtl8812au.git"
-        "dkms.conf")
-install="${pkgname}.install"
+makedepends=('git')
+conflicts=("${_pkgbase}")
+source=("git+https://github.com/zebulon2/rtl8812au-driver-5.2.9.git#branch=txpower"
+        'dkms.conf')
 sha256sums=('SKIP'
-            '6d4ea7322b1ccdcd9351232e2e49f10ef93b93bfc2034f494cdd256d0b3bd8c0')
-pkgver() {
-  cd "${srcdir}/${_pkgbase}"
-  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+	    'ac5685acf0457773a6a8f83ef2ec84184be3bf26e6472e4b76e31d660964eb6d')
+
+
+build() {
+  cd "rtl8812au-driver-5.2.9"
+  make clean
+  make
 }
 
 package() {
-	cd ${srcdir}/${_pkgbase}
-	mkdir -p ${pkgdir}/usr/src/${_pkgbase}-${pkgver}
-	cp -pr * ${pkgdir}/usr/src/${_pkgbase}-${pkgver}
-	cp ${srcdir}/dkms.conf ${pkgdir}/usr/src/${_pkgbase}-${pkgver}
-	# Set name and version
-	sed -e "s/@_PKGBASE@/${_pkgbase}-dkms/" \
-			-e "s/@PKGVER@/${pkgver}/" \
-			-i "${pkgdir}"/usr/src/${_pkgbase}-${pkgver}/dkms.conf
+        cd ${srcdir}/rtl8812au-driver-5.2.9
+        mkdir -p ${pkgdir}/usr/src/${_pkgbase}-${pkgver}
+        cp -pr * ${pkgdir}/usr/src/${_pkgbase}-${pkgver}
+        cp ${srcdir}/dkms.conf ${pkgdir}/usr/src/${_pkgbase}-${pkgver}
+        # Set name and version
+        sed -e "s/@_PKGBASE@/${_pkgbase}-dkms/" \
+                        -e "s/@PKGVER@/${pkgver}/" \
+                        -i "${pkgdir}"/usr/src/${_pkgbase}-${pkgver}/dkms.conf
 }
diff --git a/dkms.conf b/dkms.conf
index 1507f8b3266f..3e09fa8f5ba7 100644
--- a/dkms.conf
+++ b/dkms.conf
@@ -5,3 +5,4 @@ CLEAN="make clean"
 BUILT_MODULE_NAME="8812au"
 DEST_MODULE_LOCATION=/kernel/drivers/net/wireless
 REMAKE_INITRD=no
+AUTOINSTALL="yes"
diff --git a/rtl8812au-dkms-git.install b/rtl8812au-dkms-git.install
deleted file mode 100644
index 1be6a09f6e50..000000000000
--- a/rtl8812au-dkms-git.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-   dkms install rtl8812au/${1%%-*}
-}
-pre_upgrade() {
-    pre_remove ${2%%-*}
-}
-post_upgrade() {
-    post_install ${1%%-*}
-}
-pre_remove() {
-   dkms remove rtl8812au/${1%%-*} --all
-}