Rolling v10.6.1

code/components/esp32-camera-master/CMakeLists.txt

@@ -1,29 +1,5 @@
-# get IDF version for comparison
-set(idf_version "${IDF_VERSION_MAJOR}.${IDF_VERSION_MINOR}")
-
-# set conversion sources
-set(COMPONENT_SRCS
-  conversions/yuv.c
-  conversions/to_jpg.cpp
-  conversions/to_bmp.c
-  conversions/jpge.cpp
-  conversions/esp_jpg_decode.c
-  )
-
-set(COMPONENT_PRIV_INCLUDEDIRS
-  conversions/private_include
-  )
-
-set(COMPONENT_ADD_INCLUDEDIRS
-  driver/include
-  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 COMPONENT_SRCS
+  set(COMPONENT_SRCS
     driver/esp_camera.c
     driver/cam_hal.c
     driver/sccb.c
@@ -38,14 +14,22 @@ if(IDF_TARGET STREQUAL "esp32" OR IDF_TARGET STREQUAL "esp32s2" OR IDF_TARGET ST
     sensors/gc2145.c
     sensors/gc032a.c
     sensors/bf3005.c
-    sensors/bf20a6.c
-    sensors/sc101iot.c
-    sensors/sc030iot.c
+    conversions/yuv.c
+    conversions/to_jpg.cpp
+    conversions/to_bmp.c
+    conversions/jpge.cpp
+    conversions/esp_jpg_decode.c
     )
 
-  list(APPEND COMPONENT_PRIV_INCLUDEDIRS
+  set(COMPONENT_ADD_INCLUDEDIRS
+    driver/include
+    conversions/include
+    )
+
+  set(COMPONENT_PRIV_INCLUDEDIRS
     driver/private_include
     sensors/private_include
+    conversions/private_include
     target/private_include
     )
 
@@ -74,13 +58,8 @@ if(IDF_TARGET STREQUAL "esp32" OR IDF_TARGET STREQUAL "esp32s2" OR IDF_TARGET ST
       )
   endif()
 
+  set(COMPONENT_REQUIRES driver)
   set(COMPONENT_PRIV_REQUIRES freertos nvs_flash)
 
-  set(min_version_for_esp_timer "4.2")
-  if (idf_version VERSION_GREATER_EQUAL min_version_for_esp_timer)
-    list(APPEND COMPONENT_PRIV_REQUIRES esp_timer)
-  endif()
-
+  register_component()
 endif()
-
-register_component()