CVS commit: pkgsrc/multimedia/mpv

["Leonardo Taccari" <leot%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   leot
Date:           Wed Mar 18 11:49:21 UTC 2020

Modified Files:
        pkgsrc/multimedia/mpv: Makefile distinfo
        pkgsrc/multimedia/mpv/patches: patch-audio_out_ao__netbsd.c

Log Message:
mpv: Adjust two MP_ERR printf-s (missing \n and wrong `device' was printed)

OK <nia>, thanks!


To generate a diff of this commit:
cvs rdiff -u -r1.103 -r1.104 pkgsrc/multimedia/mpv/Makefile
cvs rdiff -u -r1.62 -r1.63 pkgsrc/multimedia/mpv/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    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.

Modified files:

Index: pkgsrc/multimedia/mpv/Makefile
diff -u pkgsrc/multimedia/mpv/Makefile:1.103 pkgsrc/multimedia/mpv/Makefile:1.104
--- pkgsrc/multimedia/mpv/Makefile:1.103        Tue Mar 17 11:36:04 2020
+++ pkgsrc/multimedia/mpv/Makefile      Wed Mar 18 11:49:21 2020
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.103 2020/03/17 11:36:04 nia Exp $
+# $NetBSD: Makefile,v 1.104 2020/03/18 11:49:21 leot Exp $
 
 DISTNAME=      mpv-0.32.0
-PKGREVISION=   6
+PKGREVISION=   7
 CATEGORIES=    multimedia
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=mpv-player/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}

Index: pkgsrc/multimedia/mpv/distinfo
diff -u pkgsrc/multimedia/mpv/distinfo:1.62 pkgsrc/multimedia/mpv/distinfo:1.63
--- pkgsrc/multimedia/mpv/distinfo:1.62 Mon Mar 16 21:20:02 2020
+++ pkgsrc/multimedia/mpv/distinfo      Wed Mar 18 11:49:21 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.62 2020/03/16 21:20:02 wiz Exp $
+$NetBSD: distinfo,v 1.63 2020/03/18 11:49:21 leot 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) = a0cdd3c10cf2320c738ff88a51f380675b123022
+SHA1 (patch-audio_out_ao__netbsd.c) = 544b976fae4d672a4f99b226b949f5f338712820
 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.2 pkgsrc/multimedia/mpv/patches/patch-audio_out_ao__netbsd.c:1.3
--- pkgsrc/multimedia/mpv/patches/patch-audio_out_ao__netbsd.c:1.2      Mon Mar 16 20:58:18 2020
+++ pkgsrc/multimedia/mpv/patches/patch-audio_out_ao__netbsd.c  Wed Mar 18 11:49:21 2020
@@ -1,8 +1,8 @@
-$NetBSD: patch-audio_out_ao__netbsd.c,v 1.2 2020/03/16 20:58:18 nia Exp $
+$NetBSD: patch-audio_out_ao__netbsd.c,v 1.3 2020/03/18 11:49:21 leot Exp $
 
 NetBSD audio support.
 
---- audio/out/ao_netbsd.c.orig 2020-03-16 20:38:28.287433271 +0000
+--- audio/out/ao_netbsd.c.orig 2020-03-18 11:11:11.484992180 +0000
 +++ audio/out/ao_netbsd.c
 @@ -0,0 +1,263 @@
 +/*
@@ -80,10 +80,10 @@ NetBSD audio support.
 +                        ao->device + sizeof("netbsd/") - 1);
 +    }
 +
-+    MP_ERR(ao, "Opening device %s", ao->device);
++    MP_ERR(ao, "Opening device %s\n", device);
 +    if ((p->fd = open(device, O_WRONLY)) == -1) {
 +        MP_ERR(ao, "Can't open audio device %s: %s\n",
-+               ao->device, mp_strerror(errno));
++               device, mp_strerror(errno));
 +        goto fail;
 +    }
 +