[weasel-commit] Source: esound=0.2.41-2
- From: rbuilder@xxxxxxxxx
- To: weasel-commit@xxxxxxxxxxxxx
- Date: Wed, 30 Jun 2010 13:21:55 -0400
================================
esound:source=0.2.41-2 (previous: 0.2.41-1)
cvc rdiff esound -1 /weasel.rpath.org@wgl:3-devel/0.2.41-2
================================
0.2.41-2 Filip Brcic (brcha@xxxxxxxxxxxx) Wed Jun 30 13:21:24 2010
esound 0.2.41
esound.init.d.2: new
--- /dev/null
+++ esound.init.d.2
@@ -0,0 +30 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/esound/files/esound.init.d.2,v
1.1 2006/07/19 00:02:27 flameeyes Exp $
+
+# Note: You need to start esound on boot, only if you want to use it over
network.
+
+# Warning: To use global esound daemon, you must also set spawn_options
+# in /etc/esd/esd.conf to the same protocol (i. e. add "-tcp") and unset
+# "Enable sound server startup" in gnome-sound-properties for all users
+# and optionally handle authentization.
+
+# The name sound-esd is needed because /usr/bin/esd might simply be a symlink
+# to PulseAudio's esd wrapper
+
+depend() {
+ use net@extradepend@
+}
+
+start() {
+ ebegin "Starting esound"
+ start-stop-daemon --start --quiet --background --exec
/usr/bin/esound-esd -- $ESD_START $ESD_OPTIONS
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping esound"
+ start-stop-daemon --stop --quiet --exec /usr/bin/esound-esd
+ eend $?
+}
esound.conf.d: new
--- /dev/null
+++ esound.conf.d
@@ -0,0 +28 @@
+# Config file for /etc/init.d/esound
+
+# Note: You need to start esound on boot, only if you want to use it over
network.
+
+# Warning: To use global esound daemon, you must also set spawn_options
+# in /etc/esd/esd.conf to the same protocol (i. e. add "-tcp") and unset
+# "Enable sound server startup" in gnome-sound-properties for all users
+# and optionally handle authentization.
+
+# For more see "esd -h".
+
+
+# Startup options
+
+# Do not beep on start. Free device after 2 sec.
+ESD_START="-nobeeps -as 2"
+
+
+# Network behavior. Use one of following.
+
+# Local only (useful for root-only soundcard access)
+#ESD_OPTIONS=""
+
+# Public TCP access.
+ESD_OPTIONS="-tcp -public"
+
+# TCP access with bind to address.
+#ESD_OPTIONS="-tcp -bind $HOSTNAME"
esound-0.2.41-debug.patch: new
--- /dev/null
+++ esound-0.2.41-debug.patch
@@ -0,0 +12 @@
+diff -u -r esound-0.2.41.old/clients.c esound-0.2.41/clients.c
+--- esound-0.2.41.old/clients.c 2008-11-26 20:01:03.000000000 +0200
++++ esound-0.2.41/clients.c 2008-11-26 20:01:47.000000000 +0200
+@@ -175,6 +175,8 @@
+ ESDBG_TRACE(
+ if (esd_use_tcpip) {
+
++ unsigned long addr;
++
+ port = ntohs( incoming.sin_port );
+ addr = ntohl( incoming.sin_addr.s_addr );
+
esound.recipe: changed
Index: esound.recipe
====================================================================
contents(size sha1)
inode(mtime)
--- esound.recipe /weasel.rpath.org@wgl:3-devel/0.2.41-1
+++ esound.recipe /weasel.rpath.org@wgl:3-devel/0.2.41-2
@@ -1,7 +1,6 @@
#
-# Copyright (c) 2004-2007 rPath, Inc.
-# This file is distributed under the terms of the MIT License.
-# A copy is available at http://www.rpath.com/permanent/mit-license.html
+# Copyright (c) 2010 Weasel GNU/Linux [Filip Brcic (brcha@xxxxxxxxxxxx)]
+# Distributed under the terms of the GNU General Public License v3
#
loadSuperClass('gnomepackage')
@@ -9,30 +8,61 @@
name = 'esound'
version = '0.2.41'
- buildRequires = [ 'audiofile:devel', 'alsa-lib:devel',
'tcp_wrappers:devel', ]
-
- buildMultiarch = True
-
- if Arch.x86_64:
- buildRequires.extend(['multiarch_wrapper:runtime'])
-
- extraConfig = '--with-libwrap'
+ buildRequires = [
+ 'audiofile:devel', 'alsa-lib:devel', 'tcp_wrappers:devel',
+ 'pkg-config:devel', 'alternatives:runtime',
+ ]
if Use.builddocs:
- buildRequires.extend(['docbook-utils:runtime', 'docbook-dsssl:data'])
- else:
- GnomePackageRecipe.makeArgs += ' SUBDIRS="" ' # Skip docs.
- GnomePackageRecipe.makeInstallArgs += ' SUBDIRS="" ' # Skip docs.
+ buildRequires.extend(['docbook-sgml-utils:runtime'])
- docs = ['TIPS', 'docs/esound.sgml']
+ shortDesc = 'The Enlightened Sound Daemon'
+ longDesc = """
+The Enlightened Sound Daemon mixes several audio streams for playback
+by a single audio device. You can also pre-load samples, and play them
+back without having to send all the data for the sound. Network
+transparency is also built in, so you can play sounds on one machine,
+and listen to them on another.
+"""
+ url = 'http://www.tux.org/~ricdude/EsounD.html'
+ licenses = [ 'LGPL-2' ]
+ categories = [ 'Media/Sound' ]
- def post32bit(r):
- r.Move('%(bindir)s/esd-config', '%(bindir)s/esd-config-32')
- r.ComponentSpec('devel', '%(bindir)s/esd-config-32')
-
+ patches = [
+ 'esound-0.2.39-fix-errno.patch',
+ 'esound-0.2.41-debug.patch',
+ ]
+
+ extraConfig = (
+ ' --sysconfdir=%(sysconfdir)s/esd'
+ ' --htmldir=%(thisdocdir)s/html'
+ ' --disable-dependency-tracking'
+ ' --disable-static'
+ ' --enable-ipv6'
+ ' --disable-debugging'
+ ' --enable-alsa'
+ ' --disable-arts'
+ ' --disable-artstest'
+ ' --with-libwrap'
+ ' --enable-oss'
+ )
+
+ def unpack(r):
+ GnomePackageRecipe.unpack(r)
+
+ # Strict aliasing issues
+ r.macros.cflags += ' -fno-strict-aliasing'
+
def policy(r):
- if Arch.x86_64:
- r.Move('%(bindir)s/esd-config', '%(bindir)s/esd-config-64')
- r.ComponentSpec('devel', '%(bindir)s/esd-config-64')
- r.Symlink('%(bindir)s/multiarch_wrapper', '%(bindir)s/esd-config')
- r.DanglingSymlinks(exceptions='%(bindir)s/esd-config')
+ r.Move('%(bindir)s/esd', '%(bindir)s/esound-esd')
+
+ r.Create('%(sysconfdir)s/alternatives/packages.d/esd-esound-runtime',
+ contents='%(bindir)s/esd %(bindir)s/esound-esd 10')
+
+ r.addSource('esound.conf.d',
+ dest='%(sysconfdir)s/conf.d/esound')
+ r.addSource('esound.init.d.2',
+ dest='%(initdir)s/esound',
+ mode=0755)
+ r.Replace('@extradepend@', ' portmap alsasound',
+ '%(initdir)s/esound')
esound-0.2.39-fix-errno.patch: new
--- /dev/null
+++ esound-0.2.39-fix-errno.patch
@@ -0,0 +9 @@
+diff -urN esound-0.2.39/audio_oss.c esound-0.2.39.new/audio_oss.c
+--- esound-0.2.39/audio_oss.c 2008-07-15 18:00:03.000000000 +0200
++++ esound-0.2.39.new/audio_oss.c 2008-07-21 13:17:58.000000000 +0200
+@@ -1,4 +1,5 @@
+ #include "config.h"
++#include <errno.h>
+
+ #ifdef HAVE_MACHINE_SOUNDCARD_H
+ # include <machine/soundcard.h>
Committed by: brcha
Other related posts:
