From 810797f0af876c3bec76be9d9cfd837481158abc Mon Sep 17 00:00:00 2001 From: darkeye Date: Tue, 18 Sep 2001 17:35:15 +0000 Subject: [PATCH] for version 0.6 --- darkice/trunk/ChangeLog | 5 + darkice/trunk/INSTALL | 244 +++----------------------------- darkice/trunk/INSTALL.lame | 52 +++++++ darkice/trunk/INSTALL.vorbis | 39 +++++ darkice/trunk/Makefile.am | 2 +- darkice/trunk/NEWS | 10 ++ darkice/trunk/README | 15 +- darkice/trunk/TODO | 2 +- darkice/trunk/configure.in | 2 +- darkice/trunk/darkice.cfg | 6 +- darkice/trunk/man/darkice.1 | 2 +- darkice/trunk/man/darkice.cfg.5 | 4 +- darkice/trunk/rpm/darkice.spec | 20 ++- 13 files changed, 157 insertions(+), 246 deletions(-) create mode 100644 darkice/trunk/INSTALL.lame create mode 100644 darkice/trunk/INSTALL.vorbis diff --git a/darkice/trunk/ChangeLog b/darkice/trunk/ChangeLog index e967044..a6b34b4 100644 --- a/darkice/trunk/ChangeLog +++ b/darkice/trunk/ChangeLog @@ -1,3 +1,8 @@ +18-09-2001: DarkIce 0.6 released + + o added support for IceCast2 server with Ogg Vorbis streaming + o added support for SUN Solaris + 09-09-2001: DarkIce 0.5 released o added support for ShoutCast servers diff --git a/darkice/trunk/INSTALL b/darkice/trunk/INSTALL index ffc4819..2c1b456 100644 --- a/darkice/trunk/INSTALL +++ b/darkice/trunk/INSTALL @@ -1,37 +1,15 @@ DarkIce installation notes ========================== -Installing Lame ---------------- +DarkIce requires the following libraries (and associated header files): -To install DarkIce, you need the lame 3.89 or later libraries already -installed on your system. If you already have done this, skip to the next -section. +- libmp3lame +- libogg +- libvoribs +- libvorbisenc -Compiling Lame is a tricky issue. Please refer to Lame online resources -for details. Here are steps I took to compile lame 3.89 on my RedHat 7.1 -system. - -It is recommended that you compile lame with GCC 3. For maximum performance, -use the nasm assembler to compile assembly optimizations into lame. - -Grab the latest lame source tarball from a download site found at -http://www.mp3dev.org/mp3/download/download.html -or from the DarkIce SourceForge project download area -http://sourceforge.net/project/showfiles.php?group_id=14111 - -I took lame lame3.89beta.tar.gz. Go to the directory where you saved it, -and issue the following commands: - -tar xfz lame3.89beta.tar.gz -cd lame-3.89 -export CC=gcc3 -./configure --with-fileio=lame --without-vorbis --disable-gtktest --enable-nasm --enable-expopt=full -make -make install - -For the last step, you need to be root or have write permissions in the -target directories, usually directories under /usr/local. +To install libmp3lame, please refer to INSTALL.lame. +To install libogg, libvoribs and libvorbisenc, please look at INSTALL.vorbis. Installing DarkIce @@ -45,25 +23,24 @@ DarkIce tarball. Go to the directory you extracted it, and try: This will give you all the compile configuration options. Options of particlar interest are: - --with-lame-prefix=DIR alternate location for lame [/usr] - files looked for: LAME-PREFIX/lib/libmp3lame.a - LAME-PREFIX/include/lame/lame.h --enable-static link everything into the executable statically [no] -Use --with-lame-prefix to specify a location for the Lame libraries and -include files other than /usr/local. Typicall Lame is installed into -this location. Should you have it somewhere else, this option gives you -the possibility to notify DarkIce of Lame's location. - Use --enable-static to build a statically linked executable. This is good if you plan to deploy DarkIce on a system where either the Lame shared object is not installed or its location is unknown. In general it is a better idea to link dynamically (not using this option). -If chosing the default compile options, with lame installed under /usr/local, -compilation is done as follows: +On Solaris systems, for some reason the configure script does not +find the include file lame/lame.h if it uses the SUN Workshop C compiler +as a preprocessor for testing. Therefore you might consider setting: -./configure --with-lame-prefix=/usr/local +export CPP="gcc -E" + +This hack is not needed on other systems. + +If chosing the default compile options, issue the following commands: + +./configure make make install @@ -78,190 +55,3 @@ To try out the program, try darkice -h - - - -Here follows the stock text for autoconf installation procedures: - -Basic Installation -================== - - These are generic installation instructions. - - The `configure' shell script attempts to guess correct values for -various system-dependent variables used during compilation. It uses -those values to create a `Makefile' in each directory of the package. -It may also create one or more `.h' files containing system-dependent -definitions. Finally, it creates a shell script `config.status' that -you can run in the future to recreate the current configuration, a file -`config.cache' that saves the results of its tests to speed up -reconfiguring, and a file `config.log' containing compiler output -(useful mainly for debugging `configure'). - - If you need to do unusual things to compile the package, please try -to figure out how `configure' could check whether to do them, and mail -diffs or instructions to the address given in the `README' so they can -be considered for the next release. If at some point `config.cache' -contains results you don't want to keep, you may remove or edit it. - - The file `configure.in' is used to create `configure' by a program -called `autoconf'. You only need `configure.in' if you want to change -it or regenerate `configure' using a newer version of `autoconf'. - -The simplest way to compile this package is: - - 1. `cd' to the directory containing the package's source code and type - `./configure' to configure the package for your system. If you're - using `csh' on an old version of System V, you might need to type - `sh ./configure' instead to prevent `csh' from trying to execute - `configure' itself. - - Running `configure' takes awhile. While running, it prints some - messages telling which features it is checking for. - - 2. Type `make' to compile the package. - - 3. Optionally, type `make check' to run any self-tests that come with - the package. - - 4. Type `make install' to install the programs and any data files and - documentation. - - 5. You can remove the program binaries and object files from the - source code directory by typing `make clean'. To also remove the - files that `configure' created (so you can compile the package for - a different kind of computer), type `make distclean'. There is - also a `make maintainer-clean' target, but that is intended mainly - for the package's developers. If you use it, you may have to get - all sorts of other programs in order to regenerate files that came - with the distribution. - -Compilers and Options -===================== - - Some systems require unusual options for compilation or linking that -the `configure' script does not know about. You can give `configure' -initial values for variables by setting them in the environment. Using -a Bourne-compatible shell, you can do that on the command line like -this: - CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure - -Or on systems that have the `env' program, you can do it like this: - env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure - -Compiling For Multiple Architectures -==================================== - - You can compile the package for more than one kind of computer at the -same time, by placing the object files for each architecture in their -own directory. To do this, you must use a version of `make' that -supports the `VPATH' variable, such as GNU `make'. `cd' to the -directory where you want the object files and executables to go and run -the `configure' script. `configure' automatically checks for the -source code in the directory that `configure' is in and in `..'. - - If you have to use a `make' that does not supports the `VPATH' -variable, you have to compile the package for one architecture at a time -in the source code directory. After you have installed the package for -one architecture, use `make distclean' before reconfiguring for another -architecture. - -Installation Names -================== - - By default, `make install' will install the package's files in -`/usr/local/bin', `/usr/local/man', etc. You can specify an -installation prefix other than `/usr/local' by giving `configure' the -option `--prefix=PATH'. - - You can specify separate installation prefixes for -architecture-specific files and architecture-independent files. If you -give `configure' the option `--exec-prefix=PATH', the package will use -PATH as the prefix for installing programs and libraries. -Documentation and other data files will still use the regular prefix. - - In addition, if you use an unusual directory layout you can give -options like `--bindir=PATH' to specify different values for particular -kinds of files. Run `configure --help' for a list of the directories -you can set and what kinds of files go in them. - - If the package supports it, you can cause programs to be installed -with an extra prefix or suffix on their names by giving `configure' the -option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. - -Optional Features -================= - - Some packages pay attention to `--enable-FEATURE' options to -`configure', where FEATURE indicates an optional part of the package. -They may also pay attention to `--with-PACKAGE' options, where PACKAGE -is something like `gnu-as' or `x' (for the X Window System). The -`README' should mention any `--enable-' and `--with-' options that the -package recognizes. - - For packages that use the X Window System, `configure' can usually -find the X include and library files automatically, but if it doesn't, -you can use the `configure' options `--x-includes=DIR' and -`--x-libraries=DIR' to specify their locations. - -Specifying the System Type -========================== - - There may be some features `configure' can not figure out -automatically, but needs to determine by the type of host the package -will run on. Usually `configure' can figure that out, but if it prints -a message saying it can not guess the host type, give it the -`--host=TYPE' option. TYPE can either be a short name for the system -type, such as `sun4', or a canonical name with three fields: - CPU-COMPANY-SYSTEM - -See the file `config.sub' for the possible values of each field. If -`config.sub' isn't included in this package, then this package doesn't -need to know the host type. - - If you are building compiler tools for cross-compiling, you can also -use the `--target=TYPE' option to select the type of system they will -produce code for and the `--build=TYPE' option to select the type of -system on which you are compiling the package. - -Sharing Defaults -================ - - If you want to set default values for `configure' scripts to share, -you can create a site shell script called `config.site' that gives -default values for variables like `CC', `cache_file', and `prefix'. -`configure' looks for `PREFIX/share/config.site' if it exists, then -`PREFIX/etc/config.site' if it exists. Or, you can set the -`CONFIG_SITE' environment variable to the location of the site script. -A warning: not all `configure' scripts look for a site script. - -Operation Controls -================== - - `configure' recognizes the following options to control how it -operates. - -`--cache-file=FILE' - Use and save the results of the tests in FILE instead of - `./config.cache'. Set FILE to `/dev/null' to disable caching, for - debugging `configure'. - -`--help' - Print a summary of the options to `configure', and exit. - -`--quiet' -`--silent' -`-q' - Do not print messages saying which checks are being made. To - suppress all normal output, redirect it to `/dev/null' (any error - messages will still be shown). - -`--srcdir=DIR' - Look for the package's source code in directory DIR. Usually - `configure' can determine that directory automatically. - -`--version' - Print the version of Autoconf used to generate the `configure' - script, and exit. - -`configure' also accepts some other, not widely useful, options. diff --git a/darkice/trunk/INSTALL.lame b/darkice/trunk/INSTALL.lame new file mode 100644 index 0000000..70f98fd --- /dev/null +++ b/darkice/trunk/INSTALL.lame @@ -0,0 +1,52 @@ +Installing Lame +--------------- + +To install DarkIce, you need the Lame 3.89 or later libraries and +related header files already installed on your system. + +It is recommended that use install Lame to the usual system locations, +/usr/lib, /usr/include, so that DarkIce will find the header files and +libraries. Thus when configuring, add --prefix=/usr to the configure +options. + +Grab the latest lame source tarball from a download site found at +http://www.mp3dev.org/mp3/download/download.html +or from the DarkIce SourceForge project download area +http://sourceforge.net/project/showfiles.php?group_id=14111 + +I took lame lame3.89beta.tar.gz. Go to the directory where you saved it, +and issue the following commands: + +tar xfz lame3.89beta.tar.gz +cd lame-3.89 +./configure --with-fileio=lame --without-vorbis --disable-gtktest --enable-expopt=full --prefix=/usr +make +make install + +For the last step, you need to be root or have write permissions in the +target directories. + +You might consider using nasm if you're on a i386 system, with the +configure option --enable-nasmm, for maximum performance. + + +On RedHat Linux +--------------- + +Compiling Lame on RedHat Linux is a tricky issue, because of gcc 2.96 +packaged with this distributions 7.0 and 7.1. You either have to use +the comaptibility compiler package (compat-egcs and related packages, +providing gcc 2.91), or even better, gcc 3.0. + +It is recommended that you compile lame with gcc 3. For maximum performance, +use the nasm assembler to compile assembly optimizations into lame. +Try the following commands: + +tar xfz lame3.89beta.tar.gz +cd lame-3.89 +export CC=gcc3 +./configure --with-fileio=lame --without-vorbis --disable-gtktest --enable-nasm --enable-expopt=full --prefix=/usr +make +make install + + diff --git a/darkice/trunk/INSTALL.vorbis b/darkice/trunk/INSTALL.vorbis new file mode 100644 index 0000000..decadbc --- /dev/null +++ b/darkice/trunk/INSTALL.vorbis @@ -0,0 +1,39 @@ +Installing Ogg Vorbis +--------------------- + +To install DarkIce, you need the Ogg Vorbis libraries (and related +header files: + +- libogg +- libvoribs +- libvorbisenc + +installed on your system. + +It is recommended that use install these to the usual system locations, +/usr/lib, /usr/include, so that DarkIce will find the header files and +libraries. Thus when configuring, add --prefix=/usr to the configure +options. + +Grab the latest Ogg Vorbis tarballs from +http://www.xiph.org/ogg/vorbis/download.html + +I took libogg-1.0rc2.tar.gz and libvorbis-1.0rc2.tar.gz. Go to the +directory where you saved them, and issue the following commands: + +tar xfz libogg-1.0rc2.tar.gz +cd libogg-1.0rc2 +./configure --prefix=/usr +make +make install +cd .. + +tar xfz libvorbis-1.0rc2.tar.gz +cd libvorbis-1.0rc2 +./configure --prefix=/usr +make +make install + +For the install steps, you need to be root or have write permissions in the +target directories. + diff --git a/darkice/trunk/Makefile.am b/darkice/trunk/Makefile.am index 83c8cf9..ecff092 100644 --- a/darkice/trunk/Makefile.am +++ b/darkice/trunk/Makefile.am @@ -4,7 +4,7 @@ SUBDIRS = src man sysconf_DATA = darkice.cfg -EXTRA_DIST = $(KDOC_DIR) darkice.cfg +EXTRA_DIST = $(KDOC_DIR) darkice.cfg INSTALL.lame INSTALL.vorbis $(KDOC_DIR): kdocs diff --git a/darkice/trunk/NEWS b/darkice/trunk/NEWS index c5865e1..5924b32 100644 --- a/darkice/trunk/NEWS +++ b/darkice/trunk/NEWS @@ -1,3 +1,13 @@ +18-09-2001, Akos Maroy, darkeye@users.sourceforge.net + + Released version 0.6. See ChangeLog for changes. + + +09-09-2001, Akos Maroy, darkeye@users.sourceforge.net + + Released version 0.5. See ChangeLog for changes. + + 02-09-2001, Akos Maroy, darkeye@users.sourceforge.net Released version 0.4. See ChangeLog for changes. diff --git a/darkice/trunk/README b/darkice/trunk/README index df606bb..d901462 100644 --- a/darkice/trunk/README +++ b/darkice/trunk/README @@ -1,15 +1,24 @@ -DarkIce 0.4 live audio streamer, http://darkice.sourceforge.net +DarkIce live audio streamer, http://darkice.sourceforge.net Copyright (c) 2000-2001, Tyrell Hungary, http://tyrell.hu Contents -------- -1. Compiling and installing +1. What is DarkIce? +2. Compiling and installing +1. What is DarkIce? +------------------- -1. Compiling and installing +DarkIce is an IceCast, IceCast2 and ShoutCast live audio streamer. It +takes audio input from a sound card, encodes it into mp3 and/or Ogg Vorbis, +and sends the mp3 stream to one or more IceCast and/or ShoutCast servers, +the Ogg Vorbis stream to one or more IceCast2 servers. + + +2. Compiling and installing --------------------------- On how to compile and install, please read the file INSTALL. If you're diff --git a/darkice/trunk/TODO b/darkice/trunk/TODO index 31ebf60..26c2cb8 100644 --- a/darkice/trunk/TODO +++ b/darkice/trunk/TODO @@ -4,6 +4,6 @@ o add support for VBR encoding o reconnect to server if connection is dropped o add support for multiple servers for one stream ? o libtoolize ? -o add IceCast 2 support w/ ogg vorbis o revisit real-time scheduling and one-thread-per-connection o look into performance +o create proper error-reporting module diff --git a/darkice/trunk/configure.in b/darkice/trunk/configure.in index 7a1d6ed..40b15e6 100644 --- a/darkice/trunk/configure.in +++ b/darkice/trunk/configure.in @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(src/DarkIce.cpp) -AM_INIT_AUTOMAKE(darkice, 0.5) +AM_INIT_AUTOMAKE(darkice, 0.6) AM_CONFIG_HEADER(config.h) diff --git a/darkice/trunk/darkice.cfg b/darkice/trunk/darkice.cfg index 98d1dd9..c589443 100644 --- a/darkice/trunk/darkice.cfg +++ b/darkice/trunk/darkice.cfg @@ -39,9 +39,9 @@ public = yes # advertise this stream? bitrate = 96 # bitrate of the mp3 stream sent to the server server = yp.yourserver.com # host name of the server -port = 8000 # port of the IceCast server, usually 8000 -password = hackme # source password to the IceCast server -mountPoint = sample96 # mount point of this stream on the IceCast server +port = 8000 # port of the IceCast2 server, usually 8000 +password = hackme # source password to the IceCast2 server +mountPoint = sample96 # mount point of this stream on the IceCast2 server name = DarkIce trial # name of the stream description = This is only a trial diff --git a/darkice/trunk/man/darkice.1 b/darkice/trunk/man/darkice.1 index 5d95159..50e0b00 100644 --- a/darkice/trunk/man/darkice.1 +++ b/darkice/trunk/man/darkice.1 @@ -1,4 +1,4 @@ -.TH darkice 1 "September 09, 2001" "DarkIce" "DarkIce live audio streamer" +.TH darkice 1 "September 18, 2001" "DarkIce" "DarkIce live audio streamer" .SH NAME darkice \- an icecast / shoutcast live audio streamer .SH SYNOPSIS diff --git a/darkice/trunk/man/darkice.cfg.5 b/darkice/trunk/man/darkice.cfg.5 index 75aa39a..b153376 100644 --- a/darkice/trunk/man/darkice.cfg.5 +++ b/darkice/trunk/man/darkice.cfg.5 @@ -1,10 +1,10 @@ -.TH darkice.cfg 5 "September 9, 2001" "DarkIce" "DarkIce live audio streamer" +.TH darkice.cfg 5 "September 18, 2001" "DarkIce" "DarkIce live audio streamer" .SH NAME darkice.cfg \- configuration file for darkice .SH DESCRIPTION .PP The configuration file consists of sections, with key = value pairs -inside each secion: +separated with spaces (not tabs) inside each secion: .nf [section1] diff --git a/darkice/trunk/rpm/darkice.spec b/darkice/trunk/rpm/darkice.spec index 0e84bb2..36fc63c 100644 --- a/darkice/trunk/rpm/darkice.spec +++ b/darkice/trunk/rpm/darkice.spec @@ -36,7 +36,7 @@ Summary : DarkIce live IceCast / ShoutCast streamer Name: darkice Vendor: Tyrell Hungary Packager: Akos Maroy -Version: 0.5 +Version: 0.6 Release: 1 Copyright: GPL Group: Applications/Multimedia @@ -47,9 +47,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root Prefix: /usr %description -DarkIce is an IceCast / ShoutCast live audio streamer. It takes audio input -from a sound card, encodes it into mp3, and sends the stream to one or more -IceCast and/or ShoutCast servers. +DarkIce is an IceCast, IceCast2 and ShoutCast live audio streamer. It +takes audio input from a sound card, encodes it into mp3 and/or Ogg Vorbis, +and sends the mp3 stream to one or more IceCast and/or ShoutCast servers, +the Ogg Vorbis stream to one or more IceCast2 servers. + # =========================================================== static sub-package @@ -58,9 +60,10 @@ Summary: %{summary} static version Group: Applications/Multimedia %description static -DarkIce is an IceCast / ShoutCast live audio streamer. It takes audio input -from a sound card, encodes it into mp3, and sends the stream to one or more -IceCast and/or ShoutCast servers. +DarkIce is an IceCast, IceCast2 and ShoutCast live audio streamer. It +takes audio input from a sound card, encodes it into mp3 and/or Ogg Vorbis, +and sends the mp3 stream to one or more IceCast and/or ShoutCast servers, +the Ogg Vorbis stream to one or more IceCast2 servers. This is the statically linked version. @@ -132,6 +135,9 @@ make clean # =================================================================== change log # # $Log$ +# Revision 1.6 2001/09/18 17:35:15 darkeye +# for version 0.6 +# # Revision 1.5 2001/09/13 05:06:41 darkeye # removed references to SourceForget FTP sites, as they are phased out #