Merging master to dev branch

.github/workflows/Linux build template.yml

@@ -16,22 +16,49 @@ jobs:
 # ----- Packages & artifacts -----
     name: Build type - ${{matrix.build_type}}${{matrix.architecture == '32' && ' x86' || ''}}
     steps:
-    - name: Install necessary packages
-      uses: nick-fields/retry@v3
-      with:
-        timeout_minutes: 10
-        max_attempts: 10
-        command: |
-          sudo gem install apt-spy2
-          sudo apt-spy2 fix --commit --launchpad --country=US
-          echo "deb http://archive.ubuntu.com/ubuntu/ jammy main universe restricted multiverse" | sudo tee -a /etc/apt/sources.list
-          echo "deb http://archive.ubuntu.com/ubuntu/ jammy-updates main universe restricted multiverse" | sudo tee -a /etc/apt/sources.list
-          sudo dpkg --add-architecture i386
-          sudo apt-get update
-          sudo apt install python3-pip build-essential cmake ninja-build libusb-1.0-0-dev ${{matrix.architecture == '32' && 'zlib1g-dev:i386 libssl-dev:i386 gcc-13-multilib g++-13-multilib' || 'zlib1g-dev libssl-dev'}}
-          python3 -m venv venv
-          source venv/bin/activate
-          pip install jsonref
+    - name: Prepare apt (add i386 if needed)
+      if: ${{ matrix.architecture == '32' }}
+      run: |
+        sudo dpkg --add-architecture i386
+
+    - name: Update apt indices (with retries)
+      shell: bash
+      run: |
+        set -euo pipefail
+        for attempt in {1..5}; do
+          if sudo apt-get update -o Acquire::Retries=5 -o Acquire::http::Timeout=30; then
+            break
+          fi
+          echo "apt-get update failed (attempt $attempt), retrying..."
+          sleep $((attempt*10))
+        done
+
+    - name: Install system dependencies
+      shell: bash
+      run: |
+        set -euo pipefail
+        export DEBIAN_FRONTEND=noninteractive
+        PKGS="python3-venv python3-pip build-essential cmake ninja-build libusb-1.0-0-dev"
+        if [ "${{ matrix.architecture }}" = "32" ]; then
+          PKGS="$PKGS zlib1g-dev:i386 libssl-dev:i386 libsbc-dev:i386 gcc-13-multilib g++-13-multilib"
+        else
+          PKGS="$PKGS zlib1g-dev libssl-dev libsbc-dev"
+        fi
+        for attempt in {1..4}; do
+          if sudo apt-get install -y --no-install-recommends $PKGS; then
+            break
+          fi
+          echo "apt-get install failed (attempt $attempt), cleaning up & retrying..."
+          sudo apt-get clean
+          sleep $((attempt*15))
+        done
+
+    - name: Set up Python environment
+      run: |
+        python3 -m venv venv
+        source venv/bin/activate
+        pip install --upgrade pip
+        pip install jsonref
 
     - name: Download artifacts
       uses: actions/download-artifact@v4

.github/workflows/cla.yml

@@ -0,0 +1,19 @@
+name: "CLA"
+on:
+  issue_comment:
+    types: [created]
+  pull_request_target:
+    types: [opened,closed,synchronize]
+
+permissions:
+  contents: read
+  pull-requests: write
+  actions: write
+  statuses: write
+
+jobs:
+  CLA-Lite:
+    name: "Signature"
+    uses: rdkcentral/cmf-actions/.github/workflows/cla.yml@main
+    secrets:
+      PERSONAL_ACCESS_TOKEN: ${{ secrets.CLA_ASSISTANT }}

CMakeLists.txt

@@ -48,5 +48,6 @@ if (BUILD_REFERENCE)
 endif()
 
 add_subdirectory(interfaces)
+add_subdirectory(example_interfaces)
 add_subdirectory(qa_interfaces)
 add_subdirectory(definitions)

definitions/CMakeLists.txt

@@ -50,6 +50,11 @@ set(WORKING_VARIABLE ${INTERFACES_PATTERNS})
 list(TRANSFORM WORKING_VARIABLE PREPEND "${CMAKE_SOURCE_DIR}/qa_interfaces/")
 file(GLOB QA_INTERFACE_FILE ${WORKING_VARIABLE})
 
+separate_arguments(INTERFACES_PATTERNS)
+set(WORKING_VARIABLE ${INTERFACES_PATTERNS})
+list(TRANSFORM WORKING_VARIABLE PREPEND "${CMAKE_SOURCE_DIR}/example_interfaces/")
+file(GLOB EXAMPLE_INTERFACE_FILE ${WORKING_VARIABLE})
+
 set(PUBLIC_HEADERS "definitions.h" "ValuePoint.h" "Module.h")
 
 if(NOT GENERATOR_SEARCH_PATH)
@@ -60,21 +65,27 @@ JsonGenerator(CODE INPUT ${JSON_FILE} OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/genera
 JsonGenerator(CODE INPUT ${QA_JSON_FILE} OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/qa_generated" INCLUDE_PATH ${GENERATOR_SEARCH_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/../jsonrpc/" CPPIFDIR "${CMAKE_CURRENT_SOURCE_DIR}/../qa_interfaces/" IFDIR "${CMAKE_CURRENT_SOURCE_DIR}/../jsonrpc/" CPP_INTERFACE_PATH "qa_interfaces" JSON_INTERFACE_PATH "qa_interfaces/json")
 JsonGenerator(CODE INPUT ${INTERFACE_FILE} OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/generated" INCLUDE_PATH ${GENERATOR_SEARCH_PATH})
 JsonGenerator(CODE NAMESPACE  Thunder::QualityAssurance INPUT ${QA_INTERFACE_FILE} OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/qa_generated" INCLUDE_PATH ${GENERATOR_SEARCH_PATH} CPP_INTERFACE_PATH "qa_interfaces" JSON_INTERFACE_PATH "qa_interfaces/json" )
+JsonGenerator(CODE NAMESPACE Thunder::Example INPUT ${EXAMPLE_INTERFACE_FILE} OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/example_generated" INCLUDE_PATH ${GENERATOR_SEARCH_PATH}  CPP_INTERFACE_PATH "example_interfaces" JSON_INTERFACE_PATH "example_interfaces/json")
 
 file(GLOB JSON_ENUM_SOURCES "${CMAKE_CURRENT_BINARY_DIR}/generated/JsonEnum*.cpp")
 file(GLOB JSON_LINK_HEADERS "${CMAKE_CURRENT_BINARY_DIR}/generated/J*.h")
 
 file(GLOB QA_JSON_ENUM_SOURCES "${CMAKE_CURRENT_BINARY_DIR}/qa_generated/JsonEnum*.cpp")
 file(GLOB QA_JSON_LINK_HEADERS "${CMAKE_CURRENT_BINARY_DIR}/qa_generated/J*.h")
 
+file(GLOB EXAMPLE_JSON_ENUM_SOURCES "${CMAKE_CURRENT_BINARY_DIR}/example_generated/JsonEnum*.cpp")
+file(GLOB EXAMPLE_JSON_LINK_HEADERS "${CMAKE_CURRENT_BINARY_DIR}/example_generated/J*.h")
+
 list(APPEND JSON_LINK_HEADERS "Module.h")
 list(APPEND QA_JSON_LINK_HEADERS "Module.h")
+list(APPEND EXAMPLE_JSON_LINK_HEADERS "Module.h")
 
 add_library(${Target} SHARED
         Definitions.cpp
         Module.cpp
         ${JSON_ENUM_SOURCES}
         ${QA_JSON_ENUM_SOURCES}
+        ${EXAMPLE_JSON_ENUM_SOURCES}
         )
 
 target_link_libraries(${Target}
@@ -122,6 +133,11 @@ install(
         DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${NAMESPACE}/qa_interfaces/json  COMPONENT ${NAMESPACE}_Test_Development
 )
 
+install(
+        FILES ${EXAMPLE_JSON_LINK_HEADERS}
+        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${NAMESPACE}/example_interfaces/json  COMPONENT ${NAMESPACE}_Example_Development
+)
+
 InstallPackageConfig(
         TARGETS ${Target}
         DESCRIPTION "${PROJECT_DESCRIPTION}"

definitions/Definitions.cpp

@@ -65,6 +65,7 @@
 #include <interfaces/IPerformance.h>
 #include <interfaces/IPlayerInfo.h>
 #include <interfaces/IPlayGiga.h>
+#include <interfaces/IPluginAsyncStateControl.h>
 #include <interfaces/IPower.h>
 #include <interfaces/IProvisioning.h>
 #include <interfaces/IRemoteControl.h>
@@ -95,6 +96,10 @@
 #include <qa_interfaces/ITestUtility.h>
 #include <qa_interfaces/ITestController.h>
 #include <qa_interfaces/ITestAutomation.h>
+
+#include <example_interfaces/ISimpleInstanceObjects.h>
+#include <example_interfaces/ISimpleAsync.h>
+#include <example_interfaces/ISimpleCustomObjects.h>
 #endif
 
 namespace Thunder {
@@ -153,15 +158,6 @@ ENUM_CONVERSION_BEGIN(Exchange::IStream::state)
     { Exchange::IStream::state::Error, _TXT(_T("Error")) },
 ENUM_CONVERSION_END(Exchange::IStream::state)
 
-ENUM_CONVERSION_BEGIN(Exchange::IPower::PCState)
-    { Exchange::IPower::On, _TXT(_T("on")) },
-    { Exchange::IPower::ActiveStandby, _TXT(_T("active")) },
-    { Exchange::IPower::PassiveStandby, _TXT(_T("passive")) },
-    { Exchange::IPower::SuspendToRAM, _TXT(_T("suspended")) },
-    { Exchange::IPower::Hibernate, _TXT(_T("hibernate")) },
-    { Exchange::IPower::PowerOff, _TXT(_T("off")) }, 
-ENUM_CONVERSION_END(Exchange::IPower::PCState)
-
 ENUM_CONVERSION_BEGIN(Exchange::External::Metadata::protocol)
     { Exchange::External::Metadata::protocol::I2C,      _TXT(_T("I2C"))      },
     { Exchange::External::Metadata::protocol::ONEWIRE,  _TXT(_T("1W"))       },