Received: by mail.netbsd.org (Postfix, from userid 605) id 4AB7B84EBD; Thu, 16 Apr 2020 04:17:56 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id C886984D59 for ; Thu, 16 Apr 2020 04:17:55 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id DdtV0xDpv-bC for ; Thu, 16 Apr 2020 04:17:55 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 4B68584CEA for ; Thu, 16 Apr 2020 04:17:55 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 45ACFFB27; Thu, 16 Apr 2020 04:17:55 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1587010675283420" MIME-Version: 1.0 Date: Thu, 16 Apr 2020 04:17:55 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/multimedia/mpv To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20200416041755.45ACFFB27@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1587010675283420 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Thu Apr 16 04:17:55 UTC 2020 Modified Files: pkgsrc/multimedia/mpv: distinfo pkgsrc/multimedia/mpv/patches: patch-audio_out_ao__netbsd.c Log Message: mpv: Fix build on NetBSD 8. To generate a diff of this commit: cvs rdiff -u -r1.66 -r1.67 pkgsrc/multimedia/mpv/distinfo cvs rdiff -u -r1.6 -r1.7 \ pkgsrc/multimedia/mpv/patches/patch-audio_out_ao__netbsd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1587010675283420 Content-Disposition: inline Content-Length: 2413 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/multimedia/mpv/distinfo diff -u pkgsrc/multimedia/mpv/distinfo:1.66 pkgsrc/multimedia/mpv/distinfo:1.67 --- pkgsrc/multimedia/mpv/distinfo:1.66 Fri Apr 10 04:00:02 2020 +++ pkgsrc/multimedia/mpv/distinfo Thu Apr 16 04:17:54 2020 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.66 2020/04/10 04:00:02 nia Exp $ +$NetBSD: distinfo,v 1.67 2020/04/16 04:17:54 nia Exp $ SHA1 (mpv-0.32.0.tar.gz) = 5b69ea34dd5f8d209acd5266415c7bc00ab83341 RMD160 (mpv-0.32.0.tar.gz) = d1e399fce8985a0399fe627248b87d8537cfefd7 @@ -7,7 +7,7 @@ Size (mpv-0.32.0.tar.gz) = 3148730 bytes SHA1 (patch-DOCS_man_ao.rst) = 5940fe1ad4d4328c03b9e6e5265c517762cfe2d0 SHA1 (patch-audio_out_ao.c) = 1527c818d0f50801485ad3b90c5d86b30b2ca6f1 SHA1 (patch-audio_out_ao__alsa.c) = c4661d0d22550d6e4eb2b7a42dd04dbcc58123b0 -SHA1 (patch-audio_out_ao__netbsd.c) = 2d0c72372fb71ab78c56fe59aa0a65c86e6e86cc +SHA1 (patch-audio_out_ao__netbsd.c) = 94549be09bec15afc08dbe132880334b3140d4a1 SHA1 (patch-options_options.c) = c75fb27140ad21e0a11c6ded976116c544661f56 SHA1 (patch-player_main.c) = 7d1d62091c327fca698844004ddb9a7871e15fce SHA1 (patch-video_out_drm__common.c) = a545a8aec29f1b3c44d26aacbc59b86d3333a0b9 Index: pkgsrc/multimedia/mpv/patches/patch-audio_out_ao__netbsd.c diff -u pkgsrc/multimedia/mpv/patches/patch-audio_out_ao__netbsd.c:1.6 pkgsrc/multimedia/mpv/patches/patch-audio_out_ao__netbsd.c:1.7 --- pkgsrc/multimedia/mpv/patches/patch-audio_out_ao__netbsd.c:1.6 Thu Apr 9 21:08:38 2020 +++ pkgsrc/multimedia/mpv/patches/patch-audio_out_ao__netbsd.c Thu Apr 16 04:17:55 2020 @@ -1,10 +1,10 @@ -$NetBSD: patch-audio_out_ao__netbsd.c,v 1.6 2020/04/09 21:08:38 nia Exp $ +$NetBSD: patch-audio_out_ao__netbsd.c,v 1.7 2020/04/16 04:17:55 nia Exp $ NetBSD audio support. ---- audio/out/ao_netbsd.c.orig 2020-04-09 21:05:57.443146477 +0000 +--- audio/out/ao_netbsd.c.orig 2020-04-16 04:14:21.934246800 +0000 +++ audio/out/ao_netbsd.c -@@ -0,0 +1,264 @@ +@@ -0,0 +1,268 @@ +/* + * Copyright (c) 2020 Nia Alarie + * All rights reserved. @@ -83,10 +83,14 @@ NetBSD audio support. + goto fail; + } + ++#ifdef AUDIO_GETFORMAT + if (ioctl(p->fd, AUDIO_GETFORMAT, &hw_info) == -1) { + MP_ERR(ao, "AUDIO_GETFORMAT failed: %s\n", mp_strerror(errno)); + goto fail; + } ++#else ++ hw_info.play.sample_rate = 48000; ++#endif + + info.mode = AUMODE_PLAY; + --_----------=_1587010675283420--