Update README.md

Vaapi support

Dockerfile

@@ -32,17 +32,18 @@ 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 \
@@ -64,12 +65,13 @@ RUN \
 	libcrypto1.0 \
 	libcurl	\
 	libhdhomerun-libs \
-	libressl \
 	libssl1.0 \
+	libva \
 	libvpx \
 	libxml2 \
 	libxslt \
 	linux-headers \
+	openssl \
 	opus \
 	pcre2 \
 	perl \
@@ -137,44 +139,42 @@ RUN \
  echo "**** install perl modules for xmltv ****" && \
  curl -L http://cpanmin.us | perl - App::cpanminus && \
  cpanm --installdeps /tmp/patches && \
- echo "**** 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 && \
  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 \
 	--prefix=/usr \
 	--sysconfdir=/config && \
-  echo "**** attempt to set number of cores available for make to use ****" && \
+ make && \
- set -ex && \
- CPU_CORES=$( < /proc/cpuinfo grep -c processor ) || echo "failed cpu look up" && \
- if echo $CPU_CORES | grep -E  -q '^[0-9]+$'; then \
-	: ;\
- if [ "$CPU_CORES" -gt 7 ]; then \
-	CPU_CORES=$(( CPU_CORES  - 3 )); \
- elif [ "$CPU_CORES" -gt 5 ]; then \
-	CPU_CORES=$(( CPU_CORES  - 2 )); \
- elif [ "$CPU_CORES" -gt 3 ]; then \
-	CPU_CORES=$(( CPU_CORES  - 1 )); fi \
- else CPU_CORES="1"; fi && \
- make -j $CPU_CORES && \
  make install && \
  echo "**** build XMLTV ****" && \
  curl -o \
@@ -193,7 +193,7 @@ RUN \
  sed "s/\(lib\/Ask\/Term.pm';\)/.\/\1/" -i Makefile.PL && \
  PERL5LIB=`pwd` && \
  echo -e "yes" | perl Makefile.PL PREFIX=/usr/ INSTALLDIRS=vendor && \
- make -j $CPU_CORES && \
+ make && \
  make test && \
  make install && \
  echo "**** build argtable2 ****" && \
@@ -210,7 +210,7 @@ RUN \
  cd /tmp/argtable && \
  ./configure \
 	--prefix=/usr && \
- make -j $CPU_CORES && \
+ make && \
  make check && \
  make install && \
  echo "***** build comskip ****" && \
@@ -220,8 +220,7 @@ RUN \
  ./configure \
 	--bindir=/usr/bin \
 	--sysconfdir=/config/comskip && \
- make -j $CPU_CORES && \
+ make && \
- set +ex && \
  make install && \
  echo "***** cleanup ****" && \
  apk del --purge \

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,20 +162,22 @@ You need to enable minimum advanced view level to see the picons options.
 
 ## Versions
 
-+ **11.12.2017:** Rebase to alpine 3.7, linting fixes.
++ **18.02.18:** Add vaapi support, some cleanup and dropping of deprecated options.
-+ **02.09.2017:** Add codec dependencies.
++ **04.01.18:** Deprecate cpu_core routine lack of scaling.
-+ **13.07.2017:** Increase uniformity across all archs.
++ **11.12.17:** Rebase to alpine 3.7, linting fixes.
-+ **08.07.2017:** Update README with full path for comskip.
++ **02.09.17:** Add codec dependencies.
-+ **02.07.2017:** Move to one branch for all 4.2 releases.
++ **13.07.17:** Increase uniformity across all archs.
-+ **27.05.2017:** Rebase to alpine 3.6.
++ **08.07.17:** Update README with full path for comskip.
-+ **01.05.2017:** Update to tvheadend 4.2.1 stable.
++ **02.07.17:** Move to one branch for all 4.2 releases.
-+ **18.04.2017:** Use repo version of gnu-libiconv rather than compiling.
++ **27.05.17:** Rebase to alpine 3.6.
-+ **09.04.2017:** Chain cpanm installs in one block and use --installdeps.
++ **01.05.17:** Update to tvheadend 4.2.1 stable.
-+ **09.02.2017:** Perl changes, add picons file to gitignore and update XMLTV to 0.5.69.
++ **18.04.17:** Use repo version of gnu-libiconv rather than compiling.
-+ **07.02.2017:** Add variable to add additional runtime paramters.
++ **09.04.17:** Chain cpanm installs in one block and use --installdeps.
-+ **05.02.2017:** Update to alpine 3.5 and change dvb-apps to only compile needed libs.
++ **09.02.17:** Perl changes, add picons file to gitignore and update XMLTV to 0.5.69.
-+ **14.11.2016:** Add picons from picons.xyz to /picons folder and add info to README.
++ **07.02.17:** Add variable to add additional runtime paramters.
-+ **22.09.2016:** Fix broken tv_grab_wg, libs for xmltv and update README.
++ **05.02.17:** Update to alpine 3.5 and change dvb-apps to only compile needed libs.
-+ **18.09.2016:** Update XMLTV to 0.5.68 and update README.
++ **14.11.16:** Add picons from picons.xyz to /picons folder and add info to README.
-+ **10.09.2016:** Add layer badges to README.
++ **22.09.16:** Fix broken tv_grab_wg, libs for xmltv and update README.
-+ **05.09.2016:** Initial release.
++ **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.