avifile-opt.patch

   1 diff -ur avifile-0.6.0.orig/configure.in avifile-0.6.0/configure.in
   2 --- avifile-0.6.0.orig/configure.in     Mon Jan 22 08:09:41 2001
   3 +++ avifile-0.6.0/configure.in  Wed Jan 24 16:42:49 2001
   4 @@ -79,11 +79,6 @@
   5  AC_FUNC_VPRINTF
   6  AC_CHECK_FUNCS(ftime gettimeofday strdup strstr)
   7
   8 -dnl remove me
   9 -CFLAGS="$CFLAGS -march=i586"
  10 -
  11 -
  12 -
  13  USE_QT=1
  14  USE_QTRECOMP=1
  15
  16 diff -ur avifile-0.6.0.orig/lib/aviplay/Makefile.am avifile-0.6.0/lib/aviplay/Makefile.am
  17 --- avifile-0.6.0.orig/lib/aviplay/Makefile.am  Mon Jan 22 07:53:27 2001
  18 +++ avifile-0.6.0/lib/aviplay/Makefile.am       Wed Jan 24 16:38:44 2001
  19 @@ -1,7 +1,7 @@
  20  noinst_LTLIBRARIES=libaviplay.la
  21  libaviplay_la_SOURCES=audio.cpp aviplay.cpp renderer.cpp aviplay2.cpp
  22
  23 -CXXFLAGS=-march=i586 -I../../include @SDL_CFLAGS@ @X_INCLUDES@
  24 +CXXFLAGS=-I../../include @SDL_CFLAGS@ @X_INCLUDES@
  25
  26  LIBS=
  27  noinst_HEADERS=RegAccess.h audio.h aviplay2.h aviplay_impl.h
  28 diff -ur avifile-0.6.0.orig/lib/aviread/Makefile.am avifile-0.6.0/lib/aviread/Makefile.am
  29 --- avifile-0.6.0.orig/lib/aviread/Makefile.am  Tue Jan 16 21:57:12 2001
  30 +++ avifile-0.6.0/lib/aviread/Makefile.am       Wed Jan 24 16:38:59 2001
  31 @@ -1,6 +1,6 @@
  32  noinst_LTLIBRARIES=libaviread.la
  33  libaviread_la_SOURCES=asfinput.cpp AsfReadHandler.cpp AviReadHandler.cpp AviRead.cpp Cache.cpp
  34  noinst_HEADERS=asfinput.h AsfReadHandler.h AviReadHandler.h AviRead.h Cache.h asffmt.h
  35 -CXXFLAGS=-I../../include -Wno-multichar -fno-omit-frame-pointer
  36 +CXXFLAGS=-I../../include -Wno-multichar
  37
  38  LIBS=
  39 diff -ur avifile-0.6.0.orig/lib/common/Makefile.am avifile-0.6.0/lib/common/Makefile.am
  40 --- avifile-0.6.0.orig/lib/common/Makefile.am   Mon Jan 22 06:13:32 2001
  41 +++ avifile-0.6.0/lib/common/Makefile.am        Wed Jan 24 16:39:14 2001
  42 @@ -1,4 +1,4 @@
  43  noinst_LTLIBRARIES=libcommon.la
  44  libcommon_la_SOURCES=mmx.cpp image.cpp impl_video.cpp impl_audio.cpp util.cpp ldt_keeper.cpp
  45 -CXXFLAGS=-I../../include -fno-exceptions -Os
  46 +CXXFLAGS=-I../../include -fno-exceptions
  47
  48 diff -ur avifile-0.6.0.orig/player/Makefile.am avifile-0.6.0/player/Makefile.am
  49 --- avifile-0.6.0.orig/player/Makefile.am       Thu Jan 18 01:30:20 2001
  50 +++ avifile-0.6.0/player/Makefile.am    Wed Jan 24 16:39:43 2001
  51 @@ -29,7 +29,7 @@
  52  DEFINES=
  53
  54  CXXFLAGS=-I../include @X_INCLUDES@ @QT_INCLUDES@ @SDL_CFLAGS@ \
  55 -    -DSHARE_PATH=\"@datadir@/avifile\" -DWIN32_PATH=\"@WIN32_PATH@\" -march=i586
  56 +    -DSHARE_PATH=\"@datadir@/avifile\" -DWIN32_PATH=\"@WIN32_PATH@\"
  57
  58  MOC=@MOC@
  59  UIC=@UIC@
  60 diff -ur avifile-0.6.0.orig/plugins/libmp3lame_audioenc/lame3.70/Makefile.am avifile-0.6.0/plugins/libmp3lame_audioenc/lame3.70/Makefile.am
  61 --- avifile-0.6.0.orig/plugins/libmp3lame_audioenc/lame3.70/Makefile.am Tue Jan 16 21:57:41 2001
  62 +++ avifile-0.6.0/plugins/libmp3lame_audioenc/lame3.70/Makefile.am      Wed Jan 24 16:40:46 2001
  63 @@ -31,7 +31,7 @@
  64          interface.c \
  65          main.c
  66
  67 -CC_OPTS =  -O3 -fomit-frame-pointer -funroll-loops -ffast-math  -finline-functions -Wall
  68 +CC_OPTS = -fomit-frame-pointer -funroll-loops -ffast-math  -finline-functions -Wall
  69
  70  # 10/99 added -D__NO_MATH_INLINES to fix a bug in *all* versions of
  71  # gcc 2.8+ as of 10/99.
  72 @@ -44,4 +44,4 @@
  73  get_audio.h gpkplotting.h gtkanal.h huffman.h id3tag.h ieeefloat.h\
  74  l3bitstream-pvt.h l3bitstream.h l3side.h lame.h machine.h mpg123.h\
  75  mpglib.h newmdct.h portableio.h psymodel.h quantize-pvt.h quantize.h\
  76 -reservoir.h rtp.h tables.h timestatus.h util.h version.h
  77 \ No newline at end of file
  78 +reservoir.h rtp.h tables.h timestatus.h util.h version.h
  79 diff -ur avifile-0.6.0.orig/plugins/libmpeg_audiodec/Makefile.am avifile-0.6.0/plugins/libmpeg_audiodec/Makefile.am
  80 --- avifile-0.6.0.orig/plugins/libmpeg_audiodec/Makefile.am     Mon Jan 22 02:17:46 2001
  81 +++ avifile-0.6.0/plugins/libmpeg_audiodec/Makefile.am  Wed Jan 24 16:40:58 2001
  82 @@ -5,6 +5,6 @@
  83   mpegtoraw.cpp
  84  libmpeg_audiodec_la_LDFLAGS=-module
  85  noinst_HEADERS=mpegsound.h mpegsound_locals.h fillplugins.h
  86 -CXXFLAGS=-I../../include -O2 -fno-exceptions
  87 +CXXFLAGS=-I../../include -fno-exceptions
  88
  89  LIBS=
  90 diff -ur avifile-0.6.0.orig/plugins/libwin32/loader/Makefile.am avifile-0.6.0/plugins/libwin32/loader/Makefile.am
  91 --- avifile-0.6.0.orig/plugins/libwin32/loader/Makefile.am      Sun Jan 21 03:33:55 2001
  92 +++ avifile-0.6.0/plugins/libwin32/loader/Makefile.am   Wed Jan 24 16:41:33 2001
  93 @@ -4,7 +4,7 @@
  94  libloader_la_LIBADD=stubs.lo
  95  noinst_HEADERS=win32.h wineacm.h loader.h
  96  CFLAGS=-I. -I../../../include -DWIN32_PATH=\"@WIN32_PATH@\" \
  97 --D__WINE__ -Ddbg_printf=__vprintf -DTRACE=__vprintf -fno-omit-frame-pointer -fno-inline
  98 +-D__WINE__ -Ddbg_printf=__vprintf -DTRACE=__vprintf
  99
 100  LIBS=
 101  EXTRA_DIST=stubs.s