From 216b6245a9b1b7c60b31412cd8ab8bdec979564f Mon Sep 17 00:00:00 2001 From: Wade Dorrell Date: Sat, 11 Jan 2020 08:11:57 -0700 Subject: [PATCH] Fix #815 (#990) * Trial fix for #815 * Remove extra semicolon from old if block * Better fix for #815 (just flip blocks) * Version to 2.2, add changelog * Update build.json * Update CHANGELOG.md Co-authored-by: Pascal Vizeli --- cec_scan/CHANGELOG.md | 5 +++++ cec_scan/Dockerfile | 4 ++-- cec_scan/build.json | 10 +++++----- cec_scan/config.json | 2 +- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/cec_scan/CHANGELOG.md b/cec_scan/CHANGELOG.md index 3aed67b..9cc128c 100644 --- a/cec_scan/CHANGELOG.md +++ b/cec_scan/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## 2.2 + +- Fix a cause of "autodetect FAILED" on Raspberry Pi introduced in 2.1 +- Update to Alpine 3.11 + ## 2.1 - Added README into the add-on repository diff --git a/cec_scan/Dockerfile b/cec_scan/Dockerfile index 4372d91..5fecbef 100644 --- a/cec_scan/Dockerfile +++ b/cec_scan/Dockerfile @@ -28,12 +28,12 @@ RUN \ && mkdir -p /usr/src/libcec/build \ && cd /usr/src/libcec/build \ && if [[ "armhf armv7 aarch64" = *"$BUILD_ARCH"* ]]; then \ - cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr/local ..; \ - else \ cmake \ -DCMAKE_INSTALL_PREFIX:PATH=/usr/local \ -DRPI_INCLUDE_DIR=/opt/vc/include \ -DRPI_LIB_DIR=/opt/vc/lib ..; \ + else \ + cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr/local ..; \ fi \ && make -j$(nproc) \ && make install \ diff --git a/cec_scan/build.json b/cec_scan/build.json index a8e6139..46c2a5b 100644 --- a/cec_scan/build.json +++ b/cec_scan/build.json @@ -1,10 +1,10 @@ { "build_from": { - "aarch64": "homeassistant/aarch64-base:3.10", - "amd64": "homeassistant/amd64-base:3.10", - "armhf": "homeassistant/armhf-base:3.10", - "armv7": "homeassistant/armv7-base:3.10", - "i386": "homeassistant/i386-base:3.10" + "aarch64": "homeassistant/aarch64-base:3.11", + "amd64": "homeassistant/amd64-base:3.11", + "armhf": "homeassistant/armhf-base:3.11", + "armv7": "homeassistant/armv7-base:3.11", + "i386": "homeassistant/i386-base:3.11" }, "args": { "LIBCEC_VERSION": "4.0.3" diff --git a/cec_scan/config.json b/cec_scan/config.json index 07df1b1..f0676c6 100644 --- a/cec_scan/config.json +++ b/cec_scan/config.json @@ -1,6 +1,6 @@ { "name": "CEC Scanner", - "version": "2.1", + "version": "2.2", "slug": "cec_scan", "description": "Scan for HDMI CEC devices", "url": "https://github.com/home-assistant/hassio-addons/tree/master/cec_scan",