diff --git a/Dockerfile b/Dockerfile index 7f5c2d2..c6f1384 100644 --- a/Dockerfile +++ b/Dockerfile @@ -37,11 +37,11 @@ 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 libvpx-dev libopusenc-dev + libdrm-dev ninja-build meson v4l-utils-dev wget build-base bsd-compat-headers musl-dev alsa-lib-dev libopusenc-dev RUN mkdir -p ~/dev && cd ~/dev && \ - git clone -b jellyfin-mpp --depth=1 https://github.com/nyanmisaka/mpp.git rkmpp && \ - #git clone --depth=1 https://github.com/rockchip-linux/mpp.git rkmpp && \ + #git clone -b jellyfin-mpp --depth=1 https://github.com/nyanmisaka/mpp.git rkmpp && \ + git clone --depth=1 https://github.com/rockchip-linux/mpp.git rkmpp && \ cd rkmpp && mkdir rkmpp_build && cd rkmpp_build && \ sed -i '/#include /a #include ' ~/dev/rkmpp/mpp/vproc/vdpp/test/hwpq_test.cpp && \ cmake \ @@ -70,7 +70,7 @@ RUN mkdir -p ~/dev && cd ~/dev && \ RUN mkdir -p ~/dev && cd ~/dev && \ git clone --depth=1 https://github.com/nyanmisaka/ffmpeg-rockchip.git ffmpeg && cd ffmpeg && \ - ./configure --prefix=/usr --enable-indev=v4l2 --enable-gpl --enable-version3 --enable-libdrm --enable-rkmpp --enable-rkrga --enable-alsa --enable-libvpx --enable-libopus \ + ./configure --prefix=/usr --enable-indev=v4l2 --enable-gpl --enable-version3 --enable-libdrm --enable-rkmpp --enable-rkrga --enable-alsa --enable-libopus \ && \ make -j $(nproc) && make install @@ -79,7 +79,7 @@ FROM pikvm/ustreamer:latest as ustreamer FROM alpine RUN apk add --no-cache portaudio alsa-utils \ - libevent libjpeg-turbo libgpiod libbsd v4l-utils libdrm libvpx libopusenc + libevent libjpeg-turbo libgpiod libbsd v4l-utils libdrm libopusenc COPY --from=frontend /static /app/static COPY --from=backend /app/bin/kvm /app/kvm