Merge pull request #38 from linuxserver/alpine3.5-stable

Update Alpine to 3.5, change dvb-apps to only compile needed libs, update README and add patch from Alpine git.

Dockerfile

@@ -1,4 +1,4 @@
-FROM lsiobase/alpine
+FROM lsiobase/alpine:3.5
 MAINTAINER saarg
 
 # package version
@@ -165,13 +165,15 @@ RUN \
 # build dvb-apps
  hg clone http://linuxtv.org/hg/dvb-apps /tmp/dvb-apps && \
  cd /tmp/dvb-apps && \
- make && \
- make install && \
+ make -C lib && \
+ make -C lib install && \
 
 # build tvheadend
  git clone https://github.com/tvheadend/tvheadend.git /tmp/tvheadend && \
  cd /tmp/tvheadend && \
  git checkout "${TVH_VER}" && \
+ ls -la && \
+ patch -p1 -i /tmp/patches/fix-indentation.patch && \
  ./configure \
 	--disable-ffmpeg_static \
 	--disable-hdhomerun_static \

README.md

@@ -134,6 +134,8 @@ You need to enable minimum advanced view level to see the picons options.
 * To monitor the logs of the container in realtime: `docker logs -f tvheadend`
 
 ## Versions
+
++ **05.02.2017:** Update to Alpine 3.5, compile only dvb-apps libs and add indentation patch for tvheadend from alpine git.
 + **15.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.05.68 and update README.

patches/fix-indentation.patch

@@ -0,0 +1,38 @@
+ src/htsmsg.c | 12 +++++++-----
+ 1 file changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/src/htsmsg.c b/src/htsmsg.c
+index 11e36ea..9c9d842 100644
+--- a/src/htsmsg.c
++++ b/src/htsmsg.c
+@@ -968,23 +968,25 @@ htsmsg_print0(htsmsg_t *msg, int indent)
+   TAILQ_FOREACH(f, &msg->hm_fields, hmf_link) {
+ 
+     for(i = 0; i < indent; i++) printf("\t");
+-    
++
+     printf("%s (", f->hmf_name ?: "");
+-    
++
+     switch(f->hmf_type) {
+ 
+     case HMF_MAP:
+       printf("MAP) = {\n");
+       htsmsg_print0(&f->hmf_msg, indent + 1);
+-      for(i = 0; i < indent; i++) printf("\t"); printf("}\n");
++      for(i = 0; i < indent; i++) printf("\t");
++      printf("}\n");
+       break;
+ 
+     case HMF_LIST:
+       printf("LIST) = {\n");
+       htsmsg_print0(&f->hmf_msg, indent + 1);
+-      for(i = 0; i < indent; i++) printf("\t"); printf("}\n");
++      for(i = 0; i < indent; i++) printf("\t");
++      printf("}\n");
+       break;
+-      
++
+     case HMF_STR:
+       printf("STR) = \"%s\"\n", f->hmf_str);
+       break;