Merge pull request #73 from CvH/vaapi-support

Vaapi support

Dockerfile

@@ -1,24 +1,24 @@
-FROM lsiobase/alpine:3.6
-MAINTAINER saarg
-
-# package version
-ARG ARGTABLE_VER="2.13"
-ARG TZ="Europe/Oslo"
-ARG XMLTV_VER="0.5.69"
+FROM lsiobase/alpine:3.7
 
 # set version label
 ARG BUILD_DATE
 ARG VERSION
-LABEL build_version="Build-date:- ${BUILD_DATE}"
+LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
+LABEL maintainer="saarg"
 
-# Environment settings
+# package versions
+ARG ARGTABLE_VER="2.13"
+ARG TZ="Europe/Oslo"
+ARG XMLTV_VER="0.5.69"
+
+# environment settings
 ENV HOME="/config"
 
 # copy patches
 COPY patches/ /tmp/patches/
 
-# install build packages
 RUN \
+ echo "**** install build packages ****" && \
  apk add --no-cache --virtual=build-dependencies \
 	autoconf \
 	automake \
@@ -32,25 +32,29 @@ RUN \
 	git \
 	libgcrypt-dev \
 	libhdhomerun-dev \
-	libressl-dev \
 	libtool \
+	libva-dev \
+	libvpx-dev \
 	libxml2-dev \
 	libxslt-dev \
 	make \
-	mercurial \
+	openssl-dev \
+	opus-dev \
 	patch \
 	pcre2-dev \
 	perl-dev \
+	pngquant \
 	pkgconf \
 	sdl-dev \
 	uriparser-dev \
 	wget \
+	x264-dev \
+	x265-dev \
 	zlib-dev && \
  apk add --no-cache --virtual=build-dependencies \
 	--repository http://nl.alpinelinux.org/alpine/edge/testing \
 	gnu-libiconv-dev && \
-
-# install runtime packages
+ echo "**** install runtime packages ****" && \
  apk add --no-cache \
 	bsd-compat-headers \
 	bzip2 \
@@ -61,11 +65,14 @@ RUN \
 	libcrypto1.0 \
 	libcurl	\
 	libhdhomerun-libs \
-	libressl \
 	libssl1.0 \
+	libva \
+	libvpx \
 	libxml2 \
 	libxslt \
 	linux-headers \
+	openssl \
+	opus \
 	pcre2 \
 	perl \
 	perl-archive-zip \
@@ -123,36 +130,45 @@ RUN \
 	tar \
 	uriparser \
 	wget \
+	x264 \
+	x265 \
 	zlib && \
  apk add --no-cache \
 	--repository http://nl.alpinelinux.org/alpine/edge/testing \
 	gnu-libiconv && \
-
-# install perl modules for xmltv
+ echo "**** install perl modules for xmltv ****" && \
  curl -L http://cpanmin.us | perl - App::cpanminus && \
  cpanm --installdeps /tmp/patches && \
-
-# build dvb-apps
- hg clone http://linuxtv.org/hg/dvb-apps /tmp/dvb-apps && \
- cd /tmp/dvb-apps && \
- make -C lib && \
- make -C lib install && \
-
-# build tvheadend
+ echo "**** build tvheadend ****" && \
  git clone https://github.com/tvheadend/tvheadend.git /tmp/tvheadend && \
  cd /tmp/tvheadend && \
  ./configure \
+	`#Encoding` \
 	--disable-ffmpeg_static \
-	--disable-hdhomerun_static \
 	--disable-libfdkaac_static \
-	--disable-libmfx_static \
 	--disable-libtheora_static \
+	--disable-libopus_static \
 	--disable-libvorbis_static \
 	--disable-libvpx_static \
 	--disable-libx264_static \
 	--disable-libx265_static \
+	--disable-libfdkaac \
+	--enable-libopus \
+	--enable-libvorbis \
+	--enable-libvpx \
+	--enable-libx264 \
+	--enable-libx265 \
+	\
+	`#Options` \
+	--disable-avahi \
+	--disable-dbus_1 \
+	--disable-bintray_cache \
+	--disable-hdhomerun_static \
 	--enable-hdhomerun_client \
 	--enable-libav \
+	--enable-pngquant \
+	--enable-trace \
+	--enable-vaapi \
 	--infodir=/usr/share/info \
 	--localstatedir=/var \
 	--mandir=/usr/share/man \
@@ -160,8 +176,7 @@ RUN \
 	--sysconfdir=/config && \
  make && \
  make install && \
-
-# build XMLTV
+ echo "**** build XMLTV ****" && \
  curl -o \
  /tmp/xmtltv-src.tar.bz2 -L \
 	"http://kent.dl.sourceforge.net/project/xmltv/xmltv/${XMLTV_VER}/xmltv-${XMLTV_VER}.tar.bz2" && \
@@ -169,12 +184,19 @@ RUN \
  /tmp/xmtltv-src.tar.bz2 -C \
 	/tmp --strip-components=1 && \
  cd "/tmp/xmltv-${XMLTV_VER}" && \
+ echo "**** Perl 5.26 fixes for XMTLV ****" && \
+ sed "s/use POSIX 'tmpnam';//" -i filter/tv_to_latex && \
+ sed "s/use POSIX 'tmpnam';//" -i filter/tv_to_text && \
+ sed "s/\(lib\/set_share_dir.pl';\)/.\/\1/" -i grab/it/tv_grab_it.PL && \
+ sed "s/\(filter\/Grep.pm';\)/.\/\1/" -i filter/tv_grep.PL && \
+ sed "s/\(lib\/XMLTV.pm.in';\)/.\/\1/" -i lib/XMLTV.pm.PL && \
+ sed "s/\(lib\/Ask\/Term.pm';\)/.\/\1/" -i Makefile.PL && \
+ PERL5LIB=`pwd` && \
  echo -e "yes" | perl Makefile.PL PREFIX=/usr/ INSTALLDIRS=vendor && \
  make && \
  make test && \
  make install && \
-
-# build argtable2
+ echo "**** build argtable2 ****" && \
  ARGTABLE_VER1="${ARGTABLE_VER//./-}" && \
  mkdir -p \
 	/tmp/argtable && \
@@ -184,14 +206,14 @@ RUN \
  tar xf \
  /tmp/argtable-src.tar.gz -C \
 	/tmp/argtable --strip-components=1 && \
+ cp /tmp/patches/config.* /tmp/argtable && \
  cd /tmp/argtable && \
  ./configure \
 	--prefix=/usr && \
  make && \
  make check && \
  make install && \
-
-# build comskip
+ echo "***** build comskip ****" && \
  git clone git://github.com/erikkaashoek/Comskip /tmp/comskip && \
  cd /tmp/comskip && \
  ./autogen.sh && \
@@ -200,8 +222,7 @@ RUN \
 	--sysconfdir=/config/comskip && \
  make && \
  make install && \
-
-# cleanup
+ echo "***** cleanup ****" && \
  apk del --purge \
 	build-dependencies && \
  rm -rf \

README.md

@@ -33,11 +33,12 @@ docker create \
   -e RUN_OPTS=<parameter> \
   -p 9981:9981 \
   -p 9982:9982 \
-  --device=/dev/dvb
+  --device=/dev/dvb \
+  --device=/dev/dri
   linuxserver/tvheadend
 ```
 The --device=/dev/dvb is only needed if you want to pass through a DVB card to the container. If you use IPTV or HDHomeRun you can leave it out.
-
+The --device=/dev/dri is only needed if you want to use your AMD/Intel GPU for hardware accelerated video encoding (vaapi).
 
 You can choose between ,using tags, latest (default, and no tag required or a specific release branch of tvheadend.
 
@@ -68,6 +69,7 @@ http://192.168.x.x:8080 would show you what's running INSIDE the container on po
 * `-e PUID` for UserID - see below for explanation
 * `-e RUN_OPTS` additional runtime parameters - see below for explanation
 * `--device=/dev/dvb` - for passing through DVB-cards
+* `--device=/dev/dri` - for passing through GPU
 * `--net=host` - for IPTV, SAT>IP and HDHomeRun
 * `-e TZ` - for timezone information *eg Europe/London, etc*
 
@@ -160,17 +162,21 @@ You need to enable minimum advanced view level to see the picons options.
 
 ## Versions
 
-+ **08.07.2017:** Update README with full path for comskip.
-+ **02.07.2017:** Move to one branch for all 4.2 releases.
-+ **27.05.2017:** Rebase to alpine 3.6.
-+ **01.05.2017:** Update to tvheadend 4.2.1 stable.
-+ **18.04.2017:** Use repo version of gnu-libiconv rather than compiling.
-+ **09.04.2017:** Chain cpanm installs in one block and use --installdeps.
-+ **09.02.2017:** Perl changes, add picons file to gitignore and update XMLTV to 0.5.69.
-+ **07.02.2017:** Add variable to add additional runtime paramters.
-+ **05.02.2017:** Update to alpine 3.5 and change dvb-apps to only compile needed libs.
-+ **14.11.2016:** Add picons from picons.xyz to /picons folder and add info to README.
-+ **22.09.2016:** Fix broken tv_grab_wg, libs for xmltv and update README.
-+ **18.09.2016:** Update XMLTV to 0.5.68 and update README.
-+ **10.09.2016:** Add layer badges to README.
-+ **05.09.2016:** Initial release.
++ **04.01.18:** Deprecate cpu_core routine lack of scaling.
++ **11.12.17:** Rebase to alpine 3.7, linting fixes.
++ **02.09.17:** Add codec dependencies.
++ **13.07.17:** Increase uniformity across all archs.
++ **08.07.17:** Update README with full path for comskip.
++ **02.07.17:** Move to one branch for all 4.2 releases.
++ **27.05.17:** Rebase to alpine 3.6.
++ **01.05.17:** Update to tvheadend 4.2.1 stable.
++ **18.04.17:** Use repo version of gnu-libiconv rather than compiling.
++ **09.04.17:** Chain cpanm installs in one block and use --installdeps.
++ **09.02.17:** Perl changes, add picons file to gitignore and update XMLTV to 0.5.69.
++ **07.02.17:** Add variable to add additional runtime paramters.
++ **05.02.17:** Update to alpine 3.5 and change dvb-apps to only compile needed libs.
++ **14.11.16:** Add picons from picons.xyz to /picons folder and add info to README.
++ **22.09.16:** Fix broken tv_grab_wg, libs for xmltv and update README.
++ **18.09.16:** Update XMLTV to 0.5.68 and update README.
++ **10.09.16:** Add layer badges to README.
++ **05.09.16:** Initial release.

root/etc/services.d/tvheadend/run

@@ -1,6 +1,6 @@
 #!/usr/bin/with-contenv bash
 
-RUN_ARRAY=(${RUN_OPTS})
+IFS=" " read -r -a RUN_ARRAY <<< "$RUN_OPTS"
 
 exec \
         s6-setuidgid abc /usr/bin/tvheadend -C -c /config "${RUN_ARRAY[@]}"