From 0a4e87ccb6ee18613482f149a9705837df23b95f Mon Sep 17 00:00:00 2001 From: Dmitry Ilyin Date: Fri, 19 Aug 2022 20:54:59 +0300 Subject: [PATCH 01/10] Apple deps installation --- .github/workflows/hi3516ev200_matrix.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/hi3516ev200_matrix.yml b/.github/workflows/hi3516ev200_matrix.yml index c4446b8d..0acc9bc5 100644 --- a/.github/workflows/hi3516ev200_matrix.yml +++ b/.github/workflows/hi3516ev200_matrix.yml @@ -180,7 +180,10 @@ jobs: - name: Install build dependencies run: | make install-deps - ls -l deps || true + if [ -d deps ]; then + ./deps/install.sh + fi + if [ ! -z "$ACT" ]; then echo "FORCE_UNSAFE_CONFIGURE=1" >> $GITHUB_ENV else From b92b84b959c7d5f61789dbb8b69d830ab6af716e Mon Sep 17 00:00:00 2001 From: Dmitry Ilyin Date: Fri, 19 Aug 2022 23:36:12 +0300 Subject: [PATCH 02/10] Use static libs where possible --- br-ext-chip-hisilicon/Config.in | 1 + br-ext-chip-hisilicon/external.mk | 1 + br-ext-chip-hisilicon/package/libsrtp-openipc | 1 + general/package/aws-producer/aws-producer.mk | 1 + general/package/aws-webrtc/aws-webrtc.mk | 2 +- general/package/libsrtp-openipc/Config.in | 8 +++++++ .../libsrtp-openipc/libsrtp-openipc.mk | 22 +++++++++++++++++++ general/package/usrsctp/usrsctp.mk | 1 + 8 files changed, 36 insertions(+), 1 deletion(-) create mode 120000 br-ext-chip-hisilicon/package/libsrtp-openipc create mode 100644 general/package/libsrtp-openipc/Config.in create mode 100644 general/package/libsrtp-openipc/libsrtp-openipc.mk diff --git a/br-ext-chip-hisilicon/Config.in b/br-ext-chip-hisilicon/Config.in index 7e48f5af..57f3e742 100644 --- a/br-ext-chip-hisilicon/Config.in +++ b/br-ext-chip-hisilicon/Config.in @@ -29,6 +29,7 @@ source "$BR2_EXTERNAL_HISILICON_PATH/package/libogg-openipc/Config.in" source "$BR2_EXTERNAL_HISILICON_PATH/package/libre-openipc/Config.in" source "$BR2_EXTERNAL_HISILICON_PATH/package/librem-openipc/Config.in" source "$BR2_EXTERNAL_HISILICON_PATH/package/libsrt-openipc/Config.in" +source "$BR2_EXTERNAL_HISILICON_PATH/package/libsrtp-openipc/Config.in" source "$BR2_EXTERNAL_HISILICON_PATH/package/libwebsockets-openipc/Config.in" source "$BR2_EXTERNAL_HISILICON_PATH/package/linux-firmware-openipc/Config.in" source "$BR2_EXTERNAL_HISILICON_PATH/package/majestic-fonts/Config.in" diff --git a/br-ext-chip-hisilicon/external.mk b/br-ext-chip-hisilicon/external.mk index 098c1d88..583f8ac6 100644 --- a/br-ext-chip-hisilicon/external.mk +++ b/br-ext-chip-hisilicon/external.mk @@ -29,6 +29,7 @@ include $(BR2_EXTERNAL_HISILICON_PATH)/package/libogg-openipc/libogg-openipc.mk include $(BR2_EXTERNAL_HISILICON_PATH)/package/libre-openipc/libre-openipc.mk include $(BR2_EXTERNAL_HISILICON_PATH)/package/librem-openipc/librem-openipc.mk include $(BR2_EXTERNAL_HISILICON_PATH)/package/libsrt-openipc/libsrt-openipc.mk +include $(BR2_EXTERNAL_HISILICON_PATH)/package/libsrtp-openipc/libsrtp-openipc.mk include $(BR2_EXTERNAL_HISILICON_PATH)/package/libwebsockets-openipc/libwebsockets-openipc.mk include $(BR2_EXTERNAL_HISILICON_PATH)/package/linux-firmware-openipc/linux-firmware-openipc.mk include $(BR2_EXTERNAL_HISILICON_PATH)/package/majestic/majestic.mk diff --git a/br-ext-chip-hisilicon/package/libsrtp-openipc b/br-ext-chip-hisilicon/package/libsrtp-openipc new file mode 120000 index 00000000..3bd0ec08 --- /dev/null +++ b/br-ext-chip-hisilicon/package/libsrtp-openipc @@ -0,0 +1 @@ +../../general/package/libsrtp-openipc \ No newline at end of file diff --git a/general/package/aws-producer/aws-producer.mk b/general/package/aws-producer/aws-producer.mk index 7d6db227..63b2b87c 100644 --- a/general/package/aws-producer/aws-producer.mk +++ b/general/package/aws-producer/aws-producer.mk @@ -17,6 +17,7 @@ AWS_PRODUCER_CONF_OPTS += \ -DBUILD_DEPENDENCIES=FALSE \ -DUSE_OPENSSL=OFF \ -DUSE_MBEDTLS=ON \ + -DBUILD_SHARED_LIBS=OFF \ -DCMAKE_BUILD_TYPE=Release AWS_PRODUCER_MAKE_OPTS += VERBOSE=1 diff --git a/general/package/aws-webrtc/aws-webrtc.mk b/general/package/aws-webrtc/aws-webrtc.mk index e42db2e2..0c093a7a 100644 --- a/general/package/aws-webrtc/aws-webrtc.mk +++ b/general/package/aws-webrtc/aws-webrtc.mk @@ -22,7 +22,7 @@ AWS_WEBRTC_CONF_OPTS += \ AWS_WEBRTC_MAKE_OPTS += VERBOSE=1 AWS_WEBRTC_DEPENDENCIES = \ - libsrtp \ + libsrtp-openipc \ libwebsockets-openipc \ aws-producer \ usrsctp \ diff --git a/general/package/libsrtp-openipc/Config.in b/general/package/libsrtp-openipc/Config.in new file mode 100644 index 00000000..75545864 --- /dev/null +++ b/general/package/libsrtp-openipc/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_LIBSRTP_OPENIPC + bool "libsrtp_openipc" + help + This package provides an implementation of the Secure + Real-time Transport Protocol (SRTP), the Universal Security + Transform (UST), and a supporting cryptographic kernel. + + https://github.com/cisco/libsrtp diff --git a/general/package/libsrtp-openipc/libsrtp-openipc.mk b/general/package/libsrtp-openipc/libsrtp-openipc.mk new file mode 100644 index 00000000..7860dcc9 --- /dev/null +++ b/general/package/libsrtp-openipc/libsrtp-openipc.mk @@ -0,0 +1,22 @@ +################################################################################ +# +# libsrtp-openipc +# +################################################################################ + +LIBSRTP_OPENIPC_VERSION = bd0f27ec0e299ad101a396dde3f7c90d48efc8fc +LIBSRTP_OPENIPC_SITE = https://github.com/cisco/libsrtp.git +LIBSRTP_OPENIPC_SITE_METHOD = git +LIBSRTP_OPENIPC_INSTALL_STAGING = YES +LIBSRTP_OPENIPC_LICENSE = BSD-3-Clause +LIBSRTP_OPENIPC_LICENSE_FILES = LICENSE +LIBSRTP_OPENIPC_CPE_ID_VENDOR = cisco + +LIBSRTP_OPENIPC_CONF_OPTS = \ + -DENABLE_OPENSSL=OFF \ + -DBUILD_SHARED_LIBS=OFF \ + -DCMAKE_BUILD_TYPE:STRING=Release + +LIBSRTP_OPENIPC_MAKE_OPTS += VERBOSE=1 + +$(eval $(cmake-package)) diff --git a/general/package/usrsctp/usrsctp.mk b/general/package/usrsctp/usrsctp.mk index e6bcd894..288c1461 100644 --- a/general/package/usrsctp/usrsctp.mk +++ b/general/package/usrsctp/usrsctp.mk @@ -15,6 +15,7 @@ USRSCTP_CONF_OPTS += \ -Dsctp_werror=0 \ -Dsctp_build_programs=0 \ -Dsctp_debug=0 \ + -DBUILD_SHARED_LIBS=OFF \ -DCMAKE_BUILD_TYPE=Release USRSCTP_MAKE_OPTS += VERBOSE=1 From 92f145e97554dc91c0c6232b3aba088d27e9914e Mon Sep 17 00:00:00 2001 From: Dmitry Ilyin Date: Sat, 20 Aug 2022 00:25:29 +0300 Subject: [PATCH 03/10] Exclude data-channel from WebRTC --- general/package/aws-webrtc/aws-webrtc.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/general/package/aws-webrtc/aws-webrtc.mk b/general/package/aws-webrtc/aws-webrtc.mk index 0c093a7a..592ff9bb 100644 --- a/general/package/aws-webrtc/aws-webrtc.mk +++ b/general/package/aws-webrtc/aws-webrtc.mk @@ -4,9 +4,9 @@ # ################################################################################ -AWS_WEBRTC_VERSION = v1.7.3 +AWS_WEBRTC_VERSION = wo-datachannel AWS_WEBRTC_SITE_METHOD = git -AWS_WEBRTC_SITE = https://github.com/awslabs/amazon-kinesis-video-streams-webrtc-sdk-c +AWS_WEBRTC_SITE = https://github.com/widgetii/amazon-kinesis-video-streams-webrtc-sdk-c AWS_WEBRTC_INSTALL_STAGING = YES AWS_WEBRTC_LICENSE = Apache-2.0 AWS_WEBRTC_LICENSE_FILES = LICENSE @@ -17,6 +17,7 @@ AWS_WEBRTC_CONF_OPTS += \ -DUSE_OPENSSL=OFF \ -DUSE_MBEDTLS=ON \ -DENABLE_DATA_CHANNEL=OFF \ + -DBUILD_SAMPLE=OFF \ -DBUILD_DEPENDENCIES=OFF AWS_WEBRTC_MAKE_OPTS += VERBOSE=1 From 1ff1c80cd942a63e5855de2cb0cd2709c8c5a676 Mon Sep 17 00:00:00 2001 From: Dmitry Ilyin Date: Sat, 20 Aug 2022 00:26:03 +0300 Subject: [PATCH 04/10] Remove liblame from lite distro --- .../configs/unknown_unknown_hi3516dv200_openipc_defconfig | 1 - .../configs/unknown_unknown_hi3516ev200_openipc_defconfig | 1 - .../configs/unknown_unknown_hi3516ev300_openipc_defconfig | 1 - .../configs/unknown_unknown_hi3518ev300_openipc_defconfig | 1 - 4 files changed, 4 deletions(-) diff --git a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516dv200_openipc_defconfig b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516dv200_openipc_defconfig index eaad6c78..1385678c 100644 --- a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516dv200_openipc_defconfig +++ b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516dv200_openipc_defconfig @@ -56,7 +56,6 @@ BR2_PACKAGE_HISI_GPIO is not set BR2_PACKAGE_HISILICON_OSDRV_HI3516EV300=y BR2_PACKAGE_IPCTOOL=y BR2_PACKAGE_JSON_C=y -BR2_PACKAGE_LAME_OPENIPC=y BR2_PACKAGE_LIBCURL_OPENIPC=y BR2_PACKAGE_LIBCURL_OPENIPC_CURL=y # BR2_PACKAGE_LIBCURL_OPENIPC_VERBOSE is not set diff --git a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev200_openipc_defconfig b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev200_openipc_defconfig index a700bde3..1cd8c9ce 100644 --- a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev200_openipc_defconfig +++ b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev200_openipc_defconfig @@ -56,7 +56,6 @@ BR2_PACKAGE_HISI_GPIO is not set BR2_PACKAGE_HISILICON_OSDRV_HI3516EV300=y BR2_PACKAGE_IPCTOOL=y BR2_PACKAGE_JSON_C=y -BR2_PACKAGE_LAME_OPENIPC=y BR2_PACKAGE_LIBCURL_OPENIPC=y BR2_PACKAGE_LIBCURL_OPENIPC_CURL=y # BR2_PACKAGE_LIBCURL_OPENIPC_VERBOSE is not set diff --git a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_openipc_defconfig b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_openipc_defconfig index c7d65f18..fece5980 100644 --- a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_openipc_defconfig +++ b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_openipc_defconfig @@ -56,7 +56,6 @@ BR2_PACKAGE_HISI_GPIO is not set BR2_PACKAGE_HISILICON_OSDRV_HI3516EV300=y BR2_PACKAGE_IPCTOOL=y BR2_PACKAGE_JSON_C=y -BR2_PACKAGE_LAME_OPENIPC=y BR2_PACKAGE_LIBCURL_OPENIPC=y BR2_PACKAGE_LIBCURL_OPENIPC_CURL=y # BR2_PACKAGE_LIBCURL_OPENIPC_VERBOSE is not set diff --git a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3518ev300_openipc_defconfig b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3518ev300_openipc_defconfig index fab9a392..5b984f67 100644 --- a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3518ev300_openipc_defconfig +++ b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3518ev300_openipc_defconfig @@ -56,7 +56,6 @@ BR2_PACKAGE_HASERL=y BR2_PACKAGE_HISILICON_OSDRV_HI3516EV300=y BR2_PACKAGE_IPCTOOL=y BR2_PACKAGE_JSON_C=y -BR2_PACKAGE_LAME_OPENIPC=y BR2_PACKAGE_LIBCURL_OPENIPC=y BR2_PACKAGE_LIBCURL_OPENIPC_CURL=y # BR2_PACKAGE_LIBCURL_OPENIPC_VERBOSE is not set From 6fc7343682d6264aeefee8ef62057e9b9f84cf98 Mon Sep 17 00:00:00 2001 From: Dmitry Ilyin Date: Sat, 20 Aug 2022 00:33:30 +0300 Subject: [PATCH 05/10] Remove sound libraries from fpv package --- .../configs/unknown_unknown_hi3516ev200_fpv_defconfig | 4 ---- .../configs/unknown_unknown_hi3516ev300_fpv_defconfig | 4 ---- 2 files changed, 8 deletions(-) diff --git a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev200_fpv_defconfig b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev200_fpv_defconfig index 73d38655..3f00cef1 100644 --- a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev200_fpv_defconfig +++ b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev200_fpv_defconfig @@ -56,7 +56,6 @@ BR2_PACKAGE_HASERL=y BR2_PACKAGE_HISI_GPIO is not set BR2_PACKAGE_IPCTOOL=y BR2_PACKAGE_JSON_C=y -BR2_PACKAGE_LAME_OPENIPC=y BR2_PACKAGE_LIBCURL_OPENIPC=y BR2_PACKAGE_LIBCURL_OPENIPC_CURL=y # BR2_PACKAGE_LIBCURL_OPENIPC_VERBOSE is not set @@ -66,7 +65,6 @@ BR2_PACKAGE_LIBCURL_OPENIPC_CURL=y BR2_PACKAGE_LIBCURL_OPENIPC_MBEDTLS=y BR2_PACKAGE_LIBEVENT_OPENIPC=y BR2_PACKAGE_LIBEVENT_OPENIPC_REMOVE_PYSCRIPT=y -BR2_PACKAGE_LIBOGG_OPENIPC=y BR2_PACKAGE_LIBWEBSOCKETS_OPENIPC=y BR2_PACKAGE_LIBYAML=y BR2_PACKAGE_MAJESTIC_FONTS=y @@ -77,8 +75,6 @@ BR2_PACKAGE_MBEDTLS_OPENIPC=y BR2_PACKAGE_MICROBE_WEB=y # BR2_PACKAGE_MINI_SNMPD is not set # BR2_PACKAGE_MOTORS is not set -BR2_PACKAGE_OPUS_OPENIPC=y -BR2_PACKAGE_OPUS_OPENIPC_FIXED_POINT=y # BR2_PACKAGE_SSHPASS is not set BR2_PACKAGE_UACME_OPENIPC=y # BR2_PACKAGE_VTUND_OPENIPC is not set diff --git a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_fpv_defconfig b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_fpv_defconfig index a8eaed2e..789afd99 100644 --- a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_fpv_defconfig +++ b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_fpv_defconfig @@ -56,7 +56,6 @@ BR2_PACKAGE_HASERL=y BR2_PACKAGE_HISI_GPIO is not set BR2_PACKAGE_IPCTOOL=y BR2_PACKAGE_JSON_C=y -BR2_PACKAGE_LAME_OPENIPC=y BR2_PACKAGE_LIBCURL_OPENIPC=y BR2_PACKAGE_LIBCURL_OPENIPC_CURL=y # BR2_PACKAGE_LIBCURL_OPENIPC_VERBOSE is not set @@ -66,7 +65,6 @@ BR2_PACKAGE_LIBCURL_OPENIPC_CURL=y BR2_PACKAGE_LIBCURL_OPENIPC_MBEDTLS=y BR2_PACKAGE_LIBEVENT_OPENIPC=y BR2_PACKAGE_LIBEVENT_OPENIPC_REMOVE_PYSCRIPT=y -BR2_PACKAGE_LIBOGG_OPENIPC=y BR2_PACKAGE_LIBWEBSOCKETS_OPENIPC=y BR2_PACKAGE_LIBYAML=y BR2_PACKAGE_MAJESTIC_FONTS=y @@ -77,8 +75,6 @@ BR2_PACKAGE_MBEDTLS_OPENIPC=y BR2_PACKAGE_MICROBE_WEB=y # BR2_PACKAGE_MINI_SNMPD is not set # BR2_PACKAGE_MOTORS is not set -BR2_PACKAGE_OPUS_OPENIPC=y -BR2_PACKAGE_OPUS_OPENIPC_FIXED_POINT=y # BR2_PACKAGE_SSHPASS is not set BR2_PACKAGE_UACME_OPENIPC=y # BR2_PACKAGE_VTUND_OPENIPC is not set From 9078c412b3333133aa7e9718ef756b458324d279 Mon Sep 17 00:00:00 2001 From: Dmitry Ilyin Date: Sat, 20 Aug 2022 16:37:45 +0300 Subject: [PATCH 06/10] Revert "Remove sound libraries from fpv package" This reverts commit 6fc7343682d6264aeefee8ef62057e9b9f84cf98. --- .../configs/unknown_unknown_hi3516ev200_fpv_defconfig | 4 ++++ .../configs/unknown_unknown_hi3516ev300_fpv_defconfig | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev200_fpv_defconfig b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev200_fpv_defconfig index 3f00cef1..73d38655 100644 --- a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev200_fpv_defconfig +++ b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev200_fpv_defconfig @@ -56,6 +56,7 @@ BR2_PACKAGE_HASERL=y BR2_PACKAGE_HISI_GPIO is not set BR2_PACKAGE_IPCTOOL=y BR2_PACKAGE_JSON_C=y +BR2_PACKAGE_LAME_OPENIPC=y BR2_PACKAGE_LIBCURL_OPENIPC=y BR2_PACKAGE_LIBCURL_OPENIPC_CURL=y # BR2_PACKAGE_LIBCURL_OPENIPC_VERBOSE is not set @@ -65,6 +66,7 @@ BR2_PACKAGE_LIBCURL_OPENIPC_CURL=y BR2_PACKAGE_LIBCURL_OPENIPC_MBEDTLS=y BR2_PACKAGE_LIBEVENT_OPENIPC=y BR2_PACKAGE_LIBEVENT_OPENIPC_REMOVE_PYSCRIPT=y +BR2_PACKAGE_LIBOGG_OPENIPC=y BR2_PACKAGE_LIBWEBSOCKETS_OPENIPC=y BR2_PACKAGE_LIBYAML=y BR2_PACKAGE_MAJESTIC_FONTS=y @@ -75,6 +77,8 @@ BR2_PACKAGE_MBEDTLS_OPENIPC=y BR2_PACKAGE_MICROBE_WEB=y # BR2_PACKAGE_MINI_SNMPD is not set # BR2_PACKAGE_MOTORS is not set +BR2_PACKAGE_OPUS_OPENIPC=y +BR2_PACKAGE_OPUS_OPENIPC_FIXED_POINT=y # BR2_PACKAGE_SSHPASS is not set BR2_PACKAGE_UACME_OPENIPC=y # BR2_PACKAGE_VTUND_OPENIPC is not set diff --git a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_fpv_defconfig b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_fpv_defconfig index 789afd99..a8eaed2e 100644 --- a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_fpv_defconfig +++ b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_fpv_defconfig @@ -56,6 +56,7 @@ BR2_PACKAGE_HASERL=y BR2_PACKAGE_HISI_GPIO is not set BR2_PACKAGE_IPCTOOL=y BR2_PACKAGE_JSON_C=y +BR2_PACKAGE_LAME_OPENIPC=y BR2_PACKAGE_LIBCURL_OPENIPC=y BR2_PACKAGE_LIBCURL_OPENIPC_CURL=y # BR2_PACKAGE_LIBCURL_OPENIPC_VERBOSE is not set @@ -65,6 +66,7 @@ BR2_PACKAGE_LIBCURL_OPENIPC_CURL=y BR2_PACKAGE_LIBCURL_OPENIPC_MBEDTLS=y BR2_PACKAGE_LIBEVENT_OPENIPC=y BR2_PACKAGE_LIBEVENT_OPENIPC_REMOVE_PYSCRIPT=y +BR2_PACKAGE_LIBOGG_OPENIPC=y BR2_PACKAGE_LIBWEBSOCKETS_OPENIPC=y BR2_PACKAGE_LIBYAML=y BR2_PACKAGE_MAJESTIC_FONTS=y @@ -75,6 +77,8 @@ BR2_PACKAGE_MBEDTLS_OPENIPC=y BR2_PACKAGE_MICROBE_WEB=y # BR2_PACKAGE_MINI_SNMPD is not set # BR2_PACKAGE_MOTORS is not set +BR2_PACKAGE_OPUS_OPENIPC=y +BR2_PACKAGE_OPUS_OPENIPC_FIXED_POINT=y # BR2_PACKAGE_SSHPASS is not set BR2_PACKAGE_UACME_OPENIPC=y # BR2_PACKAGE_VTUND_OPENIPC is not set From 970343c27288af674b63df8cc07ccc2ce4b4319f Mon Sep 17 00:00:00 2001 From: Dmitry Ilyin Date: Mon, 22 Aug 2022 20:34:08 +0300 Subject: [PATCH 07/10] Revert "Apple deps installation" This reverts commit 0a4e87ccb6ee18613482f149a9705837df23b95f. --- .github/workflows/hi3516ev200_matrix.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/hi3516ev200_matrix.yml b/.github/workflows/hi3516ev200_matrix.yml index 0acc9bc5..c4446b8d 100644 --- a/.github/workflows/hi3516ev200_matrix.yml +++ b/.github/workflows/hi3516ev200_matrix.yml @@ -180,10 +180,7 @@ jobs: - name: Install build dependencies run: | make install-deps - if [ -d deps ]; then - ./deps/install.sh - fi - + ls -l deps || true if [ ! -z "$ACT" ]; then echo "FORCE_UNSAFE_CONFIGURE=1" >> $GITHUB_ENV else From eae74d2a9edf586ccac5cfac11963c991f182db4 Mon Sep 17 00:00:00 2001 From: Dmitry Ilyin Date: Fri, 2 Sep 2022 19:34:36 +0300 Subject: [PATCH 08/10] Use OpenIPC fork --- general/package/aws-webrtc/aws-webrtc.mk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/general/package/aws-webrtc/aws-webrtc.mk b/general/package/aws-webrtc/aws-webrtc.mk index 592ff9bb..1e75af0d 100644 --- a/general/package/aws-webrtc/aws-webrtc.mk +++ b/general/package/aws-webrtc/aws-webrtc.mk @@ -4,9 +4,9 @@ # ################################################################################ -AWS_WEBRTC_VERSION = wo-datachannel +AWS_WEBRTC_VERSION = develop AWS_WEBRTC_SITE_METHOD = git -AWS_WEBRTC_SITE = https://github.com/widgetii/amazon-kinesis-video-streams-webrtc-sdk-c +AWS_WEBRTC_SITE = https://github.com/OpenIPC/webrtc-c AWS_WEBRTC_INSTALL_STAGING = YES AWS_WEBRTC_LICENSE = Apache-2.0 AWS_WEBRTC_LICENSE_FILES = LICENSE @@ -24,7 +24,6 @@ AWS_WEBRTC_MAKE_OPTS += VERBOSE=1 AWS_WEBRTC_DEPENDENCIES = \ libsrtp-openipc \ - libwebsockets-openipc \ aws-producer \ usrsctp \ mbedtls-openipc From c7e74b8362c67ac5aa5f56dd6b52bf7f4dc903ad Mon Sep 17 00:00:00 2001 From: Dmitry Ilyin Date: Fri, 2 Sep 2022 21:58:26 +0300 Subject: [PATCH 09/10] Test install.sh --- .github/workflows/matrix_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/matrix_build.yml b/.github/workflows/matrix_build.yml index 04eb4711..69d6ee64 100644 --- a/.github/workflows/matrix_build.yml +++ b/.github/workflows/matrix_build.yml @@ -335,7 +335,7 @@ jobs: - name: Install build dependencies run: | sudo make install-deps - ls -l deps || true + ./deps/install.sh if [ ! -z "$ACT" ]; then echo "FORCE_UNSAFE_CONFIGURE=1" >> $GITHUB_ENV else From 192ea4fe14117a046c398f90c7c761a07cea3846 Mon Sep 17 00:00:00 2001 From: Dmitry Ilyin Date: Fri, 2 Sep 2022 22:54:37 +0300 Subject: [PATCH 10/10] Fix CI build --- .github/workflows/matrix_build.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/matrix_build.yml b/.github/workflows/matrix_build.yml index 69d6ee64..0e0b8596 100644 --- a/.github/workflows/matrix_build.yml +++ b/.github/workflows/matrix_build.yml @@ -335,7 +335,9 @@ jobs: - name: Install build dependencies run: | sudo make install-deps - ./deps/install.sh + if [ -d deps ]; then + ./deps/install.sh + fi if [ ! -z "$ACT" ]; then echo "FORCE_UNSAFE_CONFIGURE=1" >> $GITHUB_ENV else