From patchwork Thu Sep 27 18:17:37 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Valentine Barshak X-Patchwork-Id: 187437 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 93BA22C00A8 for ; Fri, 28 Sep 2012 04:17:02 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 18FF93103D; Thu, 27 Sep 2012 18:17:01 +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 IprC6MGQM1pG; Thu, 27 Sep 2012 18:16:59 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 93AB631038; Thu, 27 Sep 2012 18:16:59 +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 5692D8F74A for ; Thu, 27 Sep 2012 18:17:00 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 4544E8F4E8 for ; Thu, 27 Sep 2012 18:16:58 +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 HOuF0rJod4Ll for ; Thu, 27 Sep 2012 18:16:56 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-bk0-f43.google.com (mail-bk0-f43.google.com [209.85.214.43]) by whitealder.osuosl.org (Postfix) with ESMTPS id D3C948F54D for ; Thu, 27 Sep 2012 18:16:55 +0000 (UTC) Received: by bkuw5 with SMTP id w5so3786948bku.16 for ; Thu, 27 Sep 2012 11:16:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:cc:subject:message-id:reply-to:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=Ih9DNlkiCX2Z3HnY3MHv8338rEXX6Mb7ijGTT9o7sV0=; b=fYHBtT+IVhV9AxqtoROYKU84QZI5GBZiU5doeibg/VRiKs6Lf6R/qy5VFD97DlJe1p vCT0HqOHNKf3IOxz4//ZdqgbhebNyiU0jJu6mIiDW2TIxZYPN7aHWUAa1g/5DuBQNgVL px67UXxu6yWMxK4e+xRN6B9TtOc72ziMROc6nSaPQPZsS9iwQ7HzX1+t/M/f5b/jI23j CdnkqiCqVnrWAUis5bSX8G8Z6obQMAApU1PrgJJXjuR6RtsfdTSvH3tn3AuDwdOEj/9M HWZwBlIbjlpXFe4Qdto+ISotGOIKOZyEQTvSzBAAR7ep7no/fk1HAYSWkzgos8O60bP/ 2Mbg== Received: by 10.152.144.67 with SMTP id sk3mr3972263lab.19.1348769813808; Thu, 27 Sep 2012 11:16:53 -0700 (PDT) Received: from gmail.com ([93.100.122.208]) by mx.google.com with ESMTPS id n6sm1942740lbm.0.2012.09.27.11.16.53 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 27 Sep 2012 11:16:53 -0700 (PDT) Date: Thu, 27 Sep 2012 22:17:37 +0400 From: Valentine Barshak To: buildroot@busybox.net Message-ID: <20120927181737.GA21348@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20120927181306.GA21215@gmail.com> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: Thomas Petazzoni , Peter Korsgaard Subject: [Buildroot] [PATCH 3/3] mplayer: Fix DVD support 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 This sets paths to dvdread-config and dvdnav-config, and configuration options to enable external libdvdread and libdvdnav support when these libraries are enabled. Otherwise DVD support is disabled. Signed-off-by: Valentine Barshak --- package/multimedia/mplayer/mplayer.mk | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/package/multimedia/mplayer/mplayer.mk b/package/multimedia/mplayer/mplayer.mk index 05120bf..0458507 100644 --- a/package/multimedia/mplayer/mplayer.mk +++ b/package/multimedia/mplayer/mplayer.mk @@ -42,6 +42,26 @@ else MPLAYER_CONF_OPTS += --disable-freetype endif +MPLAYER_CONF_OPTS += --disable-dvdread-internal + +ifeq ($(BR2_PACKAGE_LIBDVDREAD),y) +MPLAYER_CONF_OPTS += \ + --enable-dvdread \ + --with-dvdread-config=$(STAGING_DIR)/usr/bin/dvdread-config +MPLAYER_DEPENDENCIES += libdvdread +else +MPLAYER_CONF_OPTS += --disable-dvdread +endif + +ifeq ($(BR2_PACKAGE_LIBDVDNAV),y) +MPLAYER_CONF_OPTS += \ + --enable-dvdnav \ + --with-dvdnav-config=$(STAGING_DIR)/usr/bin/dvdnav-config +MPLAYER_DEPENDENCIES += libdvdnav +else +MPLAYER_CONF_OPTS += --disable-dvdnav +endif + ifeq ($(BR2_PACKAGE_MPLAYER_MPLAYER),y) MPLAYER_CONF_OPTS += --enable-mplayer else