Merge remote-tracking branch 'upstream/openelec-5.0' into openelec-5.0

config/options

@@ -71,10 +71,7 @@ LINUX_DEPENDS="$PROJECT_DIR/$PROJECT/linux/linux.$TARGET_ARCH.conf $PROJECT_DIR/
 #  Try value 1 (default) to 4 on single CPU computer, or more on
 #  multi-processor computer (like hyperthreading SMP CPU)
   if test -z "${CONCURRENCY_MAKE_LEVEL}"; then
-    if test -z "${CONCURRENCY_MAKE_FACTOR}"; then
-      CONCURRENCY_MAKE_FACTOR=1.0
-    fi
-    CONCURRENCY_MAKE_LEVEL=`echo "$(grep -c '^processor[[:cntrl:]]*:' /proc/cpuinfo) * ${CONCURRENCY_MAKE_FACTOR}" | bc | cut -d'.' -f1`
+    CONCURRENCY_MAKE_LEVEL=`cat /proc/cpuinfo | grep -c '^processor[[:cntrl:]]*:'`
   fi
 
 # cache size for ccache

config/version

@@ -1,5 +1,5 @@
 # VERSION: set full version, use "devel" for development version
-  OPENELEC_VERSION="devel"
+  OPENELEC_VERSION="4.97.1"
 
 # OS_VERSION: OS Version
   OS_VERSION="5.0"

packages/addons/service/multimedia/tvheadend/changelog.txt

@@ -1,3 +1,13 @@
+4.3.5
+- fix crash on imx6
+
+4.3.4
+- update to tvheadend-3.9.2182
+- fix xmltv grab issue
+
+4.3.3
+- update to tvheadend-3.9.2168
+
 4.3.2
 - update to kodi
 

packages/addons/service/multimedia/tvheadend/package.mk

@@ -17,12 +17,11 @@
 ################################################################################
 
 PKG_NAME="tvheadend"
-PKG_VERSION="3.9.1847"
-PKG_REV="2"
+PKG_VERSION="3.9.2182"
+PKG_REV="5"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
-PKG_SITE="http://www.lonelycoder.com/hts/tvheadend_overview.html"
-#PKG_URL="https://github.com/downloads/tvheadend/tvheadend/${PKG_NAME}-${PKG_VERSION}.tar.gz"
+PKG_SITE="http://www.tvheadend.org"
 PKG_URL="$DISTRO_SRC/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain libressl curl"
 PKG_PRIORITY="optional"
@@ -37,6 +36,8 @@ pre_build_target() {
   mkdir -p $PKG_BUILD/.$TARGET_NAME
   cp -RP $PKG_BUILD/* $PKG_BUILD/.$TARGET_NAME
   export CROSS_COMPILE=$TARGET_PREFIX
+  # meh imx6..
+  export CFLAGS="$CFLAGS -mno-unaligned-access"
 }
 
 configure_target() {
@@ -46,7 +47,6 @@ configure_target() {
             --cc=$TARGET_CC \
             --enable-hdhomerun_client \
             --enable-hdhomerun_static \
-            --enable-timeshift \
             --disable-avahi \
             --disable-libav \
             --enable-inotify \

packages/addons/service/multimedia/tvheadend/source/bin/tv_grab_file

@@ -52,6 +52,7 @@ for arg; do
        --description) args="${args}-d ";;
        --version) args="${args}-v ";;
        --capabilities) args="${args}-c ";;
+       --quiet) args="${args}-q ";;
        #pass through anything else
        *) [[ "${arg:0:1}" == "-" ]] || delim="\""
            args="${args}${delim}${arg}${delim} ";;
@@ -61,11 +62,12 @@ done
 #Reset the positional parameters to the short options
 eval set -- $args
 
-while getopts "dvc" option; do
+while getopts "dvcq" option; do
     case $option in
         d)  dflag=1;;
         v)  vflag=1;;
         c)  cflag=1;;
+        q) ;;
         \?) printf "unknown option: -%s\n" $OPTARG
             printf "Usage: %s: [--description] [--version] [--capabilities] \n" $(basename $0)
             exit 2

packages/audio/flac/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="flac"
-PKG_VERSION="1.3.0"
+PKG_VERSION="1.3.1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="LGPL"
@@ -51,6 +51,13 @@ else
   PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --disable-sse"
 fi
 
+pre_configure_target() {
+  # flac-1.3.1 dont build with LTO support
+  strip_lto
+
+  export CFLAGS="$CFLAGS -fPIC -DPIC"
+}
+
 post_makeinstall_target() {
   rm -rf $INSTALL/usr/bin
 }

packages/graphics/bcm2835-driver/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="bcm2835-driver"
-PKG_VERSION="a54afb6"
+PKG_VERSION="c48462f"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="nonfree"

packages/graphics/libpng/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="libpng"
-PKG_VERSION="1.6.12"
+PKG_VERSION="1.6.15"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"