diff --exclude=CVS -ruN faad.orig/Makefile faad/Makefile --- faad.orig/Makefile Fri Sep 9 16:31:40 2005 +++ faad/Makefile Fri Sep 9 16:34:03 2005 @@ -6,12 +6,11 @@ # PORTNAME= faad2 -PORTVERSION= 2.0 -PORTREVISION= 5 +PORTVERSION= 2.0.1 PORTEPOCH= 1 CATEGORIES= audio -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= faac +MASTER_SITES= http://people.freebsd.org/~ahze/distfiles/ +#MASTER_SITE_SUBDIR= faac MAINTAINER= ahze@FreeBSD.org COMMENT= MPEG-2 and MPEG-4 AAC audio decoder @@ -19,12 +18,12 @@ LIB_DEPENDS= mp4v2.0:${PORTSDIR}/multimedia/mpeg4ip-libmp4v2 \ sndfile.1:${PORTSDIR}/audio/libsndfile -WRKSRC= ${WRKDIR}/${PORTNAME} +#WRKSRC= ${WRKDIR}/${PORTNAME} NO_CDROM= "Restrictive copyright (do not sell for profit)" -USE_AUTOMAKE_VER= 15 -USE_AUTOHEADER_VER= 259 +#USE_AUTOMAKE_VER= 15 +#USE_AUTOHEADER_VER= 259 AUTOMAKE_ARGS= --add-missing CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} USE_GETOPT_LONG=yes @@ -41,9 +40,9 @@ .include -pre-patch: build-depends +#pre-patch: build-depends -post-patch: +DISABLE-post-patch: # make sure everything is prepared prior to configure stage # pre-configure will not work since *AUTO* tools happen in-between @cd ${WRKSRC}; ${ACLOCAL} -I ${ACLOCAL_DIR} -I .; \ @@ -61,5 +60,8 @@ ${XARGS} -n 5 -x \ ${REINPLACE_CMD} -e \ 's|-O2|${CFLAGS}|' + +post-install: + ${INSTALL_DATA} ${WRKSRC}/include/faad.h ${PREFIX}/include .include diff --exclude=CVS -ruN faad.orig/distinfo faad/distinfo --- faad.orig/distinfo Fri Sep 9 16:31:40 2005 +++ faad/distinfo Fri Sep 9 16:29:06 2005 @@ -1,2 +1,2 @@ -MD5 (faad2-2.0.tar.gz) = 1a6f79365f2934a4888b210ef47a3a07 -SIZE (faad2-2.0.tar.gz) = 766660 +MD5 (faad2-2.0.1.tar.gz) = 31eee5d13261c7347e46e1a3f1819278 +SIZE (faad2-2.0.1.tar.gz) = 1494947 diff --exclude=CVS -ruN faad.orig/files/patch-amd64-gcc34 faad/files/patch-amd64-gcc34 --- faad.orig/files/patch-amd64-gcc34 Fri Sep 9 16:31:40 2005 +++ faad/files/patch-amd64-gcc34 Wed Dec 31 19:00:00 1969 @@ -1,47 +0,0 @@ ---- common/mp4v2/mp4property.h.orig Sun Jun 29 17:41:00 2003 -+++ common/mp4v2/mp4property.h Wed Oct 20 19:41:16 2004 -@@ -58,7 +58,7 @@ - return m_name; - } - -- virtual MP4PropertyType GetType() = NULL; -+ virtual MP4PropertyType GetType() = 0; - - bool IsReadOnly() { - return m_readOnly; -@@ -74,17 +74,17 @@ - m_implicit = value; - } - -- virtual u_int32_t GetCount() = NULL; -- virtual void SetCount(u_int32_t count) = NULL; -+ virtual u_int32_t GetCount() = 0; -+ virtual void SetCount(u_int32_t count) = 0; - - virtual void Generate() { /* default is a no-op */ }; - -- virtual void Read(MP4File* pFile, u_int32_t index = 0) = NULL; -+ virtual void Read(MP4File* pFile, u_int32_t index = 0) = 0; - -- virtual void Write(MP4File* pFile, u_int32_t index = 0) = NULL; -+ virtual void Write(MP4File* pFile, u_int32_t index = 0) = 0; - - virtual void Dump(FILE* pFile, u_int8_t indent, -- bool dumpImplicits, u_int32_t index = 0) = NULL; -+ bool dumpImplicits, u_int32_t index = 0) = 0; - - virtual bool FindProperty(const char* name, - MP4Property** ppProperty, u_int32_t* pIndex = NULL); ---- common/mp4v2/rtphint.h.orig Sun Jun 29 17:41:00 2003 -+++ common/mp4v2/rtphint.h Wed Oct 20 19:41:16 2004 -@@ -35,8 +35,8 @@ - return m_pPacket; - } - -- virtual u_int16_t GetDataSize() = NULL; -- virtual void GetData(u_int8_t* pDest) = NULL; -+ virtual u_int16_t GetDataSize() = 0; -+ virtual void GetData(u_int8_t* pDest) = 0; - - MP4Track* FindTrackFromRefIndex(u_int8_t refIndex); - diff --exclude=CVS -ruN faad.orig/files/patch-configure.in faad/files/patch-configure.in --- faad.orig/files/patch-configure.in Fri Sep 9 16:31:40 2005 +++ faad/files/patch-configure.in Wed Dec 31 19:00:00 1969 @@ -1,43 +0,0 @@ ---- configure.in.orig Fri Feb 6 17:04:39 2004 -+++ configure.in Wed Jan 19 01:44:24 2005 -@@ -49,6 +49,43 @@ - fi - ]) - -+dnl @synopsis AC_C99_FUNC_LRINTF -+dnl -+dnl Check whether C99's lrintf function is available. -+dnl @version 1.3 Feb 12 2002 -+dnl @author Erik de Castro Lopo -+dnl -+dnl Permission to use, copy, modify, distribute, and sell this file for any -+dnl purpose is hereby granted without fee, provided that the above copyright -+dnl and this permission notice appear in all copies. No representations are -+dnl made about the suitability of this software for any purpose. It is -+dnl provided "as is" without express or implied warranty. -+dnl -+AC_DEFUN([AC_C99_FUNC_LRINTF], -+[AC_CACHE_CHECK(for lrintf, -+ ac_cv_c99_lrintf, -+[ -+lrintf_save_CFLAGS=$CFLAGS -+CFLAGS="-O -lm" -+AC_TRY_LINK([ -+#define _ISOC9X_SOURCE 1 -+#define _ISOC99_SOURCE 1 -+#define __USE_ISOC99 1 -+#define __USE_ISOC9X 1 -+ -+#include -+], if (!lrintf(3.14159)) lrintf(2.7183);, ac_cv_c99_lrintf=yes, ac_cv_c99_lrintf=no) -+ -+CFLAGS=$lrintf_save_CFLAGS -+ -+]) -+ -+if test "$ac_cv_c99_lrintf" = yes; then -+ AC_DEFINE(HAVE_LRINTF, 1, -+ [Define if you have C99's lrintf function.]) -+fi -+])# AC_C99_FUNC_LRINTF -+AC_C99_FUNC_LRINTF diff --exclude=CVS -ruN faad.orig/files/patch-libfaad_common.h faad/files/patch-libfaad_common.h --- faad.orig/files/patch-libfaad_common.h Fri Sep 9 16:31:40 2005 +++ faad/files/patch-libfaad_common.h Wed Dec 31 19:00:00 1969 @@ -1,16 +0,0 @@ ---- libfaad/common.h.orig Fri Feb 6 13:55:24 2004 -+++ libfaad/common.h Wed Jan 19 01:52:32 2005 -@@ -308,6 +308,7 @@ - return i; - } - #elif (defined(__i386__) && defined(__GNUC__)) -+ #ifndef HAVE_LRINTF - #define HAS_LRINTF - // from http://www.stereopsis.com/FPU.html - static INLINE int lrintf(float f) -@@ -320,6 +321,7 @@ - : "m" (f)); - return i; - } -+ #endif /* HAVE_LRINTF */ - #endif diff --exclude=CVS -ruN faad.orig/files/patch-structs.h faad/files/patch-structs.h --- faad.orig/files/patch-structs.h Fri Sep 9 16:31:40 2005 +++ faad/files/patch-structs.h Wed Dec 31 19:00:00 1969 @@ -1,94 +0,0 @@ ---- libfaad/structs.h.orig Thu Jan 29 12:31:11 2004 -+++ libfaad/structs.h Sun May 23 10:52:13 2004 -@@ -307,58 +307,58 @@ - typedef struct mp4AudioSpecificConfig - { - /* Audio Specific Info */ -- uint8_t objectTypeIndex; -- uint8_t samplingFrequencyIndex; -- uint32_t samplingFrequency; -- uint8_t channelsConfiguration; -+ unsigned char objectTypeIndex; -+ unsigned char samplingFrequencyIndex; -+ unsigned long samplingFrequency; -+ unsigned char channelsConfiguration; - - /* GA Specific Info */ -- uint8_t frameLengthFlag; -- uint8_t dependsOnCoreCoder; -- uint16_t coreCoderDelay; -- uint8_t extensionFlag; -- uint8_t aacSectionDataResilienceFlag; -- uint8_t aacScalefactorDataResilienceFlag; -- uint8_t aacSpectralDataResilienceFlag; -- uint8_t epConfig; -+ unsigned char frameLengthFlag; -+ unsigned char dependsOnCoreCoder; -+ unsigned short coreCoderDelay; -+ unsigned char extensionFlag; -+ unsigned char aacSectionDataResilienceFlag; -+ unsigned char aacScalefactorDataResilienceFlag; -+ unsigned char aacSpectralDataResilienceFlag; -+ unsigned char epConfig; - -- int8_t sbr_present_flag; -- int8_t forceUpSampling; -+ char sbr_present_flag; -+ char forceUpSampling; - } mp4AudioSpecificConfig; - - typedef struct faacDecConfiguration - { -- uint8_t defObjectType; -- uint32_t defSampleRate; -- uint8_t outputFormat; -- uint8_t downMatrix; -- uint8_t useOldADTSFormat; -- uint8_t dontUpSampleImplicitSBR; -+ unsigned char defObjectType; -+ unsigned long defSampleRate; -+ unsigned char outputFormat; -+ unsigned char downMatrix; -+ unsigned char useOldADTSFormat; -+ unsigned char dontUpSampleImplicitSBR; - } faacDecConfiguration, *faacDecConfigurationPtr; - - typedef struct faacDecFrameInfo - { -- uint32_t bytesconsumed; -- uint32_t samples; -- uint8_t channels; -- uint8_t error; -- uint32_t samplerate; -+ unsigned long bytesconsumed; -+ unsigned long samples; -+ unsigned char channels; -+ unsigned char error; -+ unsigned long samplerate; - - /* SBR: 0: off, 1: on; normal, 2: on; downsampled */ -- uint8_t sbr; -+ unsigned char sbr; - - /* MPEG-4 ObjectType */ -- uint8_t object_type; -+ unsigned char object_type; - - /* AAC header type; MP4 will be signalled as RAW also */ -- uint8_t header_type; -+ unsigned char header_type; - - /* multichannel configuration */ -- uint8_t num_front_channels; -- uint8_t num_side_channels; -- uint8_t num_back_channels; -- uint8_t num_lfe_channels; -- uint8_t channel_position[MAX_CHANNELS]; -+ unsigned char num_front_channels; -+ unsigned char num_side_channels; -+ unsigned char num_back_channels; -+ unsigned char num_lfe_channels; -+ unsigned char channel_position[MAX_CHANNELS]; - } faacDecFrameInfo; - - typedef struct diff --exclude=CVS -ruN faad.orig/pkg-plist faad/pkg-plist --- faad.orig/pkg-plist Fri Sep 9 16:31:40 2005 +++ faad/pkg-plist Fri Sep 9 16:34:25 2005 @@ -1,9 +1,6 @@ bin/faad include/faad.h -include/mp4ff.h lib/libfaad.a +lib/libfaad.la lib/libfaad.so lib/libfaad.so.0 -lib/libmp4ff.a -lib/libmp4ff.so -lib/libmp4ff.so.0