-
-
Notifications
You must be signed in to change notification settings - Fork 3.5k
enhance(main/libopenmpt, mpg123, chromaprint): split libopenmpt, mpg123 and chromaprint executables from their libraries #25227
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: master
Are you sure you want to change the base?
Conversation
Better put chromaprint as the subpackage while the main package renamed to libchromaprint. |
That's probably a better approach, I'll update the PR |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That's probably a better approach, I'll update the PR
(another hour of CI 🥲)
Dont worry too much. Its better to find issues early on before merge with many eyeballs around.
Unlike recent commits that need to be fixup a few times...
TERMUX_PKG_SRCURL=https://github.com/tizonia/tizonia-openmax-il/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz | ||
TERMUX_PKG_SHA256=0750cae23ed600fb4b4699a392f43a5e03dcd0870383d64da4b8c28ea94a82f8 | ||
TERMUX_PKG_DEPENDS="boost, dbus, libandroid-wordexp, libc++, libcurl, libflac, liblog4c, libmad, libmediainfo, libmp3lame, liboggz, libopus, libsndfile, libsqlite, libuuid, libvpx, mpg123, opusfile, pulseaudio, python, taglib" | ||
TERMUX_PKG_DEPENDS="boost, dbus, libandroid-wordexp, libc++, libcurl, libflac, liblog4c, libmad, libmediainfo, libmp3lame, liboggz, libopus, libsndfile, libsqlite, libuuid, libvpx, libmpg123, opusfile, pulseaudio, python, taglib" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
TERMUX_PKG_DEPENDS="boost, dbus, libandroid-wordexp, libc++, libcurl, libflac, liblog4c, libmad, libmediainfo, libmp3lame, liboggz, libopus, libsndfile, libsqlite, libuuid, libvpx, libmpg123, opusfile, pulseaudio, python, taglib" | |
TERMUX_PKG_DEPENDS="boost, dbus, libandroid-wordexp, libc++, libcurl, libflac, liblog4c, libmad, libmediainfo, libmp3lame, liboggz, libopus, libsndfile, libsqlite, libuuid, libvpx, libmpg123, opusfile, pulseaudio, python, taglib, util-linux" |
For reasons I dont understand for now, this is needed to avoid clashing with util-linux
installation due to the existence of $PREFIX/local/lib/python3.12/dist-packages/libmount/
in both packages
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I did some investigation, and it happens because https://github.com/tizonia/tizonia-openmax-il/blob/master/clients/meson_post_install.py compiles all packages in $PREFIX/local/lib/python3.12/dist-packages
to bytecode, which includes the util-linux installed libmount package
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
will prevent that problem globally if it ever happens again in another package. the PR might be ready soon, but also might require more changes to minor details before applying.
126305a
to
178b427
Compare
…omaprint Chromaprint consists of the libchromaprint library and a tool to calculate audio fingerprints (fpcalc). fpcalc depends on ffmpeg but libchromaprint can use fftw instead of ffmpeg and hence can be split into a subpackage to avoid pulling in ffmpeg. * rename(main/chromaprint): libchromaprint
mpg123 depends on pulseaudio for audio playback, while libmpg123 does not, hence mpg123 is split into a subpackage of libmpg123 * rename(main/mpg123): libmpg123
openmpt123 depends on libflac, libsndfile and pulseaudio, which are not needed by libopenmpt
This is ready now, right? It looks correct to me. |
It's ready, I just saw a merge conflict and force pushed to fix it |
* mpd: libchromaprint, libmpg123, libopenmpt * ffmpeg: libopenmpt * audacious-plugins: libmpg123, libopenmpt * audacity: libmpg123 * chocolate-doom: mpg123 removed from deps (reverts 1a200e2) * deadbeef: libmpg123, upstream url update * love: libmpg123 * sdl2-mixer: libmpg123 * vlc-qt: libchromaprint, libmpg123 * vlc: libchromaprint, libmpg123 * kid3: libchromaprint * mp3gain: libmpg123 * mplayer: libmpg123 * squeezelite: libmpg123 * tizonia: libmpg123, build fix * vgmstream: libmpg123 * gst-plugins-good: libmpg123
This PR splits chromaprint into libchromaprint + chromaprint by replacing ffmpeg with fftw3 for FFT to avoid pulling in ffmpeg when it's not needed. It also splits libopenmpt and mpg123 into openmpt123 + libopenmpt and mpg123 + libmpg123 to avoid pulling in pulseaudio when it's not needed.