upgpkg(main/mpd): update to 0.23.9

Signed-off-by: 2096779623 <admin@utermux.dev>
This commit is contained in:
2096779623 2022-08-19 10:17:41 +08:00 committed by buttaface
parent af7aa4321a
commit 773628ecd5
2 changed files with 2 additions and 34 deletions

View File

@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://www.musicpd.org
TERMUX_PKG_DESCRIPTION="Music player daemon"
TERMUX_PKG_LICENSE="GPL-2.0"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION="0.23.8"
TERMUX_PKG_REVISION=4
TERMUX_PKG_VERSION="0.23.9"
TERMUX_PKG_SRCURL=https://github.com/MusicPlayerDaemon/MPD/archive/v$TERMUX_PKG_VERSION.tar.gz
TERMUX_PKG_SHA256=a44584523c6e9b30d833ec214c0214dd7f8ba4680cc3b2e5670dc9fb3c6cd842
TERMUX_PKG_SHA256=0f9841ed132073fbdff6e7a7e20650958a5bb4b754392a1529dd473b379dac8e
TERMUX_PKG_DEPENDS="dbus, ffmpeg, game-music-emu, libao, libbz2, libc++, libcurl, libexpat, libflac, libicu, libid3tag, libmad, libmp3lame, libmpdclient, libnfs, libogg, libopus, libsndfile, libsoxr, libsqlite, libvorbis, openal-soft, pulseaudio, zlib"
TERMUX_PKG_BUILD_DEPENDS="boost, boost-headers, libiconv"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="

View File

@ -1,31 +0,0 @@
commit 59792cb0b801854ee41be72d33db9542735df754
Author: Max Kellermann <max.kellermann@gmail.com>
Date: Wed Jul 27 10:59:48 2022 +0200
decoder/ffmpeg: wrap FFmpeg include in "extern C"
Commit ebae25d175eb31 added that #include, but forgot to wrap it in
"extern C", so the linker tried to look up C++ symbols, causing linker
failure.
Closes https://github.com/MusicPlayerDaemon/MPD/issues/1582
diff --git a/src/decoder/plugins/FfmpegIo.cxx b/src/decoder/plugins/FfmpegIo.cxx
index 2e22d9599102..5b5c8b40e3a0 100644
--- a/src/decoder/plugins/FfmpegIo.cxx
+++ b/src/decoder/plugins/FfmpegIo.cxx
@@ -21,10 +21,13 @@
#define __STDC_CONSTANT_MACROS
#include "FfmpegIo.hxx"
-#include "libavutil/mem.h"
#include "../DecoderAPI.hxx"
#include "input/InputStream.hxx"
+extern "C" {
+#include <libavutil/mem.h>
+}
+
AvioStream::~AvioStream()
{
if (io != nullptr) {