From 34b7b2a5f5f6146d75f203fb6d280f23d4538b5f Mon Sep 17 00:00:00 2001 From: heitbaum Date: Sat, 25 Dec 2021 00:58:21 +0000 Subject: [PATCH 1/5] libopenmpt: add libvorbisfile to pkgconfig fixes following build error: ./toolchain/armv7a-libreelec-linux-gnueabihf/sysroot/usr/lib/ libopenmpt.a(libopenmpt_la-Load_xm.o):Load_xm.cpp:function OpenMPT::ReadSampleData(OpenMPT::ModSample&, OpenMPT::SampleIO, OpenMPT::detail::FileReader&, bool&): error: undefined reference to 'ov_open_callbacks' --- .../libopenmpt-add-libvorbisfile-to-pkgconfig.patch | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 packages/audio/libopenmpt/patches/libopenmpt-add-libvorbisfile-to-pkgconfig.patch diff --git a/packages/audio/libopenmpt/patches/libopenmpt-add-libvorbisfile-to-pkgconfig.patch b/packages/audio/libopenmpt/patches/libopenmpt-add-libvorbisfile-to-pkgconfig.patch new file mode 100644 index 0000000000..7aa4ad928c --- /dev/null +++ b/packages/audio/libopenmpt/patches/libopenmpt-add-libvorbisfile-to-pkgconfig.patch @@ -0,0 +1,11 @@ +--- a/libopenmpt/libopenmpt.pc.in 2016-07-09 18:17:00.000000000 +0000 ++++ b/libopenmpt/libopenmpt.pc.in 2021-12-25 00:53:54.189008995 +0000 +@@ -8,7 +8,7 @@ + Description: Tracker module player based on OpenMPT + Version: @VERSION@ + Requires.private: @LIBOPENMPT_REQUIRES_PRIVATE@ +-Libs: -L${libdir} -lopenmpt ++Libs: -L${libdir} -lopenmpt -lvorbisfile + Libs.private: @LIBOPENMPT_LIBS_PRIVATE@ + Cflags: -I${includedir} + From 6523787844457ed44158ef2af19b04d00b69682c Mon Sep 17 00:00:00 2001 From: heitbaum Date: Fri, 3 Dec 2021 10:33:18 +0000 Subject: [PATCH 2/5] mpd: update to 0.23.5 --- packages/addons/service/mpd/changelog.txt | 5 +++-- packages/addons/service/mpd/package.mk | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/addons/service/mpd/changelog.txt b/packages/addons/service/mpd/changelog.txt index 1f525ce1a6..b086c4faa7 100644 --- a/packages/addons/service/mpd/changelog.txt +++ b/packages/addons/service/mpd/changelog.txt @@ -1,6 +1,7 @@ 113 -- Update to version 0.23.4 -- Update libopenmpt to 0.5.13 +- Update to version 0.23.5 +- libmpdclient: update to 2.20 +- Update libopenmpt to 0.5.15 112 - Update to version 0.23.3 diff --git a/packages/addons/service/mpd/package.mk b/packages/addons/service/mpd/package.mk index 5b0ad8e1e5..cd7b00d2e3 100644 --- a/packages/addons/service/mpd/package.mk +++ b/packages/addons/service/mpd/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="mpd" -PKG_VERSION="0.23.4" -PKG_SHA256="2f359d30dd980f762d2bc324d916e48b731e8a4d456d01d120c61ad657e4c754" +PKG_VERSION="0.23.5" +PKG_SHA256="f22c2c25093a05f4566f9cd7207cfbcd8405af67ed29a989bcf8905f80b7a299" PKG_REV="113" PKG_ARCH="any" PKG_LICENSE="GPL" From 71c797bd22eefa5d7598380a2155b3638a07de49 Mon Sep 17 00:00:00 2001 From: heitbaum Date: Sat, 25 Dec 2021 01:01:05 +0000 Subject: [PATCH 3/5] mpd: add libopenmpt dependancy scripts/build mpd was not including libopenmpt, this was not the case when the addon script was run - thus getting different results. Include libopenmpt here so as to ensure that standalone build and jenkins mpt build are the same. --- packages/addons/service/mpd/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/addons/service/mpd/package.mk b/packages/addons/service/mpd/package.mk index cd7b00d2e3..ae1f9a38ab 100644 --- a/packages/addons/service/mpd/package.mk +++ b/packages/addons/service/mpd/package.mk @@ -11,8 +11,8 @@ PKG_LICENSE="GPL" PKG_SITE="https://www.musicpd.org" PKG_URL="http://www.musicpd.org/download/mpd/$(get_pkg_version_maj_min)/mpd-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain alsa-lib avahi boost curl faad2 ffmpeg flac glib lame libcdio libfmt \ - libgcrypt libiconv libid3tag libmad libmpdclient libsamplerate libvorbis \ - libnfs libogg mpd-mpc opus pulseaudio samba wavpack yajl" + libgcrypt libiconv libid3tag libmad libmpdclient libopenmpt libsamplerate \ + libvorbis libnfs libogg mpd-mpc opus pulseaudio samba wavpack yajl" PKG_SECTION="service.multimedia" PKG_SHORTDESC="Music Player Daemon (MPD): a free and open Music Player Server" PKG_LONGDESC="Music Player Daemon (${PKG_VERSION}) is a flexible and powerful server-side application for playing music" From c3a237e40b89b39a86569f2e13d7c0f93d776a4d Mon Sep 17 00:00:00 2001 From: heitbaum Date: Wed, 24 Nov 2021 21:41:40 +1100 Subject: [PATCH 4/5] libmpdclient: update to 2.20 --- packages/addons/addon-depends/libmpdclient/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/addons/addon-depends/libmpdclient/package.mk b/packages/addons/addon-depends/libmpdclient/package.mk index 8cb1d79236..69ce63cb19 100644 --- a/packages/addons/addon-depends/libmpdclient/package.mk +++ b/packages/addons/addon-depends/libmpdclient/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libmpdclient" -PKG_VERSION="2.19" -PKG_SHA256="158aad4c2278ab08e76a3f2b0166c99b39fae00ee17231bd225c5a36e977a189" +PKG_VERSION="2.20" +PKG_SHA256="18793f68e939c3301e34d8fcadea1f7daa24143941263cecadb80126194e277d" PKG_LICENSE="BSD-3c" PKG_SITE="https://www.musicpd.org" PKG_URL="https://www.musicpd.org/download/libmpdclient/2/libmpdclient-${PKG_VERSION}.tar.xz" From 60462c8d2e838d1df7dff8263eec7949777613fa Mon Sep 17 00:00:00 2001 From: heitbaum Date: Tue, 7 Dec 2021 13:25:40 +0000 Subject: [PATCH 5/5] libopenmpt: update to 0.5.15 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit release notes: - https://lib.openmpt.org/libopenmpt/2021/12/05/security-updates-0.5.14-0.4.26-0.3.35/ - https://lib.openmpt.org/libopenmpt/2021/12/23/security-update-0.5.15-releases-0.4.27-0.3.36/ update 0.5.13 (2021-11-14) to 0.5.15 (2021-12-23) --- 0.5.15 --- [Sec] Possible out-of-bounds read of stack-allocated array in malformed AMS files. (r16243) [Bug] Fixed various undefined behaviour found with ubsan. IT: Even after libopenmpt 0.5.14 the filter reset logic was still not 100% identical to Impulse Tracker: A note triggered on tick 0 of a row with a Pattern Delay effect still caused the filter to be reset on repetitions of that row even though the note wasn’t retriggered. MOD: Loosened VBlank timing heuristics so that the original copy of Guitar Slinger from Dizzy Tunes II plays correctly. mpg123: Update to v1.29.3 (2021-12-11). --- 0.5.14 --- [Sec] Possible out-of-bounds read in Chorus plugin with NaN plugin parameters. Most implementations of the “fast math” compiler optimizations will prevent this crash but it is not guaranteed. (r16096) [Bug] Fixed undefined behaviour with custom tunings found with ubsan. OPL: Improved channel allocation strategy when there are lots of faded-out notes. MOD: Digital Tracker MODs have four unknown bytes right after the magic bytes which seem to be ignored even by Digital Tracker itself. Just skip over them. The logic when to turn off the resonant filter was broken in some edge cases since libopenmpt 0.5.1. IMF: Implemented XE1-XE3 commands, which disable individual envelopes. Command Nxy (cutoff slide + resonance) is now also partially supported (only resonance for now). IMF: Filter envelopes were upside down. MTM: Omitting pattern loading through the load.skip_patterns ctl caused sample data to be corrupted. S3M: Ignore O00 commands in files created with Scream Tracker 3.00 and 3.01, as this command only gained effect memory in version 3.03. STM: Use S3M-like sample swap behaviour. XM: Disable arpeggio quirk for XMs made with Skale Tracker. Fixes KAPTENFL.XM. miniz: Update to v2.2.0 (2021-06-27). minimp3: Update to commit 50d2aaf360a53653b718fead8e258d654c3a7e41 (2021-11-27). --- packages/audio/libopenmpt/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/audio/libopenmpt/package.mk b/packages/audio/libopenmpt/package.mk index 35387ee3dc..f3a3ed0a98 100644 --- a/packages/audio/libopenmpt/package.mk +++ b/packages/audio/libopenmpt/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libopenmpt" -PKG_VERSION="0.5.13" -PKG_SHA256="6fa28ada93d95ee2428a2d37a5c24faaf9567ff6ede3d134c006b2a6cefbbfe8" +PKG_VERSION="0.5.15" +PKG_SHA256="bca80f897b479d39926e16058db4fb9fd618ab8be6cbe96608736628bfd8b15c" PKG_LICENSE="BSD" PKG_SITE="https://lib.openmpt.org/libopenmpt/" PKG_URL="https://lib.openmpt.org/files/libopenmpt/src/${PKG_NAME}-${PKG_VERSION}+release.autotools.tar.gz"