CVS commit: pkgsrc/multimedia/mpv

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Apr  9 21:08:38 UTC 2020

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

Log Message:
mpv: Clean up some cruft in ao_netbsd.


To generate a diff of this commit:
cvs rdiff -u -r1.107 -r1.108 pkgsrc/multimedia/mpv/Makefile
cvs rdiff -u -r1.5 -r1.6 \
    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.107 pkgsrc/multimedia/mpv/Makefile:1.108
--- pkgsrc/multimedia/mpv/Makefile:1.107        Thu Apr  9 20:53:39 2020
+++ pkgsrc/multimedia/mpv/Makefile      Thu Apr  9 21:08:38 2020
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.107 2020/04/09 20:53:39 nia Exp $
+# $NetBSD: Makefile,v 1.108 2020/04/09 21:08:38 nia Exp $
 
 DISTNAME=      mpv-0.32.0
-PKGREVISION=   9
+PKGREVISION=   10
 CATEGORIES=    multimedia
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=mpv-player/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}

Index: pkgsrc/multimedia/mpv/patches/patch-audio_out_ao__netbsd.c
diff -u pkgsrc/multimedia/mpv/patches/patch-audio_out_ao__netbsd.c:1.5 pkgsrc/multimedia/mpv/patches/patch-audio_out_ao__netbsd.c:1.6
--- pkgsrc/multimedia/mpv/patches/patch-audio_out_ao__netbsd.c:1.5      Thu Apr  9 20:53:39 2020
+++ pkgsrc/multimedia/mpv/patches/patch-audio_out_ao__netbsd.c  Thu Apr  9 21:08:38 2020
@@ -1,10 +1,10 @@
-$NetBSD: patch-audio_out_ao__netbsd.c,v 1.5 2020/04/09 20:53:39 nia Exp $
+$NetBSD: patch-audio_out_ao__netbsd.c,v 1.6 2020/04/09 21:08:38 nia Exp $
 
 NetBSD audio support.
 
---- audio/out/ao_netbsd.c.orig 2020-04-09 20:51:23.971921857 +0000
+--- audio/out/ao_netbsd.c.orig 2020-04-09 21:05:57.443146477 +0000
 +++ audio/out/ao_netbsd.c
-@@ -0,0 +1,276 @@
+@@ -0,0 +1,264 @@
 +/*
 + * Copyright (c) 2020 Nia Alarie <nia%NetBSD.org@localhost>
 + * All rights reserved.
@@ -155,12 +155,6 @@ NetBSD audio support.
 +static void reset(struct ao *ao)
 +{
 +    struct priv *p = ao->priv;
-+    struct audio_info info;
-+
-+    if (ioctl(p->fd, AUDIO_GETBUFINFO, &info) == -1) {
-+        MP_ERR(ao, "AUDIO_GETBUFINFO failed: %s\n", mp_strerror(errno));
-+        return;
-+    }
 +
 +    (void)ioctl(p->fd, AUDIO_FLUSH, NULL);
 +}
@@ -168,12 +162,6 @@ NetBSD audio support.
 +static void drain(struct ao *ao)
 +{
 +    struct priv *p = ao->priv;
-+    struct audio_info info;
-+
-+    if (ioctl(p->fd, AUDIO_GETBUFINFO, &info) == -1) {
-+        MP_ERR(ao, "AUDIO_GETBUFINFO failed: %s\n", mp_strerror(errno));
-+        return;
-+    }
 +
 +    (void)ioctl(p->fd, AUDIO_DRAIN, NULL);
 +}