package/mpd: drop tremor select
PATCH v3 1/2 package/mpd: drop tremor select
Drop tremor select added by commitd428dddf680b067c13ba9a08bfd502c7286cffe7
Indeed, nowadays, mpd can be built successfully even if there is no input plugin selected
---
Changes v2 -> v3 (after review of Thomas Petazzoni):
- Move drop of tremor select in a dedicated patch
- Remove BR2_SOFT_FLOAT dependency and make both options mutually exclusive
Changes v1 -> v2 (after review of Thomas Petazzoni):
- Drop default and replace it by a dependency on BR2_SOFT_FLOAT or !BR2_SOFT_FLOAT
package/mpd/Config.in | 1 - 1 file changed, 1 deletion(-)
package/mpd/Config.in +0 -1
@@ -9,7 +9,6 @@ menuconfig BR2_PACKAGE_MPD depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # exception_ptr select BR2_PACKAGE_BOOST select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE - select BR2_PACKAGE_MPD_TREMOR if !(BR2_PACKAGE_MPD_MAD || BR2_PACKAGE_MPD_MPG123 || BR2_PACKAGE_MPD_VORBIS || BR2_PACKAGE_MPD_WAVPACK || BR2_PACKAGE_MPD_FLAC || BR2_PACKAGE_MPD_MUSEPACK || BR2_PACKAGE_MPD_FFMPEG) help MPD is a flexible, powerful, server-side application for playing music. Through plugins and libraries
Signature · 1 line
2.20.1
PATCH v3 2/2 package/mpd: fix static build with tremor and vorbis
mpd can't be built statically with tremor and vorbis, build fails on:
block.c:(.text+0x11c): multiple definition of `vorbis_block_init' /usr/lfs/v0/rc-buildroot-test/scripts/instance-2/output/host/bin/../sparc-buildroot-linux-uclibc/sysroot/usr/lib/libvorbisidec.a(block.o):block.c:(.text+0x0): first defined here /usr/lfs/v0/rc-buildroot-test/scripts/instance-2/output/host/opt/ext-toolchain/bin/../lib/gcc/sparc-buildroot-linux-uclibc/7.4.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: Disabling relaxation: it will not work with multiple definitions /usr/lfs/v0/rc-buildroot-test/scripts/instance-2/output/host/bin/../sparc-buildroot-linux-uclibc/sysroot/usr/lib/libvorbis.a(block.o): In function `_vorbis_block_alloc':
Fix this by making both options mutually exclusive
It should be noted that upstream removed the possibility to enable tremor and vorbis at the same time since version 0.21.6 and
https://github.com/MusicPlayerDaemon/MPD/commit/c18cd941aaa4c16ac713bc4f1e16ada5281d689e
Fixes:
- http://autobuild.buildroot.org/results/60c721a82ffd668bebf02d80bca83780d6cdb2f2
---
Changes v2 -> v3 (after review of Thomas Petazzoni):
- Move drop of tremor select in a dedicated patch
- Remove BR2_SOFT_FLOAT dependency and make both options mutually exclusive
Changes v1 -> v2 (after review of Thomas Petazzoni):
- Drop default and replace it by a dependency on BR2_SOFT_FLOAT or !BR2_SOFT_FLOAT
package/mpd/Config.in | 1 + 1 file changed, 1 insertion(+)
package/mpd/Config.in +1 -0
@@ -134,6 +134,7 @@ config BR2_PACKAGE_MPD_TREMOR bool "tremor" select BR2_PACKAGE_LIBOGG select BR2_PACKAGE_TREMOR + depends on !BR2_PACKAGE_MPD_VORBIS help Enable vorbis input support. Select this if you want to play back OGG files on softfloat
Signature · 1 line
2.20.1
PATCH v3 2/2 package/mpd: fix static build with tremor and vorbis
Quoted 8 lines · Fabrice Fontaine
mpd can't be built statically with tremor and vorbis, build fails on:
block.c:(.text+0x11c): multiple definition of `vorbis_block_init' /usr/lfs/v0/rc-buildroot-test/scripts/instance-2/output/host/bin/../sparc-buildroot-linux-uclibc/sysroot/usr/lib/libvorbisidec.a(block.o):block.c:(.text+0x0): first defined here/usr/lfs/v0/rc-buildroot-test/scripts/instance-2/output/host/opt/ext-toolchain/bin/../lib/gcc/sparc-buildroot-linux-uclibc/7.4.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: Disabling relaxation: it will not work with multiple definitions /usr/lfs/v0/rc-buildroot-test/scripts/instance-2/output/host/bin/../sparc-buildroot-linux-uclibc/sysroot/usr/lib/libvorbis.a(block.o): In function `_vorbis_block_alloc':Fix this by making both options mutually exclusive
Quoted 8 lines
It should be noted that upstream removed the possibility to enable tremor and vorbis at the same time since version 0.21.6 and
https://github.com/MusicPlayerDaemon/MPD/commit/c18cd941aaa4c16ac713bc4f1e16ada5281d689eFixes:
- http://autobuild.buildroot.org/results/60c721a82ffd668bebf02d80bca83780d6cdb2f2Signed-off-by Fabrice Fontaine <[email protected]>
Both applied to master, thanks.
Quoted 18 lines
---
Changes v2 -> v3 (after review of Thomas Petazzoni):
- Move drop of tremor select in a dedicated patch
- RemoveBR2_SOFT_FLOATdependency and make both options mutually exclusiveChanges v1 -> v2 (after review of Thomas Petazzoni):
- Drop default and replace it by a dependency onBR2_SOFT_FLOATor !BR2_SOFT_FLOATpackage/mpd/Config.in | 1 + 1 file changed, 1 insertion(+)package/mpd/Config.in +0
-0
package/mpd/Config.in config BR2_PACKAGE_MPD_TREMOR · line 137
Quoted 4 lines
package/mpd/Config.in +1
-0@@ -134,6 +134,7 @@ config BR2_PACKAGE_MPD_TREMOR bool "tremor" select BR2_PACKAGE_LIBOGG select BR2_PACKAGE_TREMOR + depends on !BR2_PACKAGE_MPD_VORBIS
depends should come before select. check-package complained about this. Fixed
before applying.
Regards,
Arnout
Quoted 4 lines
package/mpd/Config.in +0
-0help Enable vorbis input support. Select this if you want to play back OGG files on softfloat
PATCH v3 2/2 package/mpd: fix static build with tremor and vorbis
In reply to Fabrice FontaineQuoted 10 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Fabrice" == Fabrice Fontaine <[email protected]> writes:
mpd can't be built statically with tremor and vorbis, build fails on:
block.c:(.text+0x11c): multiple definition of `vorbis_block_init' /usr/lfs/v0/rc-buildroot-test/scripts/instance-2/output/host/bin/../sparc-buildroot-linux-uclibc/sysroot/usr/lib/libvorbisidec.a(block.o):block.c:(.text+0x0): first defined here/usr/lfs/v0/rc-buildroot-test/scripts/instance-2/output/host/opt/ext-toolchain/bin/../lib/gcc/sparc-buildroot-linux-uclibc/7.4.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: Disabling relaxation: it will not work with multiple definitions /usr/lfs/v0/rc-buildroot-test/scripts/instance-2/output/host/bin/../sparc-buildroot-linux-uclibc/sysroot/usr/lib/libvorbis.a(block.o): In function `_vorbis_block_alloc':Fix this by making both options mutually exclusive
Quoted 8 lines
It should be noted that upstream removed the possibility to enable tremor and vorbis at the same time since version 0.21.6 and
https://github.com/MusicPlayerDaemon/MPD/commit/c18cd941aaa4c16ac713bc4f1e16ada5281d689eFixes:
- http://autobuild.buildroot.org/results/60c721a82ffd668bebf02d80bca83780d6cdb2f2Signed-off-by Fabrice Fontaine <[email protected]>
Committed to 2019.02.x and 2019.05.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH v3 1/2 package/mpd: drop tremor select
In reply to Fabrice FontaineQuoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Fabrice" == Fabrice Fontaine <[email protected]> writes:
Drop tremor select added by commit
d428dddf680b067c13ba9a08bfd502c7286cffe7Indeed, nowadays, mpd can be built successfully even if there is no input plugin selected
Signed-off-by Fabrice Fontaine <[email protected]>
Committed to 2019.02.x and 2019.05.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard