From 5c621181e88b6cd2557ea3fbf17074003907f443 Mon Sep 17 00:00:00 2001 From: heitbaum Date: Thu, 31 Dec 2020 11:59:51 +0000 Subject: [PATCH 1/6] libopenmpt: update to 0.5.13 update 0.4.17 (2021-01-31) to 0.5.13 (2021-11-14) changelog: - https://lib.openmpt.org/libopenmpt/2021/03/20/security-update-0.5.7-releases-0.4.19-0.3.28/ - https://lib.openmpt.org/libopenmpt/2021/04/11/security-updates-0.5.8-0.4.20-0.3.29/ - https://lib.openmpt.org/libopenmpt/2021/05/16/releases-0.5.9-0.4.21-0.3.30/ - https://lib.openmpt.org/libopenmpt/2021/07/04/releases-0.5.10-0.4.22-0.3.31/ - https://lib.openmpt.org/libopenmpt/2021/08/22/security-updates-0.5.11-0.4.23-0.3.32/ - https://lib.openmpt.org/libopenmpt/2021/10/04/security-updates-0.5.12-0.4.24-0.3.33/ - https://lib.openmpt.org/libopenmpt/2021/11/14/releases-0.5.13-0.4.25-0.3.34/ --- 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 96a9ba2304..35387ee3dc 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.4.17" -PKG_SHA256="1df99191400c62dbdfd144f5ffd6aedbfd39fb9c6c47e83355a222632b793593" +PKG_VERSION="0.5.13" +PKG_SHA256="6fa28ada93d95ee2428a2d37a5c24faaf9567ff6ede3d134c006b2a6cefbbfe8" 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" From 10862fb451c0e72b751ac1f1195679eb9383db14 Mon Sep 17 00:00:00 2001 From: heitbaum Date: Fri, 12 Nov 2021 19:55:19 +1100 Subject: [PATCH 2/6] mpd: update to 0.23.5 and addon (113) --- packages/addons/service/mpd/changelog.txt | 5 + packages/addons/service/mpd/package.mk | 153 +++++++++++----------- 2 files changed, 81 insertions(+), 77 deletions(-) diff --git a/packages/addons/service/mpd/changelog.txt b/packages/addons/service/mpd/changelog.txt index e942942bfd..b086c4faa7 100644 --- a/packages/addons/service/mpd/changelog.txt +++ b/packages/addons/service/mpd/changelog.txt @@ -1,3 +1,8 @@ +113 +- 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 2f02a6d053..cd7b00d2e3 100644 --- a/packages/addons/service/mpd/package.mk +++ b/packages/addons/service/mpd/package.mk @@ -3,9 +3,9 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="mpd" -PKG_VERSION="0.23.3" -PKG_SHA256="b300625701005c6b14649f11dac118d05540529a5385d05b7c3062c0ce08f399" -PKG_REV="112" +PKG_VERSION="0.23.5" +PKG_SHA256="f22c2c25093a05f4566f9cd7207cfbcd8405af67ed29a989bcf8905f80b7a299" +PKG_REV="113" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://www.musicpd.org" @@ -22,80 +22,79 @@ PKG_IS_ADDON="yes" PKG_ADDON_NAME="Music Player Daemon (MPD)" PKG_ADDON_TYPE="xbmc.service" -PKG_MESON_OPTS_TARGET=" \ - -Dadplug=disabled \ - -Dalsa=enabled \ - -Dao=disabled \ - -Daudiofile=disabled \ - -Dbzip2=enabled \ - -Dcdio_paranoia=disabled \ - -Dchromaprint=disabled \ - -Dcue=true \ - -Dcurl=enabled \ - -Ddatabase=true \ - -Ddocumentation=disabled \ - -Ddsd=true \ - -Dexpat=enabled \ - -Dfaad=enabled \ - -Dffmpeg=enabled \ - -Dfifo=true \ - -Dflac=enabled \ - -Dfluidsynth=disabled \ - -Dfuzzer=false \ - -Dgme=disabled \ - -Dhttpd=true \ - -Dhtml_manual=false \ - -Diconv=disabled \ - -Dicu=disabled \ - -Did3tag=enabled \ - -Dipv6=enabled \ - -Diso9660=enabled \ - -Djack=disabled \ - -Dlame=enabled \ - -Dlibmpdclient=enabled \ - -Dlibsamplerate=enabled \ - -Dlocal_socket=false \ - -Dmad=enabled \ - -Dmanpages=false \ - -Dmikmod=disabled \ - -Dmms=disabled \ - -Dmodplug=disabled \ - -Dmpcdec=disabled \ - -Dmpg123=disabled \ - -Dneighbor=false \ - -Dnfs=enabled \ - -Dopenal=disabled \ - -Dopus=enabled \ - -Doss=disabled \ - -Dpipe=true \ - -Dpulse=enabled \ - -Dqobuz=enabled \ - -Drecorder=false \ - -Dshine=disabled \ - -Dshout=disabled \ - -Dsidplay=disabled \ - -Dsmbclient=enabled \ - -Dsndfile=enabled \ - -Dsndio=disabled \ - -Dsolaris_output=disabled \ - -Dsoundcloud=enabled \ - -Dsoxr=enabled \ - -Dsqlite=enabled \ - -Dsyslog=disabled \ - -Dsystemd=disabled \ - -Dtest=false \ - -Dtwolame=disabled \ - -Dupnp=disabled \ - -Dvorbis=enabled \ - -Dvorbisenc=enabled \ - -Dwave_encoder=true \ - -Dwavpack=enabled \ - -Dwebdav=enabled \ - -Dwildmidi=disabled \ - -Dyajl=enabled \ - -Dzeroconf=avahi \ - -Dzlib=enabled \ - -Dzzip=disabled" +PKG_MESON_OPTS_TARGET="-Dadplug=disabled \ + -Dalsa=enabled \ + -Dao=disabled \ + -Daudiofile=disabled \ + -Dbzip2=enabled \ + -Dcdio_paranoia=disabled \ + -Dchromaprint=disabled \ + -Dcue=true \ + -Dcurl=enabled \ + -Ddatabase=true \ + -Ddocumentation=disabled \ + -Ddsd=true \ + -Dexpat=enabled \ + -Dfaad=enabled \ + -Dffmpeg=enabled \ + -Dfifo=true \ + -Dflac=enabled \ + -Dfluidsynth=disabled \ + -Dfuzzer=false \ + -Dgme=disabled \ + -Dhttpd=true \ + -Dhtml_manual=false \ + -Diconv=disabled \ + -Dicu=disabled \ + -Did3tag=enabled \ + -Dipv6=enabled \ + -Diso9660=enabled \ + -Djack=disabled \ + -Dlame=enabled \ + -Dlibmpdclient=enabled \ + -Dlibsamplerate=enabled \ + -Dlocal_socket=false \ + -Dmad=enabled \ + -Dmanpages=false \ + -Dmikmod=disabled \ + -Dmms=disabled \ + -Dmodplug=disabled \ + -Dmpcdec=disabled \ + -Dmpg123=disabled \ + -Dneighbor=false \ + -Dnfs=enabled \ + -Dopenal=disabled \ + -Dopus=enabled \ + -Doss=disabled \ + -Dpipe=true \ + -Dpulse=enabled \ + -Dqobuz=enabled \ + -Drecorder=false \ + -Dshine=disabled \ + -Dshout=disabled \ + -Dsidplay=disabled \ + -Dsmbclient=enabled \ + -Dsndfile=enabled \ + -Dsndio=disabled \ + -Dsolaris_output=disabled \ + -Dsoundcloud=enabled \ + -Dsoxr=enabled \ + -Dsqlite=enabled \ + -Dsyslog=disabled \ + -Dsystemd=disabled \ + -Dtest=false \ + -Dtwolame=disabled \ + -Dupnp=disabled \ + -Dvorbis=enabled \ + -Dvorbisenc=enabled \ + -Dwave_encoder=true \ + -Dwavpack=enabled \ + -Dwebdav=enabled \ + -Dwildmidi=disabled \ + -Dyajl=enabled \ + -Dzeroconf=avahi \ + -Dzlib=enabled \ + -Dzzip=disabled" addon() { mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/bin From 967cdba4c45942da780f2697760fac7121f639f0 Mon Sep 17 00:00:00 2001 From: heitbaum Date: Sat, 25 Dec 2021 00:58:21 +0000 Subject: [PATCH 3/6] 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 0ae73d625c2c09413ebbba11cca586c5a6ef1bd4 Mon Sep 17 00:00:00 2001 From: heitbaum Date: Tue, 7 Dec 2021 13:25:40 +0000 Subject: [PATCH 4/6] 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" From e6b928b80da90e70bde86a95fc9127072a20171d Mon Sep 17 00:00:00 2001 From: heitbaum Date: Sat, 25 Dec 2021 01:01:05 +0000 Subject: [PATCH 5/6] 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 ce945f65684ea397e617eb52da5c9a7e3833edee Mon Sep 17 00:00:00 2001 From: heitbaum Date: Wed, 24 Nov 2021 21:41:40 +1100 Subject: [PATCH 6/6] 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"