From 6d286d6738a838eec231a3fae189dd91da0fba51 Mon Sep 17 00:00:00 2001 From: Dmitry Ilyin Date: Fri, 19 Aug 2022 17:16:19 +0300 Subject: [PATCH] Move further --- br-ext-chip-hisilicon/Config.in | 2 ++ br-ext-chip-hisilicon/external.mk | 2 ++ br-ext-chip-hisilicon/package/aws-webrtc | 1 + br-ext-chip-hisilicon/package/usrsctp | 1 + general/package/aws-webrtc/aws-webrtc.mk | 9 +++++++-- general/package/usrsctp/Config.in | 4 ++++ general/package/usrsctp/usrsctp.mk | 22 ++++++++++++++++++++++ 7 files changed, 39 insertions(+), 2 deletions(-) create mode 120000 br-ext-chip-hisilicon/package/aws-webrtc create mode 120000 br-ext-chip-hisilicon/package/usrsctp create mode 100644 general/package/usrsctp/Config.in create mode 100644 general/package/usrsctp/usrsctp.mk diff --git a/br-ext-chip-hisilicon/Config.in b/br-ext-chip-hisilicon/Config.in index 1d8fe348..b3d72b54 100644 --- a/br-ext-chip-hisilicon/Config.in +++ b/br-ext-chip-hisilicon/Config.in @@ -1,4 +1,5 @@ source "$BR2_EXTERNAL_HISILICON_PATH/linux/Config.ext.in" +source "$BR2_EXTERNAL_HISILICON_PATH/package/aws-webrtc/Config.in" source "$BR2_EXTERNAL_HISILICON_PATH/package/hisi_patcher/Config.in" source "$BR2_EXTERNAL_HISILICON_PATH/package/aura-httpd/Config.in" source "$BR2_EXTERNAL_HISILICON_PATH/package/baresip-openipc/Config.in" @@ -44,6 +45,7 @@ source "$BR2_EXTERNAL_HISILICON_PATH/package/rtl8188fu-openipc/Config.in" source "$BR2_EXTERNAL_HISILICON_PATH/package/rtl8812au-openipc/Config.in" source "$BR2_EXTERNAL_HISILICON_PATH/package/uacme-openipc/Config.in" source "$BR2_EXTERNAL_HISILICON_PATH/package/uqmi-openipc/Config.in" +source "$BR2_EXTERNAL_HISILICON_PATH/package/usrsctp/Config.in" source "$BR2_EXTERNAL_HISILICON_PATH/package/vtund-openipc/Config.in" source "$BR2_EXTERNAL_HISILICON_PATH/package/wifibroadcast/Config.in" source "$BR2_EXTERNAL_HISILICON_PATH/package/xmdp/Config.in" diff --git a/br-ext-chip-hisilicon/external.mk b/br-ext-chip-hisilicon/external.mk index 7d57768e..406c7f3a 100644 --- a/br-ext-chip-hisilicon/external.mk +++ b/br-ext-chip-hisilicon/external.mk @@ -1,4 +1,5 @@ include $(BR2_EXTERNAL_HISILICON_PATH)/linux/linux-ext-hisi_patcher.mk +include $(BR2_EXTERNAL_HISILICON_PATH)/package/aws-webrtc/aws-webrtc.mk include $(BR2_EXTERNAL_HISILICON_PATH)/package/hisi_patcher/hisi_patcher.mk include $(BR2_EXTERNAL_HISILICON_PATH)/package/aura-httpd/aura-httpd.mk include $(BR2_EXTERNAL_HISILICON_PATH)/package/baresip-openipc/baresip-openipc.mk @@ -44,6 +45,7 @@ include $(BR2_EXTERNAL_HISILICON_PATH)/package/rtl8188fu-openipc/rtl8188fu-openi include $(BR2_EXTERNAL_HISILICON_PATH)/package/rtl8812au-openipc/rtl8812au-openipc.mk include $(BR2_EXTERNAL_HISILICON_PATH)/package/uacme-openipc/uacme-openipc.mk include $(BR2_EXTERNAL_HISILICON_PATH)/package/uqmi-openipc/uqmi.mk +include $(BR2_EXTERNAL_HISILICON_PATH)/package/usrsctp/usrsctp.mk include $(BR2_EXTERNAL_HISILICON_PATH)/package/vtund-openipc/vtund-openipc.mk include $(BR2_EXTERNAL_HISILICON_PATH)/package/wifibroadcast/wifibroadcast.mk include $(BR2_EXTERNAL_HISILICON_PATH)/package/xmdp/xmdp.mk diff --git a/br-ext-chip-hisilicon/package/aws-webrtc b/br-ext-chip-hisilicon/package/aws-webrtc new file mode 120000 index 00000000..328c0f4e --- /dev/null +++ b/br-ext-chip-hisilicon/package/aws-webrtc @@ -0,0 +1 @@ +../../general/package/aws-webrtc \ No newline at end of file diff --git a/br-ext-chip-hisilicon/package/usrsctp b/br-ext-chip-hisilicon/package/usrsctp new file mode 120000 index 00000000..7abd629b --- /dev/null +++ b/br-ext-chip-hisilicon/package/usrsctp @@ -0,0 +1 @@ +../../general/package/usrsctp \ No newline at end of file diff --git a/general/package/aws-webrtc/aws-webrtc.mk b/general/package/aws-webrtc/aws-webrtc.mk index df9c71dd..b3eefd70 100644 --- a/general/package/aws-webrtc/aws-webrtc.mk +++ b/general/package/aws-webrtc/aws-webrtc.mk @@ -4,8 +4,11 @@ # ################################################################################ -AWS_WEBRTC_VERSION = 1.7.3 -AWS_WEBRTC_SITE = $(call github,awslabs,amazon-kinesis-video-streams-webrtc-sdk-c,v$(AWS_WEBRTC_VERSION)) +AWS_WEBRTC_VERSION = v1.7.3 +AWS_WEBRTC_SITE_METHOD = git +AWS_WEBRTC_SITE = https://github.com/awslabs/amazon-kinesis-video-streams-webrtc-sdk-c +AWS_WEBRTC_GIT_SUBMODULES = YES +AWS_WEBRTC_INSTALL_STAGING = YES AWS_WEBRTC_LICENSE = Apache-2.0 AWS_WEBRTC_LICENSE_FILES = LICENSE @@ -21,6 +24,8 @@ AWS_WEBRTC_MAKE_OPTS += VERBOSE=1 AWS_WEBRTC_DEPENDENCIES = \ libsrtp \ + libwebsockets \ + usrsctp \ mbedtls-openipc $(eval $(cmake-package)) diff --git a/general/package/usrsctp/Config.in b/general/package/usrsctp/Config.in new file mode 100644 index 00000000..4a50f7e0 --- /dev/null +++ b/general/package/usrsctp/Config.in @@ -0,0 +1,4 @@ +config BR2_PACKAGE_USRSCTP + bool "usrsctp" + help + Userland SCTP stack diff --git a/general/package/usrsctp/usrsctp.mk b/general/package/usrsctp/usrsctp.mk new file mode 100644 index 00000000..e6bcd894 --- /dev/null +++ b/general/package/usrsctp/usrsctp.mk @@ -0,0 +1,22 @@ +################################################################################ +# +# usrsctp +# +################################################################################ + +USRSCTP_VERSION = 1ade45cbadfd19298d2c47dc538962d4425ad2dd +USRSCTP_SITE = https://github.com/sctplab/usrsctp.git +USRSCTP_SITE_METHOD = git +USRSCTP_INSTALL_STAGING = YES +USRSCTP_LICENSE = Apache-2.0 +USRSCTP_LICENSE_FILES = BSD + +USRSCTP_CONF_OPTS += \ + -Dsctp_werror=0 \ + -Dsctp_build_programs=0 \ + -Dsctp_debug=0 \ + -DCMAKE_BUILD_TYPE=Release + +USRSCTP_MAKE_OPTS += VERBOSE=1 + +$(eval $(cmake-package))