Skip to content

fix: Fix requires by IDF6 #807

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Oct 9, 2025
Merged

fix: Fix requires by IDF6 #807

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
344a0cc
fix: Fix requires by IDF6
espzav Oct 9, 2025
2a05142
Refactor CMakeLists.txt for dependency handling
me-no-dev Oct 9, 2025
bb0a2f5
Update CMakeLists to require 'driver' component
me-no-dev Oct 9, 2025
8ca4463
Modify priv_requires to use list append
me-no-dev Oct 9, 2025
821df6d
Remove esp_driver_ledc from private requirements
me-no-dev Oct 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# get IDF version for comparison
set(idf_version "${IDF_VERSION_MAJOR}.${IDF_VERSION_MINOR}")

set(priv_requires "")

# set conversion sources
set(srcs
conversions/yuv.c
Expand All @@ -18,8 +20,6 @@ set(include_dirs
conversions/include
)

set(COMPONENT_REQUIRES driver)

# set driver sources only for supported platforms
if(IDF_TARGET STREQUAL "esp32" OR IDF_TARGET STREQUAL "esp32s2" OR IDF_TARGET STREQUAL "esp32s3")
list(APPEND srcs
Expand Down Expand Up @@ -75,7 +75,7 @@ if(IDF_TARGET STREQUAL "esp32" OR IDF_TARGET STREQUAL "esp32s2" OR IDF_TARGET ST
)
endif()

set(priv_requires freertos nvs_flash esp_mm)
list(APPEND priv_requires freertos nvs_flash esp_mm)

set(min_version_for_esp_timer "4.2")
if (idf_version VERSION_GREATER_EQUAL min_version_for_esp_timer)
Expand All @@ -91,16 +91,18 @@ if(IDF_TARGET STREQUAL "esp32" OR IDF_TARGET STREQUAL "esp32s2" OR IDF_TARGET ST
list(APPEND srcs driver/sccb.c)
endif()

if (idf_version VERSION_GREATER_EQUAL "6.0")
list(APPEND priv_requires esp_driver_gpio)
endif()
endif()

set(req driver)
if (idf_version VERSION_GREATER_EQUAL "6.0")
list(APPEND priv_requires esp_driver_gpio esp_driver_spi esp_driver_i2c)
list(APPEND req esp_driver_ledc)
endif()

idf_component_register(
SRCS ${srcs}
INCLUDE_DIRS ${include_dirs}
PRIV_INCLUDE_DIRS ${priv_include_dirs}
REQUIRES driver # due to include of driver/gpio.h in esp_camera.h
REQUIRES ${req}
PRIV_REQUIRES ${priv_requires}
)
2 changes: 1 addition & 1 deletion idf_component.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ repository: https://github.com/espressif/esp32-camera.git
dependencies:
idf: ">=5.1"
esp_jpeg:
version: "^1.3.0"
version: "^1.3.1"
public: true