Merge branch 'fix/usb_stream_idf53_build' into 'master'

fix(usb_stream): link error under idf5.3 Closes AEG-1102 See merge request ae_group/esp-iot-solution!930
espressif · Jan 2, 2024 · eb2fff1 · eb2fff1
2 parents 4ebbdc5 + 0406bc4
commit eb2fff1
Show file tree

Hide file tree

Showing 6 changed files with 204 additions and 276 deletions.
diff --git a/.gitlab/ci/build.yml b/.gitlab/ci/build.yml
@@ -39,10 +39,6 @@
     - pip install idf_build_apps
     - python tools/build_apps.py ${EXAMPLE_DIR} --config ${EXAMPLE_CONFIG} -t all -vv
 
-#
-# example build jobs
-#
-
 build_example_audio_wav_player:
   extends:
     - .build_examples_template
@@ -527,10 +523,6 @@ build_example_utilities_xz_decompress_file:
   variables:
     EXAMPLE_DIR: examples/utilities/xz_decompress_file
 
-#
-# components build jobs
-#
-
 build_components_button_test_apps:
   extends:
     - .build_examples_template
@@ -745,6 +737,7 @@ build_components_usb_usb_stream_test_apps:
     matrix:
       - IMAGE: espressif/idf:release-v4.4
       - IMAGE: espressif/idf:release-v5.0
+      - IMAGE: espressif/idf:latest
   variables:
     EXAMPLE_DIR: components/usb/usb_stream/test_apps
 
@@ -770,10 +763,6 @@ build_components_usb_iot_usbh_cdc_test_apps:
   variables:
     EXAMPLE_DIR: components/usb/iot_usbh_cdc/test_apps
 
-#
-# tools build jobs
-#
-
 build_components_led_lightbulb_driver_test_apps:
   extends:
     - .build_examples_template

diff --git a/components/usb/usb_stream/CHANGELOG.md b/components/usb/usb_stream/CHANGELOG.md
@@ -1,5 +1,11 @@
 # ChangeLog
 
+## v1.3.1 - 2023-12-29
+
+### Bug Fixes:
+
+1. Fix link error under ESP-IDF 5.3
+
 ## v1.3.0 - 2023-12-14
 
 * Support UVC frame type: frame based, which can be used to transmit H264 streams.

diff --git a/components/usb/usb_stream/idf_component.yml b/components/usb/usb_stream/idf_component.yml
@@ -1,4 +1,4 @@
-version: "1.3.0"
+version: "1.3.1"
 targets:
   - esp32s2
   - esp32s3