libdca: updated to 0.0.6

libdca-0.0.6:
New release with mostly build system bugfixes.

6 files changed, 59 insertions, 56 deletions

diff --git a/audio/libdca/Makefile b/audio/libdca/Makefile
index c518ac8267f..5e2906d39e6 100644
--- a/audio/libdca/Makefile
+++ b/audio/libdca/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2015/01/27 00:36:22 jperkin Exp $
-#
+# $NetBSD: Makefile,v 1.13 2018/05/23 17:45:23 adam Exp $
 
-DISTNAME=	libdca-0.0.5
+DISTNAME=	libdca-0.0.6
 CATEGORIES=	audio
-MASTER_SITES=	http://download.videolan.org/pub/videolan/libdca/0.0.5/
+MASTER_SITES=	http://download.videolan.org/pub/videolan/libdca/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	shattered@NetBSD.org
@@ -11,21 +10,15 @@ HOMEPAGE=	http://www.videolan.org/developers/libdca.html
 COMMENT=	DTS Coherent Acoustics decoder
 LICENSE=	gnu-gpl-v2
 
-RESTRICTED=	Unresolved patent issue
-NO_BIN_ON_CDROM=${RESTRICTED}
-NO_BIN_ON_FTP=	${RESTRICTED}
-NO_SRC_ON_CDROM=${RESTRICTED}
-NO_SRC_ON_FTP=	${RESTRICTED}
+USE_LANGUAGES=		c99
+USE_LIBTOOL=		yes
+USE_TOOLS+=		pkg-config
+GNU_CONFIGURE=		yes
 
-GNU_CONFIGURE=	yes
-USE_TOOLS+=	pkg-config
-USE_LIBTOOL=	yes
-
-.include "../../mk/compiler.mk"
-
-# Avoid clang bugs resulting in "duplicate symbol ___sputc".
-.if !empty(PKGSRC_COMPILER:Mclang) && ${OPSYS} == "Darwin"
-CFLAGS+=	-std=gnu89
-.endif
+RESTRICTED=		Unresolved patent issue
+NO_BIN_ON_CDROM=	${RESTRICTED}
+NO_BIN_ON_FTP=		${RESTRICTED}
+NO_SRC_ON_CDROM=	${RESTRICTED}
+NO_SRC_ON_FTP=		${RESTRICTED}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/libdca/distinfo b/audio/libdca/distinfo
index be2499862aa..577aeaab4b1 100644
--- a/audio/libdca/distinfo
+++ b/audio/libdca/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.5 2017/03/23 17:06:46 joerg Exp $
+$NetBSD: distinfo,v 1.6 2018/05/23 17:45:23 adam Exp $
 
-SHA1 (libdca-0.0.5.tar.bz2) = 3fa5188eaaa2fc83fb9c4196f6695a23cb17f3bc
-RMD160 (libdca-0.0.5.tar.bz2) = 979ef56b7484e6542db035d03258f5fba63b9302
-SHA512 (libdca-0.0.5.tar.bz2) = d9f0ed34efeb3f27af8424fcb3e6df56744c6735854a65b5709c02b42b4513b9c4618dcc19eb44293afa051bd95616651bda5fc3b49dfabe975d0babfb1bc287
-Size (libdca-0.0.5.tar.bz2) = 393291 bytes
-SHA1 (patch-ab) = 7c736fec06ec3ed15bf7c2a4bb5d096469cfce8b
-SHA1 (patch-dtsdec) = 536268aa4009a3a0816ae2442e1be0f81233b0d1
+SHA1 (libdca-0.0.6.tar.bz2) = d292ddb7b4d60c90274f9f0398fa61df0df9442c
+RMD160 (libdca-0.0.6.tar.bz2) = 9857d7b0379266d9400f271d6f8d788cfb2227ee
+SHA512 (libdca-0.0.6.tar.bz2) = d264128019e7fd295a35691636311f81960c17802dbbc67764c4e00b2fdf12ebc69b057a4947b57551a130e5cfd1fef3fe3558c7067216ea04a0b6bbb881b4f1
+Size (libdca-0.0.6.tar.bz2) = 454121 bytes
+SHA1 (patch-configure) = 334d86745a5ef3c6077b0c2f65198632181d35d5
+SHA1 (patch-src_dcadec.c) = c60d59d5ed66c3525cbb1d92e02c3553b8a361b3
diff --git a/audio/libdca/patches/patch-ab b/audio/libdca/patches/patch-ab
deleted file mode 100644
index 43e9cf39721..00000000000
--- a/audio/libdca/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2010/11/24 22:27:06 shattered Exp $
-
---- libao/audio_out_wav.c.orig	2007-04-10 12:07:05.000000000 +0000
-+++ libao/audio_out_wav.c
-@@ -163,8 +163,8 @@ static int wav_play (ao_instance_t * _in
-     union
-     {
-         float floats[256 * 6];
--        int16_t words[0];
--        int32_t dwords[0];
-+        int16_t words[1];
-+        int32_t dwords[1];
-     } ordered_samples;
-     int chans, size;
-     uint32_t speaker_flags;
diff --git a/audio/libdca/patches/patch-configure b/audio/libdca/patches/patch-configure
new file mode 100644
index 00000000000..c52e8f627fe
--- /dev/null
+++ b/audio/libdca/patches/patch-configure
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure,v 1.1 2018/05/23 17:45:23 adam Exp $
+
+Do not override compiler flags.
+
+--- configure.orig	2018-05-23 17:05:51.000000000 +0000
++++ configure
+@@ -4685,7 +4685,7 @@ fi
+ 
+ 
+ 
+-if test x"$GCC" = x"yes"; then
++if false; then
+ 
+ 
+             TRY_CFLAGS="$OPT_CFLAGS -Wall"
diff --git a/audio/libdca/patches/patch-dtsdec b/audio/libdca/patches/patch-dtsdec
deleted file mode 100644
index f15e8383d04..00000000000
--- a/audio/libdca/patches/patch-dtsdec
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-dtsdec,v 1.2 2008/09/07 13:54:43 wiz Exp $
-
---- src/dcadec.c.orig	Mon Feb 23 23:30:49 2004
-+++ src/dcadec.c	Fri Jun  8 21:09:29 2007
-@@ -65,7 +65,9 @@
- {
-     sigint = 1;
-     signal (sig, SIG_DFL);
--    return (RETSIGTYPE)0;
-+    /* No return statement, since we cannot know whether the return
-+     * type is "void" or "int".
-+     */
- }
- 
- static void print_fps (int final)
diff --git a/audio/libdca/patches/patch-src_dcadec.c b/audio/libdca/patches/patch-src_dcadec.c
new file mode 100644
index 00000000000..3b1bae0a60f
--- /dev/null
+++ b/audio/libdca/patches/patch-src_dcadec.c
@@ -0,0 +1,25 @@
+$NetBSD: patch-src_dcadec.c,v 1.1 2018/05/23 17:45:23 adam Exp $
+
+No return statement, since we cannot know whether the return
+type is "void" or "int".
+
+Do not print debug info.
+
+--- src/dcadec.c.orig	2018-05-15 13:26:38.000000000 +0000
++++ src/dcadec.c
+@@ -66,7 +66,6 @@ static RETSIGTYPE signal_handler (int si
+ {
+     sigint = 1;
+     signal (sig, SIG_DFL);
+-    return (RETSIGTYPE)0;
+ }
+ 
+ static void print_fps (int final)
+@@ -273,7 +272,6 @@ static void dca_decode_data (uint8_t * s
+ 		length = dca_syncinfo (state, buf, &flags, &sample_rate,
+                                        &bit_rate, &frame_length);
+ 		if (!length) {
+-		    fprintf (stderr, "skip\n");
+ 		    for (bufptr = buf; bufptr < buf + HEADER_SIZE-1; bufptr++)
+ 			bufptr[0] = bufptr[1];
+ 		    continue;