From c62ddc9c6e3f2cd5610f55d3a57dd1938a6f614f Mon Sep 17 00:00:00 2001 From: gobo72 Date: Sun, 4 Sep 2011 20:47:11 +0000 Subject: [PATCH] =?utf8?q?Enlev=C3=A9=20pulseaudio?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- config/dependencies | 1 - config/packages-list | 1 - stage3/hv-install-1 | 2 +- stage5/bootscripts/pulseaudio | 39 ------------ stage5/pkg/pulseaudio | 108 ---------------------------------- 5 files changed, 1 insertion(+), 150 deletions(-) delete mode 100755 stage5/bootscripts/pulseaudio delete mode 100644 stage5/pkg/pulseaudio diff --git a/config/dependencies b/config/dependencies index 9f93412..cfa5ee1 100644 --- a/config/dependencies +++ b/config/dependencies @@ -13,7 +13,6 @@ ${RHYTHMBOX}: ${LIBID3TAG} ${EASYTAG}: id3lib OR ${LIBID3TAG} ${AUDACIOUS}: taglib, libmowgli, mcs ${GRIP}: id3lib -${PULSEAUDIO}: liboil, gdbm ${GOFFICE}: ${LIBGSF} ${PCRE} ${PANGO} ${GNUMERIC}: ${GOFFICE} diff --git a/config/packages-list b/config/packages-list index 73ac9e2..3da78ca 100644 --- a/config/packages-list +++ b/config/packages-list @@ -365,7 +365,6 @@ PPL="ppl-0.10.2" PROCMAIL="procmail-3.22" PROCPS="procps-3.2.8" PSMISC="psmisc-22.12" -PULSEAUDIO="pulseaudio-0.9.21" PYCAIRO="py2cairo-1.10.0" PYGOBJECT="pygobject-2.28.4" PYGTK="pygtk-2.24.0" diff --git a/stage3/hv-install-1 b/stage3/hv-install-1 index 1059d67..41e576e 100755 --- a/stage3/hv-install-1 +++ b/stage3/hv-install-1 @@ -177,7 +177,7 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the ipkg ${SPEEX} ipkg ${JACK} "--disable-portaudio --libdir=/usr/lib" - ipkg ${ALSA_PLUGINS} # Depends on pulseaudio + ipkg ${ALSA_PLUGINS} ipkg ${VORBIS_TOOLS} ipkg ${MOC} diff --git a/stage5/bootscripts/pulseaudio b/stage5/bootscripts/pulseaudio deleted file mode 100755 index e0953f6..0000000 --- a/stage5/bootscripts/pulseaudio +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh - -# pulseaudio - -# Source functions library -source /etc/rc.d/init.d/functions - -log_script_name "$0 $*" - -PULSE_SERVER="tcp:via:16002" -ESPEAKER="via:16001" - -# See how we were called. -case "$1" in - start) - cmd_run_log_box_warn "PulseAudio sound server start" loadproc pulseaudio - ;; - - stop) - cmd_run_log_box_warn "PulseAudio sound server stop" killproc pulseaudio - ;; - - restart) - $0 stop - sleep 1 - $0 start - ;; - - status) - statusproc pulseaudio - ;; - - *) - echo "Usage: $0 {start|stop|restart|status}" - exit ${EXIT_CODE_FAILURE} - ;; -esac - -exit $? diff --git a/stage5/pkg/pulseaudio b/stage5/pkg/pulseaudio deleted file mode 100644 index 25be81c..0000000 --- a/stage5/pkg/pulseaudio +++ /dev/null @@ -1,108 +0,0 @@ -#!/bin/bash - -hvconfig_pre() -{ - groupadd -f pulse - groupadd -f pulse-access - hv_useradd -g pulse -d /var/run/pulse pulse - - gpasswd -a ${REGUSER} pulse-access - - # Il faut ajouter l'usager pulse au groupe audio. - gpasswd -a pulse audio - - CONFIGURE_OPTS=" \ - ${CONFIGURE_OPTS} \ - --localstatedir=/var" -} - -hvconfig_post() -{ - # Workaround pour éliminer les messages de warning - # reliés à SHM... - sed -i -e "s!\(#define HAVE_SHM_OPEN 1\)!/* \1 */!g" config.h -} - -hvbuild_post() -{ - cat > /etc/pulse/daemon.conf << "EOF" -## Extra verbositiy -verbose = debug - -## Daemonize after startup -daemonize = 1 - -## Quit if startup fails -fail = 1 - -## Renice the daemon to level -15 and try to get SCHED_FIFO -## scheduling. This a good idea if you hear annyoing noise in the -## playback. However, this is a certain security issue, since it works -## when called SUID root only. root is dropped immediately after gaining -## the nice level and SCHED_FIFO scheduling on startup. -high-priority = 1 - -## The resampling algorithm to use. Use one of src-sinc-best-quality, -## src-sinc-medium-quality, src-sinc-fastest, src-zero-order-hold, -## src-linear, trivial. See the documentation of libsamplerate for an -## explanation for the different methods. The method 'trivial' is the -## only algorithm implemented without usage of floating point -## numbers. If you're tight on CPU consider using this. On the other -## hand it has the worst quality of all. -resample-method = src-sinc-best-quality - -## Create a PID file in /tmp/pulseaudio-$USER/pid. Of this is enabled -## you may use commands like "pulseaudio --kill" or "pulseaudio -## --check". If you are planning to start more than one pulseaudio -## process per user, you better disable this option since it -## effectively disables multiple instances. -use-pid-file = 1 - -## Do not install the CPU load limit, even on platforms where it is -## supported. This option is useful when debugging/profiling -## PulseAudio to disable disturbing SIGXCPU signals. -no-cpu-limit = 1 - -## Run the daemon as system-wide instance, requires root priviliges -system-instance = 1 - -## Disable shared memory data transfer -disable-shm = 1 -EOF - - cat > /etc/pulse/default.pa << "EOF" -#!/usr/bin/pulseaudio -nF - -# ---------------- -# SOURCE | PulseAudio | SINK -# --------->| |---------> -# ALSA | Daemon | EsounD -# ---------------- -# - -# SOURCE: Application -> Alsa -> PulseAudio -load-module module-alsa-source device=default - -# SINK: PulseAudio -> Network -load-module module-esound-sink server=via:16001 - -# Network protocols -load-module module-esound-protocol-unix auth-anonymous=1 - -# The native protocol is used for communications between -# ALSA and PulseAudio. -load-module module-native-protocol-unix auth-anonymous=1 - -# Automatically restore the volume of playback streams -load-module module-volume-restore - -# Automatically move streams to the default sink if the sink they are -# connected to dies, similar for sources -load-module module-rescue-streams -EOF - - install -v -m740 ${SCRDIR}/bootscripts/pulseaudio /etc/rc.d/init.d - - # script-name start stop - bootscript_add_rc3 pulseaudio 95 16 -} -- 2.20.1