summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Mallon <rmallon@gmail.com>2013-02-05 07:00:05 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2013-02-05 20:45:05 (GMT)
commit8f8e537d4329832fbe6e62e52ecfee8c41673f7d (patch)
tree26e6510f0d50311eb66dd09fe8cc63eac5bf1aa0
parentaf3fdf3e7b9ddff419b0834a8b07d6dd0575a637 (diff)
downloadbuildroot-8f8e537d4329832fbe6e62e52ecfee8c41673f7d.tar.gz
buildroot-8f8e537d4329832fbe6e62e52ecfee8c41673f7d.tar.bz2
libsndfile: Add dependency on BR2_LARGEFILE
libsndfile requires sizeof(sf_count_t) == 8, where sf_count_t is a typedef alias for off_t. This is not true by default for all tool-chains, which leads to a runtime assert failure in binaries compiled against libsndfile. See: http://permalink.gmane.org/gmane.comp.audio.libsndfile.devel/229 Add a dependency on BR2_LARGEFILE for libsndfile, and a comment if BR2_LARGEFILE is not selected. [Thomas: rebased patch, added more propagation of the new BR2_LARGEFILE dependency to gst-plugins-good and mpd.] Signed-off-by: Ryan Mallon <rmallon@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/bluez_utils/Config.in4
-rw-r--r--package/libsndfile/Config.in7
-rw-r--r--package/multimedia/gst-plugins-bad/Config.in4
-rw-r--r--package/multimedia/gst-plugins-good/Config.in1
-rw-r--r--package/multimedia/mpd/Config.in5
-rw-r--r--package/multimedia/pulseaudio/Config.in5
6 files changed, 24 insertions, 2 deletions
diff --git a/package/bluez_utils/Config.in b/package/bluez_utils/Config.in
index 7ca23fc..72b900c 100644
--- a/package/bluez_utils/Config.in
+++ b/package/bluez_utils/Config.in
@@ -22,9 +22,13 @@ config BR2_PACKAGE_BLUEZ_UTILS_AUDIO
bool "audio support"
select BR2_PACKAGE_ALSA_LIB
select BR2_PACKAGE_LIBSNDFILE
+ depends on BR2_LARGEFILE
help
Audio support
+comment "bluez-utils audio requires a toolchain with LARGEFILE support"
+ depends on !BR2_LARGEFILE
+
config BR2_PACKAGE_BLUEZ_UTILS_USB
bool "USB support"
depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
diff --git a/package/libsndfile/Config.in b/package/libsndfile/Config.in
index 9afe496..cdba70b 100644
--- a/package/libsndfile/Config.in
+++ b/package/libsndfile/Config.in
@@ -1,8 +1,15 @@
config BR2_PACKAGE_LIBSNDFILE
bool "libsndfile"
+ # The absence of largefile doesn't prevent libsndfile to
+ # build, but at runtime the code assumes that off_t is 64
+ # bits, and asserts if not.
+ depends on BR2_LARGEFILE
help
Libsndfile is a C library for reading and writing files containing
sampled sound (such as MS Windows WAV and the Apple/SGI AIFF format)
through one standard library interface.
http://www.mega-nerd.com/libsndfile/
+
+comment "libsndfile requires a toolchain with LARGEFILE support"
+ depends on !BR2_LARGEFILE
diff --git a/package/multimedia/gst-plugins-bad/Config.in b/package/multimedia/gst-plugins-bad/Config.in
index 8cbe021..370259b 100644
--- a/package/multimedia/gst-plugins-bad/Config.in
+++ b/package/multimedia/gst-plugins-bad/Config.in
@@ -305,6 +305,10 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SDL
config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SNDFILE
bool "sndfile"
select BR2_PACKAGE_LIBSNDFILE
+ depends on BR2_LARGEFILE
+
+comment "gst-plugins-bad-plugin-sndfile requires a toolchain with LARGEFILE support"
+ depends on !BR2_LARGEFILE
config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VCD
bool "vcd"
diff --git a/package/multimedia/gst-plugins-good/Config.in b/package/multimedia/gst-plugins-good/Config.in
index 1498ed0..978aa0b 100644
--- a/package/multimedia/gst-plugins-good/Config.in
+++ b/package/multimedia/gst-plugins-good/Config.in
@@ -198,6 +198,7 @@ config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_OSS4
config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_PULSE
depends on BR2_TOOLCHAIN_HAS_THREADS # pulseaudio
+ depends on BR2_LARGEFILE # pulseaudio -> libsndfile
select BR2_PACKAGE_PULSEAUDIO
bool "pulseaudio"
diff --git a/package/multimedia/mpd/Config.in b/package/multimedia/mpd/Config.in
index 2e44741..6e5c690 100644
--- a/package/multimedia/mpd/Config.in
+++ b/package/multimedia/mpd/Config.in
@@ -41,6 +41,7 @@ config BR2_PACKAGE_MPD_AUDIOFILE
config BR2_PACKAGE_MPD_PULSEAUDIO
bool "pulseaudio"
depends on BR2_TOOLCHAIN_HAS_THREADS # pulseaudio
+ depends on BR2_LARGEFILE # pulseaudio -> libsndfile
select BR2_PACKAGE_PULSEAUDIO
help
Enable pulseaudio output support.
@@ -105,10 +106,14 @@ config BR2_PACKAGE_MPD_LIBSAMPLERATE
config BR2_PACKAGE_MPD_LIBSNDFILE
bool "libsndfile"
select BR2_PACKAGE_LIBSNDFILE
+ depends on BR2_LARGEFILE
help
Enable libsndfile input/streaming support.
Select this if you want to play back WAV files.
+comment "mpd-libsndfile requires a toolchain with LARGEFILE support"
+ depends on !BR2_LARGEFILE
+
config BR2_PACKAGE_MPD_MAD
bool "mad"
default y
diff --git a/package/multimedia/pulseaudio/Config.in b/package/multimedia/pulseaudio/Config.in
index eeb8b5a..03c2613 100644
--- a/package/multimedia/pulseaudio/Config.in
+++ b/package/multimedia/pulseaudio/Config.in
@@ -7,6 +7,7 @@ config BR2_PACKAGE_PULSEAUDIO
select BR2_PACKAGE_LIBSNDFILE
select BR2_PACKAGE_SPEEX
select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
+ depends on BR2_LARGEFILE
help
PulseAudio is a sound system for POSIX OSes, meaning that it
is a proxy for your sound applications. It allows you to do
@@ -18,5 +19,5 @@ config BR2_PACKAGE_PULSEAUDIO
http://pulseaudio.org
-comment "pulseaudio requires a toolchain with WCHAR and threads support"
- depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
+comment "pulseaudio requires a toolchain with WCHAR, LARGEFILE and threads support"
+ depends on !BR2_USE_WCHAR || !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS