wip alsa

Makefile

@@ -1,33 +1,34 @@
 default_target: amd64_frigate
 
 COMMIT_HASH := $(shell git log -1 --pretty=format:"%h"|tail -1)
+VERSION := 0.10.1
 
 version:
 	echo "VERSION='0.10.1-$(COMMIT_HASH)'" > frigate/version.py
 
 web:
-	docker build --tag frigate-web --file docker/Dockerfile.web web/
+	docker build --tag chaosbunker/frigate-web --file docker/Dockerfile.web web/
 
 amd64_wheels:
-	docker build --tag blakeblackshear/frigate-wheels:1.0.3-amd64 --file docker/Dockerfile.wheels .
+	docker build --tag chaosbunker/frigate-wheels:1.0.3-amd64 --file docker/Dockerfile.wheels .
 
 amd64_ffmpeg:
-	docker build --no-cache --pull --tag blakeblackshear/frigate-ffmpeg:1.2.0-amd64 --file docker/Dockerfile.ffmpeg.amd64 .
+	docker build --no-cache --pull --tag chaosbunker/frigate-ffmpeg:1.2.0-amd64 --file docker/Dockerfile.ffmpeg.amd64 .
 
 nginx_frigate:
-	docker buildx build --push --platform linux/arm/v7,linux/arm64/v8,linux/amd64 --tag blakeblackshear/frigate-nginx:1.0.2 --file docker/Dockerfile.nginx .
+	docker buildx build --push --platform linux/arm/v7,linux/arm64/v8,linux/amd64 --tag chaosbunker/frigate-nginx:1.0.2 --file docker/Dockerfile.nginx .
 
 amd64_frigate: version web
-	docker build --no-cache --tag frigate-base --build-arg ARCH=amd64 --build-arg FFMPEG_VERSION=1.1.0 --build-arg WHEELS_VERSION=1.0.3 --build-arg NGINX_VERSION=1.0.2 --file docker/Dockerfile.base .
+	docker build --no-cache --tag chaosbunker/frigate-base --build-arg ARCH=amd64 --build-arg FFMPEG_VERSION=1.1.0 --build-arg WHEELS_VERSION=1.0.3 --build-arg NGINX_VERSION=1.0.2 --file docker/Dockerfile.base .
 	docker build --no-cache --tag frigate --file docker/Dockerfile.amd64 .
 
 amd64_all: amd64_wheels amd64_ffmpeg amd64_frigate
 
 amd64nvidia_wheels:
-	docker build --tag blakeblackshear/frigate-wheels:1.0.3-amd64nvidia --file docker/Dockerfile.wheels .
+	docker build --tag chaosbunker/frigate-wheels:1.0.3-amd64nvidia --file docker/Dockerfile.wheels .
 
 amd64nvidia_ffmpeg:
-	docker build --no-cache --pull --tag blakeblackshear/frigate-ffmpeg:1.2.0-amd64nvidia --file docker/Dockerfile.ffmpeg.amd64nvidia .
+	docker build --no-cache --pull --tag chaosbunker/frigate-ffmpeg:1.2.0-amd64nvidia --file docker/Dockerfile.ffmpeg.amd64nvidia .
 
 amd64nvidia_frigate: version web
 	docker build --no-cache --tag frigate-base --build-arg ARCH=amd64nvidia --build-arg FFMPEG_VERSION=1.0.0 --build-arg WHEELS_VERSION=1.0.3 --build-arg NGINX_VERSION=1.0.2 --file docker/Dockerfile.base .
@@ -36,22 +37,22 @@ amd64nvidia_frigate: version web
 amd64nvidia_all: amd64nvidia_wheels amd64nvidia_ffmpeg amd64nvidia_frigate
 
 aarch64_wheels:
-	docker build --tag blakeblackshear/frigate-wheels:1.0.3-aarch64 --file docker/Dockerfile.wheels .
+	docker build --tag chaosbunker/frigate-wheels:1.0.3-aarch64 --file docker/Dockerfile.wheels .
 
 aarch64_ffmpeg:
-	docker build --no-cache --pull --tag blakeblackshear/frigate-ffmpeg:1.3.0-aarch64 --file docker/Dockerfile.ffmpeg.aarch64 .
+	docker build --no-cache --pull --tag chaosbunker/frigate-ffmpeg:1.3.0-aarch64 --file docker/Dockerfile.ffmpeg.aarch64 .
 
 aarch64_frigate: version web
 	docker build --no-cache --tag frigate-base --build-arg ARCH=aarch64 --build-arg FFMPEG_VERSION=1.0.0 --build-arg WHEELS_VERSION=1.0.3 --build-arg NGINX_VERSION=1.0.2 --file docker/Dockerfile.base .
-	docker build --no-cache --tag frigate --file docker/Dockerfile.aarch64 .
+	docker build --no-cache --tag chaosbunker/frigate:${VERSION}-aarch64 --file docker/Dockerfile.aarch64 .
 
 aarch64_all: aarch64_wheels aarch64_ffmpeg aarch64_frigate
 
 armv7_wheels:
-	docker build --tag blakeblackshear/frigate-wheels:1.0.3-armv7 --file docker/Dockerfile.wheels .
+	docker build --tag chaosbunker/frigate-wheels:1.0.3-armv7 --file docker/Dockerfile.wheels .
 
 armv7_ffmpeg:
-	docker build --no-cache --pull --tag blakeblackshear/frigate-ffmpeg:1.2.0-armv7 --file docker/Dockerfile.ffmpeg.armv7 .
+	docker build --no-cache --pull --tag chaosbunker/frigate-ffmpeg:1.2.0-armv7 --file docker/Dockerfile.ffmpeg.armv7 .
 
 armv7_frigate: version web
 	docker build --no-cache --tag frigate-base --build-arg ARCH=armv7 --build-arg FFMPEG_VERSION=1.0.0 --build-arg WHEELS_VERSION=1.0.3 --build-arg NGINX_VERSION=1.0.2 --file docker/Dockerfile.base .

docker/Dockerfile.base

@@ -2,10 +2,10 @@ ARG ARCH=amd64
 ARG WHEELS_VERSION
 ARG FFMPEG_VERSION
 ARG NGINX_VERSION
-FROM blakeblackshear/frigate-wheels:${WHEELS_VERSION}-${ARCH} as wheels
-FROM blakeblackshear/frigate-ffmpeg:${FFMPEG_VERSION}-${ARCH} as ffmpeg
-FROM blakeblackshear/frigate-nginx:${NGINX_VERSION} as nginx
-FROM frigate-web as web
+FROM chaosbunker/frigate-wheels:${WHEELS_VERSION}-${ARCH} as wheels
+FROM chaosbunker/frigate-ffmpeg:${FFMPEG_VERSION}-${ARCH} as ffmpeg
+FROM chaosbunker/frigate-nginx:${NGINX_VERSION} as nginx
+FROM chaosbunker/frigate-web as web
 
 FROM ubuntu:20.04
 LABEL maintainer "blakeb@blakeshome.com"
@@ -43,6 +43,9 @@ COPY labelmap.txt /labelmap.txt
 RUN wget -q https://github.com/google-coral/test_data/raw/release-frogfish/ssdlite_mobiledet_coco_qat_postprocess_edgetpu.tflite -O /edgetpu_model.tflite
 RUN wget -q https://github.com/google-coral/test_data/raw/release-frogfish/ssdlite_mobiledet_coco_qat_postprocess.tflite -O /cpu_model.tflite
 
+RUN mkdir -p /usr/share/fonts \
+    && wget -q https://github.com/chrissimpkins/codeface/raw/master/fonts/bitstream-vera-sans-mono/VeraMono.ttf -O /usr/share/fonts/VeraMono.ttf
+
 WORKDIR /opt/frigate/
 ADD frigate frigate/
 ADD migrations migrations/

docker/Dockerfile.ffmpeg.aarch64

@@ -41,6 +41,7 @@ ENV     FFMPEG_VERSION=4.3.2 \
         XPROTO_VERSION=7.0.31 \
         XVID_VERSION=1.3.4 \
         LIBZMQ_VERSION=4.3.2 \
+        ALSA_VERSION=1.2.7.1 \
         SRC=/usr/local
 
 ARG         FREETYPE_SHA256SUM="a45c6b403413abd5706f3582f04c8339d26397c4304b78fa552f2215df64101f freetype-2.11.0.tar.gz"
@@ -52,6 +53,7 @@ ARG         THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249
 ARG         VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz"
 ARG         XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz"
 ARG         LIBZMQ_SHA256SUM="02ecc88466ae38cf2c8d79f09cfd2675ba299a439680b64ade733e26a349edeb v4.3.2.tar.gz"
+ARG         ALSA_SHA256SUM="046dc42dfcfad269217be05954686137e5e7397f3041372f8c6dcd7d79461e61 alsa-lib-1.2.7.1.tar.bz2"
 
 
 ARG         LD_LIBRARY_PATH=/opt/ffmpeg/lib
@@ -81,6 +83,8 @@ RUN     buildDeps="autoconf \
         yasm \
         linux-headers-raspi2 \
         libomxil-bellagio-dev \
+        libasound2-dev \
+        libdrm-dev \
         zlib1g-dev" && \
         apt-get -yqq update && \
         apt-get install -yq --no-install-recommends ${buildDeps}
@@ -397,9 +401,19 @@ RUN \
         DIR=/tmp/rkmpp && \
         mkdir -p ${DIR} && \
         cd ${DIR} && \
-        git clone https://github.com/rockchip-linux/libdrm-rockchip && git clone https://github.com/rockchip-linux/mpp && \
-        cd libdrm-rockchip && bash autogen.sh && ./configure && make && make install && \
-        cd ../mpp && cmake -DRKPLATFORM=ON -DHAVE_DRM=ON && make -j6 && make install && \
+        git clone https://github.com/rockchip-linux/mpp && \
+        cd mpp && cmake -DRKPLATFORM=ON -DHAVE_DRM=ON && make -j6 && make install && \
+        rm -rf ${DIR}
+
+RUN \
+        DIR=/tmp/alsa && \
+        mkdir -p ${DIR} && \
+        cd ${DIR} && \
+        curl -sLO https://www.alsa-project.org/files/pub/lib/alsa-lib-${ALSA_VERSION}.tar.bz2 && \
+        echo ${ALSA_SHA256SUM} | sha256sum --check && \
+        tar xjf alsa-lib-${ALSA_VERSION}.tar.bz2 && \
+        cd alsa-lib-${ALSA_VERSION}/ && \
+        ./configure --prefix="${PREFIX}" && make && make install && \
         rm -rf ${DIR}
 
 ## ffmpeg https://ffmpeg.org/
@@ -438,6 +452,8 @@ RUN \
         --enable-small \
         --enable-version3 \
         --enable-libzmq \
+        --enable-indev=alsa \
+        --enable-outdev=alsa \
         --extra-libs=-ldl \
         --prefix="${PREFIX}" \
         --enable-libopenjpeg \