Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_150280531726330"
MIME-Version: 1.0
Date: Tue, 15 Aug 2017 13:55:17 +0000
From: "Adam Ciarcinski" <adam@netbsd.org>
Subject: CVS commit: pkgsrc/audio/faac
To: pkgsrc-changes@NetBSD.org
Reply-To: adam@netbsd.org
Message-Id: <20170815135518.0309CFAD0@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_150280531726330
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	adam
Date:		Tue Aug 15 13:55:17 UTC 2017

Modified Files:
	pkgsrc/audio/faac: Makefile PLIST distinfo
Added Files:
	pkgsrc/audio/faac/patches: patch-libfaac_quantize.c

Log Message:
1.29.4:
- new option(--tag) to add named tags (iTunes '----')
- faster and better short/long window type switch
- Don't build DRM(Digital Radio Mondiale) by default.
  Use ./configure --enable-drm to build DRM version.
- fixed bugs
  * rounding in QuantizeReflectionCoeffs (tns.c)
  * use +60 value for scalefactor.
  * use clipped diff instead of original value (huffman.c)


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/audio/faac/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/audio/faac/PLIST
cvs rdiff -u -r1.8 -r1.9 pkgsrc/audio/faac/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/audio/faac/patches/patch-libfaac_quantize.c

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


--_----------=_150280531726330
Content-Disposition: inline
Content-Length: 3833
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/audio/faac/Makefile
diff -u pkgsrc/audio/faac/Makefile:1.13 pkgsrc/audio/faac/Makefile:1.14
--- pkgsrc/audio/faac/Makefile:1.13	Sun Jul 23 16:01:14 2017
+++ pkgsrc/audio/faac/Makefile	Tue Aug 15 13:55:17 2017
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.13 2017/07/23 16:01:14 adam Exp $
+# $NetBSD: Makefile,v 1.14 2017/08/15 13:55:17 adam Exp $
 
-DISTNAME=	faac-1.29.3
+DISTNAME=	faac-1.29.4
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=faac/}
 #EXTRACT_SUFX=	.tar.bz2

Index: pkgsrc/audio/faac/PLIST
diff -u pkgsrc/audio/faac/PLIST:1.4 pkgsrc/audio/faac/PLIST:1.5
--- pkgsrc/audio/faac/PLIST:1.4	Sun Jul 23 16:01:14 2017
+++ pkgsrc/audio/faac/PLIST	Tue Aug 15 13:55:17 2017
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.4 2017/07/23 16:01:14 adam Exp $
+@comment $NetBSD: PLIST,v 1.5 2017/08/15 13:55:17 adam Exp $
 bin/faac
 include/faac.h
 include/faaccfg.h
 lib/libfaac.la
-lib/libfaac_drm.la
 man/man1/faac.1

Index: pkgsrc/audio/faac/distinfo
diff -u pkgsrc/audio/faac/distinfo:1.8 pkgsrc/audio/faac/distinfo:1.9
--- pkgsrc/audio/faac/distinfo:1.8	Sun Jul 23 16:01:14 2017
+++ pkgsrc/audio/faac/distinfo	Tue Aug 15 13:55:17 2017
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.8 2017/07/23 16:01:14 adam Exp $
+$NetBSD: distinfo,v 1.9 2017/08/15 13:55:17 adam Exp $
 
-SHA1 (faac-1.29.3.tar.gz) = eeaa98f36bd393c1e38f1964dd5d323468640b71
-RMD160 (faac-1.29.3.tar.gz) = a16427dd05b5d01b9d97a0101351458560284376
-SHA512 (faac-1.29.3.tar.gz) = 8c25d6127c90e37bb6ae4ce72ba4dbdd9c9999b9c76de58bba61c106fa33ed9c545462589a97be4bd5bcbd2849a55b7d0fe3ed494b5d92ffee001bba2a3c7b61
-Size (faac-1.29.3.tar.gz) = 224353 bytes
+SHA1 (faac-1.29.4.tar.gz) = 22b79c7aa6e55b560f144efd3b00877375be7870
+RMD160 (faac-1.29.4.tar.gz) = a93fc322fd2276cada0df23e4eead82db4bd5508
+SHA512 (faac-1.29.4.tar.gz) = 0e2aa631d6f9fb029b5298c456ffc598a9f77b9d47b60e908c8724fdebec9af295827bbf0954b4eedbbf512dad7698cd6fde62ef9a367763217042cd504e02f5
+Size (faac-1.29.4.tar.gz) = 493035 bytes
 SHA1 (patch-configure.ac) = d29bb3379a47b62c739ef055db6acb175c4ed060
 SHA1 (patch-frontend_main.c) = 3b0327b636c60cf2a0466d3b38363e364bf504fe
 SHA1 (patch-frontend_mp4write.c) = 675cd3c56351e5630e055edc1d8aa893a6c6eb28
+SHA1 (patch-libfaac_quantize.c) = 43dad4ae028e36fa03d42dedacb627b1202d1815

Added files:

Index: pkgsrc/audio/faac/patches/patch-libfaac_quantize.c
diff -u /dev/null pkgsrc/audio/faac/patches/patch-libfaac_quantize.c:1.1
--- /dev/null	Tue Aug 15 13:55:17 2017
+++ pkgsrc/audio/faac/patches/patch-libfaac_quantize.c	Tue Aug 15 13:55:17 2017
@@ -0,0 +1,34 @@
+$NetBSD: patch-libfaac_quantize.c,v 1.1 2017/08/15 13:55:17 adam Exp $
+
+Fix compiler errors.
+
+--- libfaac/quantize.c.orig	2017-08-15 13:36:26.000000000 +0000
++++ libfaac/quantize.c
+@@ -71,14 +71,14 @@ static void bmask(CoderInfo *coderInfo, 
+         target = NOISETONE * pow(avge/avgenrg, powm);
+         target += (1.0 - NOISETONE) * 0.45 * pow(maxe/avgenrg, powm);
+ 
+-        target *= 0.9 + (40.0 / (fabs(start + end - MIDF) + 32));
++        target *= 0.9 + (40.0 / (abs(start + end - MIDF) + 32));
+     }
+     else
+     {
+         target = NOISETONE * pow(avge/avgenrg, powm);
+         target += (1.0 - NOISETONE) * 0.45 * pow(maxe/avgenrg, powm);
+ 
+-        target *= 0.9 + (40.0 / (0.125 * fabs(start + end - (8*MIDF)) + 32));
++        target *= 0.9 + (40.0 / (0.125 * abs(start + end - (8*MIDF)) + 32));
+ 
+         target *= 0.45;
+     }
+@@ -95,8 +95,8 @@ static void qlevel(CoderInfo *coderInfo,
+     int sb, cnt;
+     int start, end;
+     // 1.5dB step
+-    static const double sfstep = 20.0 / 1.5 / log(10);
+-    static const double sfstep_1 = 1.0 / sfstep;
++    const double sfstep = 20.0 / 1.5 / log(10);
++    const double sfstep_1 = 1.0 / sfstep;
+ 
+     for (sb = 0; sb < coderInfo->nr_of_sfb; sb++)
+     {


--_----------=_150280531726330--