CVS commit: pkgsrc/audio

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Fri Jun  5 10:08:36 UTC 2020

Modified Files:
        pkgsrc/audio/libao: distinfo
        pkgsrc/audio/libao-sun: Makefile
        pkgsrc/audio/libao/patches: patch-src_plugins_sun_ao__sun.c

Log Message:
libao: correct sense of conditional


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 pkgsrc/audio/libao/distinfo
cvs rdiff -u -r1.12 -r1.13 pkgsrc/audio/libao-sun/Makefile
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/audio/libao/patches/patch-src_plugins_sun_ao__sun.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/audio/libao/distinfo
diff -u pkgsrc/audio/libao/distinfo:1.27 pkgsrc/audio/libao/distinfo:1.28
--- pkgsrc/audio/libao/distinfo:1.27    Thu May 28 19:30:45 2020
+++ pkgsrc/audio/libao/distinfo Fri Jun  5 10:08:35 2020
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.27 2020/05/28 19:30:45 nia Exp $
+$NetBSD: distinfo,v 1.28 2020/06/05 10:08:35 nia Exp $
 
 SHA1 (libao-1.2.2.tar.gz) = aa2a6ac0df63c702e46477ea5ce4a9b32e0d4306
 RMD160 (libao-1.2.2.tar.gz) = d65fa3dc31b591d22bb8a47c71a91615cc1919cf
 SHA512 (libao-1.2.2.tar.gz) = d2736d25b60862e7d7469611ce31b1df40a4366ab160e2ff1b46919ae91692d1596c8468e4f016303b306fc3ac1bddc7b727f535a362f403c3fe7c6532e9045a
 Size (libao-1.2.2.tar.gz) = 96134 bytes
 SHA1 (patch-src_plugins_alsa_ao__alsa.c) = 9047608f232c4e4bfd5e4b3fcac3831750b0eef3
-SHA1 (patch-src_plugins_sun_ao__sun.c) = b1e9b11a4b5211e69172cc3d6418ec8e35d014f2
+SHA1 (patch-src_plugins_sun_ao__sun.c) = 1c2e1429644aad84317a0223aaa033821193441f

Index: pkgsrc/audio/libao-sun/Makefile
diff -u pkgsrc/audio/libao-sun/Makefile:1.12 pkgsrc/audio/libao-sun/Makefile:1.13
--- pkgsrc/audio/libao-sun/Makefile:1.12        Thu May 28 19:30:45 2020
+++ pkgsrc/audio/libao-sun/Makefile     Fri Jun  5 10:08:36 2020
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2020/05/28 19:30:45 nia Exp $
+# $NetBSD: Makefile,v 1.13 2020/06/05 10:08:36 nia Exp $
 
 .include "../../audio/libao/Makefile.common"
 
 PKGNAME=       ${DISTNAME:S/libao/libao-sun/}
-PKGREVISION=   1
+PKGREVISION=   2
 
 COMMENT+=      (Sun audio plugin)
 

Index: pkgsrc/audio/libao/patches/patch-src_plugins_sun_ao__sun.c
diff -u pkgsrc/audio/libao/patches/patch-src_plugins_sun_ao__sun.c:1.2 pkgsrc/audio/libao/patches/patch-src_plugins_sun_ao__sun.c:1.3
--- pkgsrc/audio/libao/patches/patch-src_plugins_sun_ao__sun.c:1.2      Thu May 28 19:30:45 2020
+++ pkgsrc/audio/libao/patches/patch-src_plugins_sun_ao__sun.c  Fri Jun  5 10:08:35 2020
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_plugins_sun_ao__sun.c,v 1.2 2020/05/28 19:30:45 nia Exp $
+$NetBSD: patch-src_plugins_sun_ao__sun.c,v 1.3 2020/06/05 10:08:35 nia Exp $
 
 - Fix device selection on NetBSD.
 - Support 24-bit playback on NetBSD.
@@ -20,7 +20,7 @@ $NetBSD: patch-src_plugins_sun_ao__sun.c
          if(internal->dev==NULL){
            char buf[80];
 -          sprintf(buf,"/dev/sound/%d",internal->id);
-+#ifdef __sun
++#ifndef __sun
 +          snprintf(buf,sizeof(buf),"/dev/audio%d",internal->id);
 +#else
 +          snprintf(buf,sizeof(buf),"/dev/sound/%d",internal->id);