From c3aa834d809c5a6a8f60b6c0917a236d61b098d3 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Fri, 18 Oct 2019 14:46:09 +0200
Subject: [PATCH] Fork some base libraries (#758)

* Fork some base libraries

* Update ESPAsyncWebServer
---
 .gitlab-ci.yml                                |  4 ---
 .travis.yml                                   |  4 ---
 esphome/components/async_tcp/__init__.py      |  4 +--
 esphome/components/mqtt/__init__.py           |  2 +-
 esphome/components/neopixelbus/light.py       |  2 +-
 .../components/web_server_base/__init__.py    |  4 +--
 platformio.ini                                |  8 ++---
 script/.neopixelbus.patch                     | 35 -------------------
 script/ci-custom.py                           |  1 -
 script/lint-cpp                               |  3 --
 10 files changed, 10 insertions(+), 57 deletions(-)
 delete mode 100644 script/.neopixelbus.patch

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3278827486..4ed0973cdd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -107,10 +107,6 @@ lint-tidy:
   <<: *lint
   script:
     - pio init --ide atom
-    - |
-      if ! patch -R -p0 -s -f --dry-run <script/.neopixelbus.patch; then
-        patch -p0 < script/.neopixelbus.patch
-      fi
     - script/clang-tidy --all-headers --fix
     - script/ci-suggest-changes
 
diff --git a/.travis.yml b/.travis.yml
index 69afb4e2a5..a453ab52b2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -40,10 +40,6 @@ matrix:
             - clang-format-7
       before_script:
         - pio init --ide atom
-        - |
-          if ! patch -R -p0 -s -f --dry-run <script/.neopixelbus.patch; then
-            patch -p0 < script/.neopixelbus.patch
-          fi
         - clang-tidy-7 -version
         - clang-format-7 -version
         - clang-apply-replacements-7 -version
diff --git a/esphome/components/async_tcp/__init__.py b/esphome/components/async_tcp/__init__.py
index f2c457e190..a33cf6fa53 100644
--- a/esphome/components/async_tcp/__init__.py
+++ b/esphome/components/async_tcp/__init__.py
@@ -9,5 +9,5 @@ def to_code(config):
         # https://github.com/me-no-dev/AsyncTCP/blob/master/library.json
         cg.add_library('AsyncTCP', '1.0.3')
     elif CORE.is_esp8266:
-        # https://github.com/me-no-dev/ESPAsyncTCP/blob/master/library.json
-        cg.add_library('ESPAsyncTCP', '1.2.0')
+        # https://github.com/OttoWinter/ESPAsyncTCP
+        cg.add_library('ESPAsyncTCP-esphome', '1.2.2')
diff --git a/esphome/components/mqtt/__init__.py b/esphome/components/mqtt/__init__.py
index d88187ceec..5a9bbee377 100644
--- a/esphome/components/mqtt/__init__.py
+++ b/esphome/components/mqtt/__init__.py
@@ -155,7 +155,7 @@ def to_code(config):
     yield cg.register_component(var, config)
 
     # https://github.com/marvinroger/async-mqtt-client/blob/master/library.json
-    cg.add_library('AsyncMqttClient', '0.8.2')
+    cg.add_library('AsyncMqttClient-esphome', '0.8.2')
     cg.add_define('USE_MQTT')
     cg.add_global(mqtt_ns.using)
 
diff --git a/esphome/components/neopixelbus/light.py b/esphome/components/neopixelbus/light.py
index 49ea9d237a..e5106d4bd6 100644
--- a/esphome/components/neopixelbus/light.py
+++ b/esphome/components/neopixelbus/light.py
@@ -169,4 +169,4 @@ def to_code(config):
     cg.add(var.set_pixel_order(getattr(ESPNeoPixelOrder, config[CONF_TYPE])))
 
     # https://github.com/Makuna/NeoPixelBus/blob/master/library.json
-    cg.add_library('NeoPixelBus', '2.5.0')
+    cg.add_library('NeoPixelBus-esphome', '2.5.2')
diff --git a/esphome/components/web_server_base/__init__.py b/esphome/components/web_server_base/__init__.py
index db6c256a95..53463a9927 100644
--- a/esphome/components/web_server_base/__init__.py
+++ b/esphome/components/web_server_base/__init__.py
@@ -21,5 +21,5 @@ def to_code(config):
 
     if CORE.is_esp32:
         cg.add_library('FS', None)
-    # https://github.com/me-no-dev/ESPAsyncWebServer/blob/master/library.json
-    cg.add_library('ESP Async WebServer', '1.2.2')
+    # https://github.com/OttoWinter/ESPAsyncWebServer/blob/master/library.json
+    cg.add_library('ESPAsyncWebServer-esphome', '1.2.4')
diff --git a/platformio.ini b/platformio.ini
index 5094ae3d83..ffc17b1e6d 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -11,12 +11,12 @@ include_dir = include
 [common]
 lib_deps =
     AsyncTCP@1.0.3
-    AsyncMqttClient@0.8.2
+    AsyncMqttClient-esphome@0.8.2
     ArduinoJson-esphomelib@5.13.3
-    ESP Async WebServer@1.2.2
+    ESPAsyncWebServer-esphome@1.2.3
     FastLED@3.2.9
-    NeoPixelBus@2.5.0
-    ESPAsyncTCP@1.2.0
+    NeoPixelBus-esphome@2.5.2
+    ESPAsyncTCP-esphome@1.2.2
     TinyGPSPlus@1.0.2
 build_flags =
     -Wno-reorder
diff --git a/script/.neopixelbus.patch b/script/.neopixelbus.patch
deleted file mode 100644
index e1bbd5da99..0000000000
--- a/script/.neopixelbus.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- .pio/libdeps/livingroom8266/NeoPixelBus_ID547/src/internal/NeoEsp8266DmaMethod.h	2019-06-25 11:14:33.000000000 +0200
-+++ .pio/libdeps/livingroom8266/NeoPixelBus_ID547/src/internal/NeoEsp8266DmaMethod.h.2	2019-06-25 11:14:40.000000000 +0200
-@@ -195,7 +195,12 @@
-             _i2sBufDesc[indexDesc].sub_sof = 0;
-             _i2sBufDesc[indexDesc].datalen = blockSize;
-             _i2sBufDesc[indexDesc].blocksize = blockSize;
--            _i2sBufDesc[indexDesc].buf_ptr = (uint32_t)is2Buffer;
-+            union {
-+                uint8_t *ptr;
-+                uint32_t value;
-+            } ptr;
-+            ptr.ptr = is2Buffer;
-+            _i2sBufDesc[indexDesc].buf_ptr = ptr.value;
-             _i2sBufDesc[indexDesc].unused = 0;
-             _i2sBufDesc[indexDesc].next_link_ptr = (uint32_t)&(_i2sBufDesc[indexDesc + 1]);
- 
-@@ -361,12 +366,15 @@
- 
-             case NeoDmaState_Sending:
-                 {
--                    slc_queue_item* finished_item = (slc_queue_item*)SLCRXEDA;
--
-+                    union {
-+                        slc_queue_item *ptr;
-+                        uint32_t value;
-+                    } ptr;
-+                    ptr.value = SLCRXEDA;
-                     // the data block had actual data sent
-                     // point last state block to first state block thus
-                     // just looping and not sending the data blocks
--                    (finished_item + 1)->next_link_ptr = (uint32_t)(finished_item);
-+                    (ptr.ptr + 1)->next_link_ptr = ptr.value;
- 
-                     s_this->_dmaState = NeoDmaState_Zeroing;
-                 }
diff --git a/script/ci-custom.py b/script/ci-custom.py
index 5ea7229863..fff24df0dc 100755
--- a/script/ci-custom.py
+++ b/script/ci-custom.py
@@ -126,7 +126,6 @@ def lint_executable_bit(fname):
 
 @lint_content_find_check('\t', exclude=[
     'esphome/dashboard/static/ace.js', 'esphome/dashboard/static/ext-searchbox.js',
-    'script/.neopixelbus.patch',
 ])
 def lint_tabs(fname):
     return "File contains tab character. Please convert tabs to spaces."
diff --git a/script/lint-cpp b/script/lint-cpp
index 88728c9abd..170d61d539 100755
--- a/script/lint-cpp
+++ b/script/lint-cpp
@@ -6,9 +6,6 @@ cd "$(dirname "$0")/.."
 if [[ ! -e ".gcc-flags.json" ]]; then
   pio init --ide atom
 fi
-if ! patch -R -p0 -s -f --dry-run <script/.neopixelbus.patch; then
-  patch -p0 < script/.neopixelbus.patch
-fi
 
 set -x