From patchwork Tue Nov 14 16:07:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Duskett X-Patchwork-Id: 837932 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="baOMrMU/"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3ybtBN4kqfz9sDB for ; Wed, 15 Nov 2017 03:24:28 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 487B287819; Tue, 14 Nov 2017 16:24:21 +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 bbz-2HNwqjeL; Tue, 14 Nov 2017 16:24:12 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 13932882E0; Tue, 14 Nov 2017 16:24:02 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 184AB1C20FC for ; Tue, 14 Nov 2017 16:07:48 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 1212187010 for ; Tue, 14 Nov 2017 16:07:48 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id PLjhdjS1075b for ; Tue, 14 Nov 2017 16:07:47 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-it0-f68.google.com (mail-it0-f68.google.com [209.85.214.68]) by fraxinus.osuosl.org (Postfix) with ESMTPS id A301686B65 for ; Tue, 14 Nov 2017 16:07:47 +0000 (UTC) Received: by mail-it0-f68.google.com with SMTP id m191so14212334itg.2 for ; Tue, 14 Nov 2017 08:07:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=3vLs6aZuGrNqImwCpCmiVVRWegpYxq03UqzOReCl5yo=; b=baOMrMU/SB/e7Xrdp7UiOMk3mkz7iY5Rk+DvNQzUXVODlkWSJjDC51XvQLbI4ggxHs Yshp0DlmxqQNOw4vUH5jj6BApRfmqxF1+b+dijSCA3BNqZU7L2FQMWmE0Gn4zuAJYe15 4FIkSIFMzJMcWvd21hXS7xLeV0sjGvFi488mFevaJ4rAXPE7QEQRkSvKvTNO8XJGhrbm ohuQsHgfpDt1v8u4oI5QkoVq3L5QtLGsksF3DdeT7qugu3s1/5k5pKIpsAu4mF70Kr2g RXQnvmQFrHW0ox7ttFbQxVCbzBsURd8w7jf3f4L0LAPUYdvIgcLDVQBkeL24QshtWmUR I/Yg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=3vLs6aZuGrNqImwCpCmiVVRWegpYxq03UqzOReCl5yo=; b=UbWKuCrkzfHpd5+8+sUx6wx1yxBcnY0MaNsMZQ52COVswcQbyTupSyxaTR6qNOBtl3 A4zaJiE2O8bFIs7R2soN2x+hNVhw12BokkieiSBfgGKnW1V5Eni/A4hBHx3fuL1ssXUz 48ZK8lu/4mv3K8FeHgbKC/tiGZOcxWUTP7fUoNesjGYb1m3fTGFBy9MeZgOVEJb0jO6s kv9Dqmvt1HkqXeaGv98NLRKV05fKKbX9xeQS4RtuceodLsZZhzymEr3+8dav82zNPbMv oEMrPtJC0Cc9NswnRrqO8FDfklrlyQKktK0Vx9W3pQQUWKdkJdkndUR0dgfLMFTTDvM0 mZ8A== X-Gm-Message-State: AJaThX6bZOacdgJuh9bsVMpTg2WnkYHeHKYG4wVEEmyzsXcmtnzQyQ1N Dnpa5GPnetrV1FJuazF7OOaDHKGt X-Google-Smtp-Source: AGs4zMazWsW/+VwNUTGwuBY1ycPb5Dq63UpRO9KH4tuoiXd05fADCsWQdG+tECFDkYqMcks1UDO4jg== X-Received: by 10.36.111.194 with SMTP id x185mr13167156itb.54.1510675666838; Tue, 14 Nov 2017 08:07:46 -0800 (PST) Received: from localhost.localdomain (mail.codeblue.com. [65.183.183.198]) by smtp.gmail.com with ESMTPSA id u187sm8633510iod.22.2017.11.14.08.07.46 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 14 Nov 2017 08:07:46 -0800 (PST) From: Adam Duskett To: buildroot@buildroot.org Date: Tue, 14 Nov 2017 11:07:09 -0500 Message-Id: <20171114160712.20086-4-aduskett@gmail.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171114160712.20086-1-aduskett@gmail.com> References: <20171114160712.20086-1-aduskett@gmail.com> Subject: [Buildroot] [NEXT v2 4/7] libpjsip: enable ffmpeg support X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Adam Duskett MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" If FFmpeg is selected, libpjsip should depend on it. Specifying --with-ffmpeg= is necessary because passing --enable-FFmpeg actually disables FFmpeg when cross compiling. Signed-off-by: Adam Duskett --- Changes v1 -> v2: - Remove the option to enable or disable FFmpeg support in favor of just depending on FFmpeg if it's selected by the user. - Add explination as to why with-ffmpeg is being passed to libpjsip (Arnout) package/libpjsip/libpjsip.mk | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/package/libpjsip/libpjsip.mk b/package/libpjsip/libpjsip.mk index 3c9d789..982e088 100644 --- a/package/libpjsip/libpjsip.mk +++ b/package/libpjsip/libpjsip.mk @@ -29,7 +29,6 @@ LIBPJSIP_CONF_OPTS = \ --disable-speex-codec \ --disable-speex-aec \ --disable-resample \ - --disable-video \ --disable-opencore-amr \ --disable-g7221-codec \ --disable-ilbc-codec \ @@ -41,7 +40,6 @@ LIBPJSIP_CONF_OPTS = \ --disable-g722-codec \ --disable-libsamplerate \ --disable-sdl \ - --disable-ffmpeg \ --disable-v4l2 \ --disable-openh264 \ --disable-libyuv \ @@ -75,4 +73,13 @@ LIBPJSIP_DEPENDENCIES += portaudio LIBPJSIP_CONF_OPTS += --with-external-pa endif +# Passing --enable-ffmpeg actually disables it. Instead, --with-ffmpeg +# must be passed to compile ffmpeg support. +ifeq ($(BR2_PACKAGE_FFMPEG),y) +LIBPJSIP_DEPENDENCIES += ffmpeg +LIBPJSIP_CONF_OPTS += --with-ffmpeg=$(STAGING_DIR)/usr +else +LIBPJSIP_CONF_OPTS += --disable-ffmpeg +endif + $(eval $(autotools-package))