- changes amfix to allow building avifile using ac2.53/am1.6.1

- removed unnecessary ifarchs in descriptions

Changed files:
    avifile-amfix.patch -> 1.3
    avifile.spec -> 1.84

diff --git a/avifile-amfix.patch b/avifile-amfix.patch
index 9b99f7becc3a7da7eeff3192da182f8b3d5df5a5..c0eef026a43dd26b2b7a32b3a3e14d191727253f 100644 (file)
--- a/avifile-amfix.patch
+++ b/avifile-amfix.patch
@@ -21,3 +21,58 @@ diff -urN avifile0.6-20011220.orig/plugins/libwin32/loader/Makefile.am avifile0.
  
  # ldt_keeper.c is not used here !! this is not a bug 
  # it's used in lib/common/ldt_keeper.cpp
+--- avifile0.7-20020412/acinclude.m4.orig      Thu Apr 11 20:59:08 2002
++++ avifile0.7-20020412/acinclude.m4   Sun Apr 21 15:35:25 2002
+@@ -1444,18 +1444,6 @@
+ 
+ 
+ 
+-# as.m4
+-# Figure out how to run the assembler.
+-
+-# AM_PROG_AS
+-AC_DEFUN([AM_PROG_AS],
+-[# By default we simply use the C compiler to build assembly code.
+-AC_REQUIRE([AC_PROG_CC])
+-: ${AS='$(CC)'}
+-# Set ASFLAGS if not already set.
+-: ${ASFLAGS='$(CFLAGS)'}
+-AC_SUBST(AS)
+-AC_SUBST(ASFLAGS)])
+ 
+ 
+ 
+--- avifile0.7-20020412/lib/aviplay/Makefile.am.orig   Mon Jan  7 23:24:48 2002
++++ avifile0.7-20020412/lib/aviplay/Makefile.am        Sun Apr 21 15:37:56 2002
+@@ -38,7 +38,8 @@
+ 
+ # just for testing speed
+ check_PROGRAMS = hqtest res
+-hqtest_SOURCES = AudioFpHQResampler.cpp hqtest.cpp
++hqtest_SOURCES = hqtest.cpp
++hqtest_LDADD   = AudioFpHQResampler.lo
+ hqtest_LDFLAGS = ../libaviplay.la $(SDL_LDADD)
+ 
+ res_SOURCES = ResampleSinc.cpp
+--- avifile0.7-20020412/plugins/libac3pass/Makefile.am.orig    Sun Apr 21 15:35:45 2002
++++ avifile0.7-20020412/plugins/libac3pass/Makefile.am Sun Apr 21 15:39:18 2002
+@@ -9,7 +9,8 @@
+ EXTRA_DIST = Makefile.emu README.avifile
+ 
+ check_PROGRAMS = play_ac3
+-play_ac3_SOURCES = play-ac3.c ac3-iec958.c
++play_ac3_SOURCES = play-ac3.c
++play_ac3_LDADD = ac3-iec958.lo
+ 
+ LINE1=Digital L
+ LINE2=Digital R
+--- avifile0.7-20020412/plugins/libmad/libmad/configure.in.orig        Sat Oct 27 03:28:47 2001
++++ avifile0.7-20020412/plugins/libmad/libmad/configure.in     Sun Apr 21 15:41:42 2002
+@@ -352,7 +352,5 @@
+ test -n "$optimize" && CFLAGS="$CFLAGS $optimize"
+ test -n "$profile"  && CFLAGS="$CFLAGS $profile" LDFLAGS="$LDFLAGS $profile"
+ 
+-LTLIBOBJS=`echo "$LIBOBJS" | sed -e 's/\.o/.lo/g'`
+-AC_SUBST(LTLIBOBJS)
+ 
+ AC_OUTPUT(Makefile)

diff --git a/avifile.spec b/avifile.spec
index 30263b5932b0d285e414aa47b9ef6c40a974a2bb..7d431f4f45f244a3ca7c44a6b4f31bf6dfa23284 100644 (file)
--- a/avifile.spec
+++ b/avifile.spec
@@ -96,7 +96,6 @@ Kilka u
 benchmarkowania, ³±czenia plików AVI. Maj± wiêcej b³êdów, poniewa¿ nie
 s± tak intensywnie rozwijane jak odtwarzacz.
 
-%ifarch %{ix86}
 %package win32
 Summary:       Win32 audio/video plugin
 Summary(pl):   Plugin audio/video win32
@@ -111,7 +110,6 @@ Plugin for using Win32 DLL libraries in avifile located in
 %description win32 -l pl
 Plugin do u¿ywania w avifile zlokalizowanych w /usr/lib/win32
 bibliotek DLL Win32.
-%endif
 
 %package ffmpeg
 Summary:       GPL MPEG4 codec
@@ -137,7 +135,6 @@ je do kilku format
 ruchu. D¼wiêk jest kompresowany w MPEG audio layer 2 lub u¿ywaj±c
 kompatybilnego z AC3 strumienia.
 
-%ifarch %{ix86}
 %package divx4
 Summary:       Fast MPEG4 codec
 Summary(pl):   Szybki kodek MPEG4
@@ -151,7 +148,6 @@ DivX MPEG-4 decoder and encoder.
 
 %description divx4 -l pl
 Dekoder i koder MPEG-4 DivX.
-%endif
 
 %package vorbis
 Summary:       Vorbis audio plugin
@@ -189,7 +185,6 @@ Plugin for mp3 encoding capability of avirecompress tool.
 %description lame_audioenc -l pl
 Plugin umo¿liwiaj±cy avirecompressowi kodowanie mp3.
 
-%ifarch %{ix86}
 %package xvid
 Summary:       XVID codec
 Summary(pl):   Kodek XVID
@@ -203,7 +198,6 @@ XVID decoder and encoder.
 
 %description xvid -l pl
 Dekoder i koder XVID.
-%endif
 
 %prep
 %setup -q -n avifile%{_ver}-%{_snapver}
@@ -218,8 +212,8 @@ Dekoder i koder XVID.
 rm -f missing aclocal.m4
 libtoolize --copy --force
 aclocal
-autoconf
 autoheader
+autoconf
 automake -a -c --foreign
 
 cd plugins/libmad/libmad