update to faad-2.10.1, from Brad
patch libquicktime's configure script to fix detection
This commit is contained in:
sthen
parent
127596e484
commit
2fd33fda8c
|
|
@ -3,18 +3,15 @@ NOT_FOR_ARCHS= ${GCC3_ARCHS}
|
|||
|
||||
COMMENT= MPEG-2 and MPEG-4 AAC decoder
|
||||
|
||||
V= 2.7
|
||||
DISTNAME= faad2-${V}
|
||||
V= 2.10.1
|
||||
GH_ACCOUNT= knik0
|
||||
GH_PROJECT= faad2
|
||||
GH_TAGNAME= ${V}
|
||||
PKGNAME= faad-${V}
|
||||
REVISION= 2
|
||||
CATEGORIES= audio
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=faac/}
|
||||
EXTRACT_SUFX= .tar.bz2
|
||||
|
||||
SHARED_LIBS= faad 3.0 \
|
||||
mp4ff 2.0
|
||||
|
||||
HOMEPAGE= http://www.audiocoding.com/
|
||||
SHARED_LIBS= faad 4.0 \
|
||||
faad_drm 0.0
|
||||
|
||||
# GPLv2+
|
||||
PERMIT_PACKAGE= Yes
|
||||
|
|
@ -26,17 +23,9 @@ BUILD_DEPENDS+= ${MODGNU_AUTOCONF_DEPENDS} \
|
|||
${MODGNU_AUTOMAKE_DEPENDS} \
|
||||
devel/libtool
|
||||
|
||||
USE_GMAKE= Yes
|
||||
CONFIGURE_STYLE= gnu
|
||||
AUTOCONF_VERSION= 2.61
|
||||
AUTOMAKE_VERSION= 1.9
|
||||
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
|
||||
LDFLAGS="-L${LOCALBASE}/lib"
|
||||
|
||||
post-extract:
|
||||
@mv ${WRKSRC}/frontend/faad.man ${WRKSRC}/frontend/faad.1
|
||||
|
||||
post-patch:
|
||||
@cd ${WRKSRC} && ${AUTOCONF_ENV} sh bootstrap
|
||||
AUTOCONF_VERSION= 2.71
|
||||
AUTOMAKE_VERSION= 1.16
|
||||
AUTORECONF= ./bootstrap
|
||||
CONFIGURE_STYLE= autoreconf
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
SHA256 (faad2-2.7.tar.bz2) = FFYbXWvEV+glv9OSGuUKZkjzd6k5bq8W1LBXs5o/Y7U=
|
||||
SIZE (faad2-2.7.tar.bz2) = 901043
|
||||
SHA256 (faad2-2.10.1.tar.gz) = TBbHEpXKDL98Pf6Y6xHY+o0KwwQuQWBM/WzBGkCM8mQ=
|
||||
SIZE (faad2-2.10.1.tar.gz) = 803488
|
||||
|
|
|
|||
|
|
@ -1,13 +0,0 @@
|
|||
--- common/mp4ff/Makefile.am.orig Fri Feb 6 09:24:21 2009
|
||||
+++ common/mp4ff/Makefile.am Thu May 10 19:02:20 2012
|
||||
@@ -1,7 +1,7 @@
|
||||
-lib_LIBRARIES = libmp4ff.a
|
||||
+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 \
|
||||
+libmp4ff_la_SOURCES = mp4ff.c mp4atom.c mp4meta.c mp4sample.c mp4util.c \
|
||||
mp4tagupdate.c mp4ff.h mp4ffint.h mp4ff_int_types.h
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
--- common/mp4ff/mp4ff.h.orig Mon May 14 17:05:03 2012
|
||||
+++ common/mp4ff/mp4ff.h Mon May 14 17:05:27 2012
|
||||
@@ -35,11 +35,7 @@
|
||||
extern "C" {
|
||||
#endif /* __cplusplus */
|
||||
|
||||
-#ifdef HAVE_STDINT_H
|
||||
#include <stdint.h>
|
||||
-#else
|
||||
-#include "mp4ff_int_types.h"
|
||||
-#endif
|
||||
|
||||
/* file callback structure */
|
||||
typedef struct
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
--- common/mp4ff/mp4ffint.h.orig Mon May 14 17:06:54 2012
|
||||
+++ common/mp4ff/mp4ffint.h Mon May 14 17:07:25 2012
|
||||
@@ -35,7 +35,7 @@
|
||||
extern "C" {
|
||||
#endif /* __cplusplus */
|
||||
|
||||
-#include "mp4ff_int_types.h"
|
||||
+#include <stdint.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#define MAX_TRACKS 1024
|
||||
|
|
@ -1,18 +0,0 @@
|
|||
--- frontend/Makefile.am.orig Fri Feb 6 11:03:37 2009
|
||||
+++ frontend/Makefile.am Mon May 14 16:55:55 2012
|
||||
@@ -1,12 +1,11 @@
|
||||
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 audio.h
|
||||
|
|
@ -5,13 +5,12 @@
|
|||
@pkgpath audio/faad,-xmms
|
||||
@bin bin/faad
|
||||
include/faad.h
|
||||
include/mp4ff.h
|
||||
include/mp4ffint.h
|
||||
include/neaacdec.h
|
||||
lib/libfaad.a
|
||||
@static-lib lib/libfaad.a
|
||||
lib/libfaad.la
|
||||
@lib lib/libfaad.so.${LIBfaad_VERSION}
|
||||
lib/libmp4ff.a
|
||||
lib/libmp4ff.la
|
||||
@lib lib/libmp4ff.so.${LIBmp4ff_VERSION}
|
||||
@static-lib lib/libfaad_drm.a
|
||||
lib/libfaad_drm.la
|
||||
@lib lib/libfaad_drm.so.${LIBfaad_drm_VERSION}
|
||||
lib/pkgconfig/faad2.pc
|
||||
@man man/man1/faad.1
|
||||
|
|
|
|||
|
|
@ -1,23 +1,13 @@
|
|||
--- configure.orig Thu Mar 29 15:45:15 2012
|
||||
+++ configure Mon Apr 2 19:49:37 2012
|
||||
@@ -14951,7 +14951,7 @@ fi
|
||||
VORBIS_LIBS="-L$prefix/lib"
|
||||
fi
|
||||
Fix detection of newer faad.
|
||||
|
||||
Index: configure
|
||||
--- configure.orig
|
||||
+++ configure
|
||||
@@ -17588,6 +17588,7 @@ else
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
- VORBIS_LIBS="$VORBIS_LIBS -lvorbis -lm"
|
||||
+ VORBIS_LIBS="$VORBIS_LIBS -lvorbis -logg -lm"
|
||||
VORBISFILE_LIBS="-lvorbisfile"
|
||||
VORBISENC_LIBS="-lvorbisenc"
|
||||
|
||||
@@ -15111,11 +15111,7 @@ if test "x$with_lame" != "xno"; then
|
||||
OLD_CFLAGS=$CFLAGS
|
||||
OLD_LIBS=$LIBS
|
||||
|
||||
-if test x$have_vorbis = xtrue; then
|
||||
-LIBS="$LIBS -lmp3lame -lvorbis -lm"
|
||||
-else
|
||||
LIBS="$LIBS -lmp3lame -lm"
|
||||
-fi
|
||||
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for lame" >&5
|
||||
+ #include <faad.h>
|
||||
#include <neaacdec.h>
|
||||
#include <stdio.h>
|
||||
main()
|
||||
|
|
|
|||
Loading…
Reference in New Issue