From 29a020886edd04503833c27ae7d3a275e5025896 Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Tue, 8 Jun 2021 20:48:49 +0200 Subject: [PATCH] Update Machine support of python 3.9 / Kernel CEC (#51637) --- build.json | 10 +++++----- machine/generic-x86-64 | 28 ---------------------------- machine/intel-nuc | 28 ---------------------------- machine/odroid-c2 | 29 ----------------------------- machine/odroid-c4 | 29 ----------------------------- machine/odroid-n2 | 29 ----------------------------- machine/odroid-xu | 29 ----------------------------- machine/qemuarm | 28 ---------------------------- machine/qemuarm-64 | 28 ---------------------------- machine/qemux86 | 28 ---------------------------- machine/qemux86-64 | 28 ---------------------------- machine/raspberrypi | 29 ----------------------------- machine/raspberrypi2 | 29 ----------------------------- machine/raspberrypi3 | 29 ----------------------------- machine/raspberrypi3-64 | 29 ----------------------------- machine/raspberrypi4 | 29 ----------------------------- machine/raspberrypi4-64 | 29 ----------------------------- machine/tinker | 28 ---------------------------- 18 files changed, 5 insertions(+), 491 deletions(-) diff --git a/build.json b/build.json index e3d614a8511..d2370b14773 100644 --- a/build.json +++ b/build.json @@ -2,11 +2,11 @@ "image": "homeassistant/{arch}-homeassistant", "shadow_repository": "ghcr.io/home-assistant", "build_from": { - "aarch64": "ghcr.io/home-assistant/aarch64-homeassistant-base:2021.06.0", - "armhf": "ghcr.io/home-assistant/armhf-homeassistant-base:2021.06.0", - "armv7": "ghcr.io/home-assistant/armv7-homeassistant-base:2021.06.0", - "amd64": "ghcr.io/home-assistant/amd64-homeassistant-base:2021.06.0", - "i386": "ghcr.io/home-assistant/i386-homeassistant-base:2021.06.0" + "aarch64": "ghcr.io/home-assistant/aarch64-homeassistant-base:2021.06.1", + "armhf": "ghcr.io/home-assistant/armhf-homeassistant-base:2021.06.1", + "armv7": "ghcr.io/home-assistant/armv7-homeassistant-base:2021.06.1", + "amd64": "ghcr.io/home-assistant/amd64-homeassistant-base:2021.06.1", + "i386": "ghcr.io/home-assistant/i386-homeassistant-base:2021.06.1" }, "labels": { "io.hass.type": "core", diff --git a/machine/generic-x86-64 b/machine/generic-x86-64 index 4c83228387d..b7fbac2e8ed 100644 --- a/machine/generic-x86-64 +++ b/machine/generic-x86-64 @@ -4,31 +4,3 @@ FROM homeassistant/amd64-homeassistant:$BUILD_VERSION RUN apk --no-cache add \ libva-intel-driver \ usbutils - -## -# Build libcec for HDMI-CEC -ARG LIBCEC_VERSION=6.0.2 -RUN apk add --no-cache \ - eudev-libs \ - p8-platform \ - && apk add --no-cache --virtual .build-dependencies \ - build-base \ - cmake \ - eudev-dev \ - swig \ - p8-platform-dev \ - linux-headers \ - && git clone --depth 1 -b libcec-${LIBCEC_VERSION} https://github.com/Pulse-Eight/libcec /usr/src/libcec \ - && cd /usr/src/libcec \ - && mkdir -p /usr/src/libcec/build \ - && cd /usr/src/libcec/build \ - && cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr/local \ - -DPYTHON_LIBRARY="/usr/local/lib/libpython3.8.so" \ - -DPYTHON_INCLUDE_DIR="/usr/local/include/python3.8" \ - -DHAVE_LINUX_API=1 \ - .. \ - && make -j$(nproc) \ - && make install \ - && echo "cec" > "/usr/local/lib/python3.8/site-packages/cec.pth" \ - && apk del .build-dependencies \ - && rm -rf /usr/src/libcec* diff --git a/machine/intel-nuc b/machine/intel-nuc index b5538b8ccad..5e1b7f957d1 100644 --- a/machine/intel-nuc +++ b/machine/intel-nuc @@ -7,31 +7,3 @@ FROM homeassistant/amd64-homeassistant:$BUILD_VERSION RUN apk --no-cache add \ libva-intel-driver \ usbutils - -## -# Build libcec for HDMI-CEC -ARG LIBCEC_VERSION=6.0.2 -RUN apk add --no-cache \ - eudev-libs \ - p8-platform \ - && apk add --no-cache --virtual .build-dependencies \ - build-base \ - cmake \ - eudev-dev \ - swig \ - p8-platform-dev \ - linux-headers \ - && git clone --depth 1 -b libcec-${LIBCEC_VERSION} https://github.com/Pulse-Eight/libcec /usr/src/libcec \ - && cd /usr/src/libcec \ - && mkdir -p /usr/src/libcec/build \ - && cd /usr/src/libcec/build \ - && cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr/local \ - -DPYTHON_LIBRARY="/usr/local/lib/libpython3.8.so" \ - -DPYTHON_INCLUDE_DIR="/usr/local/include/python3.8" \ - -DHAVE_LINUX_API=1 \ - .. \ - && make -j$(nproc) \ - && make install \ - && echo "cec" > "/usr/local/lib/python3.8/site-packages/cec.pth" \ - && apk del .build-dependencies \ - && rm -rf /usr/src/libcec* diff --git a/machine/odroid-c2 b/machine/odroid-c2 index 9bfbb931ed0..be07d6c8aba 100644 --- a/machine/odroid-c2 +++ b/machine/odroid-c2 @@ -3,32 +3,3 @@ FROM homeassistant/aarch64-homeassistant:$BUILD_VERSION RUN apk --no-cache add \ usbutils - -## -# Build libcec for HDMI-CEC -ARG LIBCEC_VERSION=6.0.2 -RUN apk add --no-cache \ - eudev-libs \ - p8-platform \ - && apk add --no-cache --virtual .build-dependencies \ - build-base \ - cmake \ - eudev-dev \ - swig \ - p8-platform-dev \ - linux-headers \ - && git clone --depth 1 -b libcec-${LIBCEC_VERSION} https://github.com/Pulse-Eight/libcec /usr/src/libcec \ - && cd /usr/src/libcec \ - && mkdir -p /usr/src/libcec/build \ - && cd /usr/src/libcec/build \ - && cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr/local \ - -DPYTHON_LIBRARY="/usr/local/lib/libpython3.8.so" \ - -DPYTHON_INCLUDE_DIR="/usr/local/include/python3.8" \ - -DHAVE_LINUX_API=1 \ - -DHAVE_AOCEC_API=1 \ - .. \ - && make -j$(nproc) \ - && make install \ - && echo "cec" > "/usr/local/lib/python3.8/site-packages/cec.pth" \ - && apk del .build-dependencies \ - && rm -rf /usr/src/libcec* diff --git a/machine/odroid-c4 b/machine/odroid-c4 index 9bfbb931ed0..be07d6c8aba 100644 --- a/machine/odroid-c4 +++ b/machine/odroid-c4 @@ -3,32 +3,3 @@ FROM homeassistant/aarch64-homeassistant:$BUILD_VERSION RUN apk --no-cache add \ usbutils - -## -# Build libcec for HDMI-CEC -ARG LIBCEC_VERSION=6.0.2 -RUN apk add --no-cache \ - eudev-libs \ - p8-platform \ - && apk add --no-cache --virtual .build-dependencies \ - build-base \ - cmake \ - eudev-dev \ - swig \ - p8-platform-dev \ - linux-headers \ - && git clone --depth 1 -b libcec-${LIBCEC_VERSION} https://github.com/Pulse-Eight/libcec /usr/src/libcec \ - && cd /usr/src/libcec \ - && mkdir -p /usr/src/libcec/build \ - && cd /usr/src/libcec/build \ - && cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr/local \ - -DPYTHON_LIBRARY="/usr/local/lib/libpython3.8.so" \ - -DPYTHON_INCLUDE_DIR="/usr/local/include/python3.8" \ - -DHAVE_LINUX_API=1 \ - -DHAVE_AOCEC_API=1 \ - .. \ - && make -j$(nproc) \ - && make install \ - && echo "cec" > "/usr/local/lib/python3.8/site-packages/cec.pth" \ - && apk del .build-dependencies \ - && rm -rf /usr/src/libcec* diff --git a/machine/odroid-n2 b/machine/odroid-n2 index 9bfbb931ed0..be07d6c8aba 100644 --- a/machine/odroid-n2 +++ b/machine/odroid-n2 @@ -3,32 +3,3 @@ FROM homeassistant/aarch64-homeassistant:$BUILD_VERSION RUN apk --no-cache add \ usbutils - -## -# Build libcec for HDMI-CEC -ARG LIBCEC_VERSION=6.0.2 -RUN apk add --no-cache \ - eudev-libs \ - p8-platform \ - && apk add --no-cache --virtual .build-dependencies \ - build-base \ - cmake \ - eudev-dev \ - swig \ - p8-platform-dev \ - linux-headers \ - && git clone --depth 1 -b libcec-${LIBCEC_VERSION} https://github.com/Pulse-Eight/libcec /usr/src/libcec \ - && cd /usr/src/libcec \ - && mkdir -p /usr/src/libcec/build \ - && cd /usr/src/libcec/build \ - && cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr/local \ - -DPYTHON_LIBRARY="/usr/local/lib/libpython3.8.so" \ - -DPYTHON_INCLUDE_DIR="/usr/local/include/python3.8" \ - -DHAVE_LINUX_API=1 \ - -DHAVE_AOCEC_API=1 \ - .. \ - && make -j$(nproc) \ - && make install \ - && echo "cec" > "/usr/local/lib/python3.8/site-packages/cec.pth" \ - && apk del .build-dependencies \ - && rm -rf /usr/src/libcec* diff --git a/machine/odroid-xu b/machine/odroid-xu index 1947115f672..3aa428d3f52 100644 --- a/machine/odroid-xu +++ b/machine/odroid-xu @@ -3,32 +3,3 @@ FROM homeassistant/armv7-homeassistant:$BUILD_VERSION RUN apk --no-cache add \ usbutils - -## -# Build libcec for HDMI-CEC -ARG LIBCEC_VERSION=6.0.2 -RUN apk add --no-cache \ - eudev-libs \ - p8-platform \ - && apk add --no-cache --virtual .build-dependencies \ - build-base \ - cmake \ - eudev-dev \ - swig \ - p8-platform-dev \ - linux-headers \ - && git clone --depth 1 -b libcec-${LIBCEC_VERSION} https://github.com/Pulse-Eight/libcec /usr/src/libcec \ - && cd /usr/src/libcec \ - && mkdir -p /usr/src/libcec/build \ - && cd /usr/src/libcec/build \ - && cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr/local \ - -DPYTHON_LIBRARY="/usr/local/lib/libpython3.8.so" \ - -DPYTHON_INCLUDE_DIR="/usr/local/include/python3.8" \ - -DHAVE_LINUX_API=1 \ - -DHAVE_EXYNOS_API=1 \ - .. \ - && make -j$(nproc) \ - && make install \ - && echo "cec" > "/usr/local/lib/python3.8/site-packages/cec.pth" \ - && apk del .build-dependencies \ - && rm -rf /usr/src/libcec* diff --git a/machine/qemuarm b/machine/qemuarm index 2735a7bae23..e00c945e945 100644 --- a/machine/qemuarm +++ b/machine/qemuarm @@ -3,31 +3,3 @@ FROM homeassistant/armhf-homeassistant:$BUILD_VERSION RUN apk --no-cache add \ usbutils - -## -# Build libcec for HDMI-CEC -ARG LIBCEC_VERSION=6.0.2 -RUN apk add --no-cache \ - eudev-libs \ - p8-platform \ - && apk add --no-cache --virtual .build-dependencies \ - build-base \ - cmake \ - eudev-dev \ - swig \ - p8-platform-dev \ - linux-headers \ - && git clone --depth 1 -b libcec-${LIBCEC_VERSION} https://github.com/Pulse-Eight/libcec /usr/src/libcec \ - && cd /usr/src/libcec \ - && mkdir -p /usr/src/libcec/build \ - && cd /usr/src/libcec/build \ - && cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr/local \ - -DPYTHON_LIBRARY="/usr/local/lib/libpython3.8.so" \ - -DPYTHON_INCLUDE_DIR="/usr/local/include/python3.8" \ - -DHAVE_LINUX_API=1 \ - .. \ - && make -j$(nproc) \ - && make install \ - && echo "cec" > "/usr/local/lib/python3.8/site-packages/cec.pth" \ - && apk del .build-dependencies \ - && rm -rf /usr/src/libcec* diff --git a/machine/qemuarm-64 b/machine/qemuarm-64 index 5783de82f58..be07d6c8aba 100644 --- a/machine/qemuarm-64 +++ b/machine/qemuarm-64 @@ -3,31 +3,3 @@ FROM homeassistant/aarch64-homeassistant:$BUILD_VERSION RUN apk --no-cache add \ usbutils - -## -# Build libcec for HDMI-CEC -ARG LIBCEC_VERSION=6.0.2 -RUN apk add --no-cache \ - eudev-libs \ - p8-platform \ - && apk add --no-cache --virtual .build-dependencies \ - build-base \ - cmake \ - eudev-dev \ - swig \ - p8-platform-dev \ - linux-headers \ - && git clone --depth 1 -b libcec-${LIBCEC_VERSION} https://github.com/Pulse-Eight/libcec /usr/src/libcec \ - && cd /usr/src/libcec \ - && mkdir -p /usr/src/libcec/build \ - && cd /usr/src/libcec/build \ - && cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr/local \ - -DPYTHON_LIBRARY="/usr/local/lib/libpython3.8.so" \ - -DPYTHON_INCLUDE_DIR="/usr/local/include/python3.8" \ - -DHAVE_LINUX_API=1 \ - .. \ - && make -j$(nproc) \ - && make install \ - && echo "cec" > "/usr/local/lib/python3.8/site-packages/cec.pth" \ - && apk del .build-dependencies \ - && rm -rf /usr/src/libcec* diff --git a/machine/qemux86 b/machine/qemux86 index 192d287dfde..1b5350df4c8 100644 --- a/machine/qemux86 +++ b/machine/qemux86 @@ -3,31 +3,3 @@ FROM homeassistant/i386-homeassistant:$BUILD_VERSION RUN apk --no-cache add \ usbutils - -## -# Build libcec for HDMI-CEC -ARG LIBCEC_VERSION=6.0.2 -RUN apk add --no-cache \ - eudev-libs \ - p8-platform \ - && apk add --no-cache --virtual .build-dependencies \ - build-base \ - cmake \ - eudev-dev \ - swig \ - p8-platform-dev \ - linux-headers \ - && git clone --depth 1 -b libcec-${LIBCEC_VERSION} https://github.com/Pulse-Eight/libcec /usr/src/libcec \ - && cd /usr/src/libcec \ - && mkdir -p /usr/src/libcec/build \ - && cd /usr/src/libcec/build \ - && cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr/local \ - -DPYTHON_LIBRARY="/usr/local/lib/libpython3.8.so" \ - -DPYTHON_INCLUDE_DIR="/usr/local/include/python3.8" \ - -DHAVE_LINUX_API=1 \ - .. \ - && make -j$(nproc) \ - && make install \ - && echo "cec" > "/usr/local/lib/python3.8/site-packages/cec.pth" \ - && apk del .build-dependencies \ - && rm -rf /usr/src/libcec* diff --git a/machine/qemux86-64 b/machine/qemux86-64 index 5f4ca461ae8..541e994b967 100644 --- a/machine/qemux86-64 +++ b/machine/qemux86-64 @@ -3,31 +3,3 @@ FROM homeassistant/amd64-homeassistant:$BUILD_VERSION RUN apk --no-cache add \ usbutils - -## -# Build libcec for HDMI-CEC -ARG LIBCEC_VERSION=6.0.2 -RUN apk add --no-cache \ - eudev-libs \ - p8-platform \ - && apk add --no-cache --virtual .build-dependencies \ - build-base \ - cmake \ - eudev-dev \ - swig \ - p8-platform-dev \ - linux-headers \ - && git clone --depth 1 -b libcec-${LIBCEC_VERSION} https://github.com/Pulse-Eight/libcec /usr/src/libcec \ - && cd /usr/src/libcec \ - && mkdir -p /usr/src/libcec/build \ - && cd /usr/src/libcec/build \ - && cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr/local \ - -DPYTHON_LIBRARY="/usr/local/lib/libpython3.8.so" \ - -DPYTHON_INCLUDE_DIR="/usr/local/include/python3.8" \ - -DHAVE_LINUX_API=1 \ - .. \ - && make -j$(nproc) \ - && make install \ - && echo "cec" > "/usr/local/lib/python3.8/site-packages/cec.pth" \ - && apk del .build-dependencies \ - && rm -rf /usr/src/libcec* diff --git a/machine/raspberrypi b/machine/raspberrypi index c9271aceccb..3f000b14db7 100644 --- a/machine/raspberrypi +++ b/machine/raspberrypi @@ -15,32 +15,3 @@ RUN ln -sv /opt/vc/bin/raspistill /usr/local/bin/raspistill \ && ln -sv /opt/vc/bin/raspivid /usr/local/bin/raspivid \ && ln -sv /opt/vc/bin/raspividyuv /usr/local/bin/raspividyuv \ && ln -sv /opt/vc/bin/raspiyuv /usr/local/bin/raspiyuv - -## -# Build libcec with RPi support for HDMI-CEC -ARG LIBCEC_VERSION=6.0.2 -RUN apk add --no-cache \ - eudev-libs \ - p8-platform \ - && apk add --no-cache --virtual .build-dependencies \ - build-base \ - cmake \ - eudev-dev \ - swig \ - raspberrypi-dev \ - p8-platform-dev \ - && git clone --depth 1 -b libcec-${LIBCEC_VERSION} https://github.com/Pulse-Eight/libcec /usr/src/libcec \ - && mkdir -p /usr/src/libcec/build \ - && cd /usr/src/libcec/build \ - && cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr/local \ - -DRPI_INCLUDE_DIR=/opt/vc/include \ - -DRPI_LIB_DIR=/opt/vc/lib \ - -DPYTHON_LIBRARY="/usr/local/lib/libpython3.8.so" \ - -DPYTHON_INCLUDE_DIR="/usr/local/include/python3.8" \ - .. \ - && make -j$(nproc) \ - && make install \ - && echo "cec" > "/usr/local/lib/python3.8/site-packages/cec.pth" \ - && apk del .build-dependencies \ - && rm -rf /usr/src/libcec -ENV LD_LIBRARY_PATH=/opt/vc/lib:${LD_LIBRARY_PATH} diff --git a/machine/raspberrypi2 b/machine/raspberrypi2 index d6c01b4ae02..484b209b6fa 100644 --- a/machine/raspberrypi2 +++ b/machine/raspberrypi2 @@ -15,32 +15,3 @@ RUN ln -sv /opt/vc/bin/raspistill /usr/local/bin/raspistill \ && ln -sv /opt/vc/bin/raspivid /usr/local/bin/raspivid \ && ln -sv /opt/vc/bin/raspividyuv /usr/local/bin/raspividyuv \ && ln -sv /opt/vc/bin/raspiyuv /usr/local/bin/raspiyuv - -## -# Build libcec with RPi support for HDMI-CEC -ARG LIBCEC_VERSION=6.0.2 -RUN apk add --no-cache \ - eudev-libs \ - p8-platform \ - && apk add --no-cache --virtual .build-dependencies \ - build-base \ - cmake \ - eudev-dev \ - swig \ - raspberrypi-dev \ - p8-platform-dev \ - && git clone --depth 1 -b libcec-${LIBCEC_VERSION} https://github.com/Pulse-Eight/libcec /usr/src/libcec \ - && mkdir -p /usr/src/libcec/build \ - && cd /usr/src/libcec/build \ - && cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr/local \ - -DRPI_INCLUDE_DIR=/opt/vc/include \ - -DRPI_LIB_DIR=/opt/vc/lib \ - -DPYTHON_LIBRARY="/usr/local/lib/libpython3.8.so" \ - -DPYTHON_INCLUDE_DIR="/usr/local/include/python3.8" \ - .. \ - && make -j$(nproc) \ - && make install \ - && echo "cec" > "/usr/local/lib/python3.8/site-packages/cec.pth" \ - && apk del .build-dependencies \ - && rm -rf /usr/src/libcec -ENV LD_LIBRARY_PATH=/opt/vc/lib:${LD_LIBRARY_PATH} diff --git a/machine/raspberrypi3 b/machine/raspberrypi3 index 4509e150584..1aec7ebf39f 100644 --- a/machine/raspberrypi3 +++ b/machine/raspberrypi3 @@ -15,32 +15,3 @@ RUN ln -sv /opt/vc/bin/raspistill /usr/local/bin/raspistill \ && ln -sv /opt/vc/bin/raspivid /usr/local/bin/raspivid \ && ln -sv /opt/vc/bin/raspividyuv /usr/local/bin/raspividyuv \ && ln -sv /opt/vc/bin/raspiyuv /usr/local/bin/raspiyuv - -## -# Build libcec with RPi support for HDMI-CEC -ARG LIBCEC_VERSION=6.0.2 -RUN apk add --no-cache \ - eudev-libs \ - p8-platform \ - && apk add --no-cache --virtual .build-dependencies \ - build-base \ - cmake \ - eudev-dev \ - swig \ - raspberrypi-dev \ - p8-platform-dev \ - && git clone --depth 1 -b libcec-${LIBCEC_VERSION} https://github.com/Pulse-Eight/libcec /usr/src/libcec \ - && mkdir -p /usr/src/libcec/build \ - && cd /usr/src/libcec/build \ - && cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr/local \ - -DRPI_INCLUDE_DIR=/opt/vc/include \ - -DRPI_LIB_DIR=/opt/vc/lib \ - -DPYTHON_LIBRARY="/usr/local/lib/libpython3.8.so" \ - -DPYTHON_INCLUDE_DIR="/usr/local/include/python3.8" \ - .. \ - && make -j$(nproc) \ - && make install \ - && echo "cec" > "/usr/local/lib/python3.8/site-packages/cec.pth" \ - && apk del .build-dependencies \ - && rm -rf /usr/src/libcec -ENV LD_LIBRARY_PATH=/opt/vc/lib:${LD_LIBRARY_PATH} diff --git a/machine/raspberrypi3-64 b/machine/raspberrypi3-64 index 97064a2377d..165dc2e5397 100644 --- a/machine/raspberrypi3-64 +++ b/machine/raspberrypi3-64 @@ -15,32 +15,3 @@ RUN ln -sv /opt/vc/bin/raspistill /usr/local/bin/raspistill \ && ln -sv /opt/vc/bin/raspivid /usr/local/bin/raspivid \ && ln -sv /opt/vc/bin/raspividyuv /usr/local/bin/raspividyuv \ && ln -sv /opt/vc/bin/raspiyuv /usr/local/bin/raspiyuv - -## -# Build libcec with RPi support for HDMI-CEC -ARG LIBCEC_VERSION=6.0.2 -RUN apk add --no-cache \ - eudev-libs \ - p8-platform \ - && apk add --no-cache --virtual .build-dependencies \ - build-base \ - cmake \ - eudev-dev \ - swig \ - raspberrypi-dev \ - p8-platform-dev \ - && git clone --depth 1 -b libcec-${LIBCEC_VERSION} https://github.com/Pulse-Eight/libcec /usr/src/libcec \ - && mkdir -p /usr/src/libcec/build \ - && cd /usr/src/libcec/build \ - && cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr/local \ - -DRPI_INCLUDE_DIR=/opt/vc/include \ - -DRPI_LIB_DIR=/opt/vc/lib \ - -DPYTHON_LIBRARY="/usr/local/lib/libpython3.8.so" \ - -DPYTHON_INCLUDE_DIR="/usr/local/include/python3.8" \ - .. \ - && make -j$(nproc) \ - && make install \ - && echo "cec" > "/usr/local/lib/python3.8/site-packages/cec.pth" \ - && apk del .build-dependencies \ - && rm -rf /usr/src/libcec -ENV LD_LIBRARY_PATH=/opt/vc/lib:${LD_LIBRARY_PATH} diff --git a/machine/raspberrypi4 b/machine/raspberrypi4 index 4509e150584..1aec7ebf39f 100644 --- a/machine/raspberrypi4 +++ b/machine/raspberrypi4 @@ -15,32 +15,3 @@ RUN ln -sv /opt/vc/bin/raspistill /usr/local/bin/raspistill \ && ln -sv /opt/vc/bin/raspivid /usr/local/bin/raspivid \ && ln -sv /opt/vc/bin/raspividyuv /usr/local/bin/raspividyuv \ && ln -sv /opt/vc/bin/raspiyuv /usr/local/bin/raspiyuv - -## -# Build libcec with RPi support for HDMI-CEC -ARG LIBCEC_VERSION=6.0.2 -RUN apk add --no-cache \ - eudev-libs \ - p8-platform \ - && apk add --no-cache --virtual .build-dependencies \ - build-base \ - cmake \ - eudev-dev \ - swig \ - raspberrypi-dev \ - p8-platform-dev \ - && git clone --depth 1 -b libcec-${LIBCEC_VERSION} https://github.com/Pulse-Eight/libcec /usr/src/libcec \ - && mkdir -p /usr/src/libcec/build \ - && cd /usr/src/libcec/build \ - && cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr/local \ - -DRPI_INCLUDE_DIR=/opt/vc/include \ - -DRPI_LIB_DIR=/opt/vc/lib \ - -DPYTHON_LIBRARY="/usr/local/lib/libpython3.8.so" \ - -DPYTHON_INCLUDE_DIR="/usr/local/include/python3.8" \ - .. \ - && make -j$(nproc) \ - && make install \ - && echo "cec" > "/usr/local/lib/python3.8/site-packages/cec.pth" \ - && apk del .build-dependencies \ - && rm -rf /usr/src/libcec -ENV LD_LIBRARY_PATH=/opt/vc/lib:${LD_LIBRARY_PATH} diff --git a/machine/raspberrypi4-64 b/machine/raspberrypi4-64 index 97064a2377d..165dc2e5397 100644 --- a/machine/raspberrypi4-64 +++ b/machine/raspberrypi4-64 @@ -15,32 +15,3 @@ RUN ln -sv /opt/vc/bin/raspistill /usr/local/bin/raspistill \ && ln -sv /opt/vc/bin/raspivid /usr/local/bin/raspivid \ && ln -sv /opt/vc/bin/raspividyuv /usr/local/bin/raspividyuv \ && ln -sv /opt/vc/bin/raspiyuv /usr/local/bin/raspiyuv - -## -# Build libcec with RPi support for HDMI-CEC -ARG LIBCEC_VERSION=6.0.2 -RUN apk add --no-cache \ - eudev-libs \ - p8-platform \ - && apk add --no-cache --virtual .build-dependencies \ - build-base \ - cmake \ - eudev-dev \ - swig \ - raspberrypi-dev \ - p8-platform-dev \ - && git clone --depth 1 -b libcec-${LIBCEC_VERSION} https://github.com/Pulse-Eight/libcec /usr/src/libcec \ - && mkdir -p /usr/src/libcec/build \ - && cd /usr/src/libcec/build \ - && cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr/local \ - -DRPI_INCLUDE_DIR=/opt/vc/include \ - -DRPI_LIB_DIR=/opt/vc/lib \ - -DPYTHON_LIBRARY="/usr/local/lib/libpython3.8.so" \ - -DPYTHON_INCLUDE_DIR="/usr/local/include/python3.8" \ - .. \ - && make -j$(nproc) \ - && make install \ - && echo "cec" > "/usr/local/lib/python3.8/site-packages/cec.pth" \ - && apk del .build-dependencies \ - && rm -rf /usr/src/libcec -ENV LD_LIBRARY_PATH=/opt/vc/lib:${LD_LIBRARY_PATH} diff --git a/machine/tinker b/machine/tinker index 46b627c2257..20efbe964e8 100644 --- a/machine/tinker +++ b/machine/tinker @@ -18,31 +18,3 @@ RUN apk add --no-cache --virtual .build-dependencies \ && python3 setup.py install \ && apk del .build-dependencies \ && rm -rf /usr/src/gpio - -## -# Build libcec for HDMI-CEC -ARG LIBCEC_VERSION=6.0.2 -RUN apk add --no-cache \ - eudev-libs \ - p8-platform \ - && apk add --no-cache --virtual .build-dependencies \ - build-base \ - cmake \ - eudev-dev \ - swig \ - p8-platform-dev \ - linux-headers \ - && git clone --depth 1 -b libcec-${LIBCEC_VERSION} https://github.com/Pulse-Eight/libcec /usr/src/libcec \ - && cd /usr/src/libcec \ - && mkdir -p /usr/src/libcec/build \ - && cd /usr/src/libcec/build \ - && cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr/local \ - -DPYTHON_LIBRARY="/usr/local/lib/libpython3.8.so" \ - -DPYTHON_INCLUDE_DIR="/usr/local/include/python3.8" \ - -DHAVE_LINUX_API=1 \ - .. \ - && make -j$(nproc) \ - && make install \ - && echo "cec" > "/usr/local/lib/python3.8/site-packages/cec.pth" \ - && apk del .build-dependencies \ - && rm -rf /usr/src/libcec*