diff --git a/Dockerfile b/Dockerfile index c6f1384..41cb5cb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -37,7 +37,8 @@ RUN apk add --no-cache \ bash \ cmake \ git \ - libdrm-dev ninja-build meson v4l-utils-dev wget build-base bsd-compat-headers musl-dev alsa-lib-dev libopusenc-dev + libdrm-dev ninja-build meson v4l-utils-dev wget build-base bsd-compat-headers musl-dev alsa-lib-dev libopusenc-dev \ + libevent-dev libbsd-dev libjpeg-turbo-dev RUN mkdir -p ~/dev && cd ~/dev && \ #git clone -b jellyfin-mpp --depth=1 https://github.com/nyanmisaka/mpp.git rkmpp && \ @@ -74,8 +75,17 @@ RUN mkdir -p ~/dev && cd ~/dev && \ && \ make -j $(nproc) && make install +ADD ./ustreamer /root/ustreamer -FROM pikvm/ustreamer:latest as ustreamer +RUN cd /root/ustreamer && \ + sed -i '/#include /a #include ' src/ustreamer/s2drm.h && \ + export WITH_PTHREAD_NP=0 && \ + make && cp ustreamer / +#RUN mkdir -p ~/dev && cd ~/dev && \ +# git clone https://github.com/datrixs/datrix-ustreamer ustreamer && \ +# sed -i '/#include /a #include ' ustreamer/src/ustreamer/s2drm.h && \ +# export WITH_PTHREAD_NP=0 && \ +# cd ustreamer && make && cp ustreamer / FROM alpine RUN apk add --no-cache portaudio alsa-utils \ @@ -83,10 +93,11 @@ RUN apk add --no-cache portaudio alsa-utils \ COPY --from=frontend /static /app/static COPY --from=backend /app/bin/kvm /app/kvm -COPY --from=ustreamer /ustreamer/ustreamer /app/ustreamer +COPY --from=ffmpeg /ustreamer /app/ustreamer COPY --from=ffmpeg /usr/lib/librga.* /usr/lib COPY --from=ffmpeg /usr/lib/librockchip_mpp.* /usr/lib COPY --from=ffmpeg /usr/bin/ffmpeg /app/ffmpeg +COPY --from=ffmpeg /ustreamer /app/ustreamer COPY ./edid.hex /edid.hex #COPY ./edid-audio.hex /edid.hex #COPY ./edid-test.hex /edid.hex