Fix I2S compilation on IDF 6.0-beta2 (#89)

* fix: i2s compilation on IDF 6.0-beta2

* Fix i2s_periph.h include for IDF 4.x

The conditional from the cherry-pick only included soc/i2s_periph.h for
IDF >= 5.4.0, leaving IDF 4.x without it. Change the elif to else so
all non-6.0 versions get the header.

---------

Co-authored-by: Aiden <aiden@vigue.me>

Author: stuartparmenter

components/hub75/CMakeLists.txt

@@ -14,7 +14,11 @@ if(IDF_TARGET STREQUAL "esp32p4" OR IDF_TARGET STREQUAL "esp32c6")
 endif()
 # ESP-IDF 6.0+ split drivers into separate components
 if(IDF_VERSION_MAJOR GREATER_EQUAL 6)
-    list(APPEND HUB75_REQUIRES esp_driver_gpio)
+    list(REMOVE_ITEM HUB75_REQUIRES driver) # Remove old "driver" component
+        list(APPEND HUB75_REQUIRES esp_driver_gpio)
+    if(IDF_TARGET STREQUAL "esp32" OR IDF_TARGET STREQUAL "esp32s2")
+        list(APPEND HUB75_REQUIRES esp_driver_i2s)
+    endif()
     if(IDF_TARGET STREQUAL "esp32p4" OR IDF_TARGET STREQUAL "esp32c6")
         list(APPEND HUB75_REQUIRES esp_driver_parlio)
     endif()

components/hub75/src/platforms/i2s/i2s_dma.cpp

@@ -30,7 +30,14 @@
 #include <driver/periph_ctrl.h>
 #endif
 #include <soc/gpio_sig_map.h>
+
+#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(6, 0, 0) && !__has_include("soc/i2s_periph.h")
+#include <driver/i2s_std.h>
+#include <soc/i2s_reg.h>
+#else
 #include <soc/i2s_periph.h>
+#endif
+
 #include <esp_heap_caps.h>
 
 static const char *const TAG = "I2sDma";