CVS commit: pkgsrc/audio/opus-tools

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Mon Apr 20 17:39:13 UTC 2020

Modified Files:
        pkgsrc/audio/opus-tools: Makefile distinfo
        pkgsrc/audio/opus-tools/patches: patch-configure.ac
Added Files:
        pkgsrc/audio/opus-tools/patches: patch-src_opusdec.c

Log Message:
opus-tools: Update to 0.2. Make audio output in opusdec work.

opus-tools 0.2

   Sep 18, 2018

   In this release the Opus decoder opusdec has been converted to use the
   opusfile library, and the Opus encoder opusenc has been converted to
   use the libopusenc library. These libraries make it easy to robustly
   read and write Ogg Opus audio files, and enable some new features.

   opusdec enhancements include:
     * Read directly from http or https sources
     * New option --force-stereo will force stereo output
     * Improved support for chained input files with differing sample rate
       or channel count
     * A summary is displayed for METADATA_BLOCK_PICTURE tags rather than
       displaying the base64-encoded data

   opusenc enhancements include:
     * Delayed decision support allows the encoder to look ahead up to two
       seconds in order to improve encoding decisions
     * The options --music and --speech can be used to tune low bitrate
       audio for music or speech, overriding automatic detection
     * The option --no-phase-inv disables the use of phase inversion for
       intensity stereo, which can be useful for streams that are likely
       to be downmixed to mono after decoding
     * New --tracknumber shortcut for setting tracknumber metadata

   Additionally:
     * The opusinfo utility can display the demixing matrix from Ogg Opus
       files using ambisonics channel mapping family 3
     * The experimental opusrtp tool supports new options to specify RTP
       payload type, Ogg Opus output file, original sample rate, and
       number of channels, and supports improved transmit timing,
       arbitrary network devices, and IPv6
     * Numerous bug fixes are also included


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/audio/opus-tools/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/audio/opus-tools/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/audio/opus-tools/patches/patch-configure.ac
cvs rdiff -u -r0 -r1.1 pkgsrc/audio/opus-tools/patches/patch-src_opusdec.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/opus-tools/Makefile
diff -u pkgsrc/audio/opus-tools/Makefile:1.8 pkgsrc/audio/opus-tools/Makefile:1.9
--- pkgsrc/audio/opus-tools/Makefile:1.8        Sun Jan 26 17:30:44 2020
+++ pkgsrc/audio/opus-tools/Makefile    Mon Apr 20 17:39:13 2020
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2020/01/26 17:30:44 rillig Exp $
+# $NetBSD: Makefile,v 1.9 2020/04/20 17:39:13 nia Exp $
 
-DISTNAME=      opus-tools-0.1.9
+DISTNAME=      opus-tools-0.2
 CATEGORIES=    audio
-MASTER_SITES=  http://downloads.xiph.org/releases/opus/
+MASTER_SITES=  https://downloads.xiph.org/releases/opus/
 
 MAINTAINER=    ryoon%NetBSD.org@localhost
 HOMEPAGE=      https://opus-codec.org/
@@ -13,12 +13,22 @@ GNU_CONFIGURE=      yes
 USE_LIBTOOL=   yes
 USE_TOOLS+=    autoconf pkg-config
 
+.include "../../mk/oss.buildlink3.mk"
+.if exists(/usr/include/sys/audioio.h) || ${OPSYS} == "NetBSD"
+CONFIGURE_ENV+=        ac_cv_header_soundcard_h=no
+CONFIGURE_ENV+=        ac_cv_header_sys_soundcard_h=no
+CONFIGURE_ENV+=        ac_cv_header_machine_soundcard_h=no
+.elif ${OSS_TYPE} != "none"
+LDFLAGS+=      ${LIBOSSAUDIO}
+.endif
+
 LDFLAGS.SunOS+=        -lsocket -lnsl
 
 pre-configure:
        cd ${WRKSRC} && autoconf
 
 .include "../../audio/flac/buildlink3.mk"
-.include "../../audio/libopus/buildlink3.mk"
+.include "../../audio/libopusenc/buildlink3.mk"
+.include "../../audio/opusfile/buildlink3.mk"
 .include "../../multimedia/libogg/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/audio/opus-tools/distinfo
diff -u pkgsrc/audio/opus-tools/distinfo:1.5 pkgsrc/audio/opus-tools/distinfo:1.6
--- pkgsrc/audio/opus-tools/distinfo:1.5        Tue Nov  3 01:12:44 2015
+++ pkgsrc/audio/opus-tools/distinfo    Mon Apr 20 17:39:13 2020
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.5 2015/11/03 01:12:44 agc Exp $
+$NetBSD: distinfo,v 1.6 2020/04/20 17:39:13 nia Exp $
 
-SHA1 (opus-tools-0.1.9.tar.gz) = 03551ec3b206288e93a2f2bb18768a5a9e033206
-RMD160 (opus-tools-0.1.9.tar.gz) = dad0b21c6cdea8212643d8ffd48a58feb3dabd60
-SHA512 (opus-tools-0.1.9.tar.gz) = e2cdc0c9c24297565f9d457893bcc548696b1a9c9b66e4cd48ddbe4dcf865bc50da5ed1b438b2b9ecdcd8be1d7c211d2be199f707cdbcd8a46a75353b0173a4c
-Size (opus-tools-0.1.9.tar.gz) = 385158 bytes
-SHA1 (patch-configure.ac) = 0248fe49b394c94f26bf8516a6b10e212531431e
+SHA1 (opus-tools-0.2.tar.gz) = f886c87e4882a504f24ab6b0cb6994abf20994a9
+RMD160 (opus-tools-0.2.tar.gz) = 236b05a0cfbb1e03340c0e99bcef888b01ecf36e
+SHA512 (opus-tools-0.2.tar.gz) = 6fdde8d938e8fadc9391b5d188883dab0aecf8b27d40d00b5d67d8fac9cfd9d5107b1934bfe6310587400f277c99d1db5cabf3d26f340ce2141873dec238e5ce
+Size (opus-tools-0.2.tar.gz) = 457680 bytes
+SHA1 (patch-configure.ac) = fe34d5ffe9d78edfd692a5d4fa2cd2788f5638a9
+SHA1 (patch-src_opusdec.c) = 7999b50e6eada885bb0731860ac9597b2cdd04f1

Index: pkgsrc/audio/opus-tools/patches/patch-configure.ac
diff -u pkgsrc/audio/opus-tools/patches/patch-configure.ac:1.2 pkgsrc/audio/opus-tools/patches/patch-configure.ac:1.3
--- pkgsrc/audio/opus-tools/patches/patch-configure.ac:1.2      Thu Jan  2 14:52:10 2014
+++ pkgsrc/audio/opus-tools/patches/patch-configure.ac  Mon Apr 20 17:39:13 2020
@@ -1,34 +1,22 @@
-$NetBSD: patch-configure.ac,v 1.2 2014/01/02 14:52:10 ryoon Exp $
+$NetBSD: patch-configure.ac,v 1.3 2020/04/20 17:39:13 nia Exp $
 
-* Disable opusdec's direct audio output
+Make sure the Sun audio support actually gets detected.
 
---- configure.ac.orig  2013-12-06 02:31:11.000000000 +0000
+--- configure.ac.orig  2014-06-12 00:11:24.000000000 +0000
 +++ configure.ac
-@@ -145,18 +145,18 @@ AS_IF([test "$HAVE_PKG_CONFIG" = "yes"],
-  ])
- 
- dnl check for OSS
--HAVE_OSS=no
--AC_CHECK_HEADERS([sys/soundcard.h soundcard.h machine/soundcard.h],[
--  HAVE_OSS=yes
--  break
--])
-+dnl HAVE_OSS=no
-+dnl AC_CHECK_HEADERS([sys/soundcard.h soundcard.h machine/soundcard.h],[
-+dnl   HAVE_OSS=yes
-+dnl   break
-+dnl ])
+@@ -151,10 +151,14 @@ AC_CHECK_HEADERS([sys/soundcard.h soundc
+   break
+ ])
  
++AC_CHECK_HEADERS([sys/audioio.h])
++
  dnl check for sndio
--AC_CHECK_LIB([sndio], [sio_open])
-+dnl AC_CHECK_LIB([sndio], [sio_open])
+ AC_CHECK_LIB([sndio], [sio_open])
  
 -if test "$HAVE_OSS" != "yes" && test "$ac_cv_lib_sndio_sio_open" != "yes"; then
--  AC_MSG_WARN([Audio support not found -- no direct audio output in opusdec])
--fi
-+dnl if test "$HAVE_OSS" != "yes" && test "$ac_cv_lib_sndio_sio_open" != "yes"; then
-+dnl   AC_MSG_WARN([Audio support not found -- no direct audio output in opusdec])
-+dnl fi
++if test "$HAVE_OSS" != "yes" &&
++   test "$ac_cv_header_sys_audioio_h" != "yes" &&
++   test "$ac_cv_lib_sndio_sio_open" != "yes"; then
+   AC_MSG_WARN([Audio support not found -- no direct audio output in opusdec])
+ fi
  
- dnl check for flac
- AC_ARG_WITH([flac],

Added files:

Index: pkgsrc/audio/opus-tools/patches/patch-src_opusdec.c
diff -u /dev/null pkgsrc/audio/opus-tools/patches/patch-src_opusdec.c:1.1
--- /dev/null   Mon Apr 20 17:39:13 2020
+++ pkgsrc/audio/opus-tools/patches/patch-src_opusdec.c Mon Apr 20 17:39:13 2020
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_opusdec.c,v 1.1 2020/04/20 17:39:13 nia Exp $
+
+Fix compilation on NetBSD/SunOS.
+
+--- src/opusdec.c.orig 2018-09-15 06:04:51.000000000 +0000
++++ src/opusdec.c
+@@ -373,7 +373,7 @@ FILE *out_file_open(char *outFile, int f
+ # endif
+       info.play.encoding = AUDIO_ENCODING_SLINEAR;
+       info.play.precision = 16;
+-      info.play.input_sample_rate = rate;
++      info.play.sample_rate = rate;
+       info.play.channels = *channels;
+ 
+       if (ioctl(audio_fd, AUDIO_SETINFO, &info) < 0)