Changeset 29268


Ignore:
Timestamp:
2011-11-20T04:50:35+01:00 (6 years ago)
Author:
nico
Message:

packages/icecast: fix build failure (closes: #10442)

Location:
packages/multimedia/icecast
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • packages/multimedia/icecast/Makefile

    r29199 r29268  
    1010PKG_NAME:=icecast 
    1111PKG_VERSION:=2.3.2 
    12 PKG_RELEASE:=3 
     12PKG_RELEASE:=4 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
     
    1616PKG_MD5SUM:=ff516b3ccd2bcc31e68f460cd316093f 
    1717 
    18 PKG_FIXUP:=libtool 
     18PKG_FIXUP:=autoreconf 
    1919 
    2020include $(INCLUDE_DIR)/package.mk 
  • packages/multimedia/icecast/patches/001-icecast-2.3.0-tremor.patch

    r26107 r29268  
    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 
     1--- a/src/format_flac.c 
     2+++ b/src/format_flac.c 
    43@@ -18,7 +18,7 @@ 
    54 #endif 
     
    1110  
    1211 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 
     12--- a/src/format_midi.c 
     13+++ b/src/format_midi.c 
    1614@@ -18,7 +18,7 @@ 
    1715 #endif 
     
    2321  
    2422 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 
     23--- a/src/format_ogg.c 
     24+++ b/src/format_ogg.c 
    2825@@ -24,7 +24,7 @@ 
    2926 #include <stdlib.h> 
     
    3532 #include "refbuf.h" 
    3633 #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 
     34--- a/src/format_ogg.h 
     35+++ b/src/format_ogg.h 
    4036@@ -18,7 +18,7 @@ 
    4137 #ifndef __FORMAT_OGG_H__ 
     
    4743 #include "format.h" 
    4844  
    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 
     45--- a/src/format_speex.c 
     46+++ b/src/format_speex.c 
    5247@@ -18,7 +18,7 @@ 
    5348 #endif 
     
    5954  
    6055 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 
     56--- a/src/format_theora.c 
     57+++ b/src/format_theora.c 
    6458@@ -18,7 +18,7 @@ 
    6559 #endif 
     
    7165  
    7266 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 
     67--- a/src/format_vorbis.c 
     68+++ b/src/format_vorbis.c 
    7669@@ -18,8 +18,8 @@ 
    7770 #endif 
     
    8578 #include <string.h> 
    8679  
    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 
     80--- a/src/source.c 
     81+++ b/src/source.c 
    9082@@ -19,7 +19,7 @@ 
    9183 #include <stdlib.h> 
     
    9789  
    9890 #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" 
     91--- a/src/format_kate.c 
     92+++ b/src/format_kate.c 
     93@@ -19,7 +19,7 @@ 
    10794  
    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.  */ 
     95 #include <stdlib.h> 
     96 #include <string.h> 
    11497-#include <ogg/ogg.h> 
    11598+#include <tremor/ogg.h> 
    116  int 
    117  main () 
    118  { 
    119 @@ -22410,9 +22410,9 @@ 
    120   
     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             ]) 
    121106 fi 
    122107  
     
    130115 xt_save_LIBS="$LIBS" 
    131116 xt_save_LDFLAGS="$LDFLAGS" 
    132 @@ -22537,14 +22537,13 @@ 
    133  cat >>conftest.$ac_ext <<_ACEOF 
    134  /* end confdefs.h.  */ 
     117@@ -58,18 +58,6 @@ AC_TRY_LINK_FUNC(ogg_stream_init, [xt_li 
     118             ) 
     119         ]) 
    135120  
     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([ 
    136126-#include <vorbis/codec.h> 
    137127-#include <vorbis/vorbisenc.h> 
    138 +#include <tremor/ivorbiscodec.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" 
    139144  
    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 
     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     ]) 
  • packages/multimedia/icecast/patches/010-fix_libcurl_test_crap.patch

    r26107 r29268  
    11--- a/m4/xiph_curl.m4 
    22+++ b/m4/xiph_curl.m4 
    3 @@ -52,7 +52,7 @@ 
     3@@ -52,7 +52,7 @@ AC_CHECK_HEADERS([curl/curl.h],, curl_ok 
    44 AC_MSG_CHECKING(for libcurl) 
    55 if test "$curl_ok" = "yes" 
Note: See TracChangeset for help on using the changeset viewer.