From patchwork Thu Sep 5 10:01:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Ceresoli X-Patchwork-Id: 1158337 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=lucaceresoli.net Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46PGS125mrz9sBF for ; Thu, 5 Sep 2019 20:01:35 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id D219A23459; Thu, 5 Sep 2019 10:01:31 +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 q9DYHPlgOJPF; Thu, 5 Sep 2019 10:01:28 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 95997228A4; Thu, 5 Sep 2019 10:01:28 +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 B7FDD1BF3BB for ; Thu, 5 Sep 2019 10:01:26 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id B00B287C5B for ; Thu, 5 Sep 2019 10:01:26 +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 Tcd7uAp1Enac for ; Thu, 5 Sep 2019 10:01:25 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from hostingweb31-40.netsons.net (hostingweb31-40.netsons.net [89.40.174.40]) by whitealder.osuosl.org (Postfix) with ESMTPS id 5766387C5A for ; Thu, 5 Sep 2019 10:01:25 +0000 (UTC) Received: from [109.168.11.45] (port=36740 helo=pc-ceresoli.dev.aim) by hostingweb31.netsons.net with esmtpa (Exim 4.92) (envelope-from ) id 1i5oZu-002RJx-Vm; Thu, 05 Sep 2019 12:01:23 +0200 From: Luca Ceresoli To: buildroot@buildroot.org Date: Thu, 5 Sep 2019 12:01:09 +0200 Message-Id: <20190905100109.16456-1-luca@lucaceresoli.net> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - hostingweb31.netsons.net X-AntiAbuse: Original Domain - buildroot.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - lucaceresoli.net X-Get-Message-Sender-Via: hostingweb31.netsons.net: authenticated_id: luca+lucaceresoli.net/only user confirmed/virtual account not confirmed X-Authenticated-Sender: hostingweb31.netsons.net: luca@lucaceresoli.net X-Source: X-Source-Args: X-Source-Dir: Subject: [Buildroot] [PATCH] libpjsip: bump to 2.9 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Luca Ceresoli Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Updates: - remove patch now upstream - remove --disable-oss, not supported anymore - 2.9 supports gnutls, add optional dependency - bonus: switch to https for downloading Signed-off-by: Luca Ceresoli --- ...1-Fixed-possible-function-name-clash.patch | 26 ------------------- package/libpjsip/libpjsip.hash | 6 ++--- package/libpjsip/libpjsip.mk | 8 +++--- 3 files changed, 8 insertions(+), 32 deletions(-) delete mode 100644 package/libpjsip/0001-Fixed-possible-function-name-clash.patch diff --git a/package/libpjsip/0001-Fixed-possible-function-name-clash.patch b/package/libpjsip/0001-Fixed-possible-function-name-clash.patch deleted file mode 100644 index 435b0eab548d..000000000000 --- a/package/libpjsip/0001-Fixed-possible-function-name-clash.patch +++ /dev/null @@ -1,26 +0,0 @@ -Re #2059 (misc): Fixed possible function name clash with md5 due to non-static function. - -Backported from: https://trac.pjsip.org/repos/changeset/5688 -Signed-off-by: Luca Ceresoli - -Index: pjlib-util/src/pjlib-util/md5.c -=================================================================== -diff --git a/pjproject/pjlib-util/src/pjlib-util/md5.c b/pjproject/pjlib-util/src/pjlib-util/md5.c ---- a/pjlib-util/src/pjlib-util/md5.c (revision 5687) -+++ b/pjlib-util/src/pjlib-util/md5.c (revision 5688) -@@ -29,13 +29,13 @@ - #ifndef HIGHFIRST - #define byteReverse(buf, len) /* Nothing */ - #else --void byteReverse(unsigned char *buf, unsigned longs); -+static void byteReverse(unsigned char *buf, unsigned longs); - - #ifndef ASM_MD5 - /* - * Note: this code is harmless on little-endian machines. - */ --void byteReverse(unsigned char *buf, unsigned longs) -+static void byteReverse(unsigned char *buf, unsigned longs) - { - pj_uint32_t t; - do { diff --git a/package/libpjsip/libpjsip.hash b/package/libpjsip/libpjsip.hash index 36c2ea12893f..bcf46ea5fbf3 100644 --- a/package/libpjsip/libpjsip.hash +++ b/package/libpjsip/libpjsip.hash @@ -1,6 +1,6 @@ -# From http://www.pjsip.org/release/2.7.2/MD5SUM.TXT -md5 fa3f0bc098c4bff48ddd92db1c016a7a pjproject-2.7.2.tar.bz2 +# From https://www.pjsip.org/release/2.9/MD5SUM.TXT +md5 66757078e7bd7cf316acb0425c2fdd6f pjproject-2.9.tar.bz2 # Locally computed -sha256 9c2c828abab7626edf18e04b041ef274bfaa86f99adf2c25ff56f1509e813772 pjproject-2.7.2.tar.bz2 +sha256 d185ef7855c8ec07191dde92f54b65a7a4b7a6f7bf8c46f7af35ceeb1da2a636 pjproject-2.9.tar.bz2 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/libpjsip/libpjsip.mk b/package/libpjsip/libpjsip.mk index 22b922586c14..6432954428af 100644 --- a/package/libpjsip/libpjsip.mk +++ b/package/libpjsip/libpjsip.mk @@ -4,9 +4,9 @@ # ################################################################################ -LIBPJSIP_VERSION = 2.7.2 +LIBPJSIP_VERSION = 2.9 LIBPJSIP_SOURCE = pjproject-$(LIBPJSIP_VERSION).tar.bz2 -LIBPJSIP_SITE = http://www.pjsip.org/release/$(LIBPJSIP_VERSION) +LIBPJSIP_SITE = https://www.pjsip.org/release/$(LIBPJSIP_VERSION) LIBPJSIP_DEPENDENCIES = libsrtp LIBPJSIP_LICENSE = GPL-2.0+ LIBPJSIP_LICENSE_FILES = COPYING @@ -33,7 +33,6 @@ LIBPJSIP_CONF_OPTS = \ --disable-ilbc-codec \ --disable-libwebrtc \ --disable-opus \ - --disable-oss \ --disable-ext-sound \ --disable-g711-codec \ --disable-l16-codec \ @@ -66,6 +65,9 @@ endif ifeq ($(BR2_PACKAGE_LIBOPENSSL),y) LIBPJSIP_DEPENDENCIES += libopenssl LIBPJSIP_CONF_OPTS += --with-ssl=$(STAGING_DIR)/usr +else ifeq ($(BR2_PACKAGE_GNUTLS),y) +LIBPJSIP_DEPENDENCIES += gnutls +LIBPJSIP_CONF_OPTS += --with-gnutls=$(STAGING_DIR)/usr else LIBPJSIP_CONF_OPTS += --disable-ssl endif