update to use revised makefile commands

3 files changed, 11 insertions, 58 deletions

diff --git a/.SRCINFO b/.SRCINFO
index df7fce77a494..403e6ae6429b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,25 +1,22 @@
 pkgbase = asus-nb-ctrl-git
 	pkgdesc = Asus laptop control utilities
-	pkgver = 2.0.4.r4.gf61f62c
-	pkgrel = 2
+	pkgver = 2.1.0.r4.gb496139
+	pkgrel = 1
 	url = https://gitlab.com/asus-linux/asus-nb-ctrl
 	arch = x86_64
 	license = Mozilla Public License Version 2.0
 	makedepends = git
-	makedepends = make
 	makedepends = rust
 	makedepends = clang
 	makedepends = glibc
 	depends = libusb
 	depends = udev
 	depends = systemd
-	optdepends = hid-asus-rog-dkms-git: fn+key combination support
+	depends = hid-asus-rog-dkms-git
 	optdepends = asus-rog-nb-wmi-dkms-git: G14/G15 support
 	optdepends = acpi_call: fan control
 	source = git+https://gitlab.com/asus-linux/asus-nb-ctrl.git
-	source = userpatch.patch
 	md5sums = SKIP
-	md5sums = 0add5394ceece18c95d338ec621db3c3
 
 pkgname = asus-nb-ctrl-git
 
diff --git a/PKGBUILD b/PKGBUILD
index bb566ba52c50..0e3d3282724e 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,19 +1,18 @@
 # Maintainer: Static_Rocket
 
 pkgname=asus-nb-ctrl-git
-pkgver=2.0.4.r4.gf61f62c
-pkgrel=2
+pkgver=2.1.0.r4.gb496139
+pkgrel=1
 pkgdesc="Asus laptop control utilities"
 arch=('x86_64')
 url="https://gitlab.com/asus-linux/asus-nb-ctrl"
 license=('Mozilla Public License Version 2.0')
-depends=('libusb' 'udev' 'systemd')
-optdepends=('hid-asus-rog-dkms-git: fn+key combination support'
-	'asus-rog-nb-wmi-dkms-git: G14/G15 support'
+depends=('libusb' 'udev' 'systemd' 'hid-asus-rog-dkms-git')
+optdepends=('asus-rog-nb-wmi-dkms-git: G14/G15 support'
 	'acpi_call: fan control')
-makedepends=('git' 'make' 'rust' 'clang' 'glibc')
-source=('git+https://gitlab.com/asus-linux/asus-nb-ctrl.git' 'userpatch.patch')
-md5sums=('SKIP' '0add5394ceece18c95d338ec621db3c3')
+makedepends=('git' 'rust' 'clang' 'glibc')
+source=('git+https://gitlab.com/asus-linux/asus-nb-ctrl.git')
+md5sums=('SKIP')
 _gitdir=${pkgname%"-git"}
 
 pkgver() {
@@ -21,14 +20,9 @@ pkgver() {
 	git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
-prepare() {
-	cd "$srcdir/$_gitdir"
-	patch --strip=1 --input="$srcdir/userpatch.patch"
-}
-
 build() {
 	cd "$_gitdir"
-	make
+	make build
 }
 
 package() {
diff --git a/userpatch.patch b/userpatch.patch
deleted file mode 100644
index 16927a313262..000000000000
--- a/userpatch.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --unified --recursive --text asus-nb-ctrl/Makefile new/Makefile
---- asus-nb-ctrl/Makefile	2020-09-27 12:34:08.648921861 -0400
-+++ new/Makefile	2020-09-27 12:49:03.576026582 -0400
-@@ -42,13 +42,13 @@
- 	install -D -m 0755 "target/release/$(BIN_C)" "$(DESTDIR)$(bindir)/$(BIN_C)"
- 	install -D -m 0755 "target/release/$(BIN_D)" "$(DESTDIR)$(bindir)/$(BIN_D)"
- 	install -D -m 0755 "target/release/$(BIN_N)" "$(DESTDIR)$(bindir)/$(BIN_N)"
--	install -D -m 0644 "data/$(PMRULES)" "$(DESTDIR)/lib/udev/rules.d/$(PMRULES)"
--	install -D -m 0644 "data/$(BIN_D).rules" "$(DESTDIR)/lib/udev/rules.d/99-$(BIN_D).rules"
-+	install -D -m 0644 "data/$(PMRULES)" "$(DESTDIR)/usr/lib/udev/rules.d/$(PMRULES)"
-+	install -D -m 0644 "data/$(BIN_D).rules" "$(DESTDIR)/usr/lib/udev/rules.d/99-$(BIN_D).rules"
- 	install -D -m 0644 "data/$(LEDCFG)" "$(DESTDIR)$(sysconfdir)/asusd/$(LEDCFG)"
- 	install -D -m 0644 "data/$(BIN_D).conf" "$(DESTDIR)$(sysconfdir)/dbus-1/system.d/$(BIN_D).conf"
- 	install -D -m 0644 "data/$(X11CFG)" "$(DESTDIR)$(sysconfdir)/X11/xorg.conf.d/$(X11CFG)"
--	install -D -m 0644 "data/$(BIN_D).service" "$(DESTDIR)/lib/systemd/system/$(BIN_D).service"
--	install -D -m 0644 "data/$(BIN_N).service" "$(DESTDIR)/lib/systemd/user/$(BIN_N).service"
-+	install -D -m 0644 "data/$(BIN_D).service" "$(DESTDIR)/usr/lib/systemd/system/$(BIN_D).service"
-+	install -D -m 0644 "data/$(BIN_N).service" "$(DESTDIR)/usr/lib/systemd/user/$(BIN_N).service"
- 	install -D -m 0644 "data/icons/asus_notif_yellow.png" "$(DESTDIR)/usr/share/icons/hicolor/512x512/apps/asus_notif_yellow.png"
- 	install -D -m 0644 "data/icons/asus_notif_green.png" "$(DESTDIR)/usr/share/icons/hicolor/512x512/apps/asus_notif_green.png"
- 	install -D -m 0644 "data/icons/asus_notif_red.png" "$(DESTDIR)/usr/share/icons/hicolor/512x512/apps/asus_notif_red.png"
-@@ -57,12 +57,12 @@
- 	rm -f "$(DESTDIR)$(bindir)/$(BIN_C)"
- 	rm -f "$(DESTDIR)$(bindir)/$(BIN_D)"
- 	rm -f "$(DESTDIR)$(bindir)/$(BIN_N)"
--	rm -f "$(DESTDIR)/lib/udev/rules.d/$(PMRULES)"
--	rm -f "$(DESTDIR)/lib/udev/rules.d/99-$(BIN_D).rules"
-+	rm -f "$(DESTDIR)/usr/lib/udev/rules.d/$(PMRULES)"
-+	rm -f "$(DESTDIR)/usr/lib/udev/rules.d/99-$(BIN_D).rules"
- 	rm -f "$(DESTDIR)$(sysconfdir)/dbus-1/system.d/$(BIN_D).conf"
- 	rm -f "$(DESTDIR)$(sysconfdir)/X11/xorg.conf.d/$(X11CFG)"
--	rm -f "$(DESTDIR)/lib/systemd/system/$(BIN_D).service"
--	rm -r "$(DESTDIR)/lib/systemd/user/$(BIN_N).service"
-+	rm -f "$(DESTDIR)/usr/lib/systemd/system/$(BIN_D).service"
-+	rm -r "$(DESTDIR)/usr/lib/systemd/user/$(BIN_N).service"
- 	rm -r "$(DESTDIR)/usr/share/icons/hicolor/512x512/apps/asus_notif_*"
- 
- update: