Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/sound
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10334/10.3/unstable/main/finkinfo/sound
Modified Files:
faad.info
Added Files:
faad.patch
Log Message:
backport gcc4 fixes
Index: faad.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/sound/faad.info,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- faad.info 23 Nov 2005 22:00:14 -0000 1.9
+++ faad.info 27 Mar 2006 23:01:52 -0000 1.10
@@ -1,14 +1,15 @@
Package: faad
Version: 2.0.0
-Revision: 12
+Revision: 13
###
-Depends: libfaad1-shlibs, libmp4v21-shlibs
+Depends: libfaad1-shlibs (>= %v-%r), libmp4v21-shlibs
BuildDepends: id3lib4-dev, libtool14, xmms, libiconv-dev, gettext-dev, gtk+,
glib, automake1.8, gcc3.3
###
Source: mirror:sourceforge:faac/faad2-2.0.tar.gz
Source-MD5: 1a6f79365f2934a4888b210ef47a3a07
SourceDirectory: faad2
###
+# Only libmp4v21-{dev,shlibs} has C++ symbols
GCC: 3.3
###
PatchScript: <<
@@ -24,6 +25,7 @@
perl -pi -e 's,[EMAIL PROTECTED]@,\$\(top_srcdir\)/common/mp4v2/libmp4v2.la
[EMAIL PROTECTED]@,g' frontend/Makefile.in
perl -pi -e 's,[EMAIL PROTECTED]@,\$\(top_srcdir\)/common/mp4v2/libmp4v2.la
[EMAIL PROTECTED]@,g' plugins/xmms/Makefile.in
<<
+Patch: %n.patch
###
NoSetLDFLAGS: true
SetLIBS: -L%p/lib
@@ -105,12 +107,6 @@
<<
###
Description: FAAC audio library
-DescPackaging: <<
- This version is compiled with g++-3.3, even in the 10.4 tree. If it is
- ever updated to a more recent compiler, the group of packages avidemux,
- faad, and ffmpeg (and any packages which depend on any of them) must all
- be updated at the same time.
-<<
DescDetail: <<
FAAC is an Advanced Audio Coder (MPEG2-AAC, MPEG4-AAC). The goal of FAAC is
to explore the possibilities of AAC and exceed the quality of the currentlyi
--- NEW FILE: faad.patch ---
diff -ru faad2.orig/common/mp4ff/mp4ff.c faad2/common/mp4ff/mp4ff.c
--- faad2.orig/common/mp4ff/mp4ff.c 2004-01-11 10:52:18.000000000 -0500
+++ faad2/common/mp4ff/mp4ff.c 2006-03-23 21:38:27.000000000 -0500
@@ -87,7 +87,7 @@
if (ff) free(ff);
}
-static void mp4ff_track_add(mp4ff_t *f)
+void mp4ff_track_add(mp4ff_t *f)
{
f->total_tracks++;
diff -ru faad2.orig/common/mp4v2/mp4property.h faad2/common/mp4v2/mp4property.h
--- faad2.orig/common/mp4v2/mp4property.h 2003-06-29 17:41:00.000000000
-0400
+++ faad2/common/mp4v2/mp4property.h 2006-03-23 21:30:38.000000000 -0500
@@ -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);
diff -ru faad2.orig/common/mp4v2/rtphint.h faad2/common/mp4v2/rtphint.h
--- faad2.orig/common/mp4v2/rtphint.h 2003-06-29 17:41:00.000000000 -0400
+++ faad2/common/mp4v2/rtphint.h 2006-03-23 21:31:01.000000000 -0500
@@ -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 -ru faad2.orig/libfaad/common.h faad2/libfaad/common.h
--- faad2.orig/libfaad/common.h 2004-02-06 07:55:24.000000000 -0500
+++ faad2/libfaad/common.h 2006-03-23 21:27:29.000000000 -0500
@@ -307,6 +307,8 @@
}
return i;
}
+ #elif (defined(__i386__) && defined(__APPLE_CC__))
+ #define HAS_LRINTF
#elif (defined(__i386__) && defined(__GNUC__))
#define HAS_LRINTF
// from http://www.stereopsis.com/FPU.html
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
