From fde65eb7b68a2af22f057419cf2017c4c6d0f744 Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Sun, 9 Aug 2020 01:30:56 +0200 Subject: [PATCH] mpd: Update from 0.21.24 to 0.21.25 --- packages/mpd/build.sh | 6 ++++-- ...tput-plugins-sles-SlesOutputPlugin.cxx.patch | 17 ++++------------- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/packages/mpd/build.sh b/packages/mpd/build.sh index 27c76fb01..705399f47 100644 --- a/packages/mpd/build.sh +++ b/packages/mpd/build.sh @@ -1,9 +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.24 +TERMUX_PKG_VERSION=0.21.25 TERMUX_PKG_SRCURL=https://github.com/MusicPlayerDaemon/MPD/archive/v$TERMUX_PKG_VERSION.tar.gz -TERMUX_PKG_SHA256=0d4072da64676af5c501fa9f2ab813996f7eae5edeb1e1469f64e385188e211d +TERMUX_PKG_SHA256=61e932caf9b507448fc6de0253460e7cd045fb711a5205d2c505a5ec940d465b TERMUX_PKG_DEPENDS="libc++, libcurl, libid3tag, libopus, pulseaudio, libmpdclient, openal-soft, libvorbis, libsqlite, ffmpeg, libmp3lame, libbz2, libogg, libnfs, zlib" TERMUX_PKG_BUILD_DEPENDS="boost" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" @@ -30,6 +30,8 @@ termux_step_pre_configure() { CXXFLAGS+=" -DTERMUX -UANDROID" LDFLAGS+=" -lOpenSLES" rm -f $TERMUX_PREFIX/etc/mpd.conf + + export BOOST_ROOT=$TERMUX_PREFIX } termux_step_post_make_install() { diff --git a/packages/mpd/src-output-plugins-sles-SlesOutputPlugin.cxx.patch b/packages/mpd/src-output-plugins-sles-SlesOutputPlugin.cxx.patch index 949f13dec..1bf35aaa7 100644 --- a/packages/mpd/src-output-plugins-sles-SlesOutputPlugin.cxx.patch +++ b/packages/mpd/src-output-plugins-sles-SlesOutputPlugin.cxx.patch @@ -1,16 +1,7 @@ -Reverts commit 81c16273c543822fa8b87522cb1146a7859edd7a in the mpd repo - ---- ../SlesOutputPlugin.cxx.orig 2020-04-03 22:18:11.070009046 +0200 -+++ ./src/output/plugins/sles/SlesOutputPlugin.cxx 2020-04-03 22:18:58.189898556 +0200 -@@ -28,7 +28,6 @@ - #include "util/Macros.hxx" - #include "util/Domain.hxx" - #include "system/ByteOrder.hxx" --#include "mixer/MixerList.hxx" - #include "Log.hxx" - - #include -@@ -413,5 +412,5 @@ +diff -u -r ../MPD-0.21.25/src/output/plugins/sles/SlesOutputPlugin.cxx ./src/output/plugins/sles/SlesOutputPlugin.cxx +--- ../MPD-0.21.25/src/output/plugins/sles/SlesOutputPlugin.cxx 2020-07-06 19:41:53.000000000 +0000 ++++ ./src/output/plugins/sles/SlesOutputPlugin.cxx 2020-08-08 23:25:24.200018549 +0000 +@@ -413,5 +413,5 @@ "sles", sles_test_default_device, SlesOutput::Create,