From nobody Wed Nov 23 14:35:17 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NHNvT4tyjz4hXWf; Wed, 23 Nov 2022 14:35:17 +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 4NHNvT4LQdz4lDN; Wed, 23 Nov 2022 14:35:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669214117; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TSi4ZylV2VFI04eac0t2DcAQtRnuAkDLBETY7C/bNlk=; b=LKye0AHu0X9MzNXBmRvUDHswLVVhbkDE3iZKLi9+3mJxYZjTcWqIryuDdKbbemZ0gcpCL5 g/6Y+THR+n6aOqKit8lL7oGcXwGx2WsYQXu1gxRMLHF/syVKtwnpAnAVetngWG/eyzKlV/ eABgwslRFz7ahFfaTgU19xVceStbmo7L6FGIMQC3xsLxktVAzaL24jv9WLu4f4Bp94hTbk JEj260j5kj6txHwsVxr34paN2cOrWwwIdKQmlmcFShKh373n2l31tCgUY0MmjpEqxe+bvP ipzwqBwiWJAJncgFTtKnMkILvlj7ySzPEi00xw/Fw/OQXsNt1zD2Czu2/JskuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669214117; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TSi4ZylV2VFI04eac0t2DcAQtRnuAkDLBETY7C/bNlk=; b=ZU+u3imeKukMvlLIyS3EvBQdzXlz1MGGo62LFxBLC+ZDDFZxbF1hYhn3Y1VGMICLLWcayk PxjRf/S4+lhRNcH0l4dNpKrrMcX8Hh8jeW62W96pZTSsWl4uzHmb9+LMS0tsh/tih7MbEL teBIHCE/KCmDbTnnjmK2r3v8mtlCqRa+HzrnMNwJ3CImX7C6JO0FvQnOoe9wrpwNu8pDNF O6RiRHM6F5zWYqeXMarOU3XXwpl5wNK1JUVVX793Xrr53vAg+5gUlR20b59VQrtX5+c+kH YWPe8bdnPWX/vVAPJJRQAvDOjK2QS5bLpCYF6PCoDWJ/TfEybS0Tn5XT2HiA+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669214117; a=rsa-sha256; cv=none; b=RgWX+Pv0YFoGthuEpNG6KoBr64p3wnp9vI1/BBdGRgjCU4zxsYnrtIxXJZpCgyZzPIF8T3 qG8Y4W1t0UvJvYx3T8ipoGY2fVrqjwjNb9sOpj71qBtOHyGavuZqlXSTvT1eI3OiRNQQJ8 435FKn0sTCWTykQ0RJJcP48yOzgzm664XHtYsbsUpmd+kGXjXcnASEHSYAZTr+QmPftTb1 1G2zJNpxWqwX5vKYnXJR0ZSBju2KG+ItrCQ2guYcFK6nVxgAy+zBAqDc0wcsIpSvK++p/E nV9z4MYySiP82T1KMRwEfUXrZ071ztO6H2dqZPtJD0MsXtjevABn2s8hESILhQ== 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 4NHNvT2yqpzQm0; Wed, 23 Nov 2022 14:35:17 +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 2ANEZHK1027310; Wed, 23 Nov 2022 14:35:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2ANEZHSp027309; Wed, 23 Nov 2022 14:35:17 GMT (envelope-from git) Date: Wed, 23 Nov 2022 14:35:17 GMT Message-Id: <202211231435.2ANEZHSp027309@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 52b2cf0163d8 - main - multimedia/mpv: unbreak --vo=gpu-next with LCMS2=off after bc9f898a9c83 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org 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/main X-Git-Reftype: branch X-Git-Commit: 52b2cf0163d8c6a1b0bbceb7a216c5a33477df34 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=52b2cf0163d8c6a1b0bbceb7a216c5a33477df34 commit 52b2cf0163d8c6a1b0bbceb7a216c5a33477df34 Author: Jan Beich AuthorDate: 2022-11-23 14:22:47 +0000 Commit: Jan Beich CommitDate: 2022-11-23 14:34:53 +0000 multimedia/mpv: unbreak --vo=gpu-next with LCMS2=off after bc9f898a9c83 $ mpv --vo=gpu-next foo.mp4 [...] Segmentation fault (lldb) bt * thread #10, name = 'mpv/vo', stop reason = signal SIGSEGV: invalid address (fault address: 0x0) * frame #0: 0x000000083b4c8e84 libc.so.7`strlen + 84 frame #1: 0x000000083b4996bd libc.so.7`vsscanf + 173 frame #2: 0x000000083b48c72d libc.so.7`sscanf + 141 frame #3: 0x00000000004c0dd4 mpv`gl_parse_3dlut_size(arg=0x0000000000000000, p1=0x000000088fcf7d3c, p2=0x000000088fcf7d38, p3=0x000000088fcf7d34) at lcms.h:45:9 frame #4: 0x00000000004c085b mpv`update_icc_opts(p=0x00000008792f9b10, opts=0x0000000891370050) at vo_gpu_next.c:1619:5 frame #5: 0x00000000004c00ef mpv`update_render_options(vo=0x0000000875b38910) at vo_gpu_next.c:1863:5 frame #6: 0x00000000004bde05 mpv`preinit(vo=0x0000000875b38910) at vo_gpu_next.c:1426:5 frame #7: 0x000000000048cc99 mpv`vo_thread(ptr=0x0000000875b38910) at vo.c:1088:13 frame #8: 0x000000083bc4783a libthr.so.3`___lldb_unnamed_symbol556 + 314 --- multimedia/mpv/Makefile | 4 +++- multimedia/mpv/distinfo | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/multimedia/mpv/Makefile b/multimedia/mpv/Makefile index fa53abe23b89..a55071e98748 100644 --- a/multimedia/mpv/Makefile +++ b/multimedia/mpv/Makefile @@ -1,13 +1,15 @@ PORTNAME= mpv DISTVERSIONPREFIX= v DISTVERSION= 0.35.0 -PORTREVISION= 4 +PORTREVISION= 5 PORTEPOCH= 1 CATEGORIES= multimedia audio wayland PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ PATCHFILES+= b95111dda879.patch:-p1 # https://github.com/mpv-player/mpv/pull/10871 PATCHFILES+= f10b24e3c5c7.patch:-p1 # https://github.com/mpv-player/mpv/issues/10882 +PATCHFILES+= b9b3342369c3.patch:-p1 # https://github.com/mpv-player/mpv/pull/10895 +PATCHFILES+= e1a04cd8ac40.patch:-p1 # https://github.com/mpv-player/mpv/pull/10895 MAINTAINER= multimedia@FreeBSD.org COMMENT= Free and open-source general-purpose video player diff --git a/multimedia/mpv/distinfo b/multimedia/mpv/distinfo index 25f1140d4e22..4bfe6d5a7961 100644 --- a/multimedia/mpv/distinfo +++ b/multimedia/mpv/distinfo @@ -5,3 +5,7 @@ SHA256 (b95111dda879.patch) = c70c62f01d65c701a161954ef480d60aa8cc19454f9e04c4c6 SIZE (b95111dda879.patch) = 1474 SHA256 (f10b24e3c5c7.patch) = d5c470fdfe4c17ad3a4cc87114b344a7af3a2f04e24198c2140c0d7cccbee596 SIZE (f10b24e3c5c7.patch) = 1615 +SHA256 (b9b3342369c3.patch) = dd3255a9b33a66da54975fbbf902dd5f9d29608cf3befab3c143f1da06fd047c +SIZE (b9b3342369c3.patch) = 4405 +SHA256 (e1a04cd8ac40.patch) = cdb342b454886ba6ab709b89b50ec1dadc7277f323f62438f7977fe6cbef3704 +SIZE (e1a04cd8ac40.patch) = 1119