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

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