From ef8f4a0dd0859811b40068a825842cddd4be5f85 Mon Sep 17 00:00:00 2001 From: thelamer Date: Wed, 16 Jan 2019 16:14:39 -0800 Subject: [PATCH] removing picicons as they are included in the source repo and removing libva from arm variants --- Dockerfile | 3 --- Dockerfile.aarch64 | 7 ------- Dockerfile.armhf | 7 ------- 3 files changed, 17 deletions(-) diff --git a/Dockerfile b/Dockerfile index 13b96d1..c6e1437 100644 --- a/Dockerfile +++ b/Dockerfile @@ -333,9 +333,6 @@ COPY --from=buildstage /usr/local/share/man/ /usr/local/share/man/ COPY --from=buildstage /usr/local/share/perl5/ /usr/local/share/perl5/ COPY root/ / -# add picons -ADD picons.tar.bz2 /picons - # ports and volumes EXPOSE 9981 9982 VOLUME /config /recordings diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 2a4b7ae..f3fa7f9 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -36,7 +36,6 @@ RUN \ libgcrypt-dev \ libhdhomerun-dev \ libtool \ - libva-dev \ libvpx-dev \ libxml2-dev \ libxslt-dev \ @@ -185,7 +184,6 @@ RUN \ --enable-libav \ --enable-pngquant \ --enable-trace \ - --enable-vaapi \ --infodir=/usr/share/info \ --localstatedir=/var \ --mandir=/usr/share/man \ @@ -255,8 +253,6 @@ RUN \ libdvbcsa \ libhdhomerun-libs \ libssl1.0 \ - libva \ - libva-intel-driver \ libvpx \ libxml2 \ libxslt \ @@ -336,9 +332,6 @@ COPY --from=buildstage /usr/local/share/man/ /usr/local/share/man/ COPY --from=buildstage /usr/local/share/perl5/ /usr/local/share/perl5/ COPY root/ / -# add picons -ADD picons.tar.bz2 /picons - # ports and volumes EXPOSE 9981 9982 VOLUME /config /recordings diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 60ae4d2..2936ac1 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -36,7 +36,6 @@ RUN \ libgcrypt-dev \ libhdhomerun-dev \ libtool \ - libva-dev \ libvpx-dev \ libxml2-dev \ libxslt-dev \ @@ -185,7 +184,6 @@ RUN \ --enable-libav \ --enable-pngquant \ --enable-trace \ - --enable-vaapi \ --infodir=/usr/share/info \ --localstatedir=/var \ --mandir=/usr/share/man \ @@ -255,8 +253,6 @@ RUN \ libdvbcsa \ libhdhomerun-libs \ libssl1.0 \ - libva \ - libva-intel-driver \ libvpx \ libxml2 \ libxslt \ @@ -336,9 +332,6 @@ COPY --from=buildstage /usr/local/share/man/ /usr/local/share/man/ COPY --from=buildstage /usr/local/share/perl5/ /usr/local/share/perl5/ COPY root/ / -# add picons -ADD picons.tar.bz2 /picons - # ports and volumes EXPOSE 9981 9982 VOLUME /config /recordings