From patchwork Tue Nov 14 16:07:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Duskett X-Patchwork-Id: 837931 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.137; helo=fraxinus.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="FT+5+rag"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3ybtBH2MZrz9sDB for ; Wed, 15 Nov 2017 03:24:23 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 8C552860F8; Tue, 14 Nov 2017 16:24:18 +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 ttTMS927nPMX; Tue, 14 Nov 2017 16:24:16 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 5BBAA8675F; Tue, 14 Nov 2017 16:24:16 +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 05EF51C20FC for ; Tue, 14 Nov 2017 16:07:51 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 00D0786B65 for ; Tue, 14 Nov 2017 16:07:51 +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 T8tIwBx-uA5D for ; Tue, 14 Nov 2017 16:07:50 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-io0-f194.google.com (mail-io0-f194.google.com [209.85.223.194]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 676A987010 for ; Tue, 14 Nov 2017 16:07:50 +0000 (UTC) Received: by mail-io0-f194.google.com with SMTP id n79so14032342ion.3 for ; Tue, 14 Nov 2017 08:07:50 -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=sZEA7bUbSBTO0uR6n+eG1I6JkurV8fuPOn7Inso+sfs=; b=FT+5+ragjLDYGsuEUfWJdk3ToISQrwUo2HJ4qYlwkDHlAYObBtmfOEdCwMDVjzgXFy TqgDrEpqoSgjpn0CsgGEjH3qYVtbOFeNRo134sAs+dnTqS3KsqlUkKJ1qqG579TwoT+p nBE+CrHxY6uNG0oS719MUP1JK+sY5WInlCavqUrJ2Zk2jcgKpOBTE/1xvTyinMm+zMkB gziZ8Je7gVgOm1VkqNUr+YbfX30yuiv/BZCYT4MAi4WUA3c3mLXaub+mK/jHj2B0ozss 0ML3F1ZdORjqI7R+tJIp63WyJO6zGDJZiUSr+2/Esyt0m5T4QKsZRUxSwE7LvrfWs5vQ acmQ== 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=sZEA7bUbSBTO0uR6n+eG1I6JkurV8fuPOn7Inso+sfs=; b=FZrry+lJ3fHwh15DosJk92Og1NEPSczxCTAquTnqhCmizysw9c+Oi2jCYB/7SUjluF tRTaHCloPp8S+c3k9WcpsVJvV/G7tRt2ZPDRWbL/YBCe2LBm2C66FWYfh9jDJP55AO/I vwXjcoBvnUPxMOX/ENKZ1bE0xHvSMzbwN/m2FvM7QZEff108bOZoqefDDvfucmh/flbK 7na10B6DC9fj6IdNGtHlAAGu0ZI9yfAGIIqDlD3c99487K82Ci/ew6PV7U7MwBVWfl4O zzTPeGfmYLu4kBxlDetwHrlWwi/2nJjT2NWwy351rkmViHJpdcRJuAuMfDeiX0CwTFgT +jBg== X-Gm-Message-State: AJaThX5Fw8+2qLpO+9X7uj2ZAI6pzXq3eyU1UiMexEq7Ix2SFwozC7qS MDFHMf3su0hMKnp+fh7frEEkLR79 X-Google-Smtp-Source: AGs4zMZvDv/7mMqriWUb/LQwADIVADOWQkuG6DdAHRdbN4++eHH/H89iKUNE6aEoBUjCBzjpoH5oDA== X-Received: by 10.107.70.7 with SMTP id t7mr14241324ioa.178.1510675669505; Tue, 14 Nov 2017 08:07:49 -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.48 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 14 Nov 2017 08:07:48 -0800 (PST) From: Adam Duskett To: buildroot@buildroot.org Date: Tue, 14 Nov 2017 11:07:12 -0500 Message-Id: <20171114160712.20086-7-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 7/7] libpjsip: add codecs with dependencies 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" Add all supported codecs that rely on external dependencies. These codecs are: - bcg729 - gsm - opus - speex Signed-off-by: Adam Duskett --- Changes v1 -> v2: - Combine all codecs with external dependencies into a single patch. package/libpjsip/Config.in | 22 ++++++++++++++++++++++ package/libpjsip/libpjsip.mk | 32 ++++++++++++++++++++++++++++---- 2 files changed, 50 insertions(+), 4 deletions(-) diff --git a/package/libpjsip/Config.in b/package/libpjsip/Config.in index d21a5b5..ef05dea 100644 --- a/package/libpjsip/Config.in +++ b/package/libpjsip/Config.in @@ -29,6 +29,28 @@ config BR2_PACKAGE_LIBPJSIP_CODEC_ILBC config BR2_PACKAGE_LIBPJSIP_CODEC_L16 bool "L16" +comment "Codecs with external dependencies" + +config BR2_PACKAGE_LIBPJSIP_CODEC_BCG729 + bool "BCG729" + select BR2_PACKAGE_BCG729 + +config BR2_PACKAGE_LIBPJSIP_CODEC_GSM + bool "GSM" + depends on !BR2_STATIC_LIBS # libgsm + select BR2_PACKAGE_LIBGSM + +comment "GSM codec needs a toolchain w/ shared libraries" + depends on BR2_STATIC_LIBS + +config BR2_PACKAGE_LIBPJSIP_CODEC_OPUS + bool "Opus" + select BR2_PACKAGE_OPUS + +config BR2_PACKAGE_LIBPJSIP_CODEC_SPEEX + bool "Speex" + select BR2_PACKAGE_SPEEX + endif #BR2_PACKAGE_LIBPJSIP comment "libpjsip needs a toolchain w/ C++, threads" diff --git a/package/libpjsip/libpjsip.mk b/package/libpjsip/libpjsip.mk index 69d412a..cfdb3af 100644 --- a/package/libpjsip/libpjsip.mk +++ b/package/libpjsip/libpjsip.mk @@ -25,13 +25,9 @@ LIBPJSIP_CONF_ENV = \ CFLAGS="$(LIBPJSIP_CFLAGS)" LIBPJSIP_CONF_OPTS = \ - --disable-gsm-codec \ - --disable-speex-codec \ - --disable-speex-aec \ --disable-resample \ --disable-opencore-amr \ --disable-libwebrtc \ - --disable-opus \ --disable-oss \ --disable-libsamplerate \ --disable-sdl \ @@ -109,4 +105,32 @@ ifneq ($(BR2_PACKAGE_LIBPJSIP_CODEC_L16),y) LIBPJSIP_CONF_OPTS += --disable-l16-codec endif +# Codecs with external dependencies +ifeq ($(BR2_PACKAGE_LIBPJSIP_CODEC_BCG729),y) +LIBPJSIP_DEPENDENCIES += bcg729 +LIBPJSIP_CONF_OPTS += --with-bcg729=$(STAGING_DIR)/usr +else +LIBPJSIP_CONF_OPTS += --disable-bcg729 +endif + +ifeq ($(BR2_PACKAGE_LIBPJSIP_CODEC_GSM),y) +LIBPJSIP_DEPENDENCIES += libgsm +LIBPJSIP_CONF_OPTS += --with-external-gsm +else +LIBPJSIP_CONF_OPTS += --disable-gsm-codec +endif + +ifeq ($(BR2_PACKAGE_LIBPJSIP_CODEC_OPUS),y) +LIBPJSIP_DEPENDENCIES += opus +else +LIBPJSIP_CONF_OPTS += --disable-opus +endif + +ifeq ($(BR2_PACKAGE_LIBPJSIP_CODEC_SPEEX),y) +LIBPJSIP_DEPENDENCIES += speex +LIBPJSIP_CONF_OPTS += --with-external-speex +else +LIBPJSIP_CONF_OPTS += --disable-speex-codec --disable-speex-aec +endif + $(eval $(autotools-package))