source: packages/multimedia/icecast/patches/001-icecast-2.3.0-tremor.patch @ 26107

Last change on this file since 26107 was 26107, checked in by cshore, 6 years ago

[net] [multimedia]: Moved multimedia submenu to be part the the Multimedia package group, since that's what it's for.

  • Property svn:eol-style set to native
File size: 4.4 KB
  • src/format_flac.c

    diff -urN icecast-2.3.2/src/format_flac.c icecast-2.3.2.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 -urN icecast-2.3.2/src/format_midi.c icecast-2.3.2.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 -urN icecast-2.3.2/src/format_ogg.c icecast-2.3.2.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 -urN icecast-2.3.2/src/format_ogg.h icecast-2.3.2.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 -urN icecast-2.3.2/src/format_speex.c icecast-2.3.2.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 -urN icecast-2.3.2/src/format_theora.c icecast-2.3.2.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 -urN icecast-2.3.2/src/format_vorbis.c icecast-2.3.2.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 
  • src/source.c

    diff -urN icecast-2.3.2/src/source.c icecast-2.3.2.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 
  • icecast-2.3.2

    old new  
    2219922199if test "${xt_cv_lib_ogg+set}" = set; then 
    2220022200  echo $ECHO_N "(cached) $ECHO_C" >&6 
    2220122201else 
    22202   OGG_LIBS="-logg" 
     22202  OGG_LIBS="-lvorbisidec" 
    2220322203 
    2220422204# 
    2220522205# check if the installed Ogg is sufficiently new. 
     
    2226122261cat confdefs.h >>conftest.$ac_ext 
    2226222262cat >>conftest.$ac_ext <<_ACEOF 
    2226322263/* end confdefs.h.  */ 
    22264 #include <ogg/ogg.h> 
     22264#include <tremor/ogg.h> 
    2226522265int 
    2226622266main () 
    2226722267{ 
     
    2241022410 
    2241122411fi 
    2241222412 
    22413 VORBIS_LIBS="-lvorbis" 
    22414 VORBISFILE_LIBS="-lvorbisfile" 
    22415 VORBISENC_LIBS="-lvorbisenc" 
     22413VORBIS_LIBS="-lvorbisidec" 
     22414VORBISFILE_LIBS="-lvorbisidec" 
     22415VORBISENC_LIBS="-lvorbisidec" 
    2241622416 
    2241722417xt_save_LIBS="$LIBS" 
    2241822418xt_save_LDFLAGS="$LDFLAGS" 
     
    2253722537cat >>conftest.$ac_ext <<_ACEOF 
    2253822538/* end confdefs.h.  */ 
    2253922539 
    22540 #include <vorbis/codec.h> 
    22541 #include <vorbis/vorbisenc.h> 
     22540#include <tremor/ivorbiscodec.h> 
    2254222541 
    2254322542int 
    2254422543main () 
    2254522544{ 
    2254622545 
    22547 struct ovectl_ratemanage_arg a; 
     22546/*struct ovectl_ratemanage_arg a;*/ 
    2254822547 
    2254922548  ; 
    2255022549  return 0; 
  • src/format_kate.c

    old new  
    1919 
    2020#include <stdlib.h> 
    2121#include <string.h> 
    22 #include <ogg/ogg.h> 
     22#include <tremor/ogg.h> 
    2323#ifdef HAVE_KATE 
    2424#include <kate/oggkate.h> 
    2525#endif 
Note: See TracBrowser for help on using the repository browser.