mpd: Update from 0.21.24 to 0.21.25

This commit is contained in:
Fredrik Fornwall 2020-08-09 01:30:56 +02:00
parent 86f2467e87
commit fde65eb7b6
2 changed files with 8 additions and 15 deletions

View File

@ -1,9 +1,9 @@
TERMUX_PKG_HOMEPAGE=https://www.musicpd.org TERMUX_PKG_HOMEPAGE=https://www.musicpd.org
TERMUX_PKG_DESCRIPTION="Music player daemon" TERMUX_PKG_DESCRIPTION="Music player daemon"
TERMUX_PKG_LICENSE="GPL-2.0" 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_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_DEPENDS="libc++, libcurl, libid3tag, libopus, pulseaudio, libmpdclient, openal-soft, libvorbis, libsqlite, ffmpeg, libmp3lame, libbz2, libogg, libnfs, zlib"
TERMUX_PKG_BUILD_DEPENDS="boost" TERMUX_PKG_BUILD_DEPENDS="boost"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
@ -30,6 +30,8 @@ termux_step_pre_configure() {
CXXFLAGS+=" -DTERMUX -UANDROID" CXXFLAGS+=" -DTERMUX -UANDROID"
LDFLAGS+=" -lOpenSLES" LDFLAGS+=" -lOpenSLES"
rm -f $TERMUX_PREFIX/etc/mpd.conf rm -f $TERMUX_PREFIX/etc/mpd.conf
export BOOST_ROOT=$TERMUX_PREFIX
} }
termux_step_post_make_install() { termux_step_post_make_install() {

View File

@ -1,16 +1,7 @@
Reverts commit 81c16273c543822fa8b87522cb1146a7859edd7a in the mpd repo 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
--- ../SlesOutputPlugin.cxx.orig 2020-04-03 22:18:11.070009046 +0200 +++ ./src/output/plugins/sles/SlesOutputPlugin.cxx 2020-08-08 23:25:24.200018549 +0000
+++ ./src/output/plugins/sles/SlesOutputPlugin.cxx 2020-04-03 22:18:58.189898556 +0200 @@ -413,5 +413,5 @@
@@ -28,7 +28,6 @@
#include "util/Macros.hxx"
#include "util/Domain.hxx"
#include "system/ByteOrder.hxx"
-#include "mixer/MixerList.hxx"
#include "Log.hxx"
#include <SLES/OpenSLES.h>
@@ -413,5 +412,5 @@
"sles", "sles",
sles_test_default_device, sles_test_default_device,
SlesOutput::Create, SlesOutput::Create,