Skip to contentSkip to conversation

package/janus-gateway: bump to version 0.6.3

PATCH New aduskett at gmail.com 2 participants 2 messages Apr 24, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/janus-gateway: bump to version 0.6.3

From: Adam Duskett <[email protected]>

In additon:
- Rebase both patches to work with the new version.
- Add the dependency libconfig

All tests pass:
- br-arm-full [1/6]: OK
- br-arm-cortex-a9-glibc [2/6]: OK
- br-arm-cortex-m4-full [3/6]: SKIPPED
- br-x86-64-musl [4/6]: OK
- br-arm-full-static [5/6]: SKIPPED
- sourcery-arm [6/6]: OK

---
 package/janus-gateway/0001-disable-ssp.patch  | 37 ++++++++++-----
 ...dd-test-for-Wunused-but-set-variable.patch | 47 ++++++++++++-------
 package/janus-gateway/Config.in               |  1 +
 package/janus-gateway/janus-gateway.hash      |  2 +-
 package/janus-gateway/janus-gateway.mk        |  4 +-
 5 files changed, 57 insertions(+), 34 deletions(-)
package/janus-gateway/0001-disable-ssp.patch +24 -13
index f03b58589b..e9dabbd66a 100644
@@ -1,4 +1,7 @@
-Do not force SSP usage
+From 4b02c8207adb888d35951bbc1c5b3029594f44c6 Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <[email protected]>
+Date: Wed, 24 Apr 2019 13:56:27 -0400
+Subject: [PATCH] Do not force SSP usage
 
 The toolchain may not support SSP, so do not enforce its usage, let
 the package user pass the appropriate CFLAGS to enable SSP if needed.
@@ -7,16 +10,24 @@ Signed-off-by: Gregory Dymarek <[email protected]>
 Signed-off-by: Thomas Petazzoni <[email protected]>
 (rebased against v0.1.0)
 Signed-off-by: Bernd Kuhls <[email protected]>
+(rebased against v0.6.3)
+Signed-off-by: Adam Duskett <[email protected]>
+---
+ configure.ac | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 257ea8c..ca17a29 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -20,7 +20,6 @@ LT_INIT
+ # Common CFLAGS
+ CFLAGS="$CFLAGS \
+ 	-fPIC \
+-	-fstack-protector-all \
+ 	-fstrict-aliasing \
+ 	-ggdb3 \
+ 	-pthread \
+-- 
+2.20.1
 
-diff -rupN janus-gateway-master.orig/Makefile.am janus-gateway-master/Makefile.am
---- janus-gateway-master.orig/Makefile.am	2014-11-27 14:36:31.000000000 +0000
-+++ janus-gateway-master/Makefile.am	2014-12-01 16:39:50.551935028 +0000
-@@ -14,7 +14,7 @@ AM_CFLAGS += -Wredundant-decls  # sophia
- # some fairly big refactoring though, which can wait.
- # AM_CFLAGS += -Wshadow -Wstrict-aliasing=2
- 
--AM_CFLAGS += -fstack-protector-all -g -ggdb -fPIC -rdynamic -pthread
-+AM_CFLAGS += -g -ggdb -fPIC -rdynamic -pthread
- 
- # FIXME: make docs work with distcheck
- DISTCHECK_CONFIGURE_FLAGS = --disable-docs --enable-post-processing
package/janus-gateway/0002-Add-test-for-Wunused-but-set-variable.patch +29 -18

72 lines not on this page · raw message

package/janus-gateway/Config.in +1 -0
index 6eac763f72..9b70fa0cad 100644
@@ -5,6 +5,7 @@ menuconfig BR2_PACKAGE_JANUS_GATEWAY
 	depends on BR2_USE_MMU # libnice
 	depends on !BR2_STATIC_LIBS # dlopen
 	select BR2_PACKAGE_JANSSON
+	select BR2_PACKAGE_LIBCONFIG
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_LIBNICE
 	select BR2_PACKAGE_LIBSRTP
package/janus-gateway/janus-gateway.hash +1 -1
index 9b13e0f0fc..1f6625faab 100644
@@ -1,3 +1,3 @@
 # Locally computed
-sha256 c9c3b741a5d9f956845d5094c211690178cc0d630a7b23b870437c88a7e4ed3b janus-gateway-v0.5.0.tar.gz
+sha256 de8f4e3e8b19a099c903b5db7813dbbf442084af686c9922796736d42c8a8c98 janus-gateway-v0.6.3.tar.gz
 sha256 0a884af515b4593503f6f0c9b424db3945bd77eaa2644d25f45eb93a412b3c19 COPYING
package/janus-gateway/janus-gateway.mk +2 -2
index cea06b754e..59048b4dd6 100644
@@ -4,14 +4,14 @@
 #
 ################################################################################
 
-JANUS_GATEWAY_VERSION = v0.5.0
+JANUS_GATEWAY_VERSION = v0.6.3
 JANUS_GATEWAY_SITE = $(call github,meetecho,janus-gateway,$(JANUS_GATEWAY_VERSION))
 JANUS_GATEWAY_LICENSE = GPL-3.0
 JANUS_GATEWAY_LICENSE_FILES = COPYING
 
 # ding-libs provides the ini_config library
 JANUS_GATEWAY_DEPENDENCIES = host-pkgconf jansson libnice \
-	libsrtp host-gengetopt libglib2 openssl
+	libsrtp host-gengetopt libglib2 openssl libconfig
 
 # Straight out of the repository, no ./configure, and we also patch
 # configure.ac.
Signature · 1 line
2.20.1
#1 lore raw

PATCH 1/1 package/janus-gateway: bump to version 0.6.3

Quoted 14 lines · On Wed, 24 Apr 2019 14:53:45 -0400 aduskett at gmail.com wrote:

From: Adam Duskett <[email protected]>

In additon:
- Rebase both patches to work with the new version.
- Add the dependency libconfig

All tests pass:
- br-arm-full [1/6]: OK
- br-arm-cortex-a9-glibc [2/6]: OK
- br-arm-cortex-m4-full [3/6]: SKIPPED
- br-x86-64-musl [4/6]: OK
- br-arm-full-static [5/6]: SKIPPED
- sourcery-arm [6/6]: OK

Quoted 8 lines
---
 package/janus-gateway/0001-disable-ssp.patch  | 37 ++++++++++-----
 ...dd-test-for-Wunused-but-set-variable.patch | 47 ++++++++++++-------
 package/janus-gateway/Config.in               |  1 +
 package/janus-gateway/janus-gateway.hash      |  2 +-
 package/janus-gateway/janus-gateway.mk        |  4 +-
 5 files changed, 57 insertions(+), 34 deletions(-)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com