From 76d27bb36d7a9ee510499a7cc7c8755a4d5d4d46 Mon Sep 17 00:00:00 2001 From: tobbenb Date: Wed, 21 Feb 2018 21:50:56 +0100 Subject: [PATCH 1/5] Fix iconv runtime crash --- Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index a7c2069..059734e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -143,6 +143,9 @@ RUN \ 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 -b ${TVH_VER} --single-branch https://github.com/tvheadend/tvheadend.git /tmp/tvheadend && \ cd /tmp/tvheadend && \ From 1075ff6c38a5c11d36f6a7be98c5c01eb52ad879 Mon Sep 17 00:00:00 2001 From: tobbenb Date: Wed, 21 Feb 2018 21:52:32 +0100 Subject: [PATCH 2/5] Add build options from CvH --- Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Dockerfile b/Dockerfile index 059734e..fe24aa6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -161,6 +161,10 @@ RUN \ --disable-libx265_static \ --enable-hdhomerun_client \ --enable-libav \ + --enable-pngquant \ + --disable-avahi \ + --disable-dbus_1 \ + --disable-bintray_cache \ --infodir=/usr/share/info \ --localstatedir=/var \ --mandir=/usr/share/man \ From 0a365513dd8a7f2ae6e9943964a9498f1b6ffa5e Mon Sep 17 00:00:00 2001 From: tobbenb Date: Wed, 21 Feb 2018 21:54:23 +0100 Subject: [PATCH 3/5] Update README --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 30171dd..1563c8d 100644 --- a/README.md +++ b/README.md @@ -160,6 +160,7 @@ You need to enable minimum advanced view level to see the picons options.. ## Versions ++ **21.02.2018:** Fix wrong version of iconv used and add some build options from CvH. + **11.12.2017:** Rebase to alpine 3.7, linting fixes. + **13.07.2017:** Increase uniformity across all archs. + **08.07.2017:** Update README with full path for comskip. From b487342878e488005a05473cba0a8ba51b1dd582 Mon Sep 17 00:00:00 2001 From: tobbenb Date: Wed, 21 Feb 2018 21:57:19 +0100 Subject: [PATCH 4/5] Sparklyfi Dockerfile --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index fe24aa6..1e0b9bd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -150,6 +150,9 @@ RUN \ git clone -b ${TVH_VER} --single-branch https://github.com/tvheadend/tvheadend.git /tmp/tvheadend && \ cd /tmp/tvheadend && \ ./configure \ + --disable-avahi \ + --disable-bintray_cache \ + --disable-dbus_1 \ --disable-ffmpeg_static \ --disable-hdhomerun_static \ --disable-libfdkaac_static \ @@ -162,9 +165,6 @@ RUN \ --enable-hdhomerun_client \ --enable-libav \ --enable-pngquant \ - --disable-avahi \ - --disable-dbus_1 \ - --disable-bintray_cache \ --infodir=/usr/share/info \ --localstatedir=/var \ --mandir=/usr/share/man \ From e3b56a32cc3ebc1f6bde79208936fc3a397e2cad Mon Sep 17 00:00:00 2001 From: tobbenb Date: Wed, 21 Feb 2018 23:01:55 +0100 Subject: [PATCH 5/5] Remove old libiconv patch --- patches/libiconv-1-fixes.patch | 46 ---------------------------------- 1 file changed, 46 deletions(-) delete mode 100644 patches/libiconv-1-fixes.patch 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 -