sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-17 17:29:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update to 2.0.

Browse source 
Submitted by:	Simon Barner <barner@in.tum.de>
Approved by:	maintainer
This commit is contained in:
Joe Marcus Clarke 2004-03-05 07:27:02 +00:00
parent 2d6650ae38
commit a2f4fcba5d
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=102981
8 changed files with 36 additions and 96 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
audio/faad/Makefile
View file

@ -6,11 +6,11 @@
# #
PORTNAME= faad2 PORTNAME= faad2
PORTVERSION= 1.1 PORTVERSION= 2.0
PORTREVISION= 2
CATEGORIES= audio CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= faac MASTER_SITE_SUBDIR= faac
DISTNAME= ${PORTNAME}-${PORTVERSION}-rc3
MAINTAINER= sean@sfarc.net MAINTAINER= sean@sfarc.net
COMMENT= A LC, MAIN and LTP profile, MPEG2 and MPEG-4 AAC decoder COMMENT= A LC, MAIN and LTP profile, MPEG2 and MPEG-4 AAC decoder
@ -20,6 +20,8 @@ LIB_DEPENDS= sndfile.1:${PORTSDIR}/audio/libsndfile
WRKSRC= ${WRKDIR}/${PORTNAME} WRKSRC= ${WRKDIR}/${PORTNAME}
USE_AUTOMAKE_VER= 15 USE_AUTOMAKE_VER= 15
USE_AUTOHEADER= yes
USE_AUTOHEADER= yes
AUTOMAKE_ARGS= --add-missing AUTOMAKE_ARGS= --add-missing
USE_GETOPT_LONG= yes USE_GETOPT_LONG= yes
@ -28,7 +30,7 @@ USE_GMAKE= yes
USE_LIBTOOL= yes USE_LIBTOOL= yes
USE_REINPLACE= yes USE_REINPLACE= yes
CONFIGURE_ARGS= --program-transform-name='' CONFIGURE_ARGS= --program-transform-name='' --with-mp4v2
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \ LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \

2
audio/faad/distinfo
View file

@ -1 +1 @@
MD5 (faad2-1.1.tar.gz) = 5a20a6268484dea0e080df47f64b9075 MD5 (faad2-2.0-rc3.tar.gz) = 0080076438655ed7facf1089a9805aff

16
audio/faad/files/patch-common-mp4v2-configure.in
View file

@ -1,16 +0,0 @@
--- common/mp4v2/configure.in.orig Wed Jan 8 19:45:23 2003
+++ common/mp4v2/configure.in Wed Jan 8 19:45:57 2003
@@ -1,11 +1,12 @@
AC_INIT()
+AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE(mpeg4ip,0.9.2.8,dummy)
AC_PROG_CC
AC_PROG_CXX
AC_PROG_INSTALL
-AM_PROG_LIBTOOL
+AC_PROG_LIBTOOL
AM_CONFIG_HEADER(config.h)

26
audio/faad/files/patch-configure.in
View file

@ -1,26 +0,0 @@
--- configure.in.orig Fri Aug 9 03:23:28 2002
+++ configure.in Wed Jan 8 19:20:59 2003
@@ -1,8 +1,9 @@
-AC_INIT()
+AC_INIT
+AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE(faad,2.0)
AC_PROG_CC
-AM_PROG_LIBTOOL
+AC_PROG_LIBTOOL
AC_SUBST(LIBTOOL_DEPS)
dnl Checks for programs.
@@ -29,8 +30,9 @@
])
fi
-AC_OUTPUT_COMMANDS(,[cd common/mp4v2; aclocal -I .; autoheader; libtoolize --automake; automake --add-missing; autoconf; cd -])
+AC_CONFIG_COMMANDS([default-1],[[]],[[cd common/mp4v2; aclocal -I . -I /usr/local/share/aclocal; autoheader; libtoolize --automake; automake --add-missing; autoconf; cd -]])
AC_CONFIG_SUBDIRS(common/mp4v2)
-AC_OUTPUT(libfaad/Makefile common/Makefile frontend/Makefile Makefile)
+AC_CONFIG_FILES([libfaad/Makefile common/Makefile frontend/Makefile Makefile])
+AC_OUTPUT

14
audio/faad/files/patch-frontend-Makefile.am
View file

@ -1,14 +0,0 @@
--- frontend/Makefile.am.orig Thu Jul 25 23:22:25 2002
+++ frontend/Makefile.am Sun Jul 6 07:49:21 2003
@@ -2,8 +2,9 @@
faad_SOURCES = main.c audio.c
-CXXFLAGS = -O2
-CFLAGS = -O2 -D_FILE_OFFSET_BITS=64
+CXXFLAGS = @CXXFLAGS@
+CFLAGS = @CFLAGS@ -D_FILE_OFFSET_BITS=64
+CCLD = $(CXX)
INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/common/mp4v2
LDFLAGS =
LDADD = $(top_builddir)/libfaad/libfaad.la $(top_builddir)/common/mp4v2/libmp4v2.la -lm -lsndfile

11
audio/faad/files/patch-frontend-audio.c
View file

@ -1,11 +0,0 @@
--- frontend/audio.c.orig Thu Jul 25 08:42:54 2002
+++ frontend/audio.c Wed Jan 8 20:52:34 2003
@@ -52,7 +52,7 @@
break;
}
aufile->sfinfo.channels = channels;
- aufile->sfinfo.samples = 0;
+ aufile->sfinfo.frames = 0;
#ifdef _WIN32
if(infile[0] == '-')
{

47
audio/faad/files/patch-frontend_main_c
View file

@ -1,39 +1,38 @@
$OpenBSD: patch-frontend_main_c,v 1.3 2003/04/26 20:42:00 avsm Exp $ --- frontend/main.c.orig Thu Nov 6 16:45:08 2003
--- frontend/main.c.orig Sat Apr 26 21:32:51 2003 +++ frontend/main.c Wed Dec 10 06:27:37 2003
+++ frontend/main.c Sat Apr 26 21:33:44 2003 @@ -1074,7 +1074,7 @@
@@ -542,7 +542,7 @@ int main(int argc, char *argv[]) if (optarg)
case 's': {
if (optarg) {
char dr[10]; char dr[10];
- if (sscanf(optarg, "%s", dr) < 1) { - if (sscanf(optarg, "%s", dr) < 1) {
+ if (sscanf(optarg, "%9s", dr) < 1) { + if (sscanf(optarg, "%9s", dr) < 1) {
def_srate = 0; def_srate = 0;
} else { } else {
def_srate = atoi(dr); def_srate = atoi(dr);
@@ -552,7 +552,7 @@ int main(int argc, char *argv[]) @@ -1085,7 +1085,7 @@
case 'f': if (optarg)
if (optarg) { {
char dr[10]; char dr[10];
- if (sscanf(optarg, "%s", dr) < 1) { - if (sscanf(optarg, "%s", dr) < 1)
+ if (sscanf(optarg, "%9s", dr) < 1) { + if (sscanf(optarg, "%9s", dr) < 1)
{
format = 1; format = 1;
} else { } else {
format = atoi(dr); @@ -1099,7 +1099,7 @@
@@ -564,7 +564,7 @@ int main(int argc, char *argv[]) if (optarg)
case 'b': {
if (optarg) {
char dr[10]; char dr[10];
- if (sscanf(optarg, "%s", dr) < 1) { - if (sscanf(optarg, "%s", dr) < 1)
+ if (sscanf(optarg, "%9s", dr) < 1) { + if (sscanf(optarg, "%9s", dr) < 1)
{
outputFormat = FAAD_FMT_16BIT; /* just use default */ outputFormat = FAAD_FMT_16BIT; /* just use default */
} else { } else {
outputFormat = atoi(dr); @@ -1113,7 +1113,7 @@
@@ -576,7 +576,7 @@ int main(int argc, char *argv[]) if (optarg)
case 'l': {
if (optarg) {
char dr[10]; char dr[10];
- if (sscanf(optarg, "%s", dr) < 1) { - if (sscanf(optarg, "%s", dr) < 1)
+ if (sscanf(optarg, "%9s", dr) < 1) { + if (sscanf(optarg, "%9s", dr) < 1)
{
object_type = LC; /* default */ object_type = LC; /* default */
} else { } else {
object_type = atoi(dr);

8
audio/faad/pkg-plist
View file

@ -1,8 +1,14 @@
bin/faad bin/faad
include/faad.h include/faad.h
include/mp4ff.h
include/mp4.h
include/mpeg4ip.h
lib/libfaad.a lib/libfaad.a
lib/libfaad.so lib/libfaad.so
lib/libfaad.so.0 lib/libfaad.so.0
lib/libmp4v2.a lib/libmp4ff.a
lib/libmp4ff.so
lib/libmp4ff.so.0
lib/libmp4v2.so lib/libmp4v2.so
lib/libmp4v2.so.0 lib/libmp4v2.so.0
lib/libmp4v2.a