[xiph-commits] r8983 - in icecast/branches/kh/ices: . conf

[karl at motherfish-iii.xiph.org]

Author: karl
Date: 2005-02-24 13:25:12 -0800 (Thu, 24 Feb 2005)
New Revision: 8983

Modified:
   icecast/branches/kh/ices/
   icecast/branches/kh/ices/NEWS
   icecast/branches/kh/ices/conf/Makefile.am
   icecast/branches/kh/ices/configure.in
Log:
last build bits and bump version



Property changes on: icecast/branches/kh/ices
___________________________________________________________________
Name: svn:externals
   - m4              http://svn.xiph.org/icecast/trunk/m4
src/log         http://svn.xiph.org/icecast/trunk/log
src/net         http://svn.xiph.org/icecast/branches/kh/net
src/timing      http://svn.xiph.org/icecast/trunk/timing
src/thread      http://svn.xiph.org/icecast/branches/kh/thread

   + m4              http://svn.xiph.org/icecast/trunk/m4
src/log         http://svn.xiph.org/icecast/trunk/log
src/avl         http://svn.xiph.org/icecast/trunk/avl
src/timing      http://svn.xiph.org/icecast/trunk/timing
src/thread      http://svn.xiph.org/icecast/branches/kh/thread


Modified: icecast/branches/kh/ices/NEWS
===================================================================
--- icecast/branches/kh/ices/NEWS	2005-02-24 21:17:13 UTC (rev 8982)
+++ icecast/branches/kh/ices/NEWS	2005-02-24 21:25:12 UTC (rev 8983)
@@ -1,3 +1,12 @@
+1.60
+----
+. Update om_shout to use the libshout 2.1 release, now that
+  non-blocking is in. the subtrees are also back in
+. update alsa driver, memory cleanup, period settings is now optional
+. update to jack driver
+. HUP now triggers log reopening, logsize still triggers as well
+. update to m4 macros and docs
+
 1.59
 ----
 . fix ALSA silence issue, stupid bug...a one-liner as well

Modified: icecast/branches/kh/ices/conf/Makefile.am
===================================================================
--- icecast/branches/kh/ices/conf/Makefile.am	2005-02-24 21:17:13 UTC (rev 8982)
+++ icecast/branches/kh/ices/conf/Makefile.am	2005-02-24 21:25:12 UTC (rev 8983)
@@ -2,4 +2,4 @@
 
 AUTOMAKE_OPTIONS = foreign
 
-EXTRA_DIST = ices-fixit.xml ices-jack.xml ices-live.xml ices-pcm2.xml ices-pcm.xml ices-playlist.xml ices-switch.xml
+EXTRA_DIST = ices-fixit.xml ices-jack.xml ices-oss.xml ices-pcm2.xml ices-pcm.xml ices-playlist.xml ices-switch.xml

Modified: icecast/branches/kh/ices/configure.in
===================================================================
--- icecast/branches/kh/ices/configure.in	2005-02-24 21:17:13 UTC (rev 8982)
+++ icecast/branches/kh/ices/configure.in	2005-02-24 21:25:12 UTC (rev 8983)
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT([IceS], [2.0-kh59], [karl at xiph.org])
+AC_INIT([IceS], [2.0-kh60], [karl at xiph.org])
 AC_PREREQ(2.54)
 AC_CONFIG_SRCDIR(src/ices.c)
 
@@ -155,7 +155,7 @@
 XIPH_VAR_PREPEND([XIPH_LIBS],[$XML_LIBS])
 XIPH_VAR_APPEND([XIPH_CFLAGS],[$XML_CFLAGS])
 
-XIPH_PATH_SHOUT(,AC_MSG_ERROR([Need libshout-kh release]))
+XIPH_PATH_SHOUT(,AC_MSG_ERROR([Need libshout-2.1 release]))
 XIPH_VAR_APPEND([XIPH_CPPFLAGS], [$SHOUT_CPPFLAGS])
 XIPH_VAR_APPEND([XIPH_CFLAGS], [$SHOUT_CFLAGS])
 XIPH_VAR_PREPEND([XIPH_LIBS], [-lvorbisenc $SHOUT_LIBS])
@@ -184,4 +184,10 @@
 AC_SUBST(LIBS)
 AC_SUBST(LDFLAGS)
 
-AC_OUTPUT(Makefile conf/Makefile debian/Makefile doc/Makefile src/Makefile src/log/Makefile)
+AC_OUTPUT(Makefile conf/Makefile debian/Makefile doc/Makefile
+          src/Makefile src/log/Makefile
+          src/timing/Makefile
+          src/thread/Makefile
+          src/avl/Makefile
+          )
+