CVS commit: pkgsrc/audio/faac

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Sun Jul 23 16:01:14 UTC 2017

Modified Files:
        pkgsrc/audio/faac: Makefile PLIST distinfo
Added Files:
        pkgsrc/audio/faac/patches: patch-configure.ac patch-frontend_main.c
            patch-frontend_mp4write.c
Removed Files:
        pkgsrc/audio/faac: options.mk
        pkgsrc/audio/faac/patches: patch-aa patch-ab patch-ac

Log Message:
1.29.3:
- MP4 tag options improved
- fixed MP4 'meta' atom bug
- new option to set verbosity (-v0 to silence output)

1.29.2:
- new mp4 output code

1.29:
- various patches applied and bugs fixed


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/audio/faac/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/audio/faac/PLIST
cvs rdiff -u -r1.7 -r1.8 pkgsrc/audio/faac/distinfo
cvs rdiff -u -r1.5 -r0 pkgsrc/audio/faac/options.mk
cvs rdiff -u -r1.4 -r0 pkgsrc/audio/faac/patches/patch-aa
cvs rdiff -u -r1.2 -r0 pkgsrc/audio/faac/patches/patch-ab
cvs rdiff -u -r1.3 -r0 pkgsrc/audio/faac/patches/patch-ac
cvs rdiff -u -r0 -r1.1 pkgsrc/audio/faac/patches/patch-configure.ac \
    pkgsrc/audio/faac/patches/patch-frontend_main.c \
    pkgsrc/audio/faac/patches/patch-frontend_mp4write.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/faac/Makefile
diff -u pkgsrc/audio/faac/Makefile:1.12 pkgsrc/audio/faac/Makefile:1.13
--- pkgsrc/audio/faac/Makefile:1.12     Tue Sep 11 23:59:31 2012
+++ pkgsrc/audio/faac/Makefile  Sun Jul 23 16:01:14 2017
@@ -1,29 +1,25 @@
-# $NetBSD: Makefile,v 1.12 2012/09/11 23:59:31 asau Exp $
-#
+# $NetBSD: Makefile,v 1.13 2017/07/23 16:01:14 adam Exp $
 
-DISTNAME=      faac-1.28
+DISTNAME=      faac-1.29.3
 CATEGORIES=    audio
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=faac/}
+#EXTRACT_SUFX= .tar.bz2
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      http://www.audiocoding.com/
+HOMEPAGE=      http://faac.sourceforge.net/
 COMMENT=       AAC audio encoder
+LICENSE=       gnu-gpl-v2
 
-RESTRICTED=    This software may require the payment of patent royalties
+RESTRICTED=            This software may require the payment of patent royalties
 NO_BIN_ON_CDROM=       ${RESTRICTED}
 NO_BIN_ON_FTP=         ${RESTRICTED}
 
-USE_LIBTOOL=   yes
-USE_TOOLS+=    automake
-GNU_CONFIGURE= yes
-
-LIBTOOLIZE=    ${PREFIX}/bin/libtoolize
+USE_LIBTOOL=           yes
+USE_TOOLS+=            aclocal autoconf autoheader automake
+GNU_CONFIGURE=         yes
 
 pre-configure:
-       cd ${WRKSRC};                                           \
-       ${LIBTOOLIZE} --automake;                               \
-       aclocal; autoheader; automake -a --foreign -i; autoconf
-
-.include "options.mk"
+       cd ${WRKSRC} && aclocal -I . && autoheader && libtoolize --automake \
+       && automake -a && autoconf
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/audio/faac/PLIST
diff -u pkgsrc/audio/faac/PLIST:1.3 pkgsrc/audio/faac/PLIST:1.4
--- pkgsrc/audio/faac/PLIST:1.3 Wed Sep  9 16:40:39 2009
+++ pkgsrc/audio/faac/PLIST     Sun Jul 23 16:01:14 2017
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.3 2009/09/09 16:40:39 drochner Exp $
+@comment $NetBSD: PLIST,v 1.4 2017/07/23 16:01:14 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.7 pkgsrc/audio/faac/distinfo:1.8
--- pkgsrc/audio/faac/distinfo:1.7      Tue Nov  3 01:12:29 2015
+++ pkgsrc/audio/faac/distinfo  Sun Jul 23 16:01:14 2017
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.7 2015/11/03 01:12:29 agc Exp $
+$NetBSD: distinfo,v 1.8 2017/07/23 16:01:14 adam Exp $
 
-SHA1 (faac-1.28.tar.gz) = d00b023a3642f81bb1fb13d962a65079121396ee
-RMD160 (faac-1.28.tar.gz) = 03902393488f04223aabdc804bfe77bb32a61c94
-SHA512 (faac-1.28.tar.gz) = 0ef721ad28835e95cad41afc0cb6130e1ebb634cb6dd4b40f649bc2269b7bb5bf2887f6d8f023c74628d521f8bdf55b4dd070f972ecff162a5fe0384e026235b
-Size (faac-1.28.tar.gz) = 678891 bytes
-SHA1 (patch-aa) = 5d3fa0d38721146aa3131b555ee4f1172ce119c4
-SHA1 (patch-ab) = 9598e987fc3cbde5923236e5264cb176f84c3ba6
-SHA1 (patch-ac) = feabc1f1ecbd98b6257184013a8785598e7ffa6a
+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 (patch-configure.ac) = d29bb3379a47b62c739ef055db6acb175c4ed060
+SHA1 (patch-frontend_main.c) = 3b0327b636c60cf2a0466d3b38363e364bf504fe
+SHA1 (patch-frontend_mp4write.c) = 675cd3c56351e5630e055edc1d8aa893a6c6eb28

Added files:

Index: pkgsrc/audio/faac/patches/patch-configure.ac
diff -u /dev/null pkgsrc/audio/faac/patches/patch-configure.ac:1.1
--- /dev/null   Sun Jul 23 16:01:15 2017
+++ pkgsrc/audio/faac/patches/patch-configure.ac        Sun Jul 23 16:01:14 2017
@@ -0,0 +1,14 @@
+$NetBSD: patch-configure.ac,v 1.1 2017/07/23 16:01:14 adam Exp $
+
+Detect sys/endian.h.
+
+--- configure.ac.orig  2017-07-23 15:42:05.000000000 +0000
++++ configure.ac
+@@ -51,6 +51,7 @@ AC_CHECK_HEADERS(float.h)
+ AC_CHECK_DECL(strchr, MY_DEFINE(HAVE_STRCHR))
+ AC_CHECK_DECL(memcpy, MY_DEFINE(HAVE_MEMCPY))
+ AC_CHECK_DECL(strsep, MY_DEFINE(HAVE_STRSEP))
++AC_CHECK_HEADERS(sys/endian.h)
+ AC_CHECK_HEADERS(sys/time.h)
+ AC_HEADER_TIME
+ AC_TYPE_OFF_T
Index: pkgsrc/audio/faac/patches/patch-frontend_main.c
diff -u /dev/null pkgsrc/audio/faac/patches/patch-frontend_main.c:1.1
--- /dev/null   Sun Jul 23 16:01:15 2017
+++ pkgsrc/audio/faac/patches/patch-frontend_main.c     Sun Jul 23 16:01:14 2017
@@ -0,0 +1,14 @@
+$NetBSD: patch-frontend_main.c,v 1.1 2017/07/23 16:01:14 adam Exp $
+
+Add missing include.
+
+--- frontend/main.c.orig       2017-07-21 13:45:15.000000000 +0000
++++ frontend/main.c
+@@ -31,6 +31,7 @@
+ #include <windows.h>
+ #include <fcntl.h>
+ #else
++#include <sys/param.h>
+ #include <signal.h>
+ #endif
+ 
Index: pkgsrc/audio/faac/patches/patch-frontend_mp4write.c
diff -u /dev/null pkgsrc/audio/faac/patches/patch-frontend_mp4write.c:1.1
--- /dev/null   Sun Jul 23 16:01:15 2017
+++ pkgsrc/audio/faac/patches/patch-frontend_mp4write.c Sun Jul 23 16:01:14 2017
@@ -0,0 +1,23 @@
+$NetBSD: patch-frontend_mp4write.c,v 1.1 2017/07/23 16:01:14 adam Exp $
+
+Do not re-define bswap32() and bswap16().
+
+--- frontend/mp4write.c.orig   2017-07-23 15:44:39.000000000 +0000
++++ frontend/mp4write.c
+@@ -46,6 +46,8 @@ mp4config_t mp4config = { 0 };
+ 
+ static FILE *g_fout = NULL;
+ 
++#include "config.h"
++#ifndef HAVE_SYS_ENDIAN_H
+ static inline uint32_t bswap32(uint32_t u32)
+ {
+ #ifndef WORDS_BIGENDIAN
+@@ -61,6 +63,7 @@ static inline uint16_t bswap16(uint16_t 
+     return __builtin_bswap16(u16);
+ #endif
+ }
++#endif
+ 
+ static int dataout(const void *data, int size)
+ {