From patchwork Tue Nov 14 16:07:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Duskett X-Patchwork-Id: 837927 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="L+XV2Y1G"; 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 3ybt9y1y1zz9sDB for ; Wed, 15 Nov 2017 03:24:05 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id D2F63882A7; Tue, 14 Nov 2017 16:24:00 +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 wd13MemA0Dn2; Tue, 14 Nov 2017 16:23:58 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id C12ED87A8C; Tue, 14 Nov 2017 16:23:57 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 0E8B61C20FC for ; Tue, 14 Nov 2017 16:07:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 076F887034 for ; Tue, 14 Nov 2017 16:07: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 ZOW0XOKtDGTE for ; Tue, 14 Nov 2017 16:07:45 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-io0-f173.google.com (mail-io0-f173.google.com [209.85.223.173]) by whitealder.osuosl.org (Postfix) with ESMTPS id 8E8478701C for ; Tue, 14 Nov 2017 16:07:45 +0000 (UTC) Received: by mail-io0-f173.google.com with SMTP id z74so298214iof.12 for ; Tue, 14 Nov 2017 08:07:45 -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; bh=vyMw2pBel4COMMIaZEmuQb31ElCv1PihsBSHGiaAraU=; b=L+XV2Y1GsWLU6YSxzz0VoJGJeSej2TMxJxiA89bGopGRgfLNWoHAzlZ4J9uXM/APL0 V1pyGjy5b1+WGsT+uNWSOZNalzLuO+p6cmpF3OGV7q6YqkXxlWcScCPRme1HPP0nedMR OJs1aXJfm3GXxM16atp+Pu0bdNJpB8Wk0mNHjbI4DqxO1nvhxCePYNDn0KAr234yYdwV NV+UOpTfSh6Ci40nBJNtTgr39ec4CjXcBP+y5n7GS0oiX4HC8qvK1lkvzYSAvz/ysfAh bHcU9g26720k1ds8kZC3cvV4D4c4jKQmttL0Up3PSBS7wslPSGsnqmV1ul4YXMjARdei bNOA== 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; bh=vyMw2pBel4COMMIaZEmuQb31ElCv1PihsBSHGiaAraU=; b=CQ+CveASz5LGNTEEblXSGC3vUFC0bYIn2s17pAO9cPqL7A+jAKctloPodycBTEHPC8 vcm5N2W1wqgz8gU0W9LAo7hLle8Sltzo2s/wtTWsQlAE9CV1y/Q9O7L27KTDMUW2nRmO R9i7UZ4EcrEFusY9+i2aEa4lpPyuMDt9wfM9QeY3DZWwW0rE6XF7Jhs/PhdSoqDKG8VL MLwsyTEpe4skpPCpjS77KJmEAnpKydgopsfIzVp7UvSdD7ebibNEvzMLDD9y7xIZoCTT P4vT8n5horxFGMKdmQjiRYQjWK9xIpcyXR/LUjE2i/sBEkiWC9/WV8HjEkm51nuCJnfT Kqdw== X-Gm-Message-State: AJaThX7paENziux9gmoPTBvzb+eL2FOJc3ne+w+S6OyHOhrp1Gg+TV// 6ZT/aI4I6wzabp6jIjLO/bYcoEHP X-Google-Smtp-Source: AGs4zMawdpIOxU/9e3JPXXsZb6Fl5OMh/LIwH/UHvSPZ1BgO/kRB7Ai9aW8tn+a6i2vsBoDaddNWOg== X-Received: by 10.107.69.14 with SMTP id s14mr14820411ioa.113.1510675664433; Tue, 14 Nov 2017 08:07:44 -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.43 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 14 Nov 2017 08:07:43 -0800 (PST) From: Adam Duskett To: buildroot@buildroot.org Date: Tue, 14 Nov 2017 11:07:06 -0500 Message-Id: <20171114160712.20086-1-aduskett@gmail.com> X-Mailer: git-send-email 2.13.6 Subject: [Buildroot] [NEXT v2 1/7] libpjsip: remove disable-ext-sound option 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" The configure option --disable-ext-sound currently isn't a valid option in libpjsip. Originally it was used to prevent portaudio from building in the third_party directory, however, portaudio no longer exists in that directory. Signed-off-by: Adam Duskett --- Changes v1 -> v2: - Added this patch to the start of the series. package/libpjsip/libpjsip.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/libpjsip/libpjsip.mk b/package/libpjsip/libpjsip.mk index c772d41..2eaefaf 100644 --- a/package/libpjsip/libpjsip.mk +++ b/package/libpjsip/libpjsip.mk @@ -37,7 +37,6 @@ LIBPJSIP_CONF_OPTS = \ --disable-libwebrtc \ --disable-opus \ --disable-oss \ - --disable-ext-sound \ --disable-g711-codec \ --disable-l16-codec \ --disable-g722-codec \ From patchwork Tue Nov 14 16:07:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Duskett X-Patchwork-Id: 837930 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="vEH9Bj0z"; 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 3ybtBD4y1hz9sDB for ; Wed, 15 Nov 2017 03:24:20 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 02F2886F63; Tue, 14 Nov 2017 16:24:12 +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 hzftr5hSRuX5; Tue, 14 Nov 2017 16:24:01 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id EF329881C4; Tue, 14 Nov 2017 16:23:58 +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 A81711C20FC for ; Tue, 14 Nov 2017 16:07:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id A397F87010 for ; Tue, 14 Nov 2017 16:07:46 +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 p6MdEjmgG8Dr for ; Tue, 14 Nov 2017 16:07:46 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-it0-f65.google.com (mail-it0-f65.google.com [209.85.214.65]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 17AA486B65 for ; Tue, 14 Nov 2017 16:07:46 +0000 (UTC) Received: by mail-it0-f65.google.com with SMTP id n134so12598008itg.0 for ; Tue, 14 Nov 2017 08:07:46 -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=M8zJnPXpQ/fDE8i2ihVFEUFWdPIRjF6Nd+UlJwHyr9c=; b=vEH9Bj0z/Q7uTi/gLrdcKs1oTrvoVfBcHGunxwiB03vayiI/naCgLnnO/oQPQbaMuw XGXYcX0HQtDcgZW982RH/jCGBGlPlgO+6uGnsiqg4mMWuKqzFrACTb5JZ9WbE29KQ68G exwl68ZyQZhS8Wh4v4H1/0HQnhd/5wOQcPTQc58cjpFs4Xdnn+5UpB+52D6tJA0KGUtN YjgV8Ncwq4+v9wuM6ZWDbupYbZIsosDDD0c9MRUvUTU9mzILQCoLdXWQkbQdIMD9sSFi ZAkFd12mZ4zSf70bXUgYpSB7Cu6z1SA3cV+MmTu+pnGDNRmPunStCsWlRK+VTfsGeglq n0PA== 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=M8zJnPXpQ/fDE8i2ihVFEUFWdPIRjF6Nd+UlJwHyr9c=; b=J/DJSXTUHsn8EJmNqSEhC2j9dm68pK+J9jqVbi1egHbpesidSmV4apYbljd57fhewN icqR5w8e3Fog03EdDr2NgVwMkGJd3dBrwV0tn+7k2QkpzCdxH0vzJKU8a4SEI9HBS8iY t3c/APi1fC9irJbvfmHvXdQGmz1QBwb3VAq1YFApAzu0KduTOvnj+x2A1inJQKV/BhTc qMV7HwBaSHB6IIvYevJhotgMnJbx4q4a3lFrI94e0HbO1EIc917MuKjcHiNdeNdwivjV ti64F/Y8wVu4epzO5f/qyRP8LUdiZRJ0d9/cYfxTZ0c8SQGqh1QsGtn6CCxgSXmDFtTG 8qLg== X-Gm-Message-State: AJaThX7u2mFV97PjpTOf3FIkBhemyVKTDPuRdtaTaSHSNC6EdVVzv87i SAEGXioFigvDJhGzM4rToPxiQYZC X-Google-Smtp-Source: AGs4zMaOMMaBNMNONptM58AgqpQkg5rrQNsQFnfG05igQuNEHTixJCgi2SHYIL4Z9OLpEeNow3GK7g== X-Received: by 10.36.138.1 with SMTP id v1mr14305946itd.124.1510675665207; Tue, 14 Nov 2017 08:07:45 -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.44 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 14 Nov 2017 08:07:44 -0800 (PST) From: Adam Duskett To: buildroot@buildroot.org Date: Tue, 14 Nov 2017 11:07:07 -0500 Message-Id: <20171114160712.20086-2-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 2/7] libpjsip: enable alsa 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 alsa-lib is selected, libpjsip should depend on it. Also, remove --disable-sound in the configure options or else sound would still be disabled. Signed-off-by: Adam Duskett --- Changes v1 -> v2: - Remove the option to enable or disable alsa support in favor of just depending on alsa-lib if it's selected by the user. package/libpjsip/libpjsip.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/package/libpjsip/libpjsip.mk b/package/libpjsip/libpjsip.mk index 2eaefaf..14dbb8e 100644 --- a/package/libpjsip/libpjsip.mk +++ b/package/libpjsip/libpjsip.mk @@ -25,7 +25,6 @@ LIBPJSIP_CONF_ENV = \ CFLAGS="$(LIBPJSIP_CFLAGS)" LIBPJSIP_CONF_OPTS = \ - --disable-sound \ --disable-gsm-codec \ --disable-speex-codec \ --disable-speex-aec \ @@ -67,4 +66,8 @@ ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y) LIBPJSIP_DEPENDENCIES += util-linux endif +ifeq ($(BR2_PACKAGE_ALSA_LIB),y) +LIBPJSIP_DEPENDENCIES += alsa-lib +endif + $(eval $(autotools-package)) From patchwork Tue Nov 14 16:07:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Duskett X-Patchwork-Id: 837928 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="jQhjK1DA"; 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 3ybtB92JHpz9sPr for ; Wed, 15 Nov 2017 03:24:17 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 2BB848832C; Tue, 14 Nov 2017 16:24:10 +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 PdB7OB7JKSC5; Tue, 14 Nov 2017 16:24:04 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 2853388295; Tue, 14 Nov 2017 16:24:00 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 7A72A1C20FC for ; Tue, 14 Nov 2017 16:07:47 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 759C587034 for ; Tue, 14 Nov 2017 16:07:47 +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 JpX0lxfLMQ9g for ; Tue, 14 Nov 2017 16:07:46 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-it0-f66.google.com (mail-it0-f66.google.com [209.85.214.66]) by whitealder.osuosl.org (Postfix) with ESMTPS id C4FE28701C for ; Tue, 14 Nov 2017 16:07:46 +0000 (UTC) Received: by mail-it0-f66.google.com with SMTP id m191so14133749itg.2 for ; Tue, 14 Nov 2017 08:07:46 -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=jQCq9Y76s5myLqSW9RkBotKwOtIE/151jFxhGpqUY70=; b=jQhjK1DAjg6N8NbHNAgLujNxyZcyD0FRsj8cZ9hBpGmZ9CIcUgUeRHwos8wGZu61Zl uWQXx96LzKoCbM9NodKyySVQVQCxTVQ8OCschOoR+QGPYpO1BLWMAbcSUpmd2x6hbQ6Y IG/ea/dWZDxNouF88EYyDZPk/FKVdfGZIsEyOgRcXAQQeBJDEJkTAX+sPNIkYGse04in AGVLSXgcSoUh15dSCW3OLZflayo0xDaOIivJ/g+yS4HcdOtLxUaFNxPUnlBXRBHQL4Pj UqmSChvc0ImbevTX8ZOdV0aSlQgLEzieIuLxG4VCOj5Jpq2w59IL08/jlOoRtbaUJfr2 QIBA== 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=jQCq9Y76s5myLqSW9RkBotKwOtIE/151jFxhGpqUY70=; b=iWT0HQa+bsNovS1tPqEruTBIqKjAwZTr9BaybSkKMZe43STHGnqyjaNm9fyHlKzSqc xkNEZr6+xURFDY/5cYEPYWg+K/rp9rsNMYaEe+yWo6ecDeLlG1T3wIdcpsduBGZ+HFCo zEw+3ksccZlK4mrpyiyKj9NVmPFjE2hzEN4rVf2d8b3Fpv3goVn9UCn6QLY+m6P+GkaZ 0RsettM3JFFfZLHuKTETpFWmH11iNpAXmuHhFF50/Vk1orn25C9jBFMPseuVRFB8KOZr 17AOdB0D+DV/22iPngpymVRl6TXlXKECL3u0YaOwzT28EQWnDhCCRLoqq2ntvhMxbuzq jJGQ== X-Gm-Message-State: AJaThX4kXN5ZR4Q+2R/8y/2EnN1eUsupKJVvOLQRLt/sWChdw1PlXnCk CTpJy0rRTXxdzdV/WDO5Xy0yRSrg X-Google-Smtp-Source: AGs4zMZhZ037E9B2yeSwsm07FErbqkWb48yOjoNtfijKgIq7KXBOVg9dpDqdk20U1ysHhjVHezj4Jg== X-Received: by 10.36.81.70 with SMTP id s67mr16614759ita.72.1510675665990; Tue, 14 Nov 2017 08:07:45 -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.45 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 14 Nov 2017 08:07:45 -0800 (PST) From: Adam Duskett To: buildroot@buildroot.org Date: Tue, 14 Nov 2017 11:07:08 -0500 Message-Id: <20171114160712.20086-3-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 3/7] libpjsip: enable portaudio 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 portaudio is selected, libpjsip should depend on it. Specifying --with-external-pa was originally used to prevent libpjsip from building the portaudio library in the third_party directory, however, portaudio no longer exists in the third_party directory. This option now is used to force libpjsip to check for external portaudio headers. Signed-off-by: Adam Duskett --- Changes v1 -> v2: - Remove the option to enable or disable portaudio support in favor of just depending on portaudio if it's selected by the user. package/libpjsip/libpjsip.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/libpjsip/libpjsip.mk b/package/libpjsip/libpjsip.mk index 14dbb8e..3c9d789 100644 --- a/package/libpjsip/libpjsip.mk +++ b/package/libpjsip/libpjsip.mk @@ -70,4 +70,9 @@ ifeq ($(BR2_PACKAGE_ALSA_LIB),y) LIBPJSIP_DEPENDENCIES += alsa-lib endif +ifeq ($(BR2_PACKAGE_PORTAUDIO),y) +LIBPJSIP_DEPENDENCIES += portaudio +LIBPJSIP_CONF_OPTS += --with-external-pa +endif + $(eval $(autotools-package)) 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)) From patchwork Tue Nov 14 16:07:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Duskett X-Patchwork-Id: 837933 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="tc5fCS9C"; 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 3ybtBS000gz9sDB for ; Wed, 15 Nov 2017 03:24:31 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 8D6BA882AB; Tue, 14 Nov 2017 16:24:26 +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 gzvxyWcomrHh; Tue, 14 Nov 2017 16:24:19 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id B8F3D88327; Tue, 14 Nov 2017 16:24:06 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id A63651C20FC for ; Tue, 14 Nov 2017 16:07:49 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id A167987A70 for ; Tue, 14 Nov 2017 16:07:49 +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 g7F1WIEBkii3 for ; Tue, 14 Nov 2017 16:07:48 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-it0-f66.google.com (mail-it0-f66.google.com [209.85.214.66]) by hemlock.osuosl.org (Postfix) with ESMTPS id 87B8787908 for ; Tue, 14 Nov 2017 16:07:48 +0000 (UTC) Received: by mail-it0-f66.google.com with SMTP id n134so10536528itg.1 for ; Tue, 14 Nov 2017 08:07:48 -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=DrJoeVt4Dn0EM8TWdehQQTdKmNnn8p7kRbngMwFzjeE=; b=tc5fCS9CVGamlZ7J4qUzUN/lCMqfcZq+WIjc/BQgCzyTfzJfPxuQRTbw/hstBwhMlO QhOeq2s1+UVOjLDepwC4XM8hdT7aR4KRtBPUrafsCFiH4Y+Uqx18FStQG22RSjRwphuI hdK/a9usufLCVdEK2TWUroh86zd3lHRBqgE9NBslBOGuNBn+FSXsgTrHRt51FN/nETMF pd7AgqAZmeiaCFeIdWwFA1ClmzCuT7Q8KTw5jgRVqGSZS/7AstIIIJmZNdIMe/MUoEn3 PPILBwCrRXcWX50hcEp0Y/stxUlGEiu09+Xs3i3r7ZxAYkYwrkeYOA0twvKJ6tTD7WX5 qq7Q== 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=DrJoeVt4Dn0EM8TWdehQQTdKmNnn8p7kRbngMwFzjeE=; b=LW5q3O/m/U0deyN0zsjvh2lXnwH9LLt+2Kwi6llRfA70MOSVA0GsZlk9LQyt3ZbA9I h1vBdWknXE66nH9m1G5Au85irWFvj7pxVvgJdZHJapr/+JO4CSZRm67OV2TQVTSntsgs ksuD1quhrA4GgZ9zxd3lxgfZJKFiba8TRlNBwTQXdU3uK8XSa9QwShxGadDrXKIWfDeG jVMI+yO5dRrFF2Pdjh65si0/iXdil0yMenG0CyjZsAaO/FcAHVEE3mYbbjqkkuLIwcTG ZHS/XqpqPJmwm5bnnc8gpD9ulSSQld+XSEWVE0R4YK0u4NKRrocH6ZXb/JEvwonYvYJj 5fXQ== X-Gm-Message-State: AJaThX47PEEz1uoIbLjMHYzXwd+BkTJvU55MZirNqfEpJrJqRvYfNWDT Gpt+yxS3VoH//9F0OTJula/kUs72 X-Google-Smtp-Source: AGs4zMZA9xUql7qcZ3fU5ODnjr4meKhsIHRNlBRDNmVGdGCyjCl5r49Bwf/HB3v0WiHO743qpQbS2w== X-Received: by 10.36.58.3 with SMTP id m3mr14840216itm.81.1510675667717; Tue, 14 Nov 2017 08:07:47 -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:47 -0800 (PST) From: Adam Duskett To: buildroot@buildroot.org Date: Tue, 14 Nov 2017 11:07:10 -0500 Message-Id: <20171114160712.20086-5-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 5/7] libpjsip: enable v4l2 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 v4l2 is selected, libpjsip should depend on it. Signed-off-by: Adam Duskett --- Changes v1 -> v2: - Remove the option to enable or disable v4l2 support in favor of just depending on libv4l if it's selected by the user. package/libpjsip/libpjsip.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/package/libpjsip/libpjsip.mk b/package/libpjsip/libpjsip.mk index 982e088..8b6fd09 100644 --- a/package/libpjsip/libpjsip.mk +++ b/package/libpjsip/libpjsip.mk @@ -40,7 +40,6 @@ LIBPJSIP_CONF_OPTS = \ --disable-g722-codec \ --disable-libsamplerate \ --disable-sdl \ - --disable-v4l2 \ --disable-openh264 \ --disable-libyuv \ --disable-ipp \ @@ -82,4 +81,10 @@ else LIBPJSIP_CONF_OPTS += --disable-ffmpeg endif +ifeq ($(BR2_PACKAGE_LIBV4L),y) +LIBPJSIP_DEPENDENCIES += libv4l +else +LIBPJSIP_CONF_OPTS += --disable-v4l2 +endif + $(eval $(autotools-package)) From patchwork Tue Nov 14 16:07:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Duskett X-Patchwork-Id: 837929 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="LBTU4WgP"; 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 3ybtBB4pwtz9sDB for ; Wed, 15 Nov 2017 03:24:18 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id D7AE385C63; Tue, 14 Nov 2017 16:24:15 +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 VraIm72gx5py; Tue, 14 Nov 2017 16:24:15 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 3935E85FAD; Tue, 14 Nov 2017 16:24:15 +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 87ED91C20FC for ; Tue, 14 Nov 2017 16:07:50 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 833A587070 for ; Tue, 14 Nov 2017 16:07:50 +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 8nT_0kj9_UiB for ; Tue, 14 Nov 2017 16:07:49 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-it0-f66.google.com (mail-it0-f66.google.com [209.85.214.66]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 798A486B65 for ; Tue, 14 Nov 2017 16:07:49 +0000 (UTC) Received: by mail-it0-f66.google.com with SMTP id y15so14192343ita.4 for ; Tue, 14 Nov 2017 08:07:49 -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=j1oSX+5vazUlqW6Fr1zmW3Deul7TFdXP8//gWAUXYpA=; b=LBTU4WgPzdphi5Q6fOCIpzd8OYM1mv4VPqAw31JxqOIqPzqHJL3sWS2UZuQ1uvpVv5 Fh70d4bzlWuPKtHaJ6s5B6IxSG2GbU3wAN51lnxxB6fkZYyvp3mzqs98Vx14Oi0+dstb nmYYLDS2lEiwZjdk+BxDqYifOMRycJkGYf+s6iawregdHKVhKoHnIQKt9+1cTvJ4Lx9y nBi4uQeMxk6P68UXMkrWYblbC883lfSaQWIMsansI0DHSYYrdvBc0XJPwYkmIBT//uok ETXRTsfJUz2ISMoX4clRwUeWsBqDHPpDg531npXyAnKcYMGG4UMkkeJ9LJo7E0bipOBm PhzA== 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=j1oSX+5vazUlqW6Fr1zmW3Deul7TFdXP8//gWAUXYpA=; b=chChqaiSurgDk5lWdl9+tXLtcuma8Kv0Oc5Fik0SpzA4HB2gdSye4G54htUeAUfiGd g34dfeDaOechCKuJoH+p86vkm6HAOceVfeihmOgGmqREVzMMM5y+9epmU0khvXLliPYn WguBxbtWAniJyHdO+AKaImMGfHY6Zv+2LoQCl9JFnttgzjdj+Z/i7qQcMUptfQ2BFwi/ DeuCoQOacTSJyEdEfDH9nRyVhJmFaWIncafH7o7buONndK+4eHHhda1S1JgwYqC41AGU gjEm61jdwJr4/MIIzwKzE2HNemfE2u1OGby0fE0deX84S8HEncpONJsB10EzBI+VFz7r WXGA== X-Gm-Message-State: AJaThX6YNuLsooI+RB+GwXQChubklSw253ENypBkbP/h9fkMAU/YvM6+ 21es/4zXrkIfEwPyn7A8l9WWr0un X-Google-Smtp-Source: AGs4zMY6yJyfBBOBhXn8LS9NcJOReN2Gkpo31mKjSydUhSaYdx39+yzQWeIcEQwtz0xm7q/KSIbVDw== X-Received: by 10.36.9.146 with SMTP id 140mr6814211itm.54.1510675668602; Tue, 14 Nov 2017 08:07:48 -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.47 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 14 Nov 2017 08:07:47 -0800 (PST) From: Adam Duskett To: buildroot@buildroot.org Date: Tue, 14 Nov 2017 11:07:11 -0500 Message-Id: <20171114160712.20086-6-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 6/7] libpjsip: add dependency-less codecs 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" libpjsip has several codecs, all of which can be disabled or enabled individually. A few reasons for adding each codec as an individual choice are: 1) Many products might not want some of the more obscure codecs such as ILBC or L16. 2) libpjsip has functions that will enumerate all the codecs that were built. If all the codecs where built, this would require a developer to have to parse out the codecs they don't want. As such, turn libpjsip into a menuconfig and add each supported codec as an individual choice. Start with the codecs that are built into libpjsip and have no external dependencies. These codecs are: - G.711 - G.722 - G.722.1 - iLBC - L16 Signed-off-by: Adam Duskett --- Changes v1 -> v2: - Combine all dependency-less codecs into a single patch. - Add a more-detailed commit message explaining the reasoning for enabling each codec as a individual option. (Arnout) package/libpjsip/Config.in | 23 ++++++++++++++++++++++- package/libpjsip/libpjsip.mk | 32 +++++++++++++++++++++++++++----- 2 files changed, 49 insertions(+), 6 deletions(-) diff --git a/package/libpjsip/Config.in b/package/libpjsip/Config.in index 727d2ec..d21a5b5 100644 --- a/package/libpjsip/Config.in +++ b/package/libpjsip/Config.in @@ -1,4 +1,4 @@ -config BR2_PACKAGE_LIBPJSIP +menuconfig BR2_PACKAGE_LIBPJSIP bool "libpjsip" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS @@ -10,5 +10,26 @@ config BR2_PACKAGE_LIBPJSIP http://www.pjsip.org +if BR2_PACKAGE_LIBPJSIP + +comment "dependency-less codecs" + +config BR2_PACKAGE_LIBPJSIP_CODEC_G711 + bool "G.711" + +config BR2_PACKAGE_LIBPJSIP_CODEC_G722 + bool "G.722" + +config BR2_PACKAGE_LIBPJSIP_CODEC_G7221 + bool "G.722.1" + +config BR2_PACKAGE_LIBPJSIP_CODEC_ILBC + bool "iLBC" + +config BR2_PACKAGE_LIBPJSIP_CODEC_L16 + bool "L16" + +endif #BR2_PACKAGE_LIBPJSIP + comment "libpjsip needs a toolchain w/ C++, threads" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/libpjsip/libpjsip.mk b/package/libpjsip/libpjsip.mk index 8b6fd09..69d412a 100644 --- a/package/libpjsip/libpjsip.mk +++ b/package/libpjsip/libpjsip.mk @@ -30,14 +30,9 @@ LIBPJSIP_CONF_OPTS = \ --disable-speex-aec \ --disable-resample \ --disable-opencore-amr \ - --disable-g7221-codec \ - --disable-ilbc-codec \ --disable-libwebrtc \ --disable-opus \ --disable-oss \ - --disable-g711-codec \ - --disable-l16-codec \ - --disable-g722-codec \ --disable-libsamplerate \ --disable-sdl \ --disable-openh264 \ @@ -87,4 +82,31 @@ else LIBPJSIP_CONF_OPTS += --disable-v4l2 endif +# Codecs can only be disabled. If explicitly enabled, the check is +# omitted (but successful), and there is no configure trace "Checking +# if [codec] codec is disabled...no". So we only explicitly disable it +# and we do not explicitly enable it, so we get the configure log in +# both cases. +ifneq ($(BR2_PACKAGE_LIBPJSIP_CODEC_G711),y) +LIBPJSIP_CONF_OPTS += --disable-g711-codec +endif + +ifneq ($(BR2_PACKAGE_LIBPJSIP_CODEC_G722),y) +LIBPJSIP_CONF_OPTS += --disable-g722-codec +endif + +# libpjsip can only use a bundled version of libg7221 +ifneq ($(BR2_PACKAGE_LIBPJSIP_CODEC_G7221),y) +LIBPJSIP_CONF_OPTS += --disable-g7221-codec +endif + +# libpjsip can only use a bundled version of libilbc +ifneq ($(BR2_PACKAGE_LIBPJSIP_CODEC_ILBC),y) +LIBPJSIP_CONF_OPTS += --disable-ilbc-codec +endif + +ifneq ($(BR2_PACKAGE_LIBPJSIP_CODEC_L16),y) +LIBPJSIP_CONF_OPTS += --disable-l16-codec +endif + $(eval $(autotools-package)) 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))