pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/audio/faac 1.29.3:
details: https://anonhg.NetBSD.org/pkgsrc/rev/6163758bf337
branches: trunk
changeset: 365680:6163758bf337
user: adam <adam%pkgsrc.org@localhost>
date: Sun Jul 23 16:01:14 2017 +0000
description:
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
diffstat:
audio/faac/Makefile | 26 +++++++++++---------------
audio/faac/PLIST | 3 ++-
audio/faac/distinfo | 16 ++++++++--------
audio/faac/options.mk | 14 --------------
audio/faac/patches/patch-aa | 12 ------------
audio/faac/patches/patch-ab | 21 ---------------------
audio/faac/patches/patch-ac | 16 ----------------
audio/faac/patches/patch-configure.ac | 14 ++++++++++++++
audio/faac/patches/patch-frontend_main.c | 14 ++++++++++++++
audio/faac/patches/patch-frontend_mp4write.c | 23 +++++++++++++++++++++++
10 files changed, 72 insertions(+), 87 deletions(-)
diffs (219 lines):
diff -r 4a25f4a07a52 -r 6163758bf337 audio/faac/Makefile
--- a/audio/faac/Makefile Sun Jul 23 15:56:07 2017 +0000
+++ b/audio/faac/Makefile Sun Jul 23 16:01:14 2017 +0000
@@ -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"
diff -r 4a25f4a07a52 -r 6163758bf337 audio/faac/PLIST
--- a/audio/faac/PLIST Sun Jul 23 15:56:07 2017 +0000
+++ b/audio/faac/PLIST Sun Jul 23 16:01:14 2017 +0000
@@ -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
diff -r 4a25f4a07a52 -r 6163758bf337 audio/faac/distinfo
--- a/audio/faac/distinfo Sun Jul 23 15:56:07 2017 +0000
+++ b/audio/faac/distinfo Sun Jul 23 16:01:14 2017 +0000
@@ -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
diff -r 4a25f4a07a52 -r 6163758bf337 audio/faac/options.mk
--- a/audio/faac/options.mk Sun Jul 23 15:56:07 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-# $NetBSD: options.mk,v 1.5 2017/04/17 08:45:17 wiz Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.faac
-PKG_SUPPORTED_OPTIONS= libmp4v2
-PKG_SUGGESTED_OPTIONS=
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mlibmp4v2)
-. include "../../multimedia/libmp4v2/buildlink3.mk"
-.else
-# ignore bundled mp4v2 lib
-CONFIGURE_ARGS+= --without-mp4v2
-.endif
diff -r 4a25f4a07a52 -r 6163758bf337 audio/faac/patches/patch-aa
--- a/audio/faac/patches/patch-aa Sun Jul 23 15:56:07 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2009/09/09 16:40:39 drochner Exp $
-
---- frontend/main.c.orig 2009-01-24 02:10:20.000000000 +0100
-+++ frontend/main.c
-@@ -39,6 +39,7 @@
- #include <windows.h>
- #include <fcntl.h>
- #else
-+#include <sys/param.h>
- #include <signal.h>
- #endif
-
diff -r 4a25f4a07a52 -r 6163758bf337 audio/faac/patches/patch-ab
--- a/audio/faac/patches/patch-ab Sun Jul 23 15:56:07 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2009/09/09 16:40:39 drochner Exp $
-
---- configure.in.orig 2009-02-05 01:55:38.000000000 +0100
-+++ configure.in
-@@ -28,6 +28,7 @@ AC_CHECK_DECL(strcasecmp, MY_DEFINE(HAVE
- AC_CHECK_LIB(gnugetopt, getopt_long)
-
- AM_CONDITIONAL(WITH_MP4V2, false)
-+AM_CONDITIONAL(WITH_EXTMP4V2, false)
-
- AC_CHECK_DECLS([MP4Create, MP4MetadataDelete],
- AC_CHECK_LIB(mp4v2, MP4MetadataDelete, external_mp4v2=yes,
-@@ -36,6 +37,8 @@ AC_CHECK_DECLS([MP4Create, MP4MetadataDe
-
- if test x$external_mp4v2 = xyes; then
- AC_MSG_NOTICE([*** Building with external mp4v2 ***])
-+ MY_DEFINE(HAVE_LIBMP4V2)
-+ AM_CONDITIONAL(WITH_EXTMP4V2, true)
- else
- if test x$WITHMP4V2 = xyes; then
- AC_MSG_NOTICE([*** Building with internal mp4v2 ***])
diff -r 4a25f4a07a52 -r 6163758bf337 audio/faac/patches/patch-ac
--- a/audio/faac/patches/patch-ac Sun Jul 23 15:56:07 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2009/09/09 16:40:39 drochner Exp $
-
---- frontend/Makefile.am.orig 2008-12-16 01:56:00.000000000 +0100
-+++ frontend/Makefile.am
-@@ -7,6 +7,11 @@ if WITH_MP4V2
- INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/common/mp4v2
- LDADD = $(top_builddir)/libfaac/libfaac.la $(top_srcdir)/common/mp4v2/libmp4v2.a -lm -lstdc++
- else
-+if WITH_EXTMP4V2
-+INCLUDES = -I$(top_srcdir)/include
-+LDADD = $(top_builddir)/libfaac/libfaac.la -lmp4v2 -lm
-+else
- INCLUDES = -I$(top_srcdir)/include
- LDADD = $(top_builddir)/libfaac/libfaac.la -lm
- endif
-+endif
diff -r 4a25f4a07a52 -r 6163758bf337 audio/faac/patches/patch-configure.ac
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/faac/patches/patch-configure.ac Sun Jul 23 16:01:14 2017 +0000
@@ -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
diff -r 4a25f4a07a52 -r 6163758bf337 audio/faac/patches/patch-frontend_main.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/faac/patches/patch-frontend_main.c Sun Jul 23 16:01:14 2017 +0000
@@ -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
+
diff -r 4a25f4a07a52 -r 6163758bf337 audio/faac/patches/patch-frontend_mp4write.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/faac/patches/patch-frontend_mp4write.c Sun Jul 23 16:01:14 2017 +0000
@@ -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)
+ {
Home |
Main Index |
Thread Index |
Old Index