CVS commit: pkgsrc/audio

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Sun Nov 24 00:35:57 UTC 2019

Modified Files:
        pkgsrc/audio/libao: Makefile Makefile.common buildlink3.mk distinfo
        pkgsrc/audio/libao-alsa: Makefile
        pkgsrc/audio/libao-esound: Makefile
        pkgsrc/audio/libao-macosx: Makefile
        pkgsrc/audio/libao-nas: Makefile
        pkgsrc/audio/libao-oss: Makefile
        pkgsrc/audio/libao-pulse: Makefile
        pkgsrc/audio/libao-sun: Makefile
Added Files:
        pkgsrc/audio/libao/patches: patch-src_plugins_alsa_ao__alsa.c
            patch-src_plugins_sun_ao__sun.c
Removed Files:
        pkgsrc/audio/libao: MESSAGE.common
        pkgsrc/audio/libao/patches: patch-ab patch-ae patch-af
            patch-src_plugins_alsa_Makefile.in

Log Message:
libao: Update to 1.2.2

Fixes a NULL pointer dereference, among other issues.

Make libao-sun the default driver for NetBSD.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r0 pkgsrc/audio/libao/MESSAGE.common
cvs rdiff -u -r1.34 -r1.35 pkgsrc/audio/libao/Makefile
cvs rdiff -u -r1.39 -r1.40 pkgsrc/audio/libao/Makefile.common
cvs rdiff -u -r1.16 -r1.17 pkgsrc/audio/libao/buildlink3.mk
cvs rdiff -u -r1.25 -r1.26 pkgsrc/audio/libao/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/audio/libao-alsa/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/audio/libao-esound/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/audio/libao-macosx/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/audio/libao-nas/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/audio/libao-oss/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/audio/libao-pulse/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/audio/libao-sun/Makefile
cvs rdiff -u -r1.8 -r0 pkgsrc/audio/libao/patches/patch-ab
cvs rdiff -u -r1.9 -r0 pkgsrc/audio/libao/patches/patch-ae
cvs rdiff -u -r1.6 -r0 pkgsrc/audio/libao/patches/patch-af
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/audio/libao/patches/patch-src_plugins_alsa_Makefile.in
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/audio/libao/patches/patch-src_plugins_alsa_ao__alsa.c \
    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/Makefile
diff -u pkgsrc/audio/libao/Makefile:1.34 pkgsrc/audio/libao/Makefile:1.35
--- pkgsrc/audio/libao/Makefile:1.34    Thu Oct  9 14:05:56 2014
+++ pkgsrc/audio/libao/Makefile Sun Nov 24 00:35:56 2019
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.34 2014/10/09 14:05:56 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2019/11/24 00:35:56 nia Exp $
 
 .include "Makefile.common"
 
-post-install:
-       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/ao/plugins-4
+INSTALLATION_DIRS+=    lib/ao/plugins-4
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/audio/libao/Makefile.common
diff -u pkgsrc/audio/libao/Makefile.common:1.39 pkgsrc/audio/libao/Makefile.common:1.40
--- pkgsrc/audio/libao/Makefile.common:1.39     Wed Aug 16 20:21:03 2017
+++ pkgsrc/audio/libao/Makefile.common  Sun Nov 24 00:35:56 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.39 2017/08/16 20:21:03 wiz Exp $
+# $NetBSD: Makefile.common,v 1.40 2019/11/24 00:35:56 nia Exp $
 #
 # used by audio/libao-alsa/Makefile
 # used by audio/libao-arts/Makefile
@@ -9,9 +9,9 @@
 # used by audio/libao-sun/Makefile
 # used by audio/libao-pulse/Makefile
 
-DISTNAME=      libao-1.2.0
+DISTNAME=      libao-1.2.2
 CATEGORIES=    audio devel
-MASTER_SITES=  http://downloads.xiph.org/releases/ao/
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=xiph/}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://www.xiph.org/ao/
@@ -21,28 +21,34 @@ LICENSE=    gnu-gpl-v2
 DISTINFO_FILE= ${.CURDIR}/../../audio/libao/distinfo
 PATCHDIR=      ${.CURDIR}/../../audio/libao/patches
 
-GNU_CONFIGURE=         yes
-USE_TOOLS+=            gmake pkg-config
-USE_LIBTOOL=           yes
-MAKE_FLAGS+=           MANDIR=${PREFIX}/${PKGMANDIR}
-MAKE_FLAGS+=           mandir=${PREFIX}/${PKGMANDIR}
+GNU_CONFIGURE= yes
+USE_TOOLS+=    autoreconf autoconf automake
+USE_TOOLS+=    gmake pkg-config
+USE_LIBTOOL=   yes
+
+MAKE_FLAGS+=   MANDIR=${PREFIX}/${PKGMANDIR}
+MAKE_FLAGS+=   mandir=${PREFIX}/${PKGMANDIR}
 
 PKGCONFIG_OVERRIDE+=   ao.pc.in
 
 CONFIGURE_ARGS+=       --disable-alsa
-CONFIGURE_ARGS+=       --disable-alsa09
 CONFIGURE_ARGS+=       --disable-arts
 CONFIGURE_ARGS+=       --disable-esd
+CONFIGURE_ARGS+=       --disable-esdtest
 CONFIGURE_ARGS+=       --disable-nas
 CONFIGURE_ARGS+=       --disable-pulse
-CONFIGURE_ARGS+=       ENABLE_AIX_AUDIO=no
-CONFIGURE_ARGS+=       ENABLE_IRIX=no
-CONFIGURE_ARGS+=       ENABLE_OSS=no
-CONFIGURE_ARGS+=       ENABLE_SUN_AUDIO=no
-CONFIGURE_ARGS+=       ENABLE_MACOSX=no
-CONFIGURE_ARGS+=       ENABLE_SOLARIS=no
+CONFIGURE_ENV+=                ac_cv_header_sys_audio_h=no # disable AIX audio by default
+CONFIGURE_ENV+=                ac_cv_lib_audio_ALwritesamps=no # disable IRIX audio by default
+CONFIGURE_ENV+=                ac_cv_header_sys_soundcard_h=no # disable OSS by default
+CONFIGURE_ENV+=                ac_cv_header_machine_soundcard_h=no
+CONFIGURE_ENV+=                ac_cv_header_sys_audioio_h=no # disable Sun audio by default
+CONFIGURE_ENV+=                ac_cv_header_sndio_h=no # disable sndio by default
+CONFIGURE_ENV+=                have_macosx=no # disable macOS audio by default
+
+MAKE_ENV+=             DLLIB=${BUILDLINK_LDADD.dl:Q}
 
-MAKE_ENV+=             DLLIB=${BUILDLINK_LDADD.dl}
+pre-configure:
+       cd ${WRKSRC} && autoreconf -isf
 
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"

Index: pkgsrc/audio/libao/buildlink3.mk
diff -u pkgsrc/audio/libao/buildlink3.mk:1.16 pkgsrc/audio/libao/buildlink3.mk:1.17
--- pkgsrc/audio/libao/buildlink3.mk:1.16       Sun Jan  7 13:03:54 2018
+++ pkgsrc/audio/libao/buildlink3.mk    Sun Nov 24 00:35:56 2019
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2018/01/07 13:03:54 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2019/11/24 00:35:56 nia Exp $
 
 BUILDLINK_TREE+=       libao
 
@@ -11,10 +11,14 @@ BUILDLINK_PKGSRCDIR.libao?= ../../audio/
 
 .if !defined(_LIBAO_BUILDING_PLUGIN)
 .  include "../../mk/bsd.fast.prefs.mk"
-.  if ${OPSYS} != "Darwin" && ${OPSYS} != "Interix" && ${OPSYS} != "SunOS"
-_LIBAO_DEFAULT_PLUGIN=         oss
-.  elif ${OPSYS} == "NetBSD" || ${OPSYS} == "SunOS"
+.  if ${OPSYS} == "NetBSD" || ${OPSYS} == "SunOS"
 _LIBAO_DEFAULT_PLUGIN=         sun
+.  elif ${OPSYS} == "Linux"
+_LIBAO_DEFAULT_PLUGIN=         alsa
+.  elif ${OPSYS} == "Darwin"
+_LIBAO_DEFAULT_PLUGIN=         macosx
+.  elif ${OPSYS} != "Interix"
+_LIBAO_DEFAULT_PLUGIN=         oss
 .  else
 _LIBAO_DEFAULT_PLUGIN=
 .  endif

Index: pkgsrc/audio/libao/distinfo
diff -u pkgsrc/audio/libao/distinfo:1.25 pkgsrc/audio/libao/distinfo:1.26
--- pkgsrc/audio/libao/distinfo:1.25    Tue Nov  3 01:12:36 2015
+++ pkgsrc/audio/libao/distinfo Sun Nov 24 00:35:56 2019
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.25 2015/11/03 01:12:36 agc Exp $
+$NetBSD: distinfo,v 1.26 2019/11/24 00:35:56 nia Exp $
 
-SHA1 (libao-1.2.0.tar.gz) = 6b1d2c6a2e388e3bb6ebea158d51afef18aacc56
-RMD160 (libao-1.2.0.tar.gz) = 00921bf311f8d7a2be1f860221811924402beebd
-SHA512 (libao-1.2.0.tar.gz) = 9456953826c188d67129ad78366bb86d6243499f2cd340d20d61366f7e40a33f3f8ab601c7f18ce9e24aa22f898093b482b2415b7e428c1486ef7e5ac27b3ee4
-Size (libao-1.2.0.tar.gz) = 464596 bytes
-SHA1 (patch-ab) = dbab16863b62b1df33444ceb518d3c5a11b590fd
-SHA1 (patch-ae) = 55f13b97d76f605cd99d948e3e85ffff44e5546a
-SHA1 (patch-af) = 6c71ac364615a914771fc4951c6ce7eaf0f02bf1
-SHA1 (patch-src_plugins_alsa_Makefile.in) = 44dfc6371022c135219027702511897bad228ecb
+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) = 6ba6d6ae4311a8a48dd7bb55e33d4516ac68b607

Index: pkgsrc/audio/libao-alsa/Makefile
diff -u pkgsrc/audio/libao-alsa/Makefile:1.3 pkgsrc/audio/libao-alsa/Makefile:1.4
--- pkgsrc/audio/libao-alsa/Makefile:1.3        Sat Apr  6 15:46:33 2013
+++ pkgsrc/audio/libao-alsa/Makefile    Sun Nov 24 00:35:56 2019
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2013/04/06 15:46:33 rodent Exp $
+# $NetBSD: Makefile,v 1.4 2019/11/24 00:35:56 nia Exp $
 
 .include "../../audio/libao/Makefile.common"
 
 PKGNAME=       ${DISTNAME:S/libao/libao-alsa/}
 
-COMMENT+=      (OSS plugin)
+COMMENT+=      (ALSA plugin)
 
 CONFIGURE_ARGS=                --enable-alsa
 BUILD_DIRS=            src/plugins/alsa

Index: pkgsrc/audio/libao-esound/Makefile
diff -u pkgsrc/audio/libao-esound/Makefile:1.15 pkgsrc/audio/libao-esound/Makefile:1.16
--- pkgsrc/audio/libao-esound/Makefile:1.15     Thu Feb  6 18:37:23 2014
+++ pkgsrc/audio/libao-esound/Makefile  Sun Nov 24 00:35:56 2019
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.15 2014/02/06 18:37:23 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2019/11/24 00:35:56 nia Exp $
 
 .include "../../audio/libao/Makefile.common"
 
 PKGNAME=       ${DISTNAME:S/libao/libao-esound/}
 
-COMMENT+=      (esound plugin)
+COMMENT+=      (ESD plugin)
 
 CONFIGURE_ARGS:=       ${CONFIGURE_ARGS:S/disable-esd/enable-esd/g}
 BUILD_DIRS=            src/plugins/esd

Index: pkgsrc/audio/libao-macosx/Makefile
diff -u pkgsrc/audio/libao-macosx/Makefile:1.7 pkgsrc/audio/libao-macosx/Makefile:1.8
--- pkgsrc/audio/libao-macosx/Makefile:1.7      Sat Apr  6 15:46:33 2013
+++ pkgsrc/audio/libao-macosx/Makefile  Sun Nov 24 00:35:57 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2013/04/06 15:46:33 rodent Exp $
+# $NetBSD: Makefile,v 1.8 2019/11/24 00:35:57 nia Exp $
 
 .include "../../audio/libao/Makefile.common"
 
@@ -8,7 +8,7 @@ COMMENT+=       (MacOS X plugin)
 
 ONLY_FOR_PLATFORM+=    Darwin-*-*
 
-CONFIGURE_ARGS:=       ${CONFIGURE_ARGS:S/ENABLE_MACOSX=no/ENABLE_MACOSX=yes/g}
+CONFIGURE_ENV:=                ${CONFIGURE_ENV:S/have_macosx=no//1}
 BUILD_DIRS=            src/plugins/macosx
 INSTALL_DIRS=          src/plugins/macosx
 

Index: pkgsrc/audio/libao-nas/Makefile
diff -u pkgsrc/audio/libao-nas/Makefile:1.2 pkgsrc/audio/libao-nas/Makefile:1.3
--- pkgsrc/audio/libao-nas/Makefile:1.2 Wed Feb 15 21:50:17 2012
+++ pkgsrc/audio/libao-nas/Makefile     Sun Nov 24 00:35:57 2019
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2012/02/15 21:50:17 hans Exp $
+# $NetBSD: Makefile,v 1.3 2019/11/24 00:35:57 nia Exp $
 
 .include "../../audio/libao/Makefile.common"
 
 PKGNAME=       ${DISTNAME:S/libao/libao-nas/}
 
-COMMENT+=      (nas plugin)
+COMMENT+=      (NAS plugin)
 
 CONFIGURE_ARGS:=       ${CONFIGURE_ARGS:S/disable-nas/enable-nas/g}
 BUILD_DIRS=            src/plugins/nas

Index: pkgsrc/audio/libao-oss/Makefile
diff -u pkgsrc/audio/libao-oss/Makefile:1.10 pkgsrc/audio/libao-oss/Makefile:1.11
--- pkgsrc/audio/libao-oss/Makefile:1.10        Sat Apr  6 15:46:34 2013
+++ pkgsrc/audio/libao-oss/Makefile     Sun Nov 24 00:35:57 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2013/04/06 15:46:34 rodent Exp $
+# $NetBSD: Makefile,v 1.11 2019/11/24 00:35:57 nia Exp $
 
 .include "../../audio/libao/Makefile.common"
 
@@ -8,7 +8,9 @@ COMMENT+=       (OSS plugin)
 
 NOT_FOR_PLATFORM+=     Darwin-*-* Interix-*-* SunOS-5.[0-9]-* SunOS-5.10-*
 
-CONFIGURE_ARGS:=       ${CONFIGURE_ARGS:S/ENABLE_OSS=no/ENABLE_OSS=yes/g}
+CONFIGURE_ENV:=        ${CONFIGURE_ENV:S/ac_cv_header_sys_soundcard_h=no//1}
+CONFIGURE_ENV:=        ${CONFIGURE_ENV:S/ac_cv_header_machine_soundcard_h=no//1}
+
 BUILD_DIRS=            src/plugins/oss
 INSTALL_DIRS=          src/plugins/oss
 

Index: pkgsrc/audio/libao-pulse/Makefile
diff -u pkgsrc/audio/libao-pulse/Makefile:1.21 pkgsrc/audio/libao-pulse/Makefile:1.22
--- pkgsrc/audio/libao-pulse/Makefile:1.21      Wed Sep 18 14:17:05 2019
+++ pkgsrc/audio/libao-pulse/Makefile   Sun Nov 24 00:35:57 2019
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.21 2019/09/18 14:17:05 ryoon Exp $
+# $NetBSD: Makefile,v 1.22 2019/11/24 00:35:57 nia Exp $
 
 .include "../../audio/libao/Makefile.common"
 
 PKGNAME=       ${DISTNAME:S/libao/libao-pulse/}
-PKGREVISION=   10
 
-COMMENT+=      (pulse plugin)
+COMMENT+=      (PulseAudio plugin)
 
 CONFIGURE_ARGS:=       ${CONFIGURE_ARGS:S/disable-pulse/enable-pulse/g}
 BUILD_DIRS=            src/plugins/pulse

Index: pkgsrc/audio/libao-sun/Makefile
diff -u pkgsrc/audio/libao-sun/Makefile:1.10 pkgsrc/audio/libao-sun/Makefile:1.11
--- pkgsrc/audio/libao-sun/Makefile:1.10        Sun Mar 27 22:45:48 2016
+++ pkgsrc/audio/libao-sun/Makefile     Sun Nov 24 00:35:57 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2016/03/27 22:45:48 jperkin Exp $
+# $NetBSD: Makefile,v 1.11 2019/11/24 00:35:57 nia Exp $
 
 .include "../../audio/libao/Makefile.common"
 
@@ -9,7 +9,7 @@ COMMENT+=       (Sun audio plugin)
 # no support for the sun audio interface
 NOT_FOR_PLATFORM+=     Darwin-*-* DragonFly-*-* FreeBSD-*-* Linux-*-*
 
-CONFIGURE_ARGS:=       ${CONFIGURE_ARGS:S/ENABLE_SUN_AUDIO=no/ENABLE_SUN_AUDIO=yes/g}
+CONFIGURE_ENV:=                ${CONFIGURE_ENV:S/ac_cv_header_sys_audioio_h=no//1}
 BUILD_DIRS=            src/plugins/sun
 INSTALL_DIRS=          src/plugins/sun
 

Added files:

Index: pkgsrc/audio/libao/patches/patch-src_plugins_alsa_ao__alsa.c
diff -u /dev/null pkgsrc/audio/libao/patches/patch-src_plugins_alsa_ao__alsa.c:1.1
--- /dev/null   Sun Nov 24 00:35:57 2019
+++ pkgsrc/audio/libao/patches/patch-src_plugins_alsa_ao__alsa.c        Sun Nov 24 00:35:56 2019
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_plugins_alsa_ao__alsa.c,v 1.1 2019/11/24 00:35:56 nia Exp $
+
+Allow building on non-Linux.
+
+--- src/plugins/alsa/ao_alsa.c.orig    2016-11-14 08:03:30.000000000 +0000
++++ src/plugins/alsa/ao_alsa.c
+@@ -39,6 +39,10 @@
+ #include <alsa/asoundlib.h>
+ #include <ao/ao.h>
+ #include <ao/plugin.h>
++#ifndef ESTRPIPE
++#define ESTRPIPE EPIPE
++#endif
++
+ 
+ /* default 20 millisecond buffer */
+ #define AO_ALSA_BUFFER_TIME 20000
Index: pkgsrc/audio/libao/patches/patch-src_plugins_sun_ao__sun.c
diff -u /dev/null pkgsrc/audio/libao/patches/patch-src_plugins_sun_ao__sun.c:1.1
--- /dev/null   Sun Nov 24 00:35:57 2019
+++ pkgsrc/audio/libao/patches/patch-src_plugins_sun_ao__sun.c  Sun Nov 24 00:35:56 2019
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_plugins_sun_ao__sun.c,v 1.1 2019/11/24 00:35:56 nia Exp $
+
+Fix device selection.
+
+--- src/plugins/sun/ao_sun.c.orig      2016-11-14 08:03:30.000000000 +0000
++++ src/plugins/sun/ao_sun.c
+@@ -160,7 +160,7 @@ int ao_plugin_open(ao_device *device, ao
+ 
+         if(internal->dev==NULL){
+           char buf[80];
+-          sprintf(buf,"/dev/sound/%d",internal->id);
++          snprintf(buf,sizeof(buf),"/dev/audio%d",internal->id);
+           internal->dev=strdup(buf);
+         }
+