diff --git a/.SRCINFO b/.SRCINFO index ac47449bf08a..d6df9286ed53 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = asus-numberpad-driver-git pkgdesc = Linux newest feature-rich configurable driver for Asus numberpad - pkgver = r827.d2fc403 + pkgver = r845.317cd75 pkgrel = 1 url = https://github.com/asus-linux-drivers/asus-numberpad-driver install = asus-numberpad-driver-git.install diff --git a/PKGBUILD b/PKGBUILD index 70505e687922..08c24bd07f9f 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,35 +3,35 @@ _pkgbase=asus-numberpad-driver pkgbase="${_pkgbase}-git" pkgname=( - "${_pkgbase}-b7402-git" - "${_pkgbase}-e210ma-git" - "${_pkgbase}-g513-git" - "${_pkgbase}-g533-git" - "${_pkgbase}-gx551-git" - "${_pkgbase}-gx701-git" - "${_pkgbase}-up5401ea-git" - "${_pkgbase}-up5401ea-3145-git" - "${_pkgbase}-ux433fa-git" - "${_pkgbase}-ux581l-git" + "${_pkgbase}-b7402-git" + "${_pkgbase}-e210ma-git" + "${_pkgbase}-g513-git" + "${_pkgbase}-g533-git" + "${_pkgbase}-gx551-git" + "${_pkgbase}-gx701-git" + "${_pkgbase}-up5401ea-git" + "${_pkgbase}-up5401ea-3145-git" + "${_pkgbase}-ux433fa-git" + "${_pkgbase}-ux581l-git" ) -pkgver=r827.d2fc403 +pkgver=r845.317cd75 pkgrel=1 pkgdesc="Linux newest feature-rich configurable driver for Asus numberpad" arch=('any') url="https://github.com/asus-linux-drivers/asus-numberpad-driver" license=('GPL3') depends=( - 'ibus' - 'libevdev' - 'python-libevdev' - 'i2c-tools' - 'python-libevdev' - 'python-pyinotify' - 'python-xlib' - 'python-numpy' - 'python-evdev' - 'python-smbus2' - 'xorg-xinput' + 'ibus' + 'libevdev' + 'python-libevdev' + 'i2c-tools' + 'python-libevdev' + 'python-pyinotify' + 'python-xlib' + 'python-numpy' + 'python-evdev' + 'python-smbus2' + 'xorg-xinput' ) makedepends=('git') provides=("${_pkgbase}") @@ -42,36 +42,36 @@ sha256sums=('SKIP' install="$pkgbase.install" pkgver() { - cd "${srcdir}/${_pkgbase}" - printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" + cd "${srcdir}/${_pkgbase}" + printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" } prepare() { - patch "${srcdir}/${_pkgbase}/asus_numberpad_driver.service" service.patch - patch "${srcdir}/${_pkgbase}/asus_numberpad_driver.x11.service" service.patch + patch "${srcdir}/${_pkgbase}/asus_numberpad_driver.wayland.service" service.patch + patch "${srcdir}/${_pkgbase}/asus_numberpad_driver.x11.service" service.patch } _package() { - _config_dir="/usr/share/${_pkgbase}" - _log_dir="/var/log/asus-numberpad-driver" - mkdir -p "${pkgdir}${_log_dir}" - cd "${srcdir}/${_pkgbase}" - install -Dm755 numberpad.py "${pkgdir}/${_config_dir}/numberpad.py" - install -Dm644 "asus_numberpad_driver.service" "${pkgdir}/usr/lib/systemd/system/asus_numberpad_driver.service" - install -Dm644 "asus_numberpad_driver.x11.service" "${pkgdir}/usr/lib/systemd/system/asus_numberpad_driver.x11.service" - sed -i "s#\$LAYOUT_NAME#${model}#" "${pkgdir}/usr/lib/systemd/system/asus_numberpad_driver.service" - sed -i "s#\$LAYOUT_NAME#${model}#" "${pkgdir}/usr/lib/systemd/system/asus_numberpad_driver.x11.service" - install -Dm 644 -t "${pkgdir}/${_config_dir}/layouts" layouts/*.py - install -Dm 644 "LICENSE.md" "${pkgdir}/usr/share/licenses/${_pkgbase}/LICENSE.md" + _config_dir="/usr/share/${_pkgbase}" + _log_dir="/var/log/asus-numberpad-driver" + mkdir -p "${pkgdir}${_log_dir}" + cd "${srcdir}/${_pkgbase}" + install -Dm755 numberpad.py "${pkgdir}/${_config_dir}/numberpad.py" + install -Dm644 "asus_numberpad_driver.wayland.service" "${pkgdir}/usr/lib/systemd/system/asus_numberpad_driver.wayland.service" + install -Dm644 "asus_numberpad_driver.x11.service" "${pkgdir}/usr/lib/systemd/system/asus_numberpad_driver.x11.service" + sed -i "s#\$LAYOUT_NAME#${model}#" "${pkgdir}/usr/lib/systemd/system/asus_numberpad_driver.wayland.service" + sed -i "s#\$LAYOUT_NAME#${model}#" "${pkgdir}/usr/lib/systemd/system/asus_numberpad_driver.x11.service" + install -Dm 644 -t "${pkgdir}/${_config_dir}/layouts" layouts/*.py + install -Dm 644 "LICENSE.md" "${pkgdir}/usr/share/licenses/${_pkgbase}/LICENSE.md" } main() { - for _pkgname in "${pkgname[@]}"; do - eval "package_${_pkgname}() { + for _pkgname in "${pkgname[@]}"; do + eval "package_${_pkgname}() { model="$(echo ${_pkgname%-*} | sed "s/${_pkgbase}-//")" _package }" - done + done } main