From patchwork Tue Feb 25 20:36:06 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Dawson X-Patchwork-Id: 324096 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 C21B42C00AD for ; Wed, 26 Feb 2014 07:38:10 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id A1DD0898B7; Tue, 25 Feb 2014 20:38:09 +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 m99m2T3dLPW9; Tue, 25 Feb 2014 20:38:08 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 26A49896A6; Tue, 25 Feb 2014 20:38:08 +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 4483F1BF961 for ; Tue, 25 Feb 2014 20:38:07 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 4506C8B2AF for ; Tue, 25 Feb 2014 20:38:07 +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 O3qYp3Nf6RHW for ; Tue, 25 Feb 2014 20:38:05 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f169.google.com (mail-wi0-f169.google.com [209.85.212.169]) by whitealder.osuosl.org (Postfix) with ESMTPS id 5C0858AF6D for ; Tue, 25 Feb 2014 20:38:05 +0000 (UTC) Received: by mail-wi0-f169.google.com with SMTP id e4so4844541wiv.0 for ; Tue, 25 Feb 2014 12:38:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=uaJJIRAMh7cR3gSr7k8MCKlRCwoeiKZsjEnfheZkEfE=; b=U8dLARb0/CIFp4Z2MPT5acrPkYYqdM3qHbxcpy9G3XSdzt9B/vFlGAl7uWsNOFuogn jTPorge69PdWBGPf4YMYJaBbwBis/GtHtG/RwEoKrphHqjPdCOSoseZA3k5K9QYCy6mu BrMwoydWDbrYjJ8Rbn9z14XnmcFEcFqyVo7cRH6l/7cQOMJILd+Ep0nKBalrZTX5ql5i Ct7k7EjjIDwJPGXrV3JOabEzobzvawtGSJLKAYyLM1ffhKmdRlgSKUH5BbO3qQVC8MFQ lOXSEtI0DEw4T1SYljxXGLeCbxvRkq4X1ykOjS18yHNuxlVXJVdI9hsm4296yN03wE8Z 3G9g== X-Received: by 10.180.149.206 with SMTP id uc14mr1806167wib.44.1393360683878; Tue, 25 Feb 2014 12:38:03 -0800 (PST) Received: from leto.lan (host-2-97-69-117.as13285.net. [2.97.69.117]) by mx.google.com with ESMTPSA id fb8sm3415541wic.3.2014.02.25.12.38.01 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 25 Feb 2014 12:38:02 -0800 (PST) From: Simon Dawson To: buildroot@uclibc.org Date: Tue, 25 Feb 2014 20:36:06 +0000 Message-Id: <1393360566-4849-1-git-send-email-spdawson@gmail.com> X-Mailer: git-send-email 1.8.3.2 Subject: [Buildroot] [PATCH] vlc: fix some configure options 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 Fix a large number of incorrect configure options for vlc. Configure warnings reported by Arnout Vandecappelle, in his analysis of vlc autobuild failures. Reviewed-by: Samuel Martin --- package/vlc/vlc.mk | 70 +++++++++++++++++++++++++++--------------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/package/vlc/vlc.mk b/package/vlc/vlc.mk index 0e76e11..9bcedd1 100644 --- a/package/vlc/vlc.mk +++ b/package/vlc/vlc.mk @@ -14,23 +14,23 @@ VLC_AUTORECONF = YES VLC_CONF_OPT += \ --disable-a52 \ - --disable-shout \ - --disable-twolame \ - --disable-dca \ - --disable-dirac \ - --disable-schroedinger \ - --disable-quicksync \ - --disable-fluidsynth \ + --without-shout \ + --without-twolame \ + --without-dca \ + --without-dirac \ + --without-schroedinger \ + --without-quicksync \ + --without-fluidsynth \ --disable-zvbi \ - --disable-kate \ - --disable-caca \ + --without-kate \ + --without-caca \ --disable-jack \ - --disable-samplerate \ - --disable-chromaprint \ - --disable-goom \ + --without-samplerate \ + --without-chromaprint \ + --without-goom \ --disable-projectm \ --disable-vsxu \ - --disable-mtp \ + --without-mtp \ --without-opencv # Set powerpc altivec appropriately @@ -49,10 +49,10 @@ endif # bonjour support needs avahi-client, which needs avahi-daemon and dbus ifeq ($(BR2_PACKAGE_AVAHI)$(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_DBUS),yyy) -VLC_CONF_OPT += --enable-bonjour +VLC_CONF_OPT += --with-bonjour VLC_DEPENDENCIES += avahi dbus else -VLC_CONF_OPT += --disable-bonjour +VLC_CONF_OPT += --without-bonjour endif ifeq ($(BR2_PACKAGE_DBUS),y) @@ -96,10 +96,10 @@ VLC_CONF_OPT += --disable-swscale endif ifeq ($(BR2_PACKAGE_FLAC),y) -VLC_CONF_OPT += --enable-flac +VLC_CONF_OPT += --with-flac VLC_DEPENDENCIES += flac else -VLC_CONF_OPT += --disable-flac +VLC_CONF_OPT += --without-flac endif ifeq ($(BR2_PACKAGE_MESA3D),y) @@ -110,10 +110,10 @@ VLC_CONF_OPT += --disable-glx endif ifeq ($(BR2_PACKAGE_OPUS),y) -VLC_CONF_OPT += --enable-opus +VLC_CONF_OPT += --with-opus VLC_DEPENDENCIES += opus else -VLC_CONF_OPT += --disable-opus +VLC_CONF_OPT += --without-opus endif ifeq ($(BR2_PACKAGE_LIBASS),y) @@ -147,10 +147,10 @@ VLC_CONF_OPT += --disable-mod endif ifeq ($(BR2_PACKAGE_LIBMPEG2),y) -VLC_CONF_OPT += --enable-libmpeg2 +VLC_CONF_OPT += --with-libmpeg2 VLC_DEPENDENCIES += libmpeg2 else -VLC_CONF_OPT += --disable-libmpeg2 +VLC_CONF_OPT += --without-libmpeg2 endif ifeq ($(BR2_PACKAGE_LIBPNG),y) @@ -161,31 +161,31 @@ VLC_CONF_OPT += --disable-png endif ifeq ($(BR2_PACKAGE_LIBRSVG),y) -VLC_CONF_OPT += --enable-svg +VLC_CONF_OPT += --with-svg VLC_DEPENDENCIES += librsvg else -VLC_CONF_OPT += --disable-svg +VLC_CONF_OPT += --without-svg endif ifeq ($(BR2_PACKAGE_LIBTHEORA),y) -VLC_CONF_OPT += --enable-theora +VLC_CONF_OPT += --with-theora VLC_DEPENDENCIES += libtheora else -VLC_CONF_OPT += --disable-theora +VLC_CONF_OPT += --without-theora endif ifeq ($(BR2_PACKAGE_LIBUPNP),y) -VLC_CONF_OPT += --enable-upnp +VLC_CONF_OPT += --with-upnp VLC_DEPENDENCIES += libupnp else -VLC_CONF_OPT += --disable-upnp +VLC_CONF_OPT += --without-upnp endif ifeq ($(BR2_PACKAGE_LIBVORBIS),y) -VLC_CONF_OPT += --enable-vorbis +VLC_CONF_OPT += --with-vorbis VLC_DEPENDENCIES += libvorbis else -VLC_CONF_OPT += --disable-vorbis +VLC_CONF_OPT += --without-vorbis endif ifeq ($(BR2_PACKAGE_LIBV4L),y) @@ -203,10 +203,10 @@ VLC_CONF_OPT += --disable-xcb endif ifeq ($(BR2_PACKAGE_LIBXML2),y) -VLC_CONF_OPT += --enable-libxml2 +VLC_CONF_OPT += --with-libxml2 VLC_DEPENDENCIES += libxml2 else -VLC_CONF_OPT += --disable-libxml2 +VLC_CONF_OPT += --without-libxml2 endif ifeq ($(BR2_PACKAGE_LIVE555),y) @@ -254,10 +254,10 @@ VLC_CONF_OPT += --disable-sdl-image endif ifeq ($(BR2_PACKAGE_SPEEX),y) -VLC_CONF_OPT += --enable-speex +VLC_CONF_OPT += --with-speex VLC_DEPENDENCIES += speex else -VLC_CONF_OPT += --disable-speex +VLC_CONF_OPT += --without-speex endif ifeq ($(BR2_PACKAGE_TREMOR),y) @@ -268,10 +268,10 @@ VLC_CONF_OPT += --disable-tremor endif ifeq ($(BR2_PACKAGE_UDEV),y) -VLC_CONF_OPT += --enable-udev +VLC_CONF_OPT += --with-udev VLC_DEPENDENCIES += udev else -VLC_CONF_OPT += --disable-udev +VLC_CONF_OPT += --without-udev endif ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y)