CVS commit: pkgsrc/audio/faad2

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/audio/faad2
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Sun, 23 Jul 2017 16:09:17 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Sun Jul 23 16:09:17 UTC 2017

Modified Files:
        pkgsrc/audio/faad2: Makefile PLIST distinfo
Added Files:
        pkgsrc/audio/faad2/patches: patch-common_mp4ff_Makefile.am
            patch-frontend_Makefile.am patch-frontend_getopt.c
            patch-libfaad_Makefile.am patch-libfaad_common.h
            patch-plugins_xmms_src_Makefile.am patch-plugins_xmms_src_libmp4.c
Removed Files:
        pkgsrc/audio/faad2/patches: patch-aa patch-ab patch-ac patch-ad
            patch-af patch-ak patch-au patch-av

Log Message:
2.8.1:
- seeking support for MP4 files
2.8.0:
- patches and fixed bugs


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 pkgsrc/audio/faad2/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/audio/faad2/PLIST
cvs rdiff -u -r1.23 -r1.24 pkgsrc/audio/faad2/distinfo
cvs rdiff -u -r1.5 -r0 pkgsrc/audio/faad2/patches/patch-aa \
    pkgsrc/audio/faad2/patches/patch-ab
cvs rdiff -u -r1.6 -r0 pkgsrc/audio/faad2/patches/patch-ac \
    pkgsrc/audio/faad2/patches/patch-ak
cvs rdiff -u -r1.4 -r0 pkgsrc/audio/faad2/patches/patch-ad \
    pkgsrc/audio/faad2/patches/patch-af
cvs rdiff -u -r1.3 -r0 pkgsrc/audio/faad2/patches/patch-au \
    pkgsrc/audio/faad2/patches/patch-av
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/audio/faad2/patches/patch-common_mp4ff_Makefile.am \
    pkgsrc/audio/faad2/patches/patch-frontend_Makefile.am \
    pkgsrc/audio/faad2/patches/patch-frontend_getopt.c \
    pkgsrc/audio/faad2/patches/patch-libfaad_Makefile.am \
    pkgsrc/audio/faad2/patches/patch-libfaad_common.h \
    pkgsrc/audio/faad2/patches/patch-plugins_xmms_src_Makefile.am \
    pkgsrc/audio/faad2/patches/patch-plugins_xmms_src_libmp4.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/faad2/Makefile
diff -u pkgsrc/audio/faad2/Makefile:1.48 pkgsrc/audio/faad2/Makefile:1.49
--- pkgsrc/audio/faad2/Makefile:1.48    Fri Aug 30 11:01:06 2013
+++ pkgsrc/audio/faad2/Makefile Sun Jul 23 16:09:17 2017
@@ -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"

Index: pkgsrc/audio/faad2/PLIST
diff -u pkgsrc/audio/faad2/PLIST:1.14 pkgsrc/audio/faad2/PLIST:1.15
--- pkgsrc/audio/faad2/PLIST:1.14       Tue Aug 11 11:16:37 2009
+++ pkgsrc/audio/faad2/PLIST    Sun Jul 23 16:09:17 2017
@@ -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

Index: pkgsrc/audio/faad2/distinfo
diff -u pkgsrc/audio/faad2/distinfo:1.23 pkgsrc/audio/faad2/distinfo:1.24
--- pkgsrc/audio/faad2/distinfo:1.23    Tue Nov  3 01:12:29 2015
+++ pkgsrc/audio/faad2/distinfo Sun Jul 23 16:09:17 2017
@@ -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

Added files:

Index: pkgsrc/audio/faad2/patches/patch-common_mp4ff_Makefile.am
diff -u /dev/null pkgsrc/audio/faad2/patches/patch-common_mp4ff_Makefile.am:1.1
--- /dev/null   Sun Jul 23 16:09:17 2017
+++ pkgsrc/audio/faad2/patches/patch-common_mp4ff_Makefile.am   Sun Jul 23 16:09:17 2017
@@ -0,0 +1,20 @@
+$NetBSD: patch-common_mp4ff_Makefile.am,v 1.1 2017/07/23 16:09:17 adam Exp $
+
+Install libmp4ff; needed for audio/xmms-faad.
+
+--- common/mp4ff/Makefile.am.orig      2017-07-17 12:04:02.000000000 +0000
++++ common/mp4ff/Makefile.am
+@@ -1,7 +1,8 @@
+-noinst_LIBRARIES = libmp4ff.a
+-noinst_HEADERS = mp4ff.h mp4ffint.h
++lib_LTLIBRARIES = libmp4ff.la
++include_HEADERS = mp4ff.h mp4ffint.h
+ 
+-libmp4ff_a_CFLAGS = -DUSE_TAGGING=1
++libmp4ff_la_CFLAGS = -DUSE_TAGGING=1
+ 
+-libmp4ff_a_SOURCES = mp4ff.c mp4atom.c mp4meta.c mp4sample.c mp4util.c \
+-                   mp4tagupdate.c mp4ff.h mp4ffint.h
++libmp4ff_la_SOURCES = mp4ff.c mp4atom.c mp4meta.c mp4sample.c mp4util.c \
++                   mp4tagupdate.c
++libmp4ff_la_INCLUDES= mp4ff.h mp4ffint.h
Index: pkgsrc/audio/faad2/patches/patch-frontend_Makefile.am
diff -u /dev/null pkgsrc/audio/faad2/patches/patch-frontend_Makefile.am:1.1
--- /dev/null   Sun Jul 23 16:09:17 2017
+++ pkgsrc/audio/faad2/patches/patch-frontend_Makefile.am       Sun Jul 23 16:09:17 2017
@@ -0,0 +1,20 @@
+$NetBSD: patch-frontend_Makefile.am,v 1.1 2017/07/23 16:09:17 adam Exp $
+
+Libtoolize and use correct man-page.
+
+--- frontend/Makefile.am.orig  2017-07-10 13:22:37.000000000 +0000
++++ frontend/Makefile.am
+@@ -1,9 +1,10 @@
+ bin_PROGRAMS = faad
+-man1_MANS = faad.man
++man1_MANS = faad.1
+ 
+ AM_CPPFLAGS = -I$(top_srcdir)/include -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
++faad_SOURCES = main.c audio.c
++faad_INCLUDES = audio.h
Index: pkgsrc/audio/faad2/patches/patch-frontend_getopt.c
diff -u /dev/null pkgsrc/audio/faad2/patches/patch-frontend_getopt.c:1.1
--- /dev/null   Sun Jul 23 16:09:17 2017
+++ pkgsrc/audio/faad2/patches/patch-frontend_getopt.c  Sun Jul 23 16:09:17 2017
@@ -0,0 +1,15 @@
+$NetBSD: patch-frontend_getopt.c,v 1.1 2017/07/23 16:09:17 adam Exp $
+
+Avoid conflicting definitions.
+
+--- frontend/getopt.c.orig     2017-07-23 13:10:42.000000000 +0000
++++ frontend/getopt.c
+@@ -171,8 +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);
Index: pkgsrc/audio/faad2/patches/patch-libfaad_Makefile.am
diff -u /dev/null pkgsrc/audio/faad2/patches/patch-libfaad_Makefile.am:1.1
--- /dev/null   Sun Jul 23 16:09:17 2017
+++ pkgsrc/audio/faad2/patches/patch-libfaad_Makefile.am        Sun Jul 23 16:09:17 2017
@@ -0,0 +1,17 @@
+$NetBSD: patch-libfaad_Makefile.am,v 1.1 2017/07/23 16:09:17 adam Exp $
+
+Separate includes from source files.
+
+--- libfaad/Makefile.am.orig   2017-07-06 19:16:40.000000000 +0000
++++ libfaad/Makefile.am
+@@ -15,8 +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 \
+                    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 \
Index: pkgsrc/audio/faad2/patches/patch-libfaad_common.h
diff -u /dev/null pkgsrc/audio/faad2/patches/patch-libfaad_common.h:1.1
--- /dev/null   Sun Jul 23 16:09:17 2017
+++ pkgsrc/audio/faad2/patches/patch-libfaad_common.h   Sun Jul 23 16:09:17 2017
@@ -0,0 +1,25 @@
+$NetBSD: patch-libfaad_common.h,v 1.1 2017/07/23 16:09:17 adam Exp $
+
+Use correct inlines.
+lrintf() returns long.
+
+--- libfaad/common.h.orig      2017-07-06 19:16:40.000000000 +0000
++++ libfaad/common.h
+@@ -41,7 +41,7 @@ extern "C" {
+ 
+ #include "neaacdec.h"
+ 
+-#if 1
++#if 0
+ #define INLINE __inline
+ #else
+ #define INLINE inline
+@@ -332,7 +332,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__ (
Index: pkgsrc/audio/faad2/patches/patch-plugins_xmms_src_Makefile.am
diff -u /dev/null pkgsrc/audio/faad2/patches/patch-plugins_xmms_src_Makefile.am:1.1
--- /dev/null   Sun Jul 23 16:09:17 2017
+++ pkgsrc/audio/faad2/patches/patch-plugins_xmms_src_Makefile.am       Sun Jul 23 16:09:17 2017
@@ -0,0 +1,18 @@
+$NetBSD: patch-plugins_xmms_src_Makefile.am,v 1.1 2017/07/23 16:09:17 adam Exp $
+
+Use correct libraries for linking.
+
+--- 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
Index: pkgsrc/audio/faad2/patches/patch-plugins_xmms_src_libmp4.c
diff -u /dev/null pkgsrc/audio/faad2/patches/patch-plugins_xmms_src_libmp4.c:1.1
--- /dev/null   Sun Jul 23 16:09:17 2017
+++ pkgsrc/audio/faad2/patches/patch-plugins_xmms_src_libmp4.c  Sun Jul 23 16:09:17 2017
@@ -0,0 +1,15 @@
+$NetBSD: patch-plugins_xmms_src_libmp4.c,v 1.1 2017/07/23 16:09:17 adam Exp $
+
+Use external include, as this will be build from audio/xmms-faad.
+
+--- 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>
+ #endif /*HAVE_BMP*/
+ 
+-#include "neaacdec.h"
++#include <neaacdec.h>
+ #include "mp4ff.h"
+ 
+ #define MP4_DESCRIPTION       "MP4 & MPEG2/4-AAC audio player - 1.2.x"

Prev by Date: CVS commit: pkgsrc/audio/faac
Next by Date: CVS commit: pkgsrc/audio
Previous by Thread: CVS commit: pkgsrc/audio/faac
Next by Thread: CVS commit: pkgsrc/audio
Indexes:

Home | Main Index | Thread Index | Old Index