From 7aa0f879c695b69dddfbb123f830a4f99ded8741 Mon Sep 17 00:00:00 2001 From: reedts Date: Thu, 26 Aug 2021 13:13:45 +0200 Subject: [PATCH 1/2] qmk: update to 1.0.0. --- srcpkgs/qmk/template | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/srcpkgs/qmk/template b/srcpkgs/qmk/template index 033ff91fa1ff..cd717f840b82 100644 --- a/srcpkgs/qmk/template +++ b/srcpkgs/qmk/template @@ -1,27 +1,20 @@ # Template file for 'qmk' pkgname=qmk -version=0.0.35 -revision=2 -build_style=python3-module -hostmakedepends="python3-setuptools" -depends="python3-appdirs - python3-argcomplete - python3-colorama - python3-hjson - python3-nose2 - flake8 - python3-yapf - dfu-programmer - avrdude - dfu-util - avr-gcc - cross-arm-none-eabi" +version=1.0.0 +revision=1 +build_style=python3-pep517 +hostmakedepends="python3-wheel" +depends="avrdude dfu-programmer dfu-util avr-gcc hidapi" short_desc="CLI tool for working with QMK firmware of mechanical keyboards" maintainer="RinsedSloth " license="MIT" homepage="https://github.com/qmk/qmk_cli" distfiles="${PYPI_SITE}/q/qmk/qmk-${version}.tar.gz" -checksum=e704ca31cdca264bfdd99c72a4849a9e9762043e4bf328118c49af92d1c0a3b5 +checksum=da62eec73c4548cc37b0b9be3937202dc3a301dc2f2663610ecca751a610f9ca + +if [ -z "$CROSS_BUILD" ]; then + depends+=" cross-arm-none-eabi" +fi post_install() { vlicense LICENSE From c8995b8a03163465ff01bfe816e2625578793ce3 Mon Sep 17 00:00:00 2001 From: reedts Date: Mon, 30 Aug 2021 20:34:00 +0200 Subject: [PATCH 2/2] Use target arch to determine additional dependency --- srcpkgs/qmk/template | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/srcpkgs/qmk/template b/srcpkgs/qmk/template index cd717f840b82..37803c62eea8 100644 --- a/srcpkgs/qmk/template +++ b/srcpkgs/qmk/template @@ -12,9 +12,11 @@ homepage="https://github.com/qmk/qmk_cli" distfiles="${PYPI_SITE}/q/qmk/qmk-${version}.tar.gz" checksum=da62eec73c4548cc37b0b9be3937202dc3a301dc2f2663610ecca751a610f9ca -if [ -z "$CROSS_BUILD" ]; then - depends+=" cross-arm-none-eabi" -fi +case "$XBPS_TARGET_MACHINE" in + ppc*|i686*|x86_64*) + depends+=" cross-arm-none-eabi" + ;; +esac post_install() { vlicense LICENSE