net/icecast/patches/001-icecast-2.3.0-tremor.patch

   1 diff -rNu icecast-2.3.0.old/configure icecast-2.3.0.new/configure
   2 --- icecast-2.3.0.old/configure 2005-09-24 07:18:46.000000000 +1000
   3 +++ icecast-2.3.0.new/configure 2005-10-07 22:08:29.000000000 +1000
   4 @@ -21967,7 +21967,7 @@
   5  if test "${xt_cv_lib_ogg+set}" = set; then
   6    echo $ECHO_N "(cached) $ECHO_C" >&6
   7  else
   8 -  OGG_LIBS="-logg"
   9 +  OGG_LIBS="-lvorbisidec"
  10
  11  #
  12  # check if the installed Ogg is sufficiently new.
  13 @@ -22033,7 +22033,7 @@
  14  cat confdefs.h >>conftest.$ac_ext
  15  cat >>conftest.$ac_ext <<_ACEOF
  16  /* end confdefs.h.  */
  17 -#include <ogg/ogg.h>
  18 +#include <tremor/ogg.h>
  19  int
  20  main ()
  21  {
  22 @@ -22188,9 +22188,9 @@
  23
  24  fi
  25
  26 -VORBIS_LIBS="-lvorbis"
  27 -VORBISFILE_LIBS="-lvorbisfile"
  28 -VORBISENC_LIBS="-lvorbisenc"
  29 +VORBIS_LIBS="-lvorbisidec"
  30 +VORBISFILE_LIBS="-lvorbisidec"
  31 +VORBISENC_LIBS="-lvorbisidec"
  32
  33  xt_save_LIBS="$LIBS"
  34  xt_save_LDFLAGS="$LDFLAGS"
  35 @@ -22327,17 +22327,18 @@
  36  cat >>conftest.$ac_ext <<_ACEOF
  37  /* end confdefs.h.  */
  38
  39 -#include <vorbis/codec.h>
  40 -#include <vorbis/vorbisenc.h>
  41 +#include <tremor/ivorbiscodec.h>
  42
  43
  44  int
  45  main ()
  46  {
  47 +/*
  48  if ((struct ovectl_ratemanage_arg *) 0)
  49    return 0;
  50  if (sizeof (struct ovectl_ratemanage_arg))
  51    return 0;
  52 +*/
  53    ;
  54    return 0;
  55  }
  56 diff -rNu icecast-2.3.0.old/src/format_flac.c icecast-2.3.0.new/src/format_flac.c
  57 --- icecast-2.3.0.old/src/format_flac.c 2005-08-19 12:01:58.000000000 +1000
  58 +++ icecast-2.3.0.new/src/format_flac.c 2005-10-07 22:10:24.000000000 +1000
  59 @@ -18,7 +18,7 @@
  60  #endif
  61
  62  #include <stdlib.h>
  63 -#include <ogg/ogg.h>
  64 +#include <tremor/ogg.h>
  65  #include <string.h>
  66
  67  typedef struct source_tag source_t;
  68 diff -rNu icecast-2.3.0.old/src/format_midi.c icecast-2.3.0.new/src/format_midi.c
  69 --- icecast-2.3.0.old/src/format_midi.c 2005-08-19 12:01:58.000000000 +1000
  70 +++ icecast-2.3.0.new/src/format_midi.c 2005-10-07 22:10:12.000000000 +1000
  71 @@ -18,7 +18,7 @@
  72  #endif
  73
  74  #include <stdlib.h>
  75 -#include <ogg/ogg.h>
  76 +#include <tremor/ogg.h>
  77  #include <string.h>
  78
  79  typedef struct source_tag source_t;
  80 diff -rNu icecast-2.3.0.old/src/format_ogg.c icecast-2.3.0.new/src/format_ogg.c
  81 --- icecast-2.3.0.old/src/format_ogg.c  2005-08-19 12:01:58.000000000 +1000
  82 +++ icecast-2.3.0.new/src/format_ogg.c  2005-10-07 22:10:02.000000000 +1000
  83 @@ -24,7 +24,7 @@
  84  #include <stdlib.h>
  85  #include <string.h>
  86
  87 -#include <ogg/ogg.h>
  88 +#include <tremor/ogg.h>
  89
  90  #include "refbuf.h"
  91  #include "source.h"
  92 diff -rNu icecast-2.3.0.old/src/format_ogg.h icecast-2.3.0.new/src/format_ogg.h
  93 --- icecast-2.3.0.old/src/format_ogg.h  2005-08-19 12:01:58.000000000 +1000
  94 +++ icecast-2.3.0.new/src/format_ogg.h  2005-10-07 22:09:51.000000000 +1000
  95 @@ -18,7 +18,7 @@
  96  #ifndef __FORMAT_OGG_H__
  97  #define __FORMAT_OGG_H__
  98
  99 -#include <ogg/ogg.h>
 100 +#include <tremor/ogg.h>
 101  #include "refbuf.h"
 102  #include "format.h"
 103
 104 diff -rNu icecast-2.3.0.old/src/format_speex.c icecast-2.3.0.new/src/format_speex.c
 105 --- icecast-2.3.0.old/src/format_speex.c        2005-08-19 12:01:58.000000000 +1000
 106 +++ icecast-2.3.0.new/src/format_speex.c        2005-10-07 22:09:44.000000000 +1000
 107 @@ -18,7 +18,7 @@
 108  #endif
 109
 110  #include <stdlib.h>
 111 -#include <ogg/ogg.h>
 112 +#include <tremor/ogg.h>
 113  #include <speex/speex_header.h>
 114
 115  typedef struct source_tag source_t;
 116 diff -rNu icecast-2.3.0.old/src/format_theora.c icecast-2.3.0.new/src/format_theora.c
 117 --- icecast-2.3.0.old/src/format_theora.c       2005-08-19 12:01:58.000000000 +1000
 118 +++ icecast-2.3.0.new/src/format_theora.c       2005-10-07 22:09:38.000000000 +1000
 119 @@ -18,7 +18,7 @@
 120  #endif
 121
 122  #include <stdlib.h>
 123 -#include <ogg/ogg.h>
 124 +#include <tremor/ogg.h>
 125  #include <theora/theora.h>
 126
 127  typedef struct source_tag source_t;
 128 diff -rNu icecast-2.3.0.old/src/format_vorbis.c icecast-2.3.0.new/src/format_vorbis.c
 129 --- icecast-2.3.0.old/src/format_vorbis.c       2005-08-19 12:01:58.000000000 +1000
 130 +++ icecast-2.3.0.new/src/format_vorbis.c       2005-10-07 22:09:29.000000000 +1000
 131 @@ -18,8 +18,8 @@
 132  #endif
 133
 134  #include <stdlib.h>
 135 -#include <ogg/ogg.h>
 136 -#include <vorbis/codec.h>
 137 +#include <tremor/ogg.h>
 138 +#include <tremor/ivorbiscodec.h>
 139  #include <memory.h>
 140  #include <string.h>
 141
 142 diff -rNu icecast-2.3.0.old/src/source.c icecast-2.3.0.new/src/source.c
 143 --- icecast-2.3.0.old/src/source.c      2005-09-23 06:19:28.000000000 +1000
 144 +++ icecast-2.3.0.new/src/source.c      2005-10-07 22:09:17.000000000 +1000
 145 @@ -19,7 +19,7 @@
 146  #include <stdlib.h>
 147  #include <string.h>
 148  #include <sys/types.h>
 149 -#include <ogg/ogg.h>
 150 +#include <tremor/ogg.h>
 151  #include <errno.h>
 152
 153  #ifndef _WIN32