Просмотр исходного кода

removing picicons as they are included in the source repo and removing libva from arm variants

thelamer 7 лет назад
Родитель
Сommit
ef8f4a0dd0
3 измененных файлов с 0 добавлено и 17 удалено
  1. 0 3
      Dockerfile
  2. 0 7
      Dockerfile.aarch64
  3. 0 7
      Dockerfile.armhf

+ 0 - 3
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

+ 0 - 7
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

+ 0 - 7
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