From 218484cf297bb5aec629904c745854cd924c3024 Mon Sep 17 00:00:00 2001 From: Animesh Sahu Date: Mon, 21 Feb 2022 13:19:55 +0530 Subject: [PATCH] uhubctl: update to 2.4.0 --- srcpkgs/uhubctl/patches/Makefile.patch | 15 ++------------- srcpkgs/uhubctl/template | 6 ++++-- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/srcpkgs/uhubctl/patches/Makefile.patch b/srcpkgs/uhubctl/patches/Makefile.patch index 429a805e354..cd24ad3870a 100644 --- a/srcpkgs/uhubctl/patches/Makefile.patch +++ b/srcpkgs/uhubctl/patches/Makefile.patch @@ -1,21 +1,10 @@ -diff --git Makefile Makefile -index f6d69d3..58a9d98 100644 --- a/Makefile +++ b/Makefile -@@ -4,7 +4,7 @@ UNAME_S := $(shell uname -s) - - DESTDIR ?= - prefix ?= /usr --sbindir ?= $(prefix)/sbin -+sbindir ?= $(prefix)/bin - - INSTALL := install - INSTALL_DIR := $(INSTALL) -m 755 -d -@@ -14,7 +14,7 @@ RM := rm -rf +@@ -14,7 +14,7 @@ CC ?= gcc CFLAGS ?= -g -O0 CFLAGS += -Wall -Wextra -std=c99 -pedantic --GIT_VERSION := $(shell git describe --abbrev=8 --dirty --always --tags) +-GIT_VERSION := $(shell git describe --match "v[0-9]*" --abbrev=8 --dirty --tags | cut -c2-) +GIT_VERSION := $(shell basename "$(CURDIR)" | cut -d '-' -f 2) ifeq ($(GIT_VERSION),) GIT_VERSION := $(shell cat VERSION) diff --git a/srcpkgs/uhubctl/template b/srcpkgs/uhubctl/template index 748b10a9b32..8f14794092e 100644 --- a/srcpkgs/uhubctl/template +++ b/srcpkgs/uhubctl/template @@ -1,13 +1,15 @@ # Template file for 'uhubctl' pkgname=uhubctl -version=2.1.0 +version=2.4.0 revision=1 build_style=gnu-makefile make_use_env=yes +make_install_args="sbindir=/usr/bin" +hostmakedepends="pkg-config which" makedepends="libusb-devel" short_desc="USB hub per-port power control" maintainer="Pavel Fatin " license="GPL-2.0-only" homepage="https://github.com/mvp/uhubctl" distfiles="https://github.com/mvp/uhubctl/archive/v${version}.tar.gz" -checksum=227fdd541067b84eaa0e15cdc171458a56de7591f7a1deaff3e6d42d2809450b +checksum=391f24fd1f89cacce801df38ecc289b34c3627bc08ee69eec515af7e1a283d97