From c566ab7d3b9dc18cac210a5b123c9dfeda970b8d Mon Sep 17 00:00:00 2001 From: Matt Porter Date: Mon, 11 Dec 2017 08:58:41 -0500 Subject: pulseaudio: remove krogoth related appends This append is required for krogoth related builds so drop this. Change-Id: Ic4615d490ec293271993d0e0a172afe4a1ef9c16 Signed-off-by: Matt Porter --- .../pulseaudio/files/client.conf | 36 --------- .../pulseaudio/files/daemon.conf | 87 ---------------------- .../recipes-multimedia/pulseaudio/files/hifi | 50 ------------- .../pulseaudio/files/pulseaudio-bluetooth.conf | 7 -- .../pulseaudio/files/pulseaudio-ofono.conf | 15 ---- .../pulseaudio/files/pulseaudio.init | 48 ------------ .../pulseaudio/files/rsnddai0ak4613h.conf | 9 --- .../recipes-multimedia/pulseaudio/files/system.pa | 82 -------------------- .../pulseaudio/pulseaudio_8.0.bbappend | 43 ----------- 9 files changed, 377 deletions(-) delete mode 100644 meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/files/client.conf delete mode 100644 meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/files/daemon.conf delete mode 100644 meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/files/hifi delete mode 100644 meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/files/pulseaudio-bluetooth.conf delete mode 100644 meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/files/pulseaudio-ofono.conf delete mode 100755 meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/files/pulseaudio.init delete mode 100644 meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/files/rsnddai0ak4613h.conf delete mode 100644 meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/files/system.pa delete mode 100644 meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/pulseaudio_8.0.bbappend diff --git a/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/files/client.conf b/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/files/client.conf deleted file mode 100644 index a17325b..0000000 --- a/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/files/client.conf +++ /dev/null @@ -1,36 +0,0 @@ -# This file is part of PulseAudio. -# -# PulseAudio is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# PulseAudio is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with PulseAudio; if not, see . - -## Configuration file for PulseAudio clients. See pulse-client.conf(5) for -## more information. Default values are commented out. Use either ; or # for -## commenting. - -; default-sink = -; default-source = -; default-server = -; default-dbus-server = - -; autospawn = yes -; allow-autospawn-for-root = no -; daemon-binary = /usr/bin/pulseaudio -; extra-arguments = --log-target=syslog - -; cookie-file = - -; enable-shm = yes -; shm-size-bytes = 0 # setting this 0 will use the system-default, usually 64 MiB - -; auto-connect-localhost = no -; auto-connect-display = no diff --git a/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/files/daemon.conf b/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/files/daemon.conf deleted file mode 100644 index 5d42a9e..0000000 --- a/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/files/daemon.conf +++ /dev/null @@ -1,87 +0,0 @@ -# This file is part of PulseAudio. -# -# PulseAudio is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# PulseAudio is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with PulseAudio; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -# USA. - -## Configuration file for the PulseAudio daemon. See pulse-daemon.conf(5) for -## more information. Default values are commented out. Use either ; or # for -## commenting. - -; daemonize = no -; fail = yes -; allow-module-loading = yes -; allow-exit = yes -; use-pid-file = yes -; system-instance = no -; local-server-type = user -; enable-shm = yes -; shm-size-bytes = 0 # setting this 0 will use the system-default, usually 64 MiB -; lock-memory = no -; cpu-limit = no - -; high-priority = yes -; nice-level = -11 - -; realtime-scheduling = yes -; realtime-priority = 5 - -; exit-idle-time = 20 -; scache-idle-time = 20 - -; dl-search-path = (depends on architecture) - -; load-default-script-file = yes -; default-script-file = /etc/pulse/default.pa - -log-target = null -; log-level = notice -; log-meta = no -; log-time = no -; log-backtrace = 0 - -; resample-method = speex-float-1 -; enable-remixing = yes -; enable-lfe-remixing = no - -; flat-volumes = yes - -; rlimit-fsize = -1 -; rlimit-data = -1 -; rlimit-stack = -1 -; rlimit-core = -1 -; rlimit-as = -1 -; rlimit-rss = -1 -; rlimit-nproc = -1 -; rlimit-nofile = 256 -; rlimit-memlock = -1 -; rlimit-locks = -1 -; rlimit-sigpending = -1 -; rlimit-msgqueue = -1 -; rlimit-nice = 31 -; rlimit-rtprio = 9 -; rlimit-rttime = 1000000 - -; default-sample-format = s16le -default-sample-rate = 48000 -; alternate-sample-rate = 48000 -; default-sample-channels = 2 -; default-channel-map = front-left,front-right - -; default-fragments = 4 -; default-fragment-size-msec = 25 - -; enable-deferred-volume = yes -; deferred-volume-safety-margin-usec = 8000 -; deferred-volume-extra-delay-usec = 0 diff --git a/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/files/hifi b/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/files/hifi deleted file mode 100644 index e897b98..0000000 --- a/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/files/hifi +++ /dev/null @@ -1,50 +0,0 @@ -# Use case Configuration for Renesas H3 board - -SectionVerb { - EnableSequence [ - exec "echo Setting defaults for ak4613" - cdev "hw:ak4613" - cset "name='DVC Out Playback Volume' 30%" - cset "name='DVC In Capture Volume' 10%" - ] - DisableSequence [ - ] -} - - -SectionDevice."Headphone".0 { - Value { - JackName "Headphone Jack" - PlaybackChannels 2 - PlaybackPCM "hw:0" - } - - EnableSequence [ - cdev "hw:ak4613" - cset "name='DVC Out Playback Volume' 30%" - ] - DisableSequence [ - cdev "hw:ak4613" - cset "name='DVC Out Playback Volume' 0%" - ] -} - -SectionDevice."Mic".0 { - Value { - JackName "Mic Jack" - CaptureChannels 2 - CapturePCM "hw:0" - } - - EnableSequence [ - cdev "hw:ak4613" - cset "name='DVC In Capture Volume' 10%" - ] - - DisableSequence [ - cdev "hw:ak4613" - cset "name='DVC In Capture Volume' 0%" - ] -} - - diff --git a/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/files/pulseaudio-bluetooth.conf b/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/files/pulseaudio-bluetooth.conf deleted file mode 100644 index 925b9b1..0000000 --- a/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/files/pulseaudio-bluetooth.conf +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/files/pulseaudio-ofono.conf b/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/files/pulseaudio-ofono.conf deleted file mode 100644 index e526d77..0000000 --- a/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/files/pulseaudio-ofono.conf +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/files/pulseaudio.init b/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/files/pulseaudio.init deleted file mode 100755 index db8f965..0000000 --- a/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/files/pulseaudio.init +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/sh -# -### BEGIN INIT INFO -# Provides: pulseaudio-server -# Required-Start: $local_fs $remote_fs -# Required-Stop: $local_fs $remote_fs -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -### END INIT INFO - -killproc() { - pid=`/bin/pidof $1` - [ "$pid" != "" ] && kill $pid -} - -read CMDLINE < /proc/cmdline -for x in $CMDLINE; do - case $x in - pulseaudio=false) - echo "pulseaudio disabled" - exit 0; - ;; - esac -done - -case "$1" in - start) - echo "Starting pulseaudio" - start-stop-daemon -S -x pulseaudio -- -D --system --disallow-exit --log-level=3 --log-target=file:/var/log/pa.log - ;; - - stop) - echo "Stopping pulseaudio" - start-stop-daemon -K -x pulseaudio - ;; - - restart) - $0 stop - sleep 1 - $0 start - ;; - - *) - echo "usage: $0 { start | stop | restart }" - ;; -esac - -exit 0 diff --git a/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/files/rsnddai0ak4613h.conf b/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/files/rsnddai0ak4613h.conf deleted file mode 100644 index 1c084de..0000000 --- a/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/files/rsnddai0ak4613h.conf +++ /dev/null @@ -1,9 +0,0 @@ -# Use case Configuration for Renesas H3 board - -Comment "Renesas H3 board ak4613 audio card" - -SectionUseCase."HiFi" { - File "hifi" - Comment "Default" -} - diff --git a/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/files/system.pa b/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/files/system.pa deleted file mode 100644 index 963a7c9..0000000 --- a/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/files/system.pa +++ /dev/null @@ -1,82 +0,0 @@ -#!/usr/bin/pulseaudio -nF -# -# This file is part of PulseAudio. -# -# PulseAudio is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# PulseAudio is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with PulseAudio; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. - -# This startup script is used only if PulseAudio is started in system -# mode. - -## use static load order to prevent pulseaudio to auto probe MOST devices -## MOST drivers does not like how pulse probing it and crashes system - -## Onboard sound (All R-Car 3 boards) -## use ALSA card plugin to run UCM and initial controls setup -.fail -load-module module-alsa-card device_id=ak4613 rate=48000 use_ucm=1 tsched=yes sink_name=ak4613_output source_name=ak4613_input - -## Kingfisher specific devices (may not present) -.nofail -## PCM3168A card (Kingfisher only) -load-module module-alsa-card device_id=pcm3168a sink_name=pcm3168a_output source_name=pcm3168a_input format=s24-32le rate=48000 -## Radio input (Kingfisher only) -load-module module-alsa-card device_id=radio source_name=radio rate=48000 -## WL18xx PCM interface (Kingfisher only) -load-module module-alsa-card device_id=wl18xx rate=48000 sink_name=bt_output source_name=bt_input - -### Load several protocols -.ifexists module-esound-protocol-unix.so -load-module module-esound-protocol-unix -.endif -load-module module-native-protocol-unix auth-anonymous=1 - -### Automatically restore the volume of streams and devices -load-module module-stream-restore -load-module module-device-restore - -### Automatically restore the default sink/source when changed by the user -### during runtime -### NOTE: This should be loaded as early as possible so that subsequent modules -### that look up the default sink/source get the right value -load-module module-default-device-restore - -### Automatically move streams to the default sink if the sink they are -### connected to dies, similar for sources -load-module module-rescue-streams - -### Make sure we always have a sink around, even if it is a null sink. -load-module module-always-sink - -### Automatically suspend sinks/sources that become idle for too long -# load-module module-suspend-on-idle - -### Enable positioned event sounds -# load-module module-position-event-sounds - -### Automatically load driver modules for Bluetooth hardware -.ifexists module-bluetooth-policy.so -load-module module-bluetooth-policy -.endif - -.ifexists module-bluetooth-discover.so -load-module module-bluetooth-discover headset=auto -.endif - -set-default-sink ak4613_output -set-default-source ak4613_input - -# For Kingfisher board set default source and sink to multichannel soundcard -set-default-sink pcm3168a_output -set-default-source pcm3168a_input diff --git a/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/pulseaudio_8.0.bbappend b/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/pulseaudio_8.0.bbappend deleted file mode 100644 index 06710e9..0000000 --- a/meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/pulseaudio_8.0.bbappend +++ /dev/null @@ -1,43 +0,0 @@ -FILESEXTRAPATHS_append := "${THISDIR}/files:" - -PR="r2" - -SRC_URI_append_rcar-gen3 = " \ - file://pulseaudio.init \ - file://rsnddai0ak4613h.conf \ - file://hifi \ - file://system.pa \ - file://daemon.conf \ - file://pulseaudio-bluetooth.conf \ - file://pulseaudio-ofono.conf \ -" - -inherit update-rc.d - -INITSCRIPT_NAME = "pulseaudio" -INITSCRIPT_PARAMS = "defaults 30" - -do_install_append_rcar-gen3() { - install -d ${D}/etc/init.d - install -d ${D}/etc/pulse - install -d ${D}/usr/share/alsa/ucm/rsnddai0ak4613h/ - - install -m 0755 ${WORKDIR}/pulseaudio.init ${D}/etc/init.d/pulseaudio - - install -m 0644 ${WORKDIR}/system.pa ${D}/etc/pulse/system.pa - install -m 0644 ${WORKDIR}/daemon.conf ${D}/etc/pulse/daemon.conf - - install -m 0644 ${WORKDIR}/rsnddai0ak4613h.conf ${D}${datadir}/alsa/ucm/rsnddai0ak4613h/rsnddai0ak4613h.conf - install -m 0644 ${WORKDIR}/hifi ${D}${datadir}/alsa/ucm/rsnddai0ak4613h/hifi - - install -d ${D}/${sysconfdir}/dbus-1/system.d - install -m 644 ${WORKDIR}/pulseaudio-bluetooth.conf ${D}/${sysconfdir}/dbus-1/system.d/ - install -m 644 ${WORKDIR}/pulseaudio-ofono.conf ${D}/${sysconfdir}/dbus-1/system.d/ - - update-rc.d -r ${D} pulseaudio defaults 30 -} - -FILES_${PN}-server += " \ - ${datadir}/alsa/ucm \ - ${datadir}/dbus-1/ \ -" -- cgit 1.2.3-korg