faad2: Update to 2.8.8

* Add new files to Makefile.am
* Include "utils" in source package
* Some improvements to "unicode_support.h" + include this file on ALL
platforms.
* Fixed possible buffer overflow.

5 files changed, 23 insertions, 23 deletions

diff --git a/audio/faad2/Makefile b/audio/faad2/Makefile
index e8dc79f406f..13f2118a9a6 100644
--- a/audio/faad2/Makefile
+++ b/audio/faad2/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.50 2017/12/01 11:17:51 adam Exp $
+# $NetBSD: Makefile,v 1.51 2019/06/05 06:07:27 nia Exp $
 # IMPORTANT: Do not forget to update audio/xmms-faad
 
-DISTNAME=	faad2-2.8.6
+DISTNAME=	faad2-2.8.8
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=faac/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://faac.sourceforge.net/
+HOMEPAGE=	https://www.audiocoding.com/
 COMMENT=	AAC decoding library
 LICENSE=	gnu-gpl-v2
 
diff --git a/audio/faad2/distinfo b/audio/faad2/distinfo
index bcada7e05bc..ccfacd9d107 100644
--- a/audio/faad2/distinfo
+++ b/audio/faad2/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.25 2017/12/01 11:17:51 adam Exp $
+$NetBSD: distinfo,v 1.26 2019/06/05 06:07:27 nia Exp $
 
-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 (faad2-2.8.8.tar.gz) = 0d49c516d4a83c39053a9bd214fddba72cbc34ad
+RMD160 (faad2-2.8.8.tar.gz) = b69349ee69c869ba070f28c58418749d53898985
+SHA512 (faad2-2.8.8.tar.gz) = 3275d292b2a9fe984842962f4d81202894bddd17033f7cd6df95466554cc968dfcbf2890ae8b1df37da0cd25d645cca0a687f07e39b9fc37dd004fd5956a82af
+Size (faad2-2.8.8.tar.gz) = 1069044 bytes
 SHA1 (patch-common_mp4ff_Makefile.am) = a662e6fd841420110c02f85923d022919135be82
 SHA1 (patch-configure.ac) = ed9d4e9d611d27d4add86884996a8e7fc001bc90
-SHA1 (patch-frontend_Makefile.am) = 02f841382e494a49993160d9b64efc74b61fba84
+SHA1 (patch-frontend_Makefile.am) = ab3369e67fb5f2842076fb698819936473440de9
 SHA1 (patch-frontend_getopt.c) = 3eaf3e8318887eca49e354696cad1bd2c5bf5504
-SHA1 (patch-frontend_mp4read.c) = 4e8ccdb7c1ebf21243a0edc3ad172a1101c4a133
+SHA1 (patch-frontend_mp4read.c) = 235d69a310bb2cb52cf62479e9254c1d3eb9cef9
 SHA1 (patch-libfaad_Makefile.am) = 4d3b92f54d998bd577641f49e88d0c8bc38f963c
 SHA1 (patch-libfaad_common.h) = 60eccd8aebeb085760d6866f83ff5a613197918f
 SHA1 (patch-plugins_xmms_src_Makefile.am) = 4ba1dfefe1e351830ee990c711af6ac46db42c14
diff --git a/audio/faad2/patches/patch-frontend_Makefile.am b/audio/faad2/patches/patch-frontend_Makefile.am
index f21b70ed8e8..293342cb760 100644
--- a/audio/faad2/patches/patch-frontend_Makefile.am
+++ b/audio/faad2/patches/patch-frontend_Makefile.am
@@ -1,8 +1,8 @@
-$NetBSD: patch-frontend_Makefile.am,v 1.2 2017/12/01 11:17:51 adam Exp $
+$NetBSD: patch-frontend_Makefile.am,v 1.3 2019/06/05 06:07:27 nia Exp $
 
 Use correct sources.
 
---- frontend/Makefile.am.orig	2017-09-29 11:16:02.000000000 +0000
+--- frontend/Makefile.am.orig	2017-12-17 19:51:26.000000000 +0000
 +++ frontend/Makefile.am
 @@ -1,10 +1,11 @@
  bin_PROGRAMS = faad
@@ -13,8 +13,8 @@ Use correct sources.
  
  faad_LDADD = $(top_builddir)/libfaad/libfaad.la
  
--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
+-faad_SOURCES = mp4read.c audio.c main.c audio.h mp4read.h unicode_support.c unicode_support.h
++faad_SOURCES = mp4read.c audio.c main.c unicode_support.c
++faad_INCLUDES = audio.h mp4read.h unicode_support.h
  
  EXTRA_faad_SOURCES =  getopt.c
diff --git a/audio/faad2/patches/patch-frontend_mp4read.c b/audio/faad2/patches/patch-frontend_mp4read.c
index 09cf6f9eefc..297fcc54aad 100644
--- a/audio/faad2/patches/patch-frontend_mp4read.c
+++ b/audio/faad2/patches/patch-frontend_mp4read.c
@@ -1,20 +1,20 @@
-$NetBSD: patch-frontend_mp4read.c,v 1.1 2017/12/01 11:17:51 adam Exp $
+$NetBSD: patch-frontend_mp4read.c,v 1.2 2019/06/05 06:07:27 nia Exp $
 
 Do not re-define bswap32() and bswap16().
 
---- frontend/mp4read.c.orig	2017-12-01 11:02:01.786551844 +0000
+--- frontend/mp4read.c.orig	2017-12-17 11:18:43.000000000 +0000
 +++ frontend/mp4read.c
-@@ -45,6 +45,8 @@ mp4config_t mp4config = { 0 };
+@@ -46,6 +46,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)
+ static inline uint32_t bswap32(const uint32_t u32)
  {
  #ifndef WORDS_BIGENDIAN
-@@ -58,6 +60,7 @@ static inline uint16_t bswap16(uint16_t 
-     return __builtin_bswap16(u16);
+@@ -71,6 +73,7 @@ static inline uint16_t bswap16(const uin
+ 	return u16;
  #endif
  }
 +#endif
diff --git a/audio/xmms-faad/Makefile b/audio/xmms-faad/Makefile
index 8a5e80f4b0a..ab58480a9ca 100644
--- a/audio/xmms-faad/Makefile
+++ b/audio/xmms-faad/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.24 2017/12/01 11:26:31 adam Exp $
+# $NetBSD: Makefile,v 1.25 2019/06/05 06:07:27 nia Exp $
 
-DISTNAME=	faad2-2.8.6
+DISTNAME=	faad2-2.8.8
 PKGNAME=	${DISTNAME:S/faad/xmms-faad/}
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=faac/}