From patchwork Wed Jan 25 20:29:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?J=C3=B6rg_Krause?= X-Patchwork-Id: 719857 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3v7xVM4Cyjz9srY for ; Thu, 26 Jan 2017 07:29:31 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="key not found in DNS" (0-bit key; unprotected) header.d=embedded.rocks header.i=@embedded.rocks header.b="noiqZGEW"; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id E6C5E30D6B; Wed, 25 Jan 2017 20:29:28 +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 hpPSiPEhiGQ8; Wed, 25 Jan 2017 20:29:26 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 751A330D56; Wed, 25 Jan 2017 20:29:26 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 87A831BFD55 for ; Wed, 25 Jan 2017 20:29:25 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 8066430D56 for ; Wed, 25 Jan 2017 20:29:25 +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 ARV2dCP30eOc for ; Wed, 25 Jan 2017 20:29:23 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mout02.posteo.de (mout02.posteo.de [185.67.36.142]) by silver.osuosl.org (Postfix) with ESMTPS id 671222DB95 for ; Wed, 25 Jan 2017 20:29:23 +0000 (UTC) Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 3v7xV81KmYz1019 for ; Wed, 25 Jan 2017 21:29:19 +0100 (CET) Authentication-Results: mail.embedded.rocks (amavisd-new); dkim=pass reason="pass (just generated, assumed good)" header.d=embedded.rocks DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embedded.rocks; h=content-transfer-encoding:content-type:content-type :mime-version:x-mailer:message-id:date:date:subject:subject:from :from:received:received; s=default; t=1485376158; x=1485980959; bh=ySOWNaChHgxNPHVcLwPPlfwTnV/ycjMRwVHLllUPJWY=; b=noiqZGEW74yV pn37rGX/zyR6t30XpIZH1jnwNXKNF23dn7JQVW2IVvU1kuDePw1nsaTO6y5iciIv ggyXKszyjZBQ2VdFckXV65T4wxJIO4LbOE8a7hVefOPBam2ThmXvB1nkUQ6bi8hi QKNuRsLMNiaBpxAOW5kLMM+0h6YTHmvmHIuAHUJd2c2Q+b2eCcnCXMXG6bzI7uc/ ToDXbt0oHZo1WilX8dBwS2YLSVj3SItFCpU+aSDtTg1ZtKL8FX2YKZgtV3xpfQIO 44MoWzHZJZUGK7YQvbhgCYS24LmLKGC/LH1CVMDtV2Si8K8QPmb1+Tdg52+NuRjw 8XqVgki4KA== Received: from mail.embedded.rocks ([127.0.0.1]) by localhost (mail.embedded.rocks [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id YWLu1IqjPQoe; Wed, 25 Jan 2017 21:29:18 +0100 (CET) Received: from nzxt.fritz.box (x4d0c8761.dyn.telefonica.de [77.12.135.97]) (Authenticated sender: joerg.krause@embedded.rocks) by mail.embedded.rocks (Postfix) with ESMTPSA; Wed, 25 Jan 2017 21:29:18 +0100 (CET) From: =?UTF-8?q?J=C3=B6rg=20Krause?= To: buildroot@buildroot.org Date: Wed, 25 Jan 2017 21:29:15 +0100 Message-Id: <20170125202915.8084-1-joerg.krause@embedded.rocks> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH] package/mediastreamer: fix build by bumping to version 2.14.0 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" The current available version 2.12.1 of mediastreamer does not compile with the latest version 0.27 of oRTP, which was recently updated in Buildroot in [1]. Bump mediastreamer to latest version 2.14.0 to fix the incompatibility: ``` base/msfactory.c:169:3: error: too few arguments to function 'ortp_set_log_level_mask' ortp_set_log_level_mask(ORTP_MESSAGE|ORTP_WARNING|ORTP_ERROR|ORTP_FATAL); ``` Note that we need to fetch a patch from upstream to fix the build with the bctoolbox version 0.4.0. Fixes: http://autobuild.buildroot.net/results/9aa/9aa3cdad6e22ad1656eec59fc92fb7cb79afc4cd/ http://autobuild.buildroot.net/results/09e/09e8fabb72cafa284419f096da95299c51c03899/ http://autobuild.buildroot.net/results/29c/29c8ddd25c76f4c5b74f31a576c7ace9f76677db/ .. and some more. [1] http://patchwork.ozlabs.org/patch/718277/ Signed-off-by: Jörg Krause --- package/mediastreamer/mediastreamer.hash | 3 ++- package/mediastreamer/mediastreamer.mk | 9 ++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/package/mediastreamer/mediastreamer.hash b/package/mediastreamer/mediastreamer.hash index 21964a864..0f1ac77ce 100644 --- a/package/mediastreamer/mediastreamer.hash +++ b/package/mediastreamer/mediastreamer.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 0dbf8d4f721a04db9ec0982e98a4e852ad2d3acbcbd25edd96a66164a980f2e7 mediastreamer-2.12.1.tar.gz +sha256 1144849c0c96abafb1153adf56109f0f195a9e4a53cf28cb611bbca7a9012c1a mediastreamer-2.14.0.tar.gz +sha256 90091ab0aa7a77381ab1ca5d88cdfa4e7f62505fb452a2bea0f70054d9d1aece 26f884bf977977041fe6f98a0af186be1580bf22.patch diff --git a/package/mediastreamer/mediastreamer.mk b/package/mediastreamer/mediastreamer.mk index a12bfb4b2..6e05afc54 100644 --- a/package/mediastreamer/mediastreamer.mk +++ b/package/mediastreamer/mediastreamer.mk @@ -4,7 +4,7 @@ # ################################################################################ -MEDIASTREAMER_VERSION = 2.12.1 +MEDIASTREAMER_VERSION = 2.14.0 MEDIASTREAMER_SITE = http://download.savannah.nongnu.org/releases/linphone/mediastreamer MEDIASTREAMER_INSTALL_STAGING = YES MEDIASTREAMER_DEPENDENCIES = host-intltool host-pkgconf ortp host-gettext @@ -13,6 +13,13 @@ MEDIASTREAMER_CONF_OPTS = --disable-tests --disable-glx --disable-strict MEDIASTREAMER_LICENSE = GPLv2+ MEDIASTREAMER_LICENSE_FILES = COPYING +# fix compilation issue with latest bctoolbox (touches configure.ac) +MEDIASTREAMER_PATCH = \ + https://github.com/BelledonneCommunications/mediastreamer2/commit/26f884bf977977041fe6f98a0af186be1580bf22.patch + +# patching configure.ac +MEDIASTREAMER_AUTORECONF = YES + ifeq ($(BR2_PACKAGE_ALSA_LIB_MIXER)$(BR2_PACKAGE_ALSA_LIB_PCM),yy) MEDIASTREAMER_CONF_OPTS += --enable-alsa MEDIASTREAMER_DEPENDENCIES += alsa-lib