Re: [ptxdist] [PATCH 5/5] Add ices

[Michael Olbrich <m.olbrich@pengutronix.de>]

On Fri, Apr 06, 2012 at 02:45:20PM +0200, Juergen Beisert wrote:
> Signed-off-by: Juergen Beisert <jbe@pengutronix.de>
> ---
>  generic/etc/ices.conf |   78 +++++++++++++++++++++++++++++++++++++++++++++++++
>  rules/ices.in         |   33 +++++++++++++++++++++
>  rules/ices.make       |   71 ++++++++++++++++++++++++++++++++++++++++++++
>  3 files changed, 182 insertions(+)
>  create mode 100644 generic/etc/ices.conf
>  create mode 100644 rules/ices.in
>  create mode 100644 rules/ices.make
> 
> diff --git a/generic/etc/ices.conf b/generic/etc/ices.conf
> new file mode 100644
> index 0000000..b58f71a
> --- /dev/null
> +++ b/generic/etc/ices.conf
> @@ -0,0 +1,78 @@
> +<?xml version="1.0"?>
> +<ices:Configuration xmlns:ices="http://www.icecast.org/projects/ices">
> +  <Playlist>
> +    <!-- This is the filename used as a playlist when using the builtin 
> +	 playlist handler. -->
> +    <File>playlist.txt</File>
> +    <!-- Set this to 0 if you don't want to randomize your playlist, and to
> +	 1 if you do. -->
> +    <Randomize>1</Randomize>
> +    <!-- One of builtin, perl, or python. -->
> +    <Type>builtin</Type>
> +    <!-- Module name to pass to the playlist handler if using  perl or python.
> +	 If you use the builtin playlist handler then this is ignored -->
> +    <Module>ices</Module>
> +    <!-- Set this to the number of seconds to crossfade between tracks.
> +         Leave out or set to zero to disable crossfading (the default).
> +    <Crossfade>5</Crossfade>
> +    -->
> +  </Playlist>
> +
> +  <Execution>
> +    <!-- Set this to 1 if you want ices to launch in the background as a
> +         daemon -->
> +    <Background>0</Background>
> +    <!-- Set this to 1 if you want to see more verbose output from ices -->
> +    <Verbose>0</Verbose>
> +    <!-- This directory specifies where ices should put the logfile, cue file
> +	 and pid file (if daemonizing). Don't use /tmp if you have l33t h4x0rz
> +         on your server. -->
> +    <BaseDirectory>/tmp</BaseDirectory>
> +  </Execution>
> +
> +  <Stream>
> +    <Server>
> +      <!-- Hostname or ip of the icecast server you want to connect to -->
> +      <Hostname>localhost</Hostname>
> +      <!-- Port of the same -->
> +      <Port>8000</Port>
> +      <!-- Encoder password on the icecast server -->
> +      <Password>letmein</Password>
> +      <!-- Header protocol to use when communicating with the server.
> +           Shoutcast servers need "icy", icecast 1.x needs "xaudiocast", and
> +	   icecast 2.x needs "http". -->
> +      <Protocol>http</Protocol>
> +    </Server>
> +
> +    <!-- The name of the mountpoint on the icecast server -->
> +    <Mountpoint>/ices</Mountpoint>
> +    <!-- The name of the dumpfile on the server for your stream. DO NOT set
> +	 this unless you know what you're doing.
> +    <Dumpfile>ices.dump</Dumpfile>
> +    -->
> +    <!-- The name of you stream, not the name of the song! -->
> +    <Name>Default stream</Name>
> +    <!-- Genre of your stream, be it rock or pop or whatever -->
> +    <Genre>Default genre</Genre>
> +    <!-- Longer description of your stream -->
> +    <Description>Default description</Description>
> +    <!-- URL to a page describing your stream -->
> +    <URL>http://localhost/</URL>
> +    <!-- 0 if you don't want the icecast server to publish your stream on
> +	 the yp server, 1 if you do -->
> +    <Public>0</Public>
> +
> +    <!-- Stream bitrate, used to specify bitrate if reencoding, otherwise
> +	 just used for display on YP and on the server. Try to keep it
> +	 accurate -->
> +    <Bitrate>128</Bitrate>
> +    <!-- If this is set to 1, and ices is compiled with liblame support,
> +	 ices will reencode the stream on the fly to the stream bitrate. -->
> +    <Reencode>0</Reencode>
> +    <!-- Number of channels to reencode to, 1 for mono or 2 for stereo -->
> +    <!-- Sampe rate to reencode to in Hz. Leave out for LAME's best choice
> +    <Samplerate>44100</Samplerate>
> +    -->
> +    <Channels>2</Channels>
> +  </Stream>
> +</ices:Configuration>
> diff --git a/rules/ices.in b/rules/ices.in
> new file mode 100644
> index 0000000..966fe6c
> --- /dev/null
> +++ b/rules/ices.in
> @@ -0,0 +1,33 @@
> +## SECTION=applications
> +
> +menuconfig ICES
> +	tristate
> +	prompt "ices                          "
> +	select LIBVORBIS if ICES_VORBIS
> +	select LIBXML2
> +	select PYTHON if ICES_PYTHON
> +	select LAME if ICES_LAME


please indent.

> +	help
> +	  Ices is a tool sending an MP3 stream to an icecast server
> +
> +if ICES
> +
> +config ICES_VORBIS
> +	bool
> +	prompt "support VORBIS"
> +	help
> +	  Enable support for VORBIS data format
> +
> +config ICES_PYTHON
> +	bool
> +	prompt "enable python support"
> +	help
> +	  Enable python based scripting support
> +
> +config ICES_LAME
> +	bool
> +	prompt "enable lame support"
> +	help
> +	  Enable MP3 lame support
> +
> +endif
> diff --git a/rules/ices.make b/rules/ices.make
> new file mode 100644
> index 0000000..a5687ae
> --- /dev/null
> +++ b/rules/ices.make
> @@ -0,0 +1,71 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2012 by Juergen Beisert <jbe@pengutronix.de>
> +#
> +# See CREDITS for details about who has contributed to this project.
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +#
> +# We provide this package
> +#
> +PACKAGES-$(PTXCONF_ICES) += ices
> +
> +#
> +# Paths and names
> +#
> +ICES_VERSION	:= 0.4

Any reason for this version? I see 2.0.1, or is that something else?

> +ICES_MD5	:= d31450c4011561dae0229f071cb41cb6
> +ICES		:= ices-$(ICES_VERSION)
> +ICES_SUFFIX	:= tar.gz
> +ICES_URL	:= http://downloads.us.xiph.org/releases/ices/$(ICES).$(ICES_SUFFIX)
> +ICES_SOURCE	:= $(SRCDIR)/$(ICES).$(ICES_SUFFIX)
> +ICES_DIR	:= $(BUILDDIR)/$(ICES)
> +ICES_LICENSE	:= GPLv2
> +
> +# ----------------------------------------------------------------------------
> +# Prepare
> +# ----------------------------------------------------------------------------
> +
> +#
> +# autoconf
> +#
> +ICES_CONF_TOOL	:= autoconf
> +ICES_CONF_OPT	:= \
> +	$(CROSS_AUTOCONF_USR) \
> +	--enable-shared \
> +	--disable-static \
> +	--$(call ptx/wwo,PTXCONF_ICES_PYTHON)-python \
> +	--without-perl \
> +	--$(call ptx/wwo,PTXCONF_ICES_LAME)-lame \
> +	--$(call ptx/wwo,PTXCONF_ICES_VORBIS)-vorbis \
> +	--without-faad \
> +	--without-flac
> +
> +# ----------------------------------------------------------------------------
> +# Target-Install
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/ices.targetinstall:
> +	@$(call targetinfo)
> +
> +	@$(call install_init, ices)
> +	@$(call install_fixup, ices,PRIORITY,optional)
> +	@$(call install_fixup, ices,SECTION,base)
> +	@$(call install_fixup, ices,AUTHOR,"Juergen Beisert <jbe@pengutronix.de>")
> +	@$(call install_fixup, ices,DESCRIPTION,missing)
> +
> +	@$(call install_alternative, ices, 0, 0, 0644, /etc/ices.conf)
> +ifdef PTXCONF_ICES_PYTHON
> +	@$(call install_copy, ices, 0, 0, 0755, /etc/modules)
> +	@$(call install_copy, ices, 0, 0, 0755, -, /etc/modules/ices.py.dist)

This is not good. It clashes with /etc/modules for kernel modules.

Michael

> +endif
> +	@$(call install_copy, ices, 0, 0, 0755, -, /usr/bin/ices)
> +
> +	@$(call install_finish, ices)
> +
> +	@$(call touch)
> +
> +# vim: syntax=make
> -- 
> 1.7.9.5
> 
> 
> -- 
> ptxdist mailing list
> ptxdist@pengutronix.de
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

-- 
ptxdist mailing list
ptxdist@pengutronix.de