From aa9724fdc283736274e6f89da45944f152870293 Mon Sep 17 00:00:00 2001 From: tobbenb Date: Wed, 21 Feb 2018 19:00:51 +0100 Subject: [PATCH 1/3] Fix iconv runtime crash --- Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Dockerfile b/Dockerfile index d3fcbc2..31692ba 100644 --- a/Dockerfile +++ b/Dockerfile @@ -139,10 +139,14 @@ RUN \ echo "**** install perl modules for xmltv ****" && \ curl -L http://cpanmin.us | perl - App::cpanminus && \ cpanm --installdeps /tmp/patches && \ + 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 \ + --cflags="-I/usr/include/gnu-libiconv" \ `#Encoding` \ --disable-ffmpeg_static \ --disable-libfdkaac_static \ From 0f99b9a0d50b3470621cdce3514e04d32b4a8711 Mon Sep 17 00:00:00 2001 From: tobbenb Date: Wed, 21 Feb 2018 19:02:37 +0100 Subject: [PATCH 2/3] Remove --cflags option left from testing --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 31692ba..70d091d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -146,7 +146,6 @@ RUN \ git clone https://github.com/tvheadend/tvheadend.git /tmp/tvheadend && \ cd /tmp/tvheadend && \ ./configure \ - --cflags="-I/usr/include/gnu-libiconv" \ `#Encoding` \ --disable-ffmpeg_static \ --disable-libfdkaac_static \ From 6746a3fbf68755e1ea72f2bafb8bb397e97ec09f Mon Sep 17 00:00:00 2001 From: tobbenb Date: Wed, 21 Feb 2018 21:45:02 +0100 Subject: [PATCH 3/3] Update README and remove old patch file --- README.md | 1 + patches/libiconv-1-fixes.patch | 46 ---------------------------------- 2 files changed, 1 insertion(+), 46 deletions(-) delete mode 100644 patches/libiconv-1-fixes.patch diff --git a/README.md b/README.md index 62ed251..a17bb31 100644 --- a/README.md +++ b/README.md @@ -162,6 +162,7 @@ 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. diff --git a/patches/libiconv-1-fixes.patch b/patches/libiconv-1-fixes.patch deleted file mode 100644 index cf3fef5..0000000 --- a/patches/libiconv-1-fixes.patch +++ /dev/null @@ -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 -