Merge pull request #74 from linuxserver/iconv

Fix wrong version of Iconv used.

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,26 +139,39 @@ 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 "**** remove musl iconv.h and replace with gnu-iconv.h ****" && \
+ rm -rf /usr/include/iconv.h && \
+ cp /usr/include/gnu-libiconv/iconv.h /usr/include/iconv.h && \
  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 \

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,6 +162,8 @@ You need to enable minimum advanced view level to see the picons options.
 
 ## Versions
 
++ **21.02.18:** Fix wrong version of iconv used.
++ **18.02.18:** Add vaapi support, some cleanup and dropping of deprecated options.
 + **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.

patches/libiconv-1-fixes.patch

@@ -1,46 +0,0 @@
-This file is part of MXE.
-See index.html for further information.
-
-Contains ad hoc patches for cross building.
-
-From 47345f5dcfb91da8afed7c4e6c29faa2056db447 Mon Sep 17 00:00:00 2001
-From: MXE
-Date: Fri, 7 Jun 2013 17:44:24 +1000
-Subject: [PATCH] remove gets since c++11 removed it
- https://lists.gnu.org/archive/html/bug-gnulib/2012-03/msg00186.html
-
-
-diff --git a/srclib/stdio.in.h b/srclib/stdio.in.h
-index 473c84c..dfb59eb 100644
---- a/srclib/stdio.in.h
-+++ b/srclib/stdio.in.h
-@@ -679,22 +679,11 @@ _GL_WARN_ON_USE (getline, "getline is unportable - "
- # endif
- #endif
- 
--#if @GNULIB_GETS@
--# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@
--#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
--#   undef gets
--#   define gets rpl_gets
--#  endif
--_GL_FUNCDECL_RPL (gets, char *, (char *s) _GL_ARG_NONNULL ((1)));
--_GL_CXXALIAS_RPL (gets, char *, (char *s));
--# else
--_GL_CXXALIAS_SYS (gets, char *, (char *s));
--#  undef gets
--# endif
--_GL_CXXALIASWARN (gets);
- /* It is very rare that the developer ever has full control of stdin,
--   so any use of gets warrants an unconditional warning.  Assume it is
--   always declared, since it is required by C89.  */
-+   so any use of gets warrants an unconditional warning; besides, C11
-+   removed it.  */
-+#undef gets
-+#if HAVE_RAW_DECL_GETS
- _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
- #endif
- 
--- 
-1.8.2.3
-