espressif/esp-protocols
1
0
Fork 1
mirror of https://github.com/espressif/esp-protocols.git synced 2025-08-02 04:04:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #856 from david-cermak/fix/mosquitto_build

Browse Source 
[mosq]: Fix esp_webRTC-lib deprecation with new FreeRTOS
This commit is contained in:
Euripedes
2025-07-29 08:06:05 +02:00
committed by GitHub
parent ffeee3e87a 78ae25598b
commit 07e8eddcb6
3 changed files with 36 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/mosq__build.yml vendored
View File

@@ -18,6 +18,10 @@ jobs:
exclude: exclude:
- idf_ver: "release-v5.1" - idf_ver: "release-v5.1"
example: "serverless_mqtt" # serverless_mqtt is not supported due to esp-peer example: "serverless_mqtt" # serverless_mqtt is not supported due to esp-peer
include:
- idf_ver: "latest"
example: "serverless_mqtt"
warning: "'octal_mode' is deprecated"
runs-on: ubuntu-22.04 runs-on: ubuntu-22.04
container: espressif/idf:${{ matrix.idf_ver }} container: espressif/idf:${{ matrix.idf_ver }}
@@ -31,6 +35,8 @@ jobs:
with: with:
submodules: recursive submodules: recursive
- name: Build with IDF-${{ matrix.idf_ver }} - name: Build with IDF-${{ matrix.idf_ver }}
env:
EXPECTED_WARNING: ${{ matrix.warning }}
shell: bash shell: bash
run: | run: |
. ${IDF_PATH}/export.sh . ${IDF_PATH}/export.sh

28
components/mosquitto/examples/serverless_mqtt/esp_peer_setup/Remove-deprecated-API-for-get_stack_fr.patch Normal file
View File

@@ -0,0 +1,28 @@
From 600c9baaa622cd0885697829bcc5e22fa0a79e68 Mon Sep 17 00:00:00 2001
From: David Cermak <cermak@espressif.com>
Date: Fri, 25 Jul 2025 17:20:10 +0200
Subject: [PATCH] fix(media_lib): Remove deprecated API for get_stack_frame API
---
components/media_lib_sal/port/media_lib_os_freertos.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/components/media_lib_sal/port/media_lib_os_freertos.c b/components/media_lib_sal/port/media_lib_os_freertos.c
index d248d59..1117926 100644
--- a/components/media_lib_sal/port/media_lib_os_freertos.c
+++ b/components/media_lib_sal/port/media_lib_os_freertos.c
@@ -369,7 +369,11 @@ static int _get_stack_frame(void** addr, int n)
TaskSnapshot_t snap_shot;
TaskHandle_t cur_task = xTaskGetCurrentTaskHandle();
vTaskGetSnapshot(cur_task, &snap_shot);
- snap_shot.pxTopOfStack = pxTaskGetStackStart(cur_task);;
+#if (ESP_IDF_VERSION > ESP_IDF_VERSION_VAL(5, 5, 0))
+ snap_shot.pxTopOfStack = xTaskGetStackStart(cur_task);
+#else
+ snap_shot.pxTopOfStack = pxTaskGetStackStart(cur_task);
+#endif
esp_backtrace_get_start(&(frame.pc), &(frame.sp), &(frame.next_pc));
for (int i = 0; i < n; i++) {
--
2.43.0

2
components/mosquitto/examples/serverless_mqtt/esp_peer_setup/install.sh
View File

@@ -14,6 +14,7 @@ COMPONENTS_SRC="${EXTRACTED_DIR}/components"
COMPONENTS_DST="${ESP_PEER_DIR}/components" COMPONENTS_DST="${ESP_PEER_DIR}/components"
PATCH_FILE_1="${THIS_DIR}/Remove-deprecated-freeRTOS-header.patch" PATCH_FILE_1="${THIS_DIR}/Remove-deprecated-freeRTOS-header.patch"
PATCH_FILE_2="${THIS_DIR}/libpeer-Add-direct-dependency-to-libsrtp.patch" PATCH_FILE_2="${THIS_DIR}/libpeer-Add-direct-dependency-to-libsrtp.patch"
PATCH_FILE_3="${THIS_DIR}/Remove-deprecated-API-for-get_stack_fr.patch"
# Download if not exists # Download if not exists
if [ ! -d "$EXTRACTED_DIR" ]; then if [ ! -d "$EXTRACTED_DIR" ]; then
@@ -22,6 +23,7 @@ if [ ! -d "$EXTRACTED_DIR" ]; then
unzip -o "$ZIP_PATH" -d "$ESP_PEER_DIR" unzip -o "$ZIP_PATH" -d "$ESP_PEER_DIR"
patch -p1 -d "$EXTRACTED_DIR" < "$PATCH_FILE_1" patch -p1 -d "$EXTRACTED_DIR" < "$PATCH_FILE_1"
patch -p1 -d "$EXTRACTED_DIR" < "$PATCH_FILE_2" patch -p1 -d "$EXTRACTED_DIR" < "$PATCH_FILE_2"
patch -p1 -d "$EXTRACTED_DIR" < "$PATCH_FILE_3"
mv ${EXTRACTED_DIR}/components ${ESP_PEER_DIR} mv ${EXTRACTED_DIR}/components ${ESP_PEER_DIR}
mv ${ESP_PEER_DIR}/components/esp_webrtc/impl/peer_default ${ESP_PEER_DIR}/components mv ${ESP_PEER_DIR}/components/esp_webrtc/impl/peer_default ${ESP_PEER_DIR}/components
fi fi