pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/audio 2.8.1:
details: https://anonhg.NetBSD.org/pkgsrc/rev/c1873ad55a8f
branches: trunk
changeset: 365681:c1873ad55a8f
user: adam <adam%pkgsrc.org@localhost>
date: Sun Jul 23 16:09:17 2017 +0000
description:
2.8.1:
- seeking support for MP4 files
2.8.0:
- patches and fixed bugs
diffstat:
audio/faad2/Makefile | 33 +++++-----
audio/faad2/PLIST | 6 +-
audio/faad2/distinfo | 28 ++++-----
audio/faad2/patches/patch-aa | 15 -----
audio/faad2/patches/patch-ab | 23 -------
audio/faad2/patches/patch-ac | 15 -----
audio/faad2/patches/patch-ad | 22 -------
audio/faad2/patches/patch-af | 23 -------
audio/faad2/patches/patch-aj | 6 --
audio/faad2/patches/patch-ak | 33 -----------
audio/faad2/patches/patch-ar | 16 -----
audio/faad2/patches/patch-as | 13 ----
audio/faad2/patches/patch-au | 18 ------
audio/faad2/patches/patch-av | 16 -----
audio/faad2/patches/patch-common_mp4ff_Makefile.am | 20 ++++++
audio/faad2/patches/patch-frontend_Makefile.am | 20 ++++++
audio/faad2/patches/patch-frontend_getopt.c | 15 +++++
audio/faad2/patches/patch-libfaad_Makefile.am | 17 +++++
audio/faad2/patches/patch-libfaad_common.h | 25 ++++++++
audio/faad2/patches/patch-plugins_xmms_src_Makefile.am | 18 ++++++
audio/faad2/patches/patch-plugins_xmms_src_libmp4.c | 15 +++++
audio/xmms-faad/Makefile | 52 +++++++----------
22 files changed, 185 insertions(+), 264 deletions(-)
diffs (truncated from 578 to 300 lines):
diff -r 6163758bf337 -r c1873ad55a8f audio/faad2/Makefile
--- a/audio/faad2/Makefile Sun Jul 23 16:01:14 2017 +0000
+++ b/audio/faad2/Makefile Sun Jul 23 16:09:17 2017 +0000
@@ -1,34 +1,35 @@
-# $NetBSD: Makefile,v 1.48 2013/08/30 11:01:06 jperkin Exp $
+# $NetBSD: Makefile,v 1.49 2017/07/23 16:09:17 adam Exp $
+# IMPORTANT: Do not forget to update audio/xmms-faad
-DISTNAME= faad2-2.7
-PKGREVISION= 2
+DISTNAME= faad2-2.8.1
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 decoding library
-
LICENSE= gnu-gpl-v2
-USE_TOOLS+= autoconf automake autoreconf gmake
-USE_LANGUAGES= c c++
-USE_LIBTOOL= YES
-
-AUTOCONF_REQD= 2.50
-GNU_CONFIGURE= YES
-
+USE_LANGUAGES= c c++
+USE_LIBTOOL= yes
+USE_TOOLS+= autoconf automake autoreconf gmake
+GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --includedir=${PREFIX}/include/faad2
-LIBS+= -lm
+LIBS+= -lm
+CPPFLAGS.SunOS+= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE=1
-CPPFLAGS.SunOS+=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE=1
+SUBST_CLASSES+= pkgver
+SUBST_STAGE.pkgver= pre-configure
+SUBST_MESSAGE.pkgver= Setting PACKAGE_VERSION in neaacdec.h
+SUBST_FILES.pkgver= include/neaacdec.h
+SUBST_SED.pkgver= -e 's,PACKAGE_VERSION,"${PKGVERSION_NOREV}",'
post-extract:
- mv ${WRKSRC}/frontend/faad.man ${WRKSRC}/frontend/faad.1
+ ${MV} ${WRKSRC}/frontend/faad.man ${WRKSRC}/frontend/faad.1
pre-configure:
- cp ${WRKSRC}/common/faad/getopt.* ${WRKSRC}/frontend
cd ${WRKSRC} && autoreconf -if
.include "../../mk/bsd.pkg.mk"
diff -r 6163758bf337 -r c1873ad55a8f audio/faad2/PLIST
--- a/audio/faad2/PLIST Sun Jul 23 16:01:14 2017 +0000
+++ b/audio/faad2/PLIST Sun Jul 23 16:09:17 2017 +0000
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST,v 1.14 2009/08/11 11:16:37 drochner Exp $
+@comment $NetBSD: PLIST,v 1.15 2017/07/23 16:09:17 adam Exp $
bin/faad
include/faad2/faad.h
-include/faad2/faad2-config.h
-include/faad2/mp4ff_int_types.h
include/faad2/mp4ff.h
+include/faad2/mp4ffint.h
include/faad2/neaacdec.h
lib/libfaad.la
+lib/libfaad_drm.la
lib/libmp4ff.la
man/man1/faad.1
diff -r 6163758bf337 -r c1873ad55a8f audio/faad2/distinfo
--- a/audio/faad2/distinfo Sun Jul 23 16:01:14 2017 +0000
+++ b/audio/faad2/distinfo Sun Jul 23 16:09:17 2017 +0000
@@ -1,17 +1,13 @@
-$NetBSD: distinfo,v 1.23 2015/11/03 01:12:29 agc Exp $
+$NetBSD: distinfo,v 1.24 2017/07/23 16:09:17 adam Exp $
-SHA1 (faad2-2.7.tar.gz) = 80eaaa5cc576c35dd28863767b795c50cbcc0511
-RMD160 (faad2-2.7.tar.gz) = 3f0ca461e2953014d5b17edccb3337767d478b8d
-SHA512 (faad2-2.7.tar.gz) = 8135370497dfcfee09094a03a4a9545ebc58b9e532b89c5d6e5037042549e12ddb75f8903aa05866afac9fa28df96320f1ed2eebffc0660578e54392a51c1161
-Size (faad2-2.7.tar.gz) = 1137407 bytes
-SHA1 (patch-aa) = e3bf0fc44569b05295bc6b682bb14a4ca36681dd
-SHA1 (patch-ab) = e443484f19dfcc58d424401842d4747762d631e4
-SHA1 (patch-ac) = d63833cfd80d7772b66b5f4912abb55a4d9dc435
-SHA1 (patch-ad) = 949336b6963c1d01f35a8447c988ee21c4905104
-SHA1 (patch-af) = 388921b81fc710ccbe64d55cb915e2332e0d7e51
-SHA1 (patch-aj) = 06a8641803fdae5055f66255c57634b8f8619a77
-SHA1 (patch-ak) = 7d1c3dedf78a40da2ee85787d51c37d1578d24de
-SHA1 (patch-ar) = 6b65f8fb3970df3ba292e58f201fa941a1458f40
-SHA1 (patch-as) = 1626b7a4e696862c365740c6b29f786662c9d845
-SHA1 (patch-au) = a56ec5238179f0ba59e64a8b516b2bbc6dcd4efb
-SHA1 (patch-av) = c393ec95e17a2f702792c2e673df1422732ea0f6
+SHA1 (faad2-2.8.1.tar.bz2) = a5caa71cd915acd502d96cba56f38296277f2350
+RMD160 (faad2-2.8.1.tar.bz2) = a7c1a9afc9cfa9d3987df68dbfaa5cd404223a9c
+SHA512 (faad2-2.8.1.tar.bz2) = 4a38aed5cfcceee8656dc55df91d7c98dd857504168e393a0597c3a54aba470151558272c1667eeaaae022a86dce99fe6477ed3b634696270401b69bc15ae551
+Size (faad2-2.8.1.tar.bz2) = 666278 bytes
+SHA1 (patch-common_mp4ff_Makefile.am) = a662e6fd841420110c02f85923d022919135be82
+SHA1 (patch-frontend_Makefile.am) = 204a991d56430178bea176e1a9b013f0d416d7f1
+SHA1 (patch-frontend_getopt.c) = e6a560d249a34b2f3d72b6c48f1d9790cafdda69
+SHA1 (patch-libfaad_Makefile.am) = 0ec36c9ffbe56c301d672abcdb752fa87091cbb6
+SHA1 (patch-libfaad_common.h) = 60eccd8aebeb085760d6866f83ff5a613197918f
+SHA1 (patch-plugins_xmms_src_Makefile.am) = 4ba1dfefe1e351830ee990c711af6ac46db42c14
+SHA1 (patch-plugins_xmms_src_libmp4.c) = 7c6cd667999aab36efc9d713cf967c01b01916bf
diff -r 6163758bf337 -r c1873ad55a8f audio/faad2/patches/patch-aa
--- a/audio/faad2/patches/patch-aa Sun Jul 23 16:01:14 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2009/08/10 00:01:56 tnn Exp $
-
---- libfaad/Makefile.am.orig 2009-02-05 01:51:03.000000000 +0100
-+++ libfaad/Makefile.am
-@@ -14,8 +14,8 @@ libfaad_la_SOURCES = bits.c cfft.c decod
- pulse.c specrec.c syntax.c tns.c hcr.c huffman.c \
- rvlc.c ssr.c ssr_fb.c ssr_ipqf.c common.c \
- sbr_dct.c sbr_e_nf.c sbr_fbt.c sbr_hfadj.c sbr_hfgen.c \
-- sbr_huff.c sbr_qmf.c sbr_syntax.c sbr_tf_grid.c sbr_dec.c \
-- analysis.h bits.h cfft.h cfft_tab.h common.h \
-+ sbr_huff.c sbr_qmf.c sbr_syntax.c sbr_tf_grid.c sbr_dec.c
-+libfaad_la_INCLUDES = analysis.h bits.h cfft.h cfft_tab.h common.h \
- decoder.h drc.h drm_dec.h error.h fixed.h filtbank.h \
- huffman.h ic_predict.h iq_table.h is.h kbd_win.h lt_predict.h \
- mdct.h mdct_tab.h mp4.h ms.h output.h pns.h ps_dec.h ps_tables.h \
diff -r 6163758bf337 -r c1873ad55a8f audio/faad2/patches/patch-ab
--- a/audio/faad2/patches/patch-ab Sun Jul 23 16:01:14 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2009/08/11 11:16:38 drochner Exp $
-
---- frontend/Makefile.am.orig 2009-02-06 17:03:37.000000000 +0100
-+++ frontend/Makefile.am
-@@ -1,12 +1,14 @@
- bin_PROGRAMS = faad
--man_MANS = faad.man
-+man_MANS = faad.1
-
- INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/common/faad \
- -I$(top_srcdir)/common/mp4ff
-
- faad_LDADD = $(top_builddir)/libfaad/libfaad.la \
-- $(top_builddir)/common/mp4ff/libmp4ff.a
-+ $(top_builddir)/common/mp4ff/libmp4ff.la
-
- faad_SOURCES = main.c \
-- audio.c audio.h \
-- $(top_srcdir)/common/faad/getopt.c
-+ audio.c \
-+ getopt.c
-+
-+faad_INCLUDES = audio.h
diff -r 6163758bf337 -r c1873ad55a8f audio/faad2/patches/patch-ac
--- a/audio/faad2/patches/patch-ac Sun Jul 23 16:01:14 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.6 2007/12/09 10:55:31 drochner Exp $
-
---- Makefile.am.orig 2004-07-27 10:52:20.000000000 +0200
-+++ Makefile.am
-@@ -1,7 +1,9 @@
--SUBDIRS = libfaad common frontend plugins
-+SUBDIRS = libfaad common frontend include
-
- EXTRA_DIST = faad2.spec
-
-+include_HEADERS = faad2-config.h
-+
- rpm: Makefile
- make dist
- $(RPMBUILD) -ta $(PACKAGE)-$(VERSION).tar.gz
diff -r 6163758bf337 -r c1873ad55a8f audio/faad2/patches/patch-ad
--- a/audio/faad2/patches/patch-ad Sun Jul 23 16:01:14 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-$NetBSD: patch-ad,v 1.4 2009/08/10 00:01:56 tnn Exp $
-
---- libfaad/common.h.orig 2009-02-05 01:51:03.000000000 +0100
-+++ libfaad/common.h
-@@ -41,7 +41,7 @@ extern "C" {
-
- #include "neaacdec.h"
-
--#if 1
-+#if 0
- #define INLINE __inline
- #else
- #define INLINE inline
-@@ -330,7 +330,7 @@ char *strchr(), *strrchr();
- #ifndef HAVE_LRINTF
- #define HAS_LRINTF
- // from http://www.stereopsis.com/FPU.html
-- static INLINE int lrintf(float f)
-+ static INLINE long int lrintf(float f)
- {
- int i;
- __asm__ __volatile__ (
diff -r 6163758bf337 -r c1873ad55a8f audio/faad2/patches/patch-af
--- a/audio/faad2/patches/patch-af Sun Jul 23 16:01:14 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-$NetBSD: patch-af,v 1.4 2009/08/11 11:16:38 drochner Exp $
-
---- common/mp4ff/mp4ff_int_types.h.orig 2008-11-24 22:52:45.000000000 +0100
-+++ common/mp4ff/mp4ff_int_types.h
-@@ -19,7 +19,18 @@ typedef unsigned __int64 uint64_t;
-
- #else
-
-+#include "faad2-config.h"
-+
-+#if HAVE_SYS_TYPES_H
-+#include <sys/types.h>
-+#endif
-+#if HAVE_INTTYPES_H
-+#include <inttypes.h>
-+#endif
-+#if HAVE_STDINT_H
- #include <stdint.h>
-+#endif
-+
-
- #endif
-
diff -r 6163758bf337 -r c1873ad55a8f audio/faad2/patches/patch-aj
--- a/audio/faad2/patches/patch-aj Sun Jul 23 16:01:14 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2005/10/06 13:13:28 ben Exp $
-
---- /dev/null 2005-10-05 21:10:17.000000000 -0700
-+++ include/Makefile.am 2005-10-05 21:10:37.000000000 -0700
-@@ -0,0 +1 @@
-+include_HEADERS = faad.h
diff -r 6163758bf337 -r c1873ad55a8f audio/faad2/patches/patch-ak
--- a/audio/faad2/patches/patch-ak Sun Jul 23 16:01:14 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-$NetBSD: patch-ak,v 1.6 2013/01/21 16:02:34 wiz Exp $
-
-Second chunk: automake-1.13 compat.
-
---- configure.in.orig 2009-02-05 00:51:03.000000000 +0000
-+++ configure.in
-@@ -9,7 +9,7 @@ dnl - mpeg4ip plugin (requires mpeg4ip's
-
- AC_INIT
- AC_CONFIG_AUX_DIR(.)
--AM_INIT_AUTOMAKE(faad2, 2.7.0)
-+AM_INIT_AUTOMAKE(faad2, 2.7.0, do-not-define-PACKAGE-or-VERSION)
-
- AC_PROG_LIBTOOL
- AC_SUBST(LIBTOOL_DEPS)
-@@ -25,7 +25,7 @@ AC_PROG_LN_S
- AC_PROG_MAKE_SET
- AC_CHECK_PROGS(RPMBUILD, rpmbuild, rpm)
-
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADER(config.h)
-
- AC_ARG_WITH(xmms,[ --with-xmms compile XMMS-1 plugin],
- WITHXMMS=$withval, WITHXMMS=no)
-@@ -163,6 +163,8 @@ AC_CONFIG_FILES(plugins/xmms/src/Makefil
- AC_CONFIG_FILES(plugins/mpeg4ip/Makefile)
- AC_CONFIG_FILES(faad2.spec)
- AC_CONFIG_FILES(frontend/Makefile)
-+AC_CONFIG_FILES(include/Makefile)
- AC_CONFIG_FILES(Makefile)
-
- AC_OUTPUT
-+cp config.h faad2-config.h
diff -r 6163758bf337 -r c1873ad55a8f audio/faad2/patches/patch-ar
--- a/audio/faad2/patches/patch-ar Sun Jul 23 16:01:14 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-$NetBSD: patch-ar,v 1.5 2009/08/11 11:16:38 drochner Exp $
-
---- plugins/xmms/src/Makefile.am.orig 2009-01-26 23:51:44.000000000 +0100
-+++ plugins/xmms/src/Makefile.am
-@@ -6,9 +6,8 @@ lib_LTLIBRARIES = libmp4.la
- libmp4_la_CFLAGS = $(local_CFLAGS) -Wall \
- -I$(top_srcdir)/include -I$(top_srcdir)/common/mp4ff
-
--libmp4_la_LIBADD = $(top_builddir)/libfaad/libfaad.la \
-- $(top_builddir)/common/mp4ff/libmp4ff.a
-+libmp4_la_LIBADD = -L$(prefix)/lib -lmp4ff -lfaad
-
--libmp4_la_LDFLAGS = -module -avoid-version $(local_LDFLAGS) -lpthread
-+libmp4_la_LDFLAGS = -module -avoid-version $(local_LDFLAGS) ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
-
- libmp4_la_SOURCES = libmp4.c mp4_utils.c aac_utils.c
diff -r 6163758bf337 -r c1873ad55a8f audio/faad2/patches/patch-as
--- a/audio/faad2/patches/patch-as Sun Jul 23 16:01:14 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-as,v 1.2 2007/12/09 10:55:37 drochner Exp $
-
---- plugins/xmms/src/libmp4.c.orig 2007-06-05 21:00:18.000000000 +0200
-+++ plugins/xmms/src/libmp4.c
-@@ -23,7 +23,7 @@
- #include <xmms/titlestring.h>
Home |
Main Index |
Thread Index |
Old Index