From owner-dev-commits-ports-all@freebsd.org Sun Jul 25 18:20:21 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8C2D765E002; Sun, 25 Jul 2021 18:20:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GXrvT3c15z4X4f; Sun, 25 Jul 2021 18:20:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 63713485; Sun, 25 Jul 2021 18:20:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 16PIKLEZ050505; Sun, 25 Jul 2021 18:20:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16PIKLsB050497; Sun, 25 Jul 2021 18:20:21 GMT (envelope-from git) Date: Sun, 25 Jul 2021 18:20:21 GMT Message-Id: <202107251820.16PIKLsB050497@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: daaf149ba7fe - 2021Q3 - multimedia/mpv: unbreak fetch via local copy MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q3 X-Git-Reftype: branch X-Git-Commit: daaf149ba7fe96da149f0e737d0bb18576008821 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Jul 2021 18:20:21 -0000 The branch 2021Q3 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=daaf149ba7fe96da149f0e737d0bb18576008821 commit daaf149ba7fe96da149f0e737d0bb18576008821 Author: Jan Beich AuthorDate: 2021-07-25 18:02:36 +0000 Commit: Jan Beich CommitDate: 2021-07-25 18:20:18 +0000 multimedia/mpv: unbreak fetch via local copy Index abbreviation in git-format-patch(1) output seems to change frequently, probably due to GitHub load balancing. $ make checksum TRYBROKEN= MASTER_SITE_BACKUP= DISTDIR=$(mktemp -dt distfiles) [...] => 62fb374349e0.patch doesn't seem to exist in /tmp/distfiles.kipot6aT/. => Attempting to fetch https://github.com/mpv-player/mpv/commit/62fb374349e0.patch fetch: https://github.com/mpv-player/mpv/commit/62fb374349e0.patch: size mismatch: expected 2083, actual 2079 => Couldn't fetch it - please try to retrieve this => port manually into /tmp/distfiles.kipot6aT/ and try again. *** Error code 1 Reported by: LuMiWa (via multimedia@ list) (cherry picked from commit 35c4b7b1757e67c36d37a6e3f50d35c47f500e17) --- multimedia/mpv/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/multimedia/mpv/Makefile b/multimedia/mpv/Makefile index 19e935053e6c..e868169f75f4 100644 --- a/multimedia/mpv/Makefile +++ b/multimedia/mpv/Makefile @@ -10,6 +10,7 @@ MASTER_SITES= https://waf.io/:waf DISTFILES= ${WAF_RELEASE}${EXTRACT_SUFX}:waf PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCH_SITES+= LOCAL/jbeich/${PORTNAME}_patches # backup PATCHFILES+= 1bb2665e3d09.patch:-p1 59c32a04b04d.patch:-p1 62fb374349e0.patch:-p1 PATCHFILES+= 24525e4ef9ba.patch:-p1 4dd5fdc0876e.patch:-p1 4d80314c5c88.patch:-p1 PATCHFILES+= 1b2e5137e04b.patch:-p1 # https://github.com/mpv-player/mpv/pull/8312