[packages] tor-alpha: update to 0.2.2.22-alpha, add archive mirror
[openwrt/svn-archive/archive.git] / net / icecast / patches / 001-icecast-2.3.0-tremor.patch
index ed17084..a8cc267 100644 (file)
@@ -1,61 +1,6 @@
-diff -rNu icecast-2.3.0.old/configure icecast-2.3.0.new/configure
---- icecast-2.3.0.old/configure        2005-09-24 07:18:46.000000000 +1000
-+++ icecast-2.3.0.new/configure        2005-10-07 22:08:29.000000000 +1000
-@@ -21967,7 +21967,7 @@
- if test "${xt_cv_lib_ogg+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  OGG_LIBS="-logg"
-+  OGG_LIBS="-lvorbisidec"
- #
- # check if the installed Ogg is sufficiently new.
-@@ -22033,7 +22033,7 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--#include <ogg/ogg.h>
-+#include <tremor/ogg.h>
- int
- main ()
- {
-@@ -22188,9 +22188,9 @@
- fi
--VORBIS_LIBS="-lvorbis"
--VORBISFILE_LIBS="-lvorbisfile"
--VORBISENC_LIBS="-lvorbisenc"
-+VORBIS_LIBS="-lvorbisidec"
-+VORBISFILE_LIBS="-lvorbisidec"
-+VORBISENC_LIBS="-lvorbisidec"
- xt_save_LIBS="$LIBS"
- xt_save_LDFLAGS="$LDFLAGS"
-@@ -22327,17 +22327,18 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--#include <vorbis/codec.h>
--#include <vorbis/vorbisenc.h>
-+#include <tremor/ivorbiscodec.h>
- int
- main ()
- {
-+/*
- if ((struct ovectl_ratemanage_arg *) 0)
-   return 0;
- if (sizeof (struct ovectl_ratemanage_arg))
-   return 0;
-+*/
-   ;
-   return 0;
- }
-diff -rNu icecast-2.3.0.old/src/format_flac.c icecast-2.3.0.new/src/format_flac.c
---- icecast-2.3.0.old/src/format_flac.c        2005-08-19 12:01:58.000000000 +1000
-+++ icecast-2.3.0.new/src/format_flac.c        2005-10-07 22:10:24.000000000 +1000
+diff -urN icecast-2.3.2/src/format_flac.c icecast-2.3.2.new/src/format_flac.c
+--- icecast-2.3.2/src/format_flac.c    2006-09-21 03:49:16.000000000 +0200
++++ icecast-2.3.2.new/src/format_flac.c        2008-09-29 19:43:54.000000000 +0200
 @@ -18,7 +18,7 @@
  #endif
  
@@ -65,9 +10,9 @@ diff -rNu icecast-2.3.0.old/src/format_flac.c icecast-2.3.0.new/src/format_flac.
  #include <string.h>
  
  typedef struct source_tag source_t;
-diff -rNu icecast-2.3.0.old/src/format_midi.c icecast-2.3.0.new/src/format_midi.c
---- icecast-2.3.0.old/src/format_midi.c        2005-08-19 12:01:58.000000000 +1000
-+++ icecast-2.3.0.new/src/format_midi.c        2005-10-07 22:10:12.000000000 +1000
+diff -urN icecast-2.3.2/src/format_midi.c icecast-2.3.2.new/src/format_midi.c
+--- icecast-2.3.2/src/format_midi.c    2006-09-21 03:49:16.000000000 +0200
++++ icecast-2.3.2.new/src/format_midi.c        2008-09-29 19:44:15.000000000 +0200
 @@ -18,7 +18,7 @@
  #endif
  
@@ -77,9 +22,9 @@ diff -rNu icecast-2.3.0.old/src/format_midi.c icecast-2.3.0.new/src/format_midi.
  #include <string.h>
  
  typedef struct source_tag source_t;
-diff -rNu icecast-2.3.0.old/src/format_ogg.c icecast-2.3.0.new/src/format_ogg.c
---- icecast-2.3.0.old/src/format_ogg.c 2005-08-19 12:01:58.000000000 +1000
-+++ icecast-2.3.0.new/src/format_ogg.c 2005-10-07 22:10:02.000000000 +1000
+diff -urN icecast-2.3.2/src/format_ogg.c icecast-2.3.2.new/src/format_ogg.c
+--- icecast-2.3.2/src/format_ogg.c     2008-04-19 15:45:30.000000000 +0200
++++ icecast-2.3.2.new/src/format_ogg.c 2008-09-29 19:44:32.000000000 +0200
 @@ -24,7 +24,7 @@
  #include <stdlib.h>
  #include <string.h>
@@ -89,9 +34,9 @@ diff -rNu icecast-2.3.0.old/src/format_ogg.c icecast-2.3.0.new/src/format_ogg.c
  
  #include "refbuf.h"
  #include "source.h"
-diff -rNu icecast-2.3.0.old/src/format_ogg.h icecast-2.3.0.new/src/format_ogg.h
---- icecast-2.3.0.old/src/format_ogg.h 2005-08-19 12:01:58.000000000 +1000
-+++ icecast-2.3.0.new/src/format_ogg.h 2005-10-07 22:09:51.000000000 +1000
+diff -urN icecast-2.3.2/src/format_ogg.h icecast-2.3.2.new/src/format_ogg.h
+--- icecast-2.3.2/src/format_ogg.h     2006-09-21 03:49:16.000000000 +0200
++++ icecast-2.3.2.new/src/format_ogg.h 2008-09-29 19:44:38.000000000 +0200
 @@ -18,7 +18,7 @@
  #ifndef __FORMAT_OGG_H__
  #define __FORMAT_OGG_H__
@@ -101,9 +46,9 @@ diff -rNu icecast-2.3.0.old/src/format_ogg.h icecast-2.3.0.new/src/format_ogg.h
  #include "refbuf.h"
  #include "format.h"
  
-diff -rNu icecast-2.3.0.old/src/format_speex.c icecast-2.3.0.new/src/format_speex.c
---- icecast-2.3.0.old/src/format_speex.c       2005-08-19 12:01:58.000000000 +1000
-+++ icecast-2.3.0.new/src/format_speex.c       2005-10-07 22:09:44.000000000 +1000
+diff -urN icecast-2.3.2/src/format_speex.c icecast-2.3.2.new/src/format_speex.c
+--- icecast-2.3.2/src/format_speex.c   2007-10-04 04:07:57.000000000 +0200
++++ icecast-2.3.2.new/src/format_speex.c       2008-09-29 19:44:56.000000000 +0200
 @@ -18,7 +18,7 @@
  #endif
  
@@ -113,9 +58,9 @@ diff -rNu icecast-2.3.0.old/src/format_speex.c icecast-2.3.0.new/src/format_spee
  #include <speex/speex_header.h>
  
  typedef struct source_tag source_t;
-diff -rNu icecast-2.3.0.old/src/format_theora.c icecast-2.3.0.new/src/format_theora.c
---- icecast-2.3.0.old/src/format_theora.c      2005-08-19 12:01:58.000000000 +1000
-+++ icecast-2.3.0.new/src/format_theora.c      2005-10-07 22:09:38.000000000 +1000
+diff -urN icecast-2.3.2/src/format_theora.c icecast-2.3.2.new/src/format_theora.c
+--- icecast-2.3.2/src/format_theora.c  2006-09-21 03:49:16.000000000 +0200
++++ icecast-2.3.2.new/src/format_theora.c      2008-09-29 19:46:36.000000000 +0200
 @@ -18,7 +18,7 @@
  #endif
  
@@ -125,9 +70,9 @@ diff -rNu icecast-2.3.0.old/src/format_theora.c icecast-2.3.0.new/src/format_the
  #include <theora/theora.h>
  
  typedef struct source_tag source_t;
-diff -rNu icecast-2.3.0.old/src/format_vorbis.c icecast-2.3.0.new/src/format_vorbis.c
---- icecast-2.3.0.old/src/format_vorbis.c      2005-08-19 12:01:58.000000000 +1000
-+++ icecast-2.3.0.new/src/format_vorbis.c      2005-10-07 22:09:29.000000000 +1000
+diff -urN icecast-2.3.2/src/format_vorbis.c icecast-2.3.2.new/src/format_vorbis.c
+--- icecast-2.3.2/src/format_vorbis.c  2007-09-13 00:40:55.000000000 +0200
++++ icecast-2.3.2.new/src/format_vorbis.c      2008-09-29 19:47:25.000000000 +0200
 @@ -18,8 +18,8 @@
  #endif
  
@@ -139,9 +84,9 @@ diff -rNu icecast-2.3.0.old/src/format_vorbis.c icecast-2.3.0.new/src/format_vor
  #include <memory.h>
  #include <string.h>
  
-diff -rNu icecast-2.3.0.old/src/source.c icecast-2.3.0.new/src/source.c
---- icecast-2.3.0.old/src/source.c     2005-09-23 06:19:28.000000000 +1000
-+++ icecast-2.3.0.new/src/source.c     2005-10-07 22:09:17.000000000 +1000
+diff -urN icecast-2.3.2/src/source.c icecast-2.3.2.new/src/source.c
+--- icecast-2.3.2/src/source.c 2008-05-15 15:25:04.000000000 +0200
++++ icecast-2.3.2.new/src/source.c     2008-09-29 19:47:40.000000000 +0200
 @@ -19,7 +19,7 @@
  #include <stdlib.h>
  #include <string.h>
@@ -151,3 +96,64 @@ diff -rNu icecast-2.3.0.old/src/source.c icecast-2.3.0.new/src/source.c
  #include <errno.h>
  
  #ifndef _WIN32
+--- icecast-2.3.2/configure    2008-05-27 02:21:57.000000000 +0200
++++ icecast-2.3.2.new/configure        2008-09-29 20:05:43.000000000 +0200
+@@ -22199,7 +22199,7 @@
+ if test "${xt_cv_lib_ogg+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  OGG_LIBS="-logg"
++  OGG_LIBS="-lvorbisidec"
+ #
+ # check if the installed Ogg is sufficiently new.
+@@ -22261,7 +22261,7 @@
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+-#include <ogg/ogg.h>
++#include <tremor/ogg.h>
+ int
+ main ()
+ {
+@@ -22410,9 +22410,9 @@
+ fi
+-VORBIS_LIBS="-lvorbis"
+-VORBISFILE_LIBS="-lvorbisfile"
+-VORBISENC_LIBS="-lvorbisenc"
++VORBIS_LIBS="-lvorbisidec"
++VORBISFILE_LIBS="-lvorbisidec"
++VORBISENC_LIBS="-lvorbisidec"
+ xt_save_LIBS="$LIBS"
+ xt_save_LDFLAGS="$LDFLAGS"
+@@ -22537,14 +22537,13 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+-#include <vorbis/codec.h>
+-#include <vorbis/vorbisenc.h>
++#include <tremor/ivorbiscodec.h>
+ int
+ main ()
+ {
+-struct ovectl_ratemanage_arg a;
++/*struct ovectl_ratemanage_arg a;*/
+   ;
+   return 0;
+--- icecast-2.3.2/src/format_kate.c    2008-04-18 18:29:28.000000000 +0200
++++ icecast-2.3.2.new/src/format_kate.c        2008-10-01 08:27:00.000000000 +0200
+@@ -19,7 +19,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+-#include <ogg/ogg.h>
++#include <tremor/ogg.h>
+ #ifdef HAVE_KATE
+ #include <kate/oggkate.h>
+ #endif