summaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
authoradam <adam@pkgsrc.org>2017-12-01 11:17:51 +0000
committeradam <adam@pkgsrc.org>2017-12-01 11:17:51 +0000
commitab8af3c5c05af6c1f6b00ee20bc30f0254eaa32e (patch)
treea277f713fd5e76306bcdf380f3da740b822f3906 /audio
parent15a08f516b7fb575c4f4d3fca17aab85104e2b86 (diff)
downloadpkgsrc-ab8af3c5c05af6c1f6b00ee20bc30f0254eaa32e.tar.gz
faad2: updated to 2.8.6
2.8.6: 2.8.5: - another package fix 2.8.4: - minor fix to released packages 2.8.3 - better autotools support 2.8.2 - PNS bug fixed - New MP4 input module - NeAACDecGetVersion: new api function to get version and copyright strings
Diffstat (limited to 'audio')
-rw-r--r--audio/faad2/Makefile5
-rw-r--r--audio/faad2/distinfo18
-rw-r--r--audio/faad2/patches/patch-configure.ac14
-rw-r--r--audio/faad2/patches/patch-frontend_Makefile.am26
-rw-r--r--audio/faad2/patches/patch-frontend_getopt.c7
-rw-r--r--audio/faad2/patches/patch-frontend_mp4read.c23
-rw-r--r--audio/faad2/patches/patch-libfaad_Makefile.am13
7 files changed, 71 insertions, 35 deletions
diff --git a/audio/faad2/Makefile b/audio/faad2/Makefile
index eeed1431f00..e8dc79f406f 100644
--- a/audio/faad2/Makefile
+++ b/audio/faad2/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.49 2017/07/23 16:09:17 adam Exp $
+# $NetBSD: Makefile,v 1.50 2017/12/01 11:17:51 adam Exp $
# IMPORTANT: Do not forget to update audio/xmms-faad
-DISTNAME= faad2-2.8.1
+DISTNAME= faad2-2.8.6
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=faac/}
-EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://faac.sourceforge.net/
diff --git a/audio/faad2/distinfo b/audio/faad2/distinfo
index 42a4418fdf3..bcada7e05bc 100644
--- a/audio/faad2/distinfo
+++ b/audio/faad2/distinfo
@@ -1,13 +1,15 @@
-$NetBSD: distinfo,v 1.24 2017/07/23 16:09:17 adam Exp $
+$NetBSD: distinfo,v 1.25 2017/12/01 11:17:51 adam Exp $
-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 (faad2-2.8.6.tar.gz) = 13b0a356c3801424d535e9441718b9edb2f64a15
+RMD160 (faad2-2.8.6.tar.gz) = 499f14790b3ea4527b2ee024658d2514a21c3b3b
+SHA512 (faad2-2.8.6.tar.gz) = 9b6d7e0277ae6c93a8a799f75e7fa9b9cde6419d61533a4c5ab4335382d0cb01aa0aa2fe0fe727bb94d66fafcfeb1b6871141ab5d8dff49600775ffde5b239b8
+Size (faad2-2.8.6.tar.gz) = 1025654 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-configure.ac) = ed9d4e9d611d27d4add86884996a8e7fc001bc90
+SHA1 (patch-frontend_Makefile.am) = 02f841382e494a49993160d9b64efc74b61fba84
+SHA1 (patch-frontend_getopt.c) = 3eaf3e8318887eca49e354696cad1bd2c5bf5504
+SHA1 (patch-frontend_mp4read.c) = 4e8ccdb7c1ebf21243a0edc3ad172a1101c4a133
+SHA1 (patch-libfaad_Makefile.am) = 4d3b92f54d998bd577641f49e88d0c8bc38f963c
SHA1 (patch-libfaad_common.h) = 60eccd8aebeb085760d6866f83ff5a613197918f
SHA1 (patch-plugins_xmms_src_Makefile.am) = 4ba1dfefe1e351830ee990c711af6ac46db42c14
SHA1 (patch-plugins_xmms_src_libmp4.c) = 7c6cd667999aab36efc9d713cf967c01b01916bf
diff --git a/audio/faad2/patches/patch-configure.ac b/audio/faad2/patches/patch-configure.ac
new file mode 100644
index 00000000000..7ce588b1799
--- /dev/null
+++ b/audio/faad2/patches/patch-configure.ac
@@ -0,0 +1,14 @@
+$NetBSD: patch-configure.ac,v 1.1 2017/12/01 11:17:51 adam Exp $
+
+Detect sys/endian.h.
+
+--- configure.ac.orig 2017-10-10 09:58:02.000000000 +0000
++++ configure.ac
+@@ -43,6 +43,7 @@ AC_CHECK_HEADERS(stdint.h inttypes.h)
+ AC_CHECK_HEADERS(mathf.h)
+ AC_CHECK_HEADERS(float.h)
+ AC_CHECK_FUNCS(strchr memcpy)
++AC_CHECK_HEADERS(sys/endian.h)
+ AC_CHECK_HEADERS(sys/time.h)
+ AC_HEADER_TIME
+
diff --git a/audio/faad2/patches/patch-frontend_Makefile.am b/audio/faad2/patches/patch-frontend_Makefile.am
index 6665327b0d3..f21b70ed8e8 100644
--- a/audio/faad2/patches/patch-frontend_Makefile.am
+++ b/audio/faad2/patches/patch-frontend_Makefile.am
@@ -1,20 +1,20 @@
-$NetBSD: patch-frontend_Makefile.am,v 1.1 2017/07/23 16:09:17 adam Exp $
+$NetBSD: patch-frontend_Makefile.am,v 1.2 2017/12/01 11:17:51 adam Exp $
-Libtoolize and use correct man-page.
+Use correct sources.
---- frontend/Makefile.am.orig 2017-07-10 13:22:37.000000000 +0000
+--- frontend/Makefile.am.orig 2017-09-29 11:16:02.000000000 +0000
+++ frontend/Makefile.am
-@@ -1,9 +1,10 @@
+@@ -1,10 +1,11 @@
bin_PROGRAMS = faad
--man1_MANS = faad.man
-+man1_MANS = faad.1
+-dist_man1_MANS = faad.man
++dist_man1_MANS = faad.1
- AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/common/mp4ff
+ AM_CPPFLAGS = -I$(top_srcdir)/include
- faad_LDADD = $(top_builddir)/libfaad/libfaad.la \
-- $(top_builddir)/common/mp4ff/libmp4ff.a
-+ $(top_builddir)/common/mp4ff/libmp4ff.la
+ faad_LDADD = $(top_builddir)/libfaad/libfaad.la
--faad_SOURCES = main.c audio.c audio.h
-+faad_SOURCES = main.c audio.c
-+faad_INCLUDES = audio.h
+-faad_SOURCES = mp4read.c audio.c main.c audio.h mp4read.h
++faad_SOURCES = mp4read.c audio.c main.c
++faad_INCLUDES = audio.h mp4read.h
+
+ EXTRA_faad_SOURCES = getopt.c
diff --git a/audio/faad2/patches/patch-frontend_getopt.c b/audio/faad2/patches/patch-frontend_getopt.c
index d3c914b535d..d964d6382e7 100644
--- a/audio/faad2/patches/patch-frontend_getopt.c
+++ b/audio/faad2/patches/patch-frontend_getopt.c
@@ -1,15 +1,14 @@
-$NetBSD: patch-frontend_getopt.c,v 1.1 2017/07/23 16:09:17 adam Exp $
+$NetBSD: patch-frontend_getopt.c,v 1.2 2017/12/01 11:17:51 adam Exp $
Avoid conflicting definitions.
---- frontend/getopt.c.orig 2017-07-23 13:10:42.000000000 +0000
+--- frontend/getopt.c.orig 2017-09-06 08:37:30.000000000 +0000
+++ frontend/getopt.c
-@@ -171,8 +171,6 @@ static enum
+@@ -171,7 +171,6 @@ static enum
#if __STDC__ || defined(PROTO)
extern char *getenv(const char *name);
-extern int strcmp (const char *s1, const char *s2);
--extern int strncmp(const char *s1, const char *s2, unsigned int n);
static int my_strlen(const char *s);
static char *my_index (const char *str, int chr);
diff --git a/audio/faad2/patches/patch-frontend_mp4read.c b/audio/faad2/patches/patch-frontend_mp4read.c
new file mode 100644
index 00000000000..09cf6f9eefc
--- /dev/null
+++ b/audio/faad2/patches/patch-frontend_mp4read.c
@@ -0,0 +1,23 @@
+$NetBSD: patch-frontend_mp4read.c,v 1.1 2017/12/01 11:17:51 adam Exp $
+
+Do not re-define bswap32() and bswap16().
+
+--- frontend/mp4read.c.orig 2017-12-01 11:02:01.786551844 +0000
++++ frontend/mp4read.c
+@@ -45,6 +45,8 @@ mp4config_t mp4config = { 0 };
+
+ static FILE *g_fin = NULL;
+
++#include "config.h"
++#ifndef HAVE_SYS_ENDIAN_H
+ static inline uint32_t bswap32(uint32_t u32)
+ {
+ #ifndef WORDS_BIGENDIAN
+@@ -58,6 +60,7 @@ static inline uint16_t bswap16(uint16_t
+ return __builtin_bswap16(u16);
+ #endif
+ }
++#endif
+
+ enum {ERR_OK = 0, ERR_FAIL = -1, ERR_UNSUPPORTED = -2};
+
diff --git a/audio/faad2/patches/patch-libfaad_Makefile.am b/audio/faad2/patches/patch-libfaad_Makefile.am
index bddd74e12d9..303abb3c56b 100644
--- a/audio/faad2/patches/patch-libfaad_Makefile.am
+++ b/audio/faad2/patches/patch-libfaad_Makefile.am
@@ -1,17 +1,16 @@
-$NetBSD: patch-libfaad_Makefile.am,v 1.1 2017/07/23 16:09:17 adam Exp $
+$NetBSD: patch-libfaad_Makefile.am,v 1.2 2017/12/01 11:17:51 adam Exp $
Separate includes from source files.
---- libfaad/Makefile.am.orig 2017-07-06 19:16:40.000000000 +0000
+--- libfaad/Makefile.am.orig 2017-10-07 09:02:02.000000000 +0000
+++ libfaad/Makefile.am
-@@ -15,8 +15,8 @@ libfaad_la_SOURCES = bits.c cfft.c decod
+@@ -15,7 +15,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 \
++libfaad_la_INCLUDES = \
+ analysis.h bits.h cfft.h cfft_tab.h common.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 \