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

   1 --- a/src/format_flac.c
   2 +++ b/src/format_flac.c
   3 @@ -18,7 +18,7 @@
   4  #endif
   5
   6  #include <stdlib.h>
   7 -#include <ogg/ogg.h>
   8 +#include <tremor/ogg.h>
   9  #include <string.h>
  10
  11  typedef struct source_tag source_t;
  12 --- a/src/format_midi.c
  13 +++ b/src/format_midi.c
  14 @@ -18,7 +18,7 @@
  15  #endif
  16
  17  #include <stdlib.h>
  18 -#include <ogg/ogg.h>
  19 +#include <tremor/ogg.h>
  20  #include <string.h>
  21
  22  typedef struct source_tag source_t;
  23 --- a/src/format_ogg.c
  24 +++ b/src/format_ogg.c
  25 @@ -24,7 +24,7 @@
  26  #include <stdlib.h>
  27  #include <string.h>
  28
  29 -#include <ogg/ogg.h>
  30 +#include <tremor/ogg.h>
  31
  32  #include "refbuf.h"
  33  #include "source.h"
  34 --- a/src/format_ogg.h
  35 +++ b/src/format_ogg.h
  36 @@ -18,7 +18,7 @@
  37  #ifndef __FORMAT_OGG_H__
  38  #define __FORMAT_OGG_H__
  39
  40 -#include <ogg/ogg.h>
  41 +#include <tremor/ogg.h>
  42  #include "refbuf.h"
  43  #include "format.h"
  44
  45 --- a/src/format_speex.c
  46 +++ b/src/format_speex.c
  47 @@ -18,7 +18,7 @@
  48  #endif
  49
  50  #include <stdlib.h>
  51 -#include <ogg/ogg.h>
  52 +#include <tremor/ogg.h>
  53  #include <speex/speex_header.h>
  54
  55  typedef struct source_tag source_t;
  56 --- a/src/format_theora.c
  57 +++ b/src/format_theora.c
  58 @@ -18,7 +18,7 @@
  59  #endif
  60
  61  #include <stdlib.h>
  62 -#include <ogg/ogg.h>
  63 +#include <tremor/ogg.h>
  64  #include <theora/theora.h>
  65
  66  typedef struct source_tag source_t;
  67 --- a/src/format_vorbis.c
  68 +++ b/src/format_vorbis.c
  69 @@ -18,8 +18,8 @@
  70  #endif
  71
  72  #include <stdlib.h>
  73 -#include <ogg/ogg.h>
  74 -#include <vorbis/codec.h>
  75 +#include <tremor/ogg.h>
  76 +#include <tremor/ivorbiscodec.h>
  77  #include <memory.h>
  78  #include <string.h>
  79
  80 --- a/src/source.c
  81 +++ b/src/source.c
  82 @@ -19,7 +19,7 @@
  83  #include <stdlib.h>
  84  #include <string.h>
  85  #include <sys/types.h>
  86 -#include <ogg/ogg.h>
  87 +#include <tremor/ogg.h>
  88  #include <errno.h>
  89
  90  #ifndef _WIN32
  91 --- a/src/format_kate.c
  92 +++ b/src/format_kate.c
  93 @@ -19,7 +19,7 @@
  94
  95  #include <stdlib.h>
  96  #include <string.h>
  97 -#include <ogg/ogg.h>
  98 +#include <tremor/ogg.h>
  99  #ifdef HAVE_KATE
 100  #include <kate/oggkate.h>
 101  #endif
 102 --- a/m4/vorbis.m4
 103 +++ b/m4/vorbis.m4
 104 @@ -38,9 +38,9 @@ if test "x$vorbis_prefix" != "x$ogg_pref
 105              ])
 106  fi
 107
 108 -VORBIS_LIBS="-lvorbis"
 109 -VORBISFILE_LIBS="-lvorbisfile"
 110 -VORBISENC_LIBS="-lvorbisenc"
 111 +VORBIS_LIBS="-lvorbisidec"
 112 +VORBISFILE_LIBS="-lvorbisidec"
 113 +VORBISENC_LIBS="-lvorbisidec"
 114
 115  xt_save_LIBS="$LIBS"
 116  xt_save_LDFLAGS="$LDFLAGS"
 117 @@ -58,18 +58,6 @@ AC_TRY_LINK_FUNC(ogg_stream_init, [xt_li
 118              )
 119          ])
 120
 121 -if test "x$xt_lib_vorbis" = "xok"; then
 122 -#
 123 -# Now check if the installed Vorbis is sufficiently new.
 124 -#
 125 -AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
 126 -#include <vorbis/codec.h>
 127 -#include <vorbis/vorbisenc.h>
 128 -        ], [
 129 -struct ovectl_ratemanage_arg a;
 130 -])],,[xt_lib_vorbis="old version found"])
 131 -AC_MSG_RESULT([$xt_lib_vorbis])
 132 -fi
 133  CPPFLAGS="$xt_save_CPPFLAGS"
 134  LIBS="$xt_save_LIBS"
 135  LDFLAGS="$xt_save_LDFLAGS"
 136 --- a/m4/ogg.m4
 137 +++ b/m4/ogg.m4
 138 @@ -29,7 +29,7 @@ XIPH_GCC_WARNING([-I$ogg_prefix/include]
 139        ])
 140  AC_CACHE_CHECK([for libogg], xt_cv_lib_ogg,
 141  [dnl
 142 -OGG_LIBS="-logg"
 143 +OGG_LIBS="-lvorbisidec"
 144
 145  #
 146  # check if the installed Ogg is sufficiently new.
 147 @@ -42,7 +42,7 @@ LIBS="$LIBS $OGG_LIBS"
 148  LDFLAGS="$LDFLAGS $OGG_LDFLAGS"
 149  AC_TRY_LINK_FUNC(ogg_sync_init,
 150      [ xt_cv_lib_ogg=ok ],
 151 -    [ AC_TRY_LINK([#include <ogg/ogg.h>],,
 152 +    [ AC_TRY_LINK([#include <tremor/ogg.h>],,
 153          [ xt_cv_lib_ogg="pre v1.0, needs updating" ],
 154          [ xt_cv_lib_ogg="not found" ])
 155      ])