Index: configure.in =================================================================== RCS file: /cvsroot/faac/faad2/configure.in,v retrieving revision 1.28 diff -u -w -b -r1.28 configure.in --- configure.in 8 Nov 2004 08:05:47 -0000 1.28 +++ configure.in 24 Jan 2006 21:22:12 -0000 @@ -9,7 +9,7 @@ AC_INIT AC_CONFIG_AUX_DIR(.) -AM_INIT_AUTOMAKE(faad2, 2.0) +AM_INIT_AUTOMAKE(faad2, 2.0.1cvs2006124) AC_PROG_LIBTOOL AC_SUBST(LIBTOOL_DEPS) @@ -35,6 +35,9 @@ AC_ARG_WITH(mpeg4ip, [ --with-mpeg4ip compile mpeg4ip plugin], WITHMPEG4IP=$withval, WITHMPEG4IP=no) +AC_ARG_WITH(fixpoint, [ --with-fixpoint compile fixpoint support], + WITHFIXPOINT=$withval, WITHFIXPOINT=no) + dnl Checks for header files required for mp4.h AC_HEADER_STDC AC_CHECK_HEADERS(stdint.h inttypes.h) @@ -59,7 +62,7 @@ AC_TYPE_OFF_T -AC_DEFUN(MY_CHECK_TYPEDEF_FROM_INCLUDE, +AC_DEFUN([MY_CHECK_TYPEDEF_FROM_INCLUDE], [ AC_MSG_CHECKING([for $1]) AC_TRY_COMPILE([$2], @@ -80,6 +83,11 @@ AC_CHECK_FUNCS(strsep) +if test $WITHFIXPOINT = "yes"; then + AC_DEFINE(FIXED_POINT, 1, [Define if you want to compile a fix-point libfaad library]) + AC_DEFINE(BIG_IQ, 1, [Define if you want to use the full 8192 value table, otherwise a 1026 value table and interpolation will be used]) +fi + AC_CHECK_PROG(external_mp4v2, mpeg4ip-config, yes, no) AM_CONDITIONAL(HAVE_MPEG4IP_PLUG, false) if test x$WITHMPEG4IP = xyes; then Index: faad2.spec.in =================================================================== RCS file: /cvsroot/faac/faad2/faad2.spec.in,v retrieving revision 1.2 diff -u -w -b -r1.2 faad2.spec.in --- faad2.spec.in 8 Nov 2004 08:05:48 -0000 1.2 +++ faad2.spec.in 24 Jan 2006 21:22:12 -0000 @@ -1,3 +1,9 @@ +# option to compile without XMMS plugin +%if %{?without_xmms:1}%{!?without_xmms:0} + %define _without_xmms --without-xmms +%else + %define _with_xmms --with-xmms +%endif # this has been taken from http://www.hyperborea.org/software/dillo/dillo.spec ################################################################################# # Identify which distribution we're building on. @@ -25,9 +31,14 @@ Source0: http://download.sourceforge.net/faad/%{name}-%{version}.tar.gz #Patch: faad2-%{version}.patch BuildRequires: autoconf, automake, libtool, gcc-c++ -BuildRequires: xmms-devel, id3lib-devel + +%if %{?_with_xmms:1}%{!?_with_xmms:0} +BuildRequires: xmms-devel +%endif + URL: http://www.audiocoding.com/ ################################################################################# +%if %{?_with_xmms:1}%{!?_with_xmms:0} # GTK Dependencies %if %{mdk} BuildRequires: libgtk+-devel >= 1.2.0 @@ -38,6 +49,7 @@ %if !%{suse} && !%{mdk} BuildRequires: gtk+-devel >= 1.2.0 %endif +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Packager: a.kurpiers@nt.tu-darmstadt.de @@ -57,10 +69,11 @@ %description devel Header files and development documentation for libfaad. +%if %{?_with_xmms:1}%{!?_with_xmms:0} %package xmms Group: Applications/Multimedia Summary: AAC and MP4 input plugin for xmms -Requires: %{name}, %{name}-libmp4v2, xmms, id3lib +Requires: %{name}, xmms %description xmms @@ -69,7 +82,7 @@ This MP4 xmms plugin reads AAC files with and without ID3 tags (version 2.x). AAC files are MPEG2 or MPEG4 files that can be found in MPEG4 audio files (.mp4). MPEG4 files with AAC inside can be read by RealPlayer or Quicktime. - +%endif %prep #%setup -n %{name} @@ -78,13 +91,16 @@ %build #sh bootstrap -./configure --with-drm --with-xmms --prefix=/usr +./configure --with-drm %{?_with_xmms} %{?_without_xmms} --prefix=/usr make %install rm -rf %{buildroot} # Hack to work around a problem with DESTDIR in libtool 1.4.x LIBRARY_PATH="%{buildroot}/usr/lib:${LIBRARY_PATH}" make install DESTDIR=%{buildroot} +# install libmp4ff +install -m 755 common/mp4ff/libmp4ff.a %{buildroot}%{_libdir} +install common/mp4ff/mp4ff.h %{buildroot}%{_includedir} %post -p /sbin/ldconfig @@ -105,13 +121,30 @@ %{_libdir}/libfaad.la %{_includedir}/faad.h %{_includedir}/neaacdec.h +%{_includedir}/mp4ff.h +%{_libdir}/libmp4ff.a +%if %{?_with_xmms:1}%{!?_with_xmms:0} %files xmms %defattr(-,root,root) %doc plugins/xmms/README %_libdir/xmms/Input/* +%endif %changelog +* Tue Jan 24 2006 Alexander Kurpiers +- fix wrong function declaration in mp4ffint.h + +* Wed Nov 15 2005 Alexander Kurpiers +- fix requirements for xmms plugin +- add libmp4ff to devel package (only static library) + +* Sat Aug 13 2005 Alexander Kurpiers +- fix dependencies for xmms plugin. libmp4v2/id3lib no longer needed + +* Sun Apr 24 2005 Alexander Kurpiers +- make xmms plugin generation optional. Build with '--define "without_xmms 1"' + * Tue Nov 02 2004 Alexander Kurpiers - remove libmp4ff and libmp4v2 from RPM - changes for new version of faad2 Index: common/mp4ff/mp4ff.h =================================================================== RCS file: /cvsroot/faac/faad2/common/mp4ff/mp4ff.h,v retrieving revision 1.22 diff -u -w -b -r1.22 mp4ff.h --- common/mp4ff/mp4ff.h 1 Feb 2005 13:15:55 -0000 1.22 +++ common/mp4ff/mp4ff.h 24 Jan 2006 21:22:13 -0000 @@ -129,3 +129,4 @@ #endif /* __cplusplus */ #endif \ No newline at end of file + Index: common/mp4ff/mp4ffint.h =================================================================== RCS file: /cvsroot/faac/faad2/common/mp4ff/mp4ffint.h,v retrieving revision 1.19 diff -u -w -b -r1.19 mp4ffint.h --- common/mp4ff/mp4ffint.h 1 Feb 2005 13:15:55 -0000 1.19 +++ common/mp4ff/mp4ffint.h 24 Jan 2006 21:22:14 -0000 @@ -347,7 +347,7 @@ mp4ff_t *mp4ff_open_edit(mp4ff_callback_t *f); #endif void mp4ff_close(mp4ff_t *ff); -void mp4ff_track_add(mp4ff_t *f); +static void mp4ff_track_add(mp4ff_t *f); int32_t parse_sub_atoms(mp4ff_t *f, const uint64_t total_size,int meta_only); int32_t parse_atoms(mp4ff_t *f,int meta_only); Index: frontend/main.c =================================================================== RCS file: /cvsroot/faac/faad2/frontend/main.c,v retrieving revision 1.77 diff -u -w -b -r1.77 main.c --- frontend/main.c 1 Feb 2005 13:15:56 -0000 1.77 +++ frontend/main.c 24 Jan 2006 21:22:15 -0000 @@ -36,6 +36,7 @@ #define off_t __int64 #else #include +#include #endif #include