From aac7971f264c846a55a4c4159d2d49057577cd5a Mon Sep 17 00:00:00 2001 From: Gareth Sylvester-Bradley <31761158+garethsb@users.noreply.github.com> Date: Mon, 4 Mar 2024 14:11:38 +0000 Subject: [PATCH] Update to nmos-cpp/cci.20240223 (#30) * Update to nmos-cpp/cci.20240223 * Update README.md - ubuntu-latest runner is now Ubuntu 22.04 - nmos-cpp/cci.20240223 supports IS-10, BCP-002-02 and BCP-006-01 * Use Conan provider --- Dockerfile | 9 +++++---- README.md | 11 +++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 241385e..0d6e370 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,8 +19,8 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive && apt-get install - apt-get clean -y --no-install-recommends && \ apt-get autoclean -y --no-install-recommends -## Install latest versions of CMake and Conan using pip3 package installer. Pin v1.x for Conan -RUN python3 -m pip install --upgrade pip setuptools wheel cmake conan~=1.62 +## Install latest versions of CMake and Conan using pip3 package installer +RUN python3 -m pip install --upgrade pip setuptools wheel cmake conan ## Get Certificates and scripts from AMWA-TV/nmos-testing RUN cd /home && mkdir certs && git config --global http.sslVerify false && \ @@ -29,7 +29,8 @@ RUN cd /home && mkdir certs && git config --global http.sslVerify false && \ rm -rf /home/nmos-testing ## Get source for Sony nmos-cpp -ENV NMOS_CPP_VERSION=85d5443c0e41ba45d44a7ba9da66e8deceaf9955 +## Commit 27dff31 corresponds to Conan package nmos-cpp/cci.20240223 +ENV NMOS_CPP_VERSION=27dff31919e06a132651291648293ff7b6b38b38 RUN cd /home/ && curl --output - -s -k https://codeload.github.com/sony/nmos-cpp/tar.gz/$NMOS_CPP_VERSION | tar zxvf - -C . && \ mv ./nmos-cpp-${NMOS_CPP_VERSION} ./nmos-cpp @@ -48,8 +49,8 @@ RUN mkdir /home/nmos-cpp/Development/build && \ cd /home/nmos-cpp/Development/build && \ cmake \ -G "Unix Makefiles" \ + -DCMAKE_PROJECT_TOP_LEVEL_INCLUDES:STRING="third_party/cmake/conan_provider.cmake" \ -DCMAKE_BUILD_TYPE:STRING="MinSizeRel" \ - -DCMAKE_CONFIGURATION_TYPES:STRING="MinSizeRel" \ -DCXXFLAGS:STRING="-Os" \ -DNMOS_CPP_USE_AVAHI:BOOL="0" \ /home/nmos-cpp/Development/build .. && \ diff --git a/README.md b/README.md index 23b9c43..12a0ba5 100644 --- a/README.md +++ b/README.md @@ -20,9 +20,12 @@ Specifically the implementation supports the following specifications: - [AMWA IS-07 NMOS Event & Tally Specification](https://specs.amwa.tv/is-07/) (supporting v1.0) - [AMWA IS-08 NMOS Audio Channel Mapping Specification](https://specs.amwa.tv/is-08/) (supporting v1.0) - [AMWA IS-09 NMOS System Parameters Specification](https://specs.amwa.tv/is-09/) (supporting v1.0) +- [AMWA IS-10 NMOS Authorization Specification](https://specs.amwa.tv/is-10/) (supporting v1.0) - [AMWA BCP-002-01 NMOS Grouping Recommendations - Natural Grouping](https://specs.amwa.tv/bcp-002-01/) +- [AMWA BCP-002-02 NMOS Asset Distinguishing Information](https://specs.amwa.tv/bcp-002-02/) - [AMWA BCP-003-01 Secure Communication in NMOS Systems](https://specs.amwa.tv/bcp-003-01/) - [AMWA BCP-004-01 NMOS Receiver Capabilities](https://specs.amwa.tv/bcp-004-01/) +- [AMWA BCP-006-01 NMOS With JPEG XS](https://specs.amwa.tv/bcp-006-01/) Additionally it supports the following additional components: @@ -68,9 +71,9 @@ Please see wider [Sony CI Testing](https://github.com/sony/nmos-cpp/blob/master/ The following configuration, defined by the [ci-build-test-publish](.github/workflows/ci-build-test-publish.yml) job, is built and unit tested automatically via continuous integration. If the tests complete successfully the container is published directly to Docker Hub and also saved as an artifact against the GitHub Action Job. Additional configurations may be added in the future. -| Platform | Version | Configuration Options | -|----------|--------------------------|----------------------------------------| -| Linux | Ubuntu 18.04 (GCC 7.5.0) | Avahi | +| Platform | Version | Configuration Options | +|----------|---------------------------|----------------------------------------| +| Linux | Ubuntu 22.04 (GCC 11.4.0) | Avahi | The [AMWA NMOS API Testing Tool](https://github.com/AMWA-TV/nmos-testing) is automatically run against the built **NMOS container** operating in both "nmos-node" and "nmos-registry" configurations. @@ -270,4 +273,4 @@ make build ```sh make buildnode ``` -Please note the container will be built with a “-node” suffix applied to remove any confusion. +Please note the container will be built with a "-node" suffix applied to remove any confusion.