From 86f1d45a0e499f3783d64afad081f6259fc5b148 Mon Sep 17 00:00:00 2001 From: j1nx Date: Tue, 7 Apr 2020 18:18:26 +0200 Subject: [PATCH] MycroftOS: Enable MPD again, the normal way. --- buildroot-external/Config.in | 1 - buildroot-external/configs/rpi4_defconfig | 2 +- .../package/mycroft-mpd/Config.in | 22 -------- .../package/mycroft-mpd/mpd.conf | 52 ------------------- .../package/mycroft-mpd/mpd.service | 11 ---- .../package/mycroft-mpd/mycroft-mpd.mk | 24 --------- .../mycroft-mpd/playlists/einslive.m3u | 1 - 7 files changed, 1 insertion(+), 112 deletions(-) delete mode 100644 buildroot-external/package/mycroft-mpd/Config.in delete mode 100644 buildroot-external/package/mycroft-mpd/mpd.conf delete mode 100644 buildroot-external/package/mycroft-mpd/mpd.service delete mode 100644 buildroot-external/package/mycroft-mpd/mycroft-mpd.mk delete mode 100644 buildroot-external/package/mycroft-mpd/playlists/einslive.m3u diff --git a/buildroot-external/Config.in b/buildroot-external/Config.in index 88a63e47..b24b6bb0 100644 --- a/buildroot-external/Config.in +++ b/buildroot-external/Config.in @@ -10,7 +10,6 @@ menu "Additional drivers, libraries and/or applications" source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/btspeaker/Config.in" source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/fann/Config.in" source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/hostname-service/Config.in" - source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/mycroft-mpd/Config.in" source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/respeaker/Config.in" source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/snapcast/Config.in" source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/spotifyd/Config.in" diff --git a/buildroot-external/configs/rpi4_defconfig b/buildroot-external/configs/rpi4_defconfig index c280d6e2..be6a8033 100644 --- a/buildroot-external/configs/rpi4_defconfig +++ b/buildroot-external/configs/rpi4_defconfig @@ -73,6 +73,7 @@ BR2_PACKAGE_MIMIC_AUDIO_BACKEND_PULSEAUDIO=y BR2_PACKAGE_MIRACLECAST=y BR2_PACKAGE_MJPEGTOOLS=y BR2_PACKAGE_MOTION=y +BR2_PACKAGE_MPD=y BR2_PACKAGE_MPV=y BR2_PACKAGE_NCMPC=y BR2_PACKAGE_OMXPLAYER=y @@ -256,7 +257,6 @@ BR2_PACKAGE_PYTHON_WEBSOCKET_CLIENT=y BR2_PACKAGE_PYTHON_WRAPT=y BR2_PACKAGE_AUDIOFILE=y BR2_PACKAGE_LIBCDDB=y -BR2_PACKAGE_LIBID3TAG=y BR2_PACKAGE_LIBMPD=y BR2_PACKAGE_LIBSIDPLAY2=y BR2_PACKAGE_OPUS_FIXED_POINT=y diff --git a/buildroot-external/package/mycroft-mpd/Config.in b/buildroot-external/package/mycroft-mpd/Config.in deleted file mode 100644 index 7b283bf5..00000000 --- a/buildroot-external/package/mycroft-mpd/Config.in +++ /dev/null @@ -1,22 +0,0 @@ -config BR2_PACKAGE_MYCROFT_MPD - bool "mycroft-mpd" - select BR2_PACKAGE_MPD - select BR2_PACKAGE_MPD_BZIP2 - select BR2_PACKAGE_MPD_SQLITE - select BR2_PACKAGE_MPD_LIBSAMPLERATE - select BR2_PACKAGE_MPD_LIBSOXR - select BR2_PACKAGE_MPD_AUDIOFILE - select BR2_PACKAGE_MPD_FAAD2 - select BR2_PACKAGE_MPD_FLAC - select BR2_PACKAGE_MPD_OPUS - select BR2_PACKAGE_MPD_VORBIS - select BR2_PACKAGE_MPD_CURL - select BR2_PACKAGE_MPD_LIBNFS - select BR2_PACKAGE_MPD_LIBSMBCLIENT - select BR2_PACKAGE_MPD_SOUNDCLOUD - select BR2_PACKAGE_MPD_AVAHI_SUPPORT - select BR2_PACKAGE_MPD_NEIGHBOR_DISCOVERY_SUPPORT - select BR2_PACKAGE_MPD_UPNP - select BR2_PACKAGE_NCMPC - help - Helper package that selects MPD and several codecs. diff --git a/buildroot-external/package/mycroft-mpd/mpd.conf b/buildroot-external/package/mycroft-mpd/mpd.conf deleted file mode 100644 index af9b6756..00000000 --- a/buildroot-external/package/mycroft-mpd/mpd.conf +++ /dev/null @@ -1,52 +0,0 @@ -# -# Sample configuration file for mpd -# This is a minimal configuration, see the manpage for more options -# - -# Directory where the music is stored -music_directory "/opt/mpd/music" - -# Directory where user-made playlists are stored (RW) -playlist_directory "/opt/mpd/playlists" - -# Database file (RW) -db_file "/opt/mpd/database" - -# Log file (RW) -log_file "/var/log/mpd.log" - -# Process ID file (RW) -pid_file "/var/run/mpd.pid" - -# State file (RW) -state_file "/opt/mpd/state" - -# User id to run the daemon as -#user "nobody" - -# TCP socket binding -bind_to_address "any" -#bind_to_address "localhost" - -# Unix socket to listen on -bind_to_address "/var/lib/mpd/socket" - -# Feed audio into PulseAudio's sink -audio_output { - type "pulse" - name "Local Music Player Daemon" - server "127.0.0.1" -} - -# Comment below and uncomment the snapcast section -# if you want to use mpd as multiroom audio -# (make sure snapcast is started if so...) - -# Feed audio into snapcast's fifo -#audio_output { -# type "fifo" -# name "Snapcast" -# path "/tmp/snapfifo" -# format "48000:16:2" -# mixer_type "software" -#} diff --git a/buildroot-external/package/mycroft-mpd/mpd.service b/buildroot-external/package/mycroft-mpd/mpd.service deleted file mode 100644 index cdc04048..00000000 --- a/buildroot-external/package/mycroft-mpd/mpd.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=mpd -Wants=network.target -After=network.target sound.target - -[Service] -Type=simple -ExecStart=/bin/mpd --no-daemon - -[Install] -WantedBy=multi-user.target diff --git a/buildroot-external/package/mycroft-mpd/mycroft-mpd.mk b/buildroot-external/package/mycroft-mpd/mycroft-mpd.mk deleted file mode 100644 index dce6f4cc..00000000 --- a/buildroot-external/package/mycroft-mpd/mycroft-mpd.mk +++ /dev/null @@ -1,24 +0,0 @@ -################################################################################ -# -# mycroft-mpd -# -################################################################################ - -define MYCROFT_MPD_INSTALL_EXTRA_FILES - $(INSTALL) -m 0644 -D $(BR2_EXTERNAL_MYCROFTOS_PATH)/package/mycroft-mpd/mpd.conf \ - $(TARGET_DIR)/etc/mpd.conf - - mkdir -p $(TARGET_DIR)/opt/mpd/playlists - mkdir -p $(TARGET_DIR)/opt/mpd/music - mkdir -p $(TARGET_DIR)/var/lib/mpd - - cp -r $(BR2_EXTERNAL_MYCROFTOS_PATH)/package/mycroft-mpd/playlists/* \ - $(TARGET_DIR)/opt/mpd/playlists/ - - $(INSTALL) -m 0644 -D $(BR2_EXTERNAL_MYCROFTOS_PATH)/package/mycroft-mpd/mpd.service \ - $(TARGET_DIR)/usr/lib/systemd/system/mpd.service -endef - -MYCROFT_MPD_POST_INSTALL_TARGET_HOOKS += MYCROFT_MPD_INSTALL_EXTRA_FILES - -$(eval $(generic-package)) diff --git a/buildroot-external/package/mycroft-mpd/playlists/einslive.m3u b/buildroot-external/package/mycroft-mpd/playlists/einslive.m3u deleted file mode 100644 index c6c6c78e..00000000 --- a/buildroot-external/package/mycroft-mpd/playlists/einslive.m3u +++ /dev/null @@ -1 +0,0 @@ -http://wdr-1live-live.icecast.wdr.de/wdr/1live/live/mp3/128/stream.mp3