source: freewrt/package/icecast/patches/01-icecast-2.3.0-tremor.patch@ d419478

freewrt_1_0 freewrt_2_0
Last change on this file since d419478 was 475ad56, checked in by Waldemar Brodkorb <wbx@…>, 20 years ago

add OpenWrt trunk revision 3830.

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@1 afb5a338-a214-0410-bd46-81f09a774fd1
  • Property mode set to 100644
File size: 4.3 KB

  • icecast-2.3.0. 

    diff -rNu icecast-2.3.0.old/configure icecast-2.3.0.new/configure
    old new  
    2196721967if test "${xt_cv_lib_ogg+set}" = set; then
    2196821968  echo $ECHO_N "(cached) $ECHO_C" >&6
    2196921969else
    21970   OGG_LIBS="-logg"
     21970  OGG_LIBS="-lvorbisidec"
    2197121971
    2197221972#
    2197321973# check if the installed Ogg is sufficiently new.
    … …  
    2203322033cat confdefs.h >>conftest.$ac_ext
    2203422034cat >>conftest.$ac_ext <<_ACEOF
    2203522035/* end confdefs.h.  */
    22036 #include <ogg/ogg.h>
     22036#include <tremor/ogg.h>
    2203722037int
    2203822038main ()
    2203922039{
    … …  
    2218822188
    2218922189fi
    2219022190
    22191 VORBIS_LIBS="-lvorbis"
    22192 VORBISFILE_LIBS="-lvorbisfile"
    22193 VORBISENC_LIBS="-lvorbisenc"
     22191VORBIS_LIBS="-lvorbisidec"
     22192VORBISFILE_LIBS="-lvorbisidec"
     22193VORBISENC_LIBS="-lvorbisidec"
    2219422194
    2219522195xt_save_LIBS="$LIBS"
    2219622196xt_save_LDFLAGS="$LDFLAGS"
    … …  
    2232722327cat >>conftest.$ac_ext <<_ACEOF
    2232822328/* end confdefs.h.  */
    2232922329
    22330 #include <vorbis/codec.h>
    22331 #include <vorbis/vorbisenc.h>
     22330#include <tremor/ivorbiscodec.h>
    2233222331
    2233322332
    2233422333int
    2233522334main ()
    2233622335{
     22336/*
    2233722337if ((struct ovectl_ratemanage_arg *) 0)
    2233822338  return 0;
    2233922339if (sizeof (struct ovectl_ratemanage_arg))
    2234022340  return 0;
     22341*/
    2234122342  ;
    2234222343  return 0;
    2234322344}

  • src/format_flac.c 

    diff -rNu icecast-2.3.0.old/src/format_flac.c icecast-2.3.0.new/src/format_flac.c
    old new  
    1818#endif
    1919
    2020#include <stdlib.h>
    21 #include <ogg/ogg.h>
     21#include <tremor/ogg.h>
    2222#include <string.h>
    2323
    2424typedef struct source_tag source_t;

  • src/format_midi.c 

    diff -rNu icecast-2.3.0.old/src/format_midi.c icecast-2.3.0.new/src/format_midi.c
    old new  
    1818#endif
    1919
    2020#include <stdlib.h>
    21 #include <ogg/ogg.h>
     21#include <tremor/ogg.h>
    2222#include <string.h>
    2323
    2424typedef struct source_tag source_t;

  • src/format_ogg.c 

    diff -rNu icecast-2.3.0.old/src/format_ogg.c icecast-2.3.0.new/src/format_ogg.c
    old new  
    2424#include <stdlib.h>
    2525#include <string.h>
    2626
    27 #include <ogg/ogg.h>
     27#include <tremor/ogg.h>
    2828
    2929#include "refbuf.h"
    3030#include "source.h"

  • src/format_ogg.h 

    diff -rNu icecast-2.3.0.old/src/format_ogg.h icecast-2.3.0.new/src/format_ogg.h
    old new  
    1818#ifndef __FORMAT_OGG_H__
    1919#define __FORMAT_OGG_H__
    2020
    21 #include <ogg/ogg.h>
     21#include <tremor/ogg.h>
    2222#include "refbuf.h"
    2323#include "format.h"
    2424

  • src/format_speex.c 

    diff -rNu icecast-2.3.0.old/src/format_speex.c icecast-2.3.0.new/src/format_speex.c
    old new  
    1818#endif
    1919
    2020#include <stdlib.h>
    21 #include <ogg/ogg.h>
     21#include <tremor/ogg.h>
    2222#include <speex/speex_header.h>
    2323
    2424typedef struct source_tag source_t;

  • src/format_theora.c 

    diff -rNu icecast-2.3.0.old/src/format_theora.c icecast-2.3.0.new/src/format_theora.c
    old new  
    1818#endif
    1919
    2020#include <stdlib.h>
    21 #include <ogg/ogg.h>
     21#include <tremor/ogg.h>
    2222#include <theora/theora.h>
    2323
    2424typedef struct source_tag source_t;

  • src/format_vorbis.c 

    diff -rNu icecast-2.3.0.old/src/format_vorbis.c icecast-2.3.0.new/src/format_vorbis.c
    old new  
    1818#endif
    1919
    2020#include <stdlib.h>
    21 #include <ogg/ogg.h>
    22 #include <vorbis/codec.h>
     21#include <tremor/ogg.h>
     22#include <tremor/ivorbiscodec.h>
    2323#include <memory.h>
    2424#include <string.h>
    2525

  • icecast-2.3.0. 

    diff -rNu icecast-2.3.0.old/src/source.c icecast-2.3.0.new/src/source.c
    old new  
    1919#include <stdlib.h>
    2020#include <string.h>
    2121#include <sys/types.h>
    22 #include <ogg/ogg.h>
     22#include <tremor/ogg.h>
    2323#include <errno.h>
    2424
    2525#ifndef _WIN32
Note: See TracBrowser for help on using the repository browser.