From patchwork Fri Sep 28 19:19:25 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Valentine Barshak X-Patchwork-Id: 187888 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 A39242C00C3 for ; Sat, 29 Sep 2012 05:18:52 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id DE1348F6B4; Fri, 28 Sep 2012 19:18:49 +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 TI7dkRRTLP6P; Fri, 28 Sep 2012 19:18:47 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 3B20E8F6B9; Fri, 28 Sep 2012 19:18:47 +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 2EB418F74B for ; Fri, 28 Sep 2012 19:18:48 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 1DFCE8F6AE for ; Fri, 28 Sep 2012 19:18:46 +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 Im4kYxFPeuw7 for ; Fri, 28 Sep 2012 19:18:44 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-lb0-f171.google.com (mail-lb0-f171.google.com [209.85.217.171]) by whitealder.osuosl.org (Postfix) with ESMTPS id 58FD78F6C3 for ; Fri, 28 Sep 2012 19:18:44 +0000 (UTC) Received: by lbom4 with SMTP id m4so5373461lbo.16 for ; Fri, 28 Sep 2012 12:18:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:subject:message-id:reply-to:mime-version:content-type :content-disposition:in-reply-to:user-agent; bh=/oQ65NFLkXA9ISQxINbzzjHPbYqDE92yyXbIQWXergY=; b=IzRzjtIZPWlXNY1MSmeG5M1zaPlM5foadhyNGFjciC+BDBVfMYqyIdYI9VRN0Ulssb UQwAys5G7zzfnJxvt3g92+F4lkpJ1p6iqg4zfPOkBb0NRElZhzuz68upCBcu9K2vsxiY 4sEULAe6yAxEPloxTtEg69qS9s+nwJgVSlw3DVIel9TDnTEXkDDXI6niZy2BvIHtCfoc VQHqOjx4XXVmWK8ywykjkrYFYOiN1ROgUO+ZK/cwDA7EQ0YZvm2d5CXp4VuF0jUvp+o8 YBGG4lMWsYEbgNGqgFaX50JWqrvOObZ51v2fIch5KCfz/Q2hBkBzr9fr8MNXmKgIMoxk BL1A== Received: by 10.152.113.165 with SMTP id iz5mr6488086lab.48.1348859921969; Fri, 28 Sep 2012 12:18:41 -0700 (PDT) Received: from gmail.com ([93.100.122.208]) by mx.google.com with ESMTPS id xw14sm2709772lab.15.2012.09.28.12.18.40 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 28 Sep 2012 12:18:41 -0700 (PDT) Date: Fri, 28 Sep 2012 23:19:25 +0400 From: Valentine Barshak To: buildroot@busybox.net Message-ID: <20120928191925.GA9852@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20120928191730.GA9550@gmail.com> User-Agent: Mutt/1.5.21 (2010-09-15) Subject: [Buildroot] [PATCH 1/2] mplayer: Amend libmad selection X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list Reply-To: Valentine Barshak List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net Do not set both --enable-mad and --disable-mad. Signed-off-by: Valentine Barshak --- package/multimedia/mplayer/mplayer.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/multimedia/mplayer/mplayer.mk b/package/multimedia/mplayer/mplayer.mk index 05120bf..788beeb 100644 --- a/package/multimedia/mplayer/mplayer.mk +++ b/package/multimedia/mplayer/mplayer.mk @@ -66,6 +66,7 @@ endif ifeq ($(BR2_PACKAGE_LIBMAD),y) MPLAYER_DEPENDENCIES += libmad +MPLAYER_CONF_OPTS += --enable-mad else MPLAYER_CONF_OPTS += --disable-mad endif @@ -121,7 +122,6 @@ define MPLAYER_CONFIGURE_CMDS --extra-cflags="$(MPLAYER_CFLAGS)" \ --extra-ldflags="$(MPLAYER_LDFLAGS)" \ --yasm='' \ - --enable-mad \ --enable-fbdev \ $(MPLAYER_CONF_OPTS) \ --enable-cross-compile \