From patchwork Mon Jul 27 17:53:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Duskett X-Patchwork-Id: 1337114 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) 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; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=jhHx+9cr; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BFnVc3BKGz9sRk for ; Tue, 28 Jul 2020 03:53:59 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 3E7F586216; Mon, 27 Jul 2020 17:53:58 +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 I8CraXafKvhs; Mon, 27 Jul 2020 17:53:56 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 413B685EC2; Mon, 27 Jul 2020 17:53:56 +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 2FD6D1BF34A for ; Mon, 27 Jul 2020 17:53:55 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 2126F20008 for ; Mon, 27 Jul 2020 17:53:55 +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 oX0vk028N0TM for ; Mon, 27 Jul 2020 17:53:53 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-qv1-f52.google.com (mail-qv1-f52.google.com [209.85.219.52]) by silver.osuosl.org (Postfix) with ESMTPS id 4B6E41FF98 for ; Mon, 27 Jul 2020 17:53:53 +0000 (UTC) Received: by mail-qv1-f52.google.com with SMTP id dd12so2857122qvb.0 for ; Mon, 27 Jul 2020 10:53:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=LdqGdO2LnbBNr2UN3TpWwK6iT59KQxNAJf9iBAyRe+M=; b=jhHx+9crx2rXK7bZrJ1IituIVJgDXU+1MHHUNIpvxJM1PKIMNVLpEK1BZKkC3pN4Rp P+Rxd0gsSrA539m4SkID7fDqA82FB9Kxt8fZ7uGPBYCNp9V2YVtCBZNIl20KAZg2NC2h Audt2+/kGrucfP2u1cTCAzFUfWq3BZkga1+4i68fOyq8yBuX2aT2hjLKPVn5T3/xRx9x 8t3bPz0ugiRJJV7qZ0xc3oIDQdUfKuQX6E3Z3dgz/JKrFRZyOGi0QR6XhdkujVgHZ8bC sNHSxevGym+uD3bcR0lN31ffbGVIxL/qUk3Yojp1fydktZTkjuQCJDqv+kncCx95rAuL HWXg== 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:mime-version :content-transfer-encoding; bh=LdqGdO2LnbBNr2UN3TpWwK6iT59KQxNAJf9iBAyRe+M=; b=dF83d9tIVdDT1P+56sw7oD/o78Pu1AkmZ2CmWhpNXS3WPP037J+G1cP11J1QRviSuG DemVUO5TZcpxy3jr3/EUXatTwwMHbdc/cw+2+nzET8f/E85Zbjdji+B2YWpJA8KmREOC PEj4CZB+BxCNPfKlOilDmCrdaOn3fMOO3/prf9nQpCAPOvy4RieBUCzRPVQYNIqRx223 Z0tP9+owlClImt3Xxs3cCQTTtMLQ1+YzyuIAW9N7NJymgEVnhP2c8R8bRU5h02/hnVwh x4Vf+Mn8UtLr4exCsRaI1PoGx+2Xd10dkw7zDlISzV9ncRpV2O0GtGRs2cRMTW4wjNpj 7SUg== X-Gm-Message-State: AOAM5321rA+IPw7jjWaco2f7UGZdMm8R2IlLZ1UP/A1p8QtI1dE6Pfkc k13fs5hbFuVdZETjs49n1hFcMN/6 X-Google-Smtp-Source: ABdhPJw1yb5fRbB5ajjCHg/8hPAPaJtgA3ZCokNlLaAVVC+RXfVnQAMCWIY6ohUD6UfbQvh4lPiFeA== X-Received: by 2002:a0c:82a2:: with SMTP id i31mr23962818qva.106.1595872431541; Mon, 27 Jul 2020 10:53:51 -0700 (PDT) Received: from aduskett-workstation.rai.com ([47.149.8.172]) by smtp.gmail.com with ESMTPSA id q56sm7852679qtb.58.2020.07.27.10.53.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Jul 2020 10:53:50 -0700 (PDT) From: aduskett@gmail.com To: buildroot@buildroot.org Date: Mon, 27 Jul 2020 10:53:48 -0700 Message-Id: <20200727175348.1218300-1-aduskett@gmail.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/janus-gateway: bump version to 0.10.3 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: Gregory Dymarek , Adam Duskett Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Adam Duskett Also remove upstream patch. Signed-off-by: Adam Duskett --- ...dd-test-for-Wunused-but-set-variable.patch | 2 +- ...diobridge.c-fix-build-without-libogg.patch | 74 ------------------- package/janus-gateway/janus-gateway.hash | 2 +- package/janus-gateway/janus-gateway.mk | 2 +- 4 files changed, 3 insertions(+), 77 deletions(-) delete mode 100644 package/janus-gateway/0003-plugins-janus_audiobridge.c-fix-build-without-libogg.patch diff --git a/package/janus-gateway/0002-Add-test-for-Wunused-but-set-variable.patch b/package/janus-gateway/0002-Add-test-for-Wunused-but-set-variable.patch index c68d6b3b02..b54c8cbec6 100644 --- a/package/janus-gateway/0002-Add-test-for-Wunused-but-set-variable.patch +++ b/package/janus-gateway/0002-Add-test-for-Wunused-but-set-variable.patch @@ -60,7 +60,7 @@ index ca17a29..beef91a 100644 + -Wunsafe-loop-optimizations" esac - JANUS_VERSION=101 + JANUS_VERSION=103 diff --git a/m4/ax_check_compile_flag.m4 b/m4/ax_check_compile_flag.m4 new file mode 100644 index 0000000..51df0c0 diff --git a/package/janus-gateway/0003-plugins-janus_audiobridge.c-fix-build-without-libogg.patch b/package/janus-gateway/0003-plugins-janus_audiobridge.c-fix-build-without-libogg.patch deleted file mode 100644 index 1d25b1a071..0000000000 --- a/package/janus-gateway/0003-plugins-janus_audiobridge.c-fix-build-without-libogg.patch +++ /dev/null @@ -1,74 +0,0 @@ -From b728e30508101093331b08ac617e6315ba82caa1 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 20 Jun 2020 15:38:08 +0200 -Subject: [PATCH] plugins/janus_audiobridge.c: fix build without libogg - -Build without libogg is broken since commit -53761d07c5456424d368c708fda2757e6606a4bf: - -plugins/janus_audiobridge.c:1337:41: error: 'janus_audiobridge_participant' {aka 'struct janus_audiobridge_participant'} has no member named 'annc' - 1337 | janus_audiobridge_file_free(participant->annc); - | ^~ - CC plugins/plugins_libjanus_nosip_la-janus_nosip.lo -plugins/janus_audiobridge.c: In function 'janus_audiobridge_mixer_thread': -plugins/janus_audiobridge.c:6394:9: error: 'janus_audiobridge_participant' {aka 'struct janus_audiobridge_participant'} has no member named 'annc' - 6394 | if(p->annc == NULL || g_atomic_int_get(&p->destroyed)) { - | ^~ -plugins/janus_audiobridge.c:6398:16: warning: implicit declaration of function 'janus_audiobridge_file_read'; did you mean 'janus_audiobridge_mixer_thread'? [-Wimplicit-function-declaration] - 6398 | int read = janus_audiobridge_file_read(p->annc, p->decoder, resampled, sizeof(resampled)); - | ^~~~~~~~~~~~~~~~~~~~~~~~~~~ - | janus_audiobridge_mixer_thread -plugins/janus_audiobridge.c:6398:16: warning: nested extern declaration of 'janus_audiobridge_file_read' [-Wnested-externs] -plugins/janus_audiobridge.c:6398:45: error: 'janus_audiobridge_participant' {aka 'struct janus_audiobridge_participant'} has no member named 'annc' - 6398 | int read = janus_audiobridge_file_read(p->annc, p->decoder, resampled, sizeof(resampled)); - | ^~ -plugins/janus_audiobridge.c:6401:10: error: 'janus_audiobridge_participant' {aka 'struct janus_audiobridge_participant'} has no member named 'annc' - 6401 | if(p->annc->started) { - | ^~ -plugins/janus_audiobridge.c:6428:10: error: 'janus_audiobridge_participant' {aka 'struct janus_audiobridge_participant'} has no member named 'annc' - 6428 | if(!p->annc->started) { - | ^~ -plugins/janus_audiobridge.c:6430:7: error: 'janus_audiobridge_participant' {aka 'struct janus_audiobridge_participant'} has no member named 'annc' - 6430 | p->annc->started = TRUE; - | ^~ - CC plugins/plugins_libjanus_streaming_la-janus_streaming.lo - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/meetecho/janus-gateway/pull/2238] ---- - plugins/janus_audiobridge.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/plugins/janus_audiobridge.c b/plugins/janus_audiobridge.c -index 200a1f1d..ee931e24 100644 ---- a/plugins/janus_audiobridge.c -+++ b/plugins/janus_audiobridge.c -@@ -1334,7 +1334,9 @@ static void janus_audiobridge_participant_free(const janus_refcount *participant - } - g_async_queue_unref(participant->outbuf); - } -+#ifdef HAVE_LIBOGG - janus_audiobridge_file_free(participant->annc); -+#endif - g_free(participant); - } - -@@ -6385,6 +6387,7 @@ static void *janus_audiobridge_mixer_thread(void *data) { - janus_mutex_unlock(&p->qmutex); - ps = ps->next; - } -+#ifdef HAVE_LIBOGG - /* If there are announcements playing, mix those too */ - GList *anncs_list = g_hash_table_get_values(audiobridge->anncs); - if(anncs_list != NULL) { -@@ -6458,6 +6461,7 @@ static void *janus_audiobridge_mixer_thread(void *data) { - ps = ps->next; - } - } -+#endif - /* Are we recording the mix? (only do it if there's someone in, though...) */ - if(audiobridge->recording != NULL && g_list_length(participants_list) > 0) { - for(i=0; i