From patchwork Tue Feb 5 17:00:05 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 218298 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id 95AC72C02C9 for ; Wed, 6 Feb 2013 04:00:24 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id E466E8BD1C; Tue, 5 Feb 2013 17:00:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 9OVoIW-HEHjf; Tue, 5 Feb 2013 17:00:16 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id D68958BDDF; Tue, 5 Feb 2013 17:00:14 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id CA5688F783 for ; Tue, 5 Feb 2013 17:00:20 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 449841015CD for ; Tue, 5 Feb 2013 17:00:01 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id gb1ClFl5MoK8 for ; Tue, 5 Feb 2013 16:59:59 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail.free-electrons.com (mail.free-electrons.com [94.23.35.102]) by fraxinus.osuosl.org (Postfix) with ESMTP id DD75910078F for ; Tue, 5 Feb 2013 16:59:58 +0000 (UTC) Received: by mail.free-electrons.com (Postfix, from userid 106) id 40F17834; Tue, 5 Feb 2013 18:00:10 +0100 (CET) Received: from localhost (unknown [74.125.61.14]) by mail.free-electrons.com (Postfix) with ESMTPSA id BC3C65BE; Tue, 5 Feb 2013 18:00:09 +0100 (CET) From: Thomas Petazzoni To: buildroot@uclibc.org Date: Tue, 5 Feb 2013 18:00:05 +0100 Message-Id: <1360083605-10855-1-git-send-email-thomas.petazzoni@free-electrons.com> X-Mailer: git-send-email 1.7.9.5 Subject: [Buildroot] [PATCH] libsndfile: Add dependency on BR2_LARGEFILE X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net From: Ryan Mallon 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 Signed-off-by: Thomas Petazzoni --- package/bluez_utils/Config.in | 4 ++++ package/libsndfile/Config.in | 7 +++++++ package/multimedia/gst-plugins-bad/Config.in | 4 ++++ package/multimedia/gst-plugins-good/Config.in | 1 + package/multimedia/mpd/Config.in | 5 +++++ package/multimedia/pulseaudio/Config.in | 5 +++-- 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