From patchwork Thu Apr 3 21:01:16 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 336775 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id D0EF4140095 for ; Fri, 4 Apr 2014 08:02:37 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id E056531D2D; Thu, 3 Apr 2014 21:02:36 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id PJ6oP+awdm0q; Thu, 3 Apr 2014 21:02:32 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 7101231A13; Thu, 3 Apr 2014 21:02:25 +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 7BD281C1E95 for ; Thu, 3 Apr 2014 21:02:20 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 791D18C827 for ; Thu, 3 Apr 2014 21:02:20 +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 dgGe2GW8qrd4 for ; Thu, 3 Apr 2014 21:02:20 +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 C921D8C7CA for ; Thu, 3 Apr 2014 21:02:19 +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 1WVom8-00045j-Iw; Thu, 03 Apr 2014 23:02:16 +0200 From: Paul Cercueil To: buildroot@busybox.net Date: Thu, 3 Apr 2014 23:01:16 +0200 Message-Id: <1396558881-29631-6-git-send-email-paul@crapouillou.net> X-Mailer: git-send-email 1.9.0 In-Reply-To: <1396558881-29631-1-git-send-email-paul@crapouillou.net> References: <1396558881-29631-1-git-send-email-paul@crapouillou.net> Cc: Maarten ter Huurne Subject: [Buildroot] [PATCH 06/11] 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 Acked-By: Paul Cercueil --- package/libao/libao.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/package/libao/libao.mk b/package/libao/libao.mk index 8e9ee35..e6704f2 100644 --- a/package/libao/libao.mk +++ b/package/libao/libao.mk @@ -11,11 +11,16 @@ 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 + +define LIBAO_REMOVE_OSS_PLUGIN + rm -f $(TARGET_DIR)/usr/lib/ao/plugins-4/liboss.so +endef ifeq ($(BR2_PACKAGE_ALSA_LIB),y) LIBAO_DEPENDENCIES += alsa-lib LIBAO_CONF_OPT += --enable-alsa --enable-alsa-mmap +LIBAO_POST_INSTALL_TARGET_HOOKS += LIBAO_REMOVE_OSS_PLUGIN else LIBAO_CONF_OPT += --disable-alsa endif