From patchwork Tue Apr 8 17:45:07 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 337706 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 7B02914007F for ; Wed, 9 Apr 2014 03:45:43 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 194FA8A5BE; Tue, 8 Apr 2014 17:45:41 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id rtDcC7IpB2R3; Tue, 8 Apr 2014 17:45:40 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 8EDAA8A51B; Tue, 8 Apr 2014 17:45:40 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id F04C81BF99C for ; Tue, 8 Apr 2014 17:45:33 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id ECD678AB24 for ; Tue, 8 Apr 2014 17:45:33 +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 1KOwPx7ZhUD7 for ; Tue, 8 Apr 2014 17:45:33 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from marvin.crapouillou.net (rev33.vpn.fdn.fr [80.67.179.33]) by whitealder.osuosl.org (Postfix) with ESMTPS id 57F278A931 for ; Tue, 8 Apr 2014 17:45:33 +0000 (UTC) Received: from 95-91-234-117-dynip.superkabel.de ([95.91.234.117] helo=debian.hitronhub.home) by marvin.crapouillou.net with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA256:128) (Exim 4.80) (envelope-from ) id 1WXa5R-00032S-Om; Tue, 08 Apr 2014 19:45:30 +0200 From: Paul Cercueil To: buildroot@busybox.net Date: Tue, 8 Apr 2014 19:45:07 +0200 Message-Id: <1396979109-10691-3-git-send-email-paul@crapouillou.net> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1396979109-10691-1-git-send-email-paul@crapouillou.net> References: <1396979109-10691-1-git-send-email-paul@crapouillou.net> Cc: maarten@treewalker.org Subject: [Buildroot] [PATCH 3/5] libao: Remove OSS plugin when ALSA is enabled 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: Maarten ter Huurne At runtime, libao will load all plugins, even ones that will never be used. Since libao will prefer ALSA over OSS by default anyway, it is pretty safe to exclude the OSS plugin. There is no configure option for disabling the OSS plugin, so we remove the shared object in a post-install hook. Signed-Off-By: Maarten ter Huurne --- package/libao/libao.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/libao/libao.mk b/package/libao/libao.mk index 8e9ee35..3f7d166 100644 --- a/package/libao/libao.mk +++ b/package/libao/libao.mk @@ -11,11 +11,17 @@ LIBAO_INSTALL_STAGING = YES LIBAO_LICENSE = GPLv2+ LIBAO_LICENSE_FILES = COPYING LIBAO_CONF_OPT = --disable-esd --disable-wmm --disable-arts \ - --disable-nas --disable-pulse + --disable-nas --disable-pulse --disable-broken-oss ifeq ($(BR2_PACKAGE_ALSA_LIB),y) LIBAO_DEPENDENCIES += alsa-lib LIBAO_CONF_OPT += --enable-alsa --enable-alsa-mmap + +# Remove the OSS plugin if ALSA is enabled, as libao will prefer ALSA anyway +define LIBAO_REMOVE_OSS_PLUGIN + rm -f $(TARGET_DIR)/usr/lib/ao/plugins-4/liboss.so +endef +LIBAO_POST_INSTALL_TARGET_HOOKS += LIBAO_REMOVE_OSS_PLUGIN else LIBAO_CONF_OPT += --disable-alsa endif