sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mpd: update to 0.22

Browse Source
This commit is contained in:
Henrik Grimler 2020-10-18 00:04:14 +02:00
parent ead182bc92
commit cd97b716c9
3 changed files with 34 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/mpd/build.sh
View File

@ -1,10 +1,9 @@
TERMUX_PKG_HOMEPAGE=https://www.musicpd.org
TERMUX_PKG_DESCRIPTION="Music player daemon"
TERMUX_PKG_LICENSE="GPL-2.0"
TERMUX_PKG_VERSION=0.21.25
TERMUX_PKG_REVISION=2
TERMUX_PKG_VERSION=0.22
TERMUX_PKG_SRCURL=https://github.com/MusicPlayerDaemon/MPD/archive/v$TERMUX_PKG_VERSION.tar.gz
TERMUX_PKG_SHA256=61e932caf9b507448fc6de0253460e7cd045fb711a5205d2c505a5ec940d465b
TERMUX_PKG_SHA256=d2bc8595a114bc3e3b8ef942d13f360f82093afc96e5432d945d4c78296024a6
TERMUX_PKG_DEPENDS="libc++, libcurl, libexpat, libid3tag, libopus, pulseaudio, libmpdclient, openal-soft, libvorbis, libsqlite, ffmpeg, libmp3lame, libbz2, libogg, libnfs, zlib"
TERMUX_PKG_BUILD_DEPENDS="boost"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="

40
packages/mpd/doc-mpdconf.example.patch
View File

@ -1,6 +1,5 @@
diff -u -r ../MPD-0.21.3/doc/mpdconf.example ./doc/mpdconf.example
--- ../MPD-0.21.3/doc/mpdconf.example 2018-11-16 12:27:58.000000000 +0000
+++ ./doc/mpdconf.example 2018-12-30 22:31:44.428337004 +0000
--- ./doc/mpdconf.example.orig 2020-09-23 13:26:51.000000000 +0000
+++ ./doc/mpdconf.example 2020-10-17 21:31:55.630574924 +0000
@@ -10,14 +10,14 @@
# be disabled and audio files will only be accepted over ipc socket (using
# file:// protocol) or streaming files over an accepted protocol.
@ -32,7 +31,7 @@ diff -u -r ../MPD-0.21.3/doc/mpdconf.example ./doc/mpdconf.example
# setting defaults to logging to syslog.
#
-#log_file "~/.mpd/log"
+#log_file "@TERMUX_HOME@/.mpd/log"
+#log_file "/data/data/com.termux/files/home/.mpd/log"
#
# This setting sets the location of the file which stores the process ID
# for use of mpd --kill and some init scripts. This setting is disabled by
@ -69,7 +68,7 @@ diff -u -r ../MPD-0.21.3/doc/mpdconf.example ./doc/mpdconf.example
#
# And for Unix Socket
-#bind_to_address "~/.mpd/socket"
+bind_to_address "@TERMUX_PREFIX@/var/run/mpd.socket"
+bind_to_address "/data/data/com.termux/files/usr/var/run/mpd.socket"
#
# This setting is the TCP port that is desired for the daemon to get assigned
-# to.
@ -78,9 +77,9 @@ diff -u -r ../MPD-0.21.3/doc/mpdconf.example ./doc/mpdconf.example
-#port "6600"
+#port "8600"
#
# This setting controls the type of information which is logged. Available
# setting arguments are "default", "secure" or "verbose". The "verbose" setting
@@ -133,12 +134,12 @@
# Suppress all messages below the given threshold. Use "verbose" for
# troubleshooting.
@@ -131,12 +132,12 @@
# If this setting is set to "yes", MPD will discover audio files by following
# symbolic links outside of the configured music_directory.
#
@ -95,7 +94,7 @@ diff -u -r ../MPD-0.21.3/doc/mpdconf.example ./doc/mpdconf.example
#
###############################################################################
@@ -201,28 +202,6 @@
@@ -199,28 +200,6 @@
# blocks. Setting this block is optional, though the server will only attempt
# autodetection for one sound card.
#
@ -124,7 +123,7 @@ diff -u -r ../MPD-0.21.3/doc/mpdconf.example ./doc/mpdconf.example
#
# An example of a shout output (for streaming to Icecast):
#
@@ -253,7 +232,8 @@
@@ -251,7 +230,8 @@
# type "recorder"
# name "My recorder"
# encoder "vorbis" # optional, vorbis or lame
@ -134,8 +133,8 @@ diff -u -r ../MPD-0.21.3/doc/mpdconf.example ./doc/mpdconf.example
## quality "5.0" # do not define if bitrate is defined
# bitrate "128" # do not define if quality is defined
# format "44100:16:1"
@@ -282,42 +262,31 @@
## sink "remote_server_sink" # optional
@@ -281,55 +261,31 @@
## media_role "media_role" #optional
#}
#
-# An example of a winmm output (Windows multimedia API).
@ -148,6 +147,20 @@ diff -u -r ../MPD-0.21.3/doc/mpdconf.example ./doc/mpdconf.example
-## device "0" # optional
-## mixer_type "hardware" # optional
-#}
-#
-# An example of a wasapi output (Windows multimedia API).
-#
-#audio_output {
-# type "wasapi"
-# name "My WASAPI output"
-## device "Digital Audio (S/PDIF) (High Definition Audio Device)" # optional
-# or
-## device "0" # optional
-## Exclusive mode blocks all other audio source, and get best audio quality without resampling.
-## exclusive "no" # optional
-## Enumerate all devices in log.
-## enumerate "no" # optional
-#}
+# An example of an opensl android output.
+audio_output {
+ type "sles"
@ -179,7 +192,6 @@ diff -u -r ../MPD-0.21.3/doc/mpdconf.example ./doc/mpdconf.example
-## device "Built-in Output" # optional
-## channel_map "-1,-1,0,1" # optional
-#}
-#
+audio_output {
+ type "openal"
+ name "OpenAL output"
@ -196,6 +208,6 @@ diff -u -r ../MPD-0.21.3/doc/mpdconf.example ./doc/mpdconf.example
+ enabled "no"
+}
+
#
## Example "pipe" output:
#
#audio_output {

13
packages/mpd/src-input-Error.cxx.patch
View File

@ -1,9 +1,8 @@
diff -u -r ../MPD-0.21.3/src/input/Error.cxx ./src/input/Error.cxx
--- ../MPD-0.21.3/src/input/Error.cxx 2018-11-16 12:27:58.000000000 +0000
+++ ./src/input/Error.cxx 2018-12-31 00:46:04.225900587 +0000
@@ -30,22 +30,28 @@
#include <nfsc/libnfs-raw-nfs.h>
#endif
--- ./src/input/Error.cxx.orig 2020-10-17 21:35:20.410175114 +0000
+++ ./src/input/Error.cxx 2020-10-17 21:42:26.976008977 +0000
@@ -32,22 +32,28 @@
#include <utility>
+#include <iostream>
+
@ -11,7 +10,7 @@ diff -u -r ../MPD-0.21.3/src/input/Error.cxx ./src/input/Error.cxx
IsFileNotFound(std::exception_ptr ep) noexcept
{
try {
std::rethrow_exception(ep);
std::rethrow_exception(std::move(ep));
} catch (const std::system_error &e) {
+ std::cout << "";
return IsFileNotFound(e);