From 30b80510dea885c5fc44e0fbe855e955b71dafa3 Mon Sep 17 00:00:00 2001 From: Anthony Iliopoulos Date: Wed, 13 Nov 2019 16:58:28 +0100 Subject: [PATCH] uhubctl: update to 2.1.0. --- srcpkgs/uhubctl/patches/Makefile.patch | 14 ++++++++------ srcpkgs/uhubctl/template | 6 +++--- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/srcpkgs/uhubctl/patches/Makefile.patch b/srcpkgs/uhubctl/patches/Makefile.patch index addd0da74ac..04cbd19fc9c 100644 --- a/srcpkgs/uhubctl/patches/Makefile.patch +++ b/srcpkgs/uhubctl/patches/Makefile.patch @@ -1,6 +1,8 @@ +diff --git Makefile Makefile +index f6d69d3..58a9d98 100644 --- Makefile +++ Makefile -@@ -4,7 +4,7 @@ +@@ -4,7 +4,7 @@ UNAME_S := $(shell uname -s) DESTDIR ?= prefix ?= /usr @@ -9,12 +11,12 @@ INSTALL := install INSTALL_DIR := $(INSTALL) -m 755 -d -@@ -14,7 +14,7 @@ +@@ -14,7 +14,7 @@ RM := rm -rf CC ?= gcc CFLAGS ?= -g -O0 CFLAGS += -Wall -Wextra -std=c99 -pedantic --GIT_VERSION := $(shell git describe --abbrev=4 --dirty --always --tags) +-GIT_VERSION := $(shell git describe --abbrev=8 --dirty --always --tags) +GIT_VERSION := $(shell basename "$(CURDIR)" | cut -d '-' -f 2) - CFLAGS += -DPROGRAM_VERSION=\"$(GIT_VERSION)\" - - ifeq ($(UNAME_S),Linux) + ifeq ($(GIT_VERSION),) + GIT_VERSION := $(shell cat VERSION) + endif diff --git a/srcpkgs/uhubctl/template b/srcpkgs/uhubctl/template index ac51814a6b3..748b10a9b32 100644 --- a/srcpkgs/uhubctl/template +++ b/srcpkgs/uhubctl/template @@ -1,13 +1,13 @@ # Template file for 'uhubctl' pkgname=uhubctl -version=2.0.0 +version=2.1.0 revision=1 build_style=gnu-makefile make_use_env=yes makedepends="libusb-devel" short_desc="USB hub per-port power control" maintainer="Pavel Fatin " -license="GPL-2" +license="GPL-2.0-only" homepage="https://github.com/mvp/uhubctl" distfiles="https://github.com/mvp/uhubctl/archive/v${version}.tar.gz" -checksum=4c31278b2c03e5be5a696c3088bc86cf2557a70e00f697799c163aba18e3c40e +checksum=227fdd541067b84eaa0e15cdc171458a56de7591f7a1deaff3e6d42d2809450b