git: 9d7f749e26f5 - main - multimedia/livego: fix build on riscv64

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Robert Clausecker <fuz_at_FreeBSD.org>
Date: Fri, 24 Mar 2023 20:56:39 UTC
The branch main has been updated by fuz:

URL: https://cgit.FreeBSD.org/ports/commit/?id=9d7f749e26f5eb727a90a429c371e2ae25a0a6bc

commit 9d7f749e26f5eb727a90a429c371e2ae25a0a6bc
Author:     Robert Clausecker <fuz@FreeBSD.org>
AuthorDate: 2023-03-22 19:32:23 +0000
Commit:     Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2023-03-24 20:54:44 +0000

    multimedia/livego: fix build on riscv64
    
    Bump golang.org/x/sys dependency to a version new enough
    to support riscv64-freebsd.  While we are at it, chase
    github.com/go-redis/redis => github.com/redis/go-redis rename.
    Remove thus obsoleted patch file.
    
    Sponsored by:   Berliner Linux User Group e.V.
    Approved by:    portmgr (build fix blanket)
---
 multimedia/livego/Makefile                         |  6 +++---
 multimedia/livego/distinfo                         | 10 ++++-----
 ...golang.org_x_sys_unix_ztypes__freebsd__arm64.go | 24 ----------------------
 3 files changed, 8 insertions(+), 32 deletions(-)

diff --git a/multimedia/livego/Makefile b/multimedia/livego/Makefile
index 377c0565f124..e1996d0b7069 100644
--- a/multimedia/livego/Makefile
+++ b/multimedia/livego/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	livego
 DISTVERSION=	0.0.15
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	multimedia
 
 MAINTAINER=	ports@FreeBSD.org
@@ -21,9 +21,8 @@ GH_TUPLE=	\
 		dgrijalva:jwt-go:v3.2.0:dgrijalva_jwt_go/vendor/github.com/dgrijalva/jwt-go \
 		fsnotify:fsnotify:v1.4.7:fsnotify_fsnotify/vendor/github.com/fsnotify/fsnotify \
 		go-ini:ini:v1.51.0:go_ini_ini/vendor/gopkg.in/ini.v1 \
-		go-redis:redis:v7.2.0:go_redis_redis_v7/vendor/github.com/go-redis/redis/v7 \
 		go-yaml:yaml:v2.2.4:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \
-		golang:sys:b09406accb47:golang_sys/vendor/golang.org/x/sys \
+		golang:sys:v0.6.0:golang_sys/vendor/golang.org/x/sys \
 		golang:text:v0.3.2:golang_text/vendor/golang.org/x/text \
 		hashicorp:hcl:v1.0.0:hashicorp_hcl/vendor/github.com/hashicorp/hcl \
 		konsorten:go-windows-terminal-sequences:v1.0.1:konsorten_go_windows_terminal_sequences/vendor/github.com/konsorten/go-windows-terminal-sequences \
@@ -34,6 +33,7 @@ GH_TUPLE=	\
 		patrickmn:go-cache:v2.1.0:patrickmn_go_cache/vendor/github.com/patrickmn/go-cache \
 		pelletier:go-toml:v1.2.0:pelletier_go_toml/vendor/github.com/pelletier/go-toml \
 		pmezard:go-difflib:v1.0.0:pmezard_go_difflib/vendor/github.com/pmezard/go-difflib \
+		redis:go-redis:v7.2.0:go_redis_redis_v7/vendor/github.com/go-redis/redis/v7 \
 		satori:go.uuid:v1.2.0:satori_go_uuid/vendor/github.com/satori/go.uuid \
 		sirupsen:logrus:v1.5.0:sirupsen_logrus/vendor/github.com/sirupsen/logrus \
 		spf13:afero:v1.1.2:spf13_afero/vendor/github.com/spf13/afero \
diff --git a/multimedia/livego/distinfo b/multimedia/livego/distinfo
index 1189c10a65c6..d4d6b46ce42c 100644
--- a/multimedia/livego/distinfo
+++ b/multimedia/livego/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1611343160
+TIMESTAMP = 1679512645
 SHA256 (gwuhaolin-livego-0.0.15_GH0.tar.gz) = f1beb250dbbcfb578c32e37f862379aacf804570a8ce602b1a7a9f4d53d1304d
 SIZE (gwuhaolin-livego-0.0.15_GH0.tar.gz) = 74659
 SHA256 (auth0-go-jwt-middleware-36081240882b_GH0.tar.gz) = ab5a31dffaac4998b2c9544f80ab718c5bc12c046557c0cf00518d9fecf1d884
@@ -11,12 +11,10 @@ SHA256 (fsnotify-fsnotify-v1.4.7_GH0.tar.gz) = b7530d973d0ab0e58ad8ce1b9a4b963d6
 SIZE (fsnotify-fsnotify-v1.4.7_GH0.tar.gz) = 31139
 SHA256 (go-ini-ini-v1.51.0_GH0.tar.gz) = 6c98311d375afbe36a246c5d29acb5cb428634a4186e591ce9b7fe2fa4f2a471
 SIZE (go-ini-ini-v1.51.0_GH0.tar.gz) = 43536
-SHA256 (go-redis-redis-v7.2.0_GH0.tar.gz) = 9aa836b2ae3be6214a12efbce7cf54d234525396e51a4ebcdadc35942807958a
-SIZE (go-redis-redis-v7.2.0_GH0.tar.gz) = 101816
 SHA256 (go-yaml-yaml-v2.2.4_GH0.tar.gz) = 9004c9709200d52ef6e5c69af3f71f3adb1a2b7e884ea7597f306bf54b1f007c
 SIZE (go-yaml-yaml-v2.2.4_GH0.tar.gz) = 72209
-SHA256 (golang-sys-b09406accb47_GH0.tar.gz) = 732651ee709d3443e992f716796c5dac7cbc29a345a8ffe3fb80f505c93503d2
-SIZE (golang-sys-b09406accb47_GH0.tar.gz) = 1496780
+SHA256 (golang-sys-v0.6.0_GH0.tar.gz) = b4f6d17c7a128f76169964b437cb66b3f2dbf9a33361928ec19dfecf7b03fc54
+SIZE (golang-sys-v0.6.0_GH0.tar.gz) = 1434234
 SHA256 (golang-text-v0.3.2_GH0.tar.gz) = 0b9309698f5708531c5377ab1e29b423a6d9e20c55a8d386c3b8283428212f22
 SIZE (golang-text-v0.3.2_GH0.tar.gz) = 7168069
 SHA256 (hashicorp-hcl-v1.0.0_GH0.tar.gz) = 50632428210503070fd2fde748c88b7414bf84a6a0eadebf9d8e596a033bead2
@@ -37,6 +35,8 @@ SHA256 (pelletier-go-toml-v1.2.0_GH0.tar.gz) = 1a5a620f680033f17e34148bee8f26d96
 SIZE (pelletier-go-toml-v1.2.0_GH0.tar.gz) = 57496
 SHA256 (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 28f3dc1b5c0efd61203ab07233f774740d3bf08da4d8153fb5310db6cea0ebda
 SIZE (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 11398
+SHA256 (redis-go-redis-v7.2.0_GH0.tar.gz) = 0be85c516835a2715a70648c10650f0d412c6b31398937c1511ae812ae2a2234
+SIZE (redis-go-redis-v7.2.0_GH0.tar.gz) = 101823
 SHA256 (satori-go.uuid-v1.2.0_GH0.tar.gz) = 6f9d9549958252d7c5a5ed1cabeedeaab7a600ca0b888a3666cce4c3590aa5a7
 SIZE (satori-go.uuid-v1.2.0_GH0.tar.gz) = 8297
 SHA256 (sirupsen-logrus-v1.5.0_GH0.tar.gz) = b93c79fdb137a8c723bd096cf7cf1871e2c038e790d7f3cb5758e07bc2b836f3
diff --git a/multimedia/livego/files/patch-vendor_golang.org_x_sys_unix_ztypes__freebsd__arm64.go b/multimedia/livego/files/patch-vendor_golang.org_x_sys_unix_ztypes__freebsd__arm64.go
deleted file mode 100644
index 9684a5cfae8e..000000000000
--- a/multimedia/livego/files/patch-vendor_golang.org_x_sys_unix_ztypes__freebsd__arm64.go
+++ /dev/null
@@ -1,24 +0,0 @@
-From 33540a1f603772f9d4b761f416f5c10dade23e96 Mon Sep 17 00:00:00 2001
-From: Tobias Klauser <tklauser@distanz.ch>
-Date: Fri, 25 Oct 2019 21:13:51 +0200
-Subject: [PATCH] unix: don't use non-existing uint128 type on freebsd/arm64
-
-CL 179099 introduced type FpReg on freebsd, on freebsd/arm64 using a
-type uint128. This type doesn't exist in Go.
-
-Change-Id: Ie7f065f38f2cc2c163abdfa7dddad886b8edbe3b
-Reviewed-on: https://go-review.googlesource.com/c/sys/+/203419
-Run-TryBot: Tobias Klauser <tobias.klauser@gmail.com>
-TryBot-Result: Gobot Gobot <gobot@golang.org>
-Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
---- vendor/golang.org/x/sys/unix/ztypes_freebsd_arm64.go.orig	2019-10-10 19:43:22 UTC
-+++ vendor/golang.org/x/sys/unix/ztypes_freebsd_arm64.go
-@@ -397,7 +397,7 @@ type Reg struct {
- }
- 
- type FpReg struct {
--	Fp_q  [32]uint128
-+	Fp_q  [512]uint8
- 	Fp_sr uint32
- 	Fp_cr uint32
- }