From nobody Sat Dec 25 10:20:27 2021 X-Original-To: dev-commits-ports-branches@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 978661912D8B; Sat, 25 Dec 2021 10:20:28 +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 4JLg182MQRz4Ygq; Sat, 25 Dec 2021 10:20:28 +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 22C1C1566C; Sat, 25 Dec 2021 10:20:28 +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 1BPAKSuF079429; Sat, 25 Dec 2021 10:20:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BPAKRJ7079428; Sat, 25 Dec 2021 10:20:27 GMT (envelope-from git) Date: Sat, 25 Dec 2021 10:20:27 GMT Message-Id: <202112251020.1BPAKRJ7079428@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: 966b63a0412c - 2021Q4 - multimedia/mpv: restore SNDIO (--ao=sndio) after 0cee9d1b218a List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@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/2021Q4 X-Git-Reftype: branch X-Git-Commit: 966b63a0412c3a2fb1793e94d93e62a1efb7e1ab Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640427628; 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=EFUzkRqNzv8R0cA7BzwC4fR9lqHEA3t8h9yk7Cjqxr8=; b=DtHJYo/2qC59Ljx5EnXeB5VsqfN7K820YmjubHxN6TZ/L5+XWfVGZPceLYj7z5zWTP57wq gylMpN0PfW64n/ZmFgCaErYAZJGfYWtgoges6XOcYb/F9FJgNimZIC6iL8+oni4DlEln+X sKtDTls3YbetntonelHC834ozZPEUAM0bMB5mVGta3iIuZ8Djc0o4uyFsvSE9jw0h5S9RQ jGiEVr9yKE8l9t/HMUwGNacOmKOG//T3ekcts/d0yFn7Ot8BitviAKbeAJOldkulYOTCYi mhiQt6yGZj6zAAqr4PCCla4mir1Rp++FHE6ePQK88+lphMCT4fLiZGGPgrkahA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640427628; a=rsa-sha256; cv=none; b=ldvb20rxk8G8ayEKiq391pQyDdy1bUHoVwmhExdxLxIzFvcQ9lY4WpClM3J5FMyTQAjwk2 OVWjmsTt+DlOi+sxsr6r5frnlFQumDR2CG3arGwvur5HFlIn/9qo6MQlBP806PuGo50ALu ECnQ1emb/F5qCwWUtMoH+zCJvzOF6sCvVUJrRqV/Vxh58f0tngadsc7LLfOXuTAMwOmU6p rj5+2ZIBeKjR6k5f9Ii5YwRjLIh+VIJKXN1SpgTH7SjoO0YxaVzTITNy8x5B/jorYQTMn4 8X84JgNSJUsocq/o+xohEe/L8jUiBkSVhak8Vh+kFonRFVy9Mk+VLmymZ4KltA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=966b63a0412c3a2fb1793e94d93e62a1efb7e1ab commit 966b63a0412c3a2fb1793e94d93e62a1efb7e1ab Author: Jan Beich AuthorDate: 2021-12-25 09:58:23 +0000 Commit: Jan Beich CommitDate: 2021-12-25 10:12:21 +0000 multimedia/mpv: restore SNDIO (--ao=sndio) after 0cee9d1b218a Requested by: Brad Smith (cherry picked from commit a6e090a8c9f44a519972f942b4351017cfba0ef1) --- multimedia/mpv/Makefile | 8 +++++++- multimedia/mpv/distinfo | 4 ++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/multimedia/mpv/Makefile b/multimedia/mpv/Makefile index 9b2c2180cc40..9b7ba249326f 100644 --- a/multimedia/mpv/Makefile +++ b/multimedia/mpv/Makefile @@ -23,6 +23,8 @@ PATCHFILES+= 968faef86723.patch:-p1 # libplacebo 3.104 PATCHFILES+= 7c4465cefb27.patch:-p1 # libplacebo 3.104 PATCHFILES+= cc4ada655aae.patch:-p1 # https://github.com/mpv-player/mpv/pull/9209 PATCHFILES+= b030cfe05f58.patch:-p1 # https://github.com/mpv-player/mpv/pull/9440 +PATCHFILES+= edf0039d7621.patch:-p1 # https://github.com/mpv-player/mpv/pull/9298 +PATCHFILES+= 5319731526fb.patch:-p1 # https://github.com/mpv-player/mpv/pull/9298 MAINTAINER= multimedia@FreeBSD.org COMMENT= Free and open-source general-purpose video player @@ -63,7 +65,7 @@ OPTIONS_DEFAULT= ARCHIVE DVDNAV MANPAGES OPENGL UCHARDET \ OPTIONS_GROUP= IN VO AO OPTIONS_GROUP_IN= CDIO DVDNAV LIBBLURAY V4L YTDL OPTIONS_GROUP_VO= CACA OPENGL SIXEL VAAPI VDPAU VULKAN WAYLAND X11 -OPTIONS_GROUP_AO= ALSA JACK OPENAL PULSEAUDIO SDL +OPTIONS_GROUP_AO= ALSA JACK OPENAL PULSEAUDIO SDL SNDIO OPTIONS_SUB= yes DVDNAV_DESC= DVD menu navigation @@ -138,6 +140,10 @@ SDL_CONFIGURE_ON= --enable-sdl2 SIXEL_LIB_DEPENDS= libsixel.so:graphics/libsixel SIXEL_CONFIGURE_OFF= --disable-sixel +SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio +SNDIO_CONFIGURE_ON= --enable-sndio +SNDIO_CONFIGURE_OFF= --disable-sndio + TEST_CONFIGURE_ON= --enable-tests UCHARDET_LIB_DEPENDS= libuchardet.so:textproc/uchardet diff --git a/multimedia/mpv/distinfo b/multimedia/mpv/distinfo index d6ed262befef..d91fb48605d3 100644 --- a/multimedia/mpv/distinfo +++ b/multimedia/mpv/distinfo @@ -35,3 +35,7 @@ SHA256 (cc4ada655aae.patch) = 6937e60a1b04a5c32fc6d34a760e79ad408ed56374d4b9d689 SIZE (cc4ada655aae.patch) = 5202 SHA256 (b030cfe05f58.patch) = df7590e1d27e8e6c0e326781723ee87ef7c3fdf5a88438c8c29bb729a911ff74 SIZE (b030cfe05f58.patch) = 5270 +SHA256 (edf0039d7621.patch) = 8c7e75d9e2a0ae2622fd23df8121d756fc919f7f9733edd7c59c2cc1900a3507 +SIZE (edf0039d7621.patch) = 12278 +SHA256 (5319731526fb.patch) = 29364fa31f184a5f6d59bbcceea0a7c9269ca4af08a34f93eccd283254709a68 +SIZE (5319731526fb.patch) = 6629