Merge pull request #1647 from Stane1983/libreelec-8.0-wetekdvb

wetekdvb: Use older WeTek proprietary DVB modules if building for WP1

config/functions

@@ -17,9 +17,12 @@ setup_toolchain() {
       export CFLAGS="$TARGET_CFLAGS"
       export CXXFLAGS="$TARGET_CXXFLAGS"
       export LDFLAGS="$TARGET_LDFLAGS"
+      export PKG_CONFIG="$ROOT/$TOOLCHAIN/bin/pkg-config"
       export PKG_CONFIG_PATH=""
       export PKG_CONFIG_LIBDIR="$SYSROOT_PREFIX/usr/lib/pkgconfig:$SYSROOT_PREFIX/usr/share/pkgconfig"
       export PKG_CONFIG_SYSROOT_DIR="$SYSROOT_PREFIX"
+      export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
+      export PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
       export CMAKE_CONF=$ROOT/$TOOLCHAIN/etc/cmake-$TARGET_NAME.conf
       export CMAKE="cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF -DCMAKE_INSTALL_PREFIX=/usr"
       if [ ! -f $CMAKE_CONF ] ; then
@@ -34,6 +37,7 @@ setup_toolchain() {
         echo "SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)" >> $CMAKE_CONF
         echo "SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)"  >> $CMAKE_CONF
         echo "SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)"  >> $CMAKE_CONF
+        echo "SET(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)"  >> $CMAKE_CONF
       fi
       export HOST_CC="$ROOT/$TOOLCHAIN/bin/host-gcc"
       export HOST_CXX="$ROOT/$TOOLCHAIN/bin/host-g++"
@@ -65,9 +69,12 @@ setup_toolchain() {
       export CFLAGS="$HOST_CFLAGS"
       export CXXFLAGS="$HOST_CXXFLAGS"
       export LDFLAGS="$HOST_LDFLAGS"
+      export PKG_CONFIG="$ROOT/$TOOLCHAIN/bin/pkg-config"
       export PKG_CONFIG_PATH=""
       export PKG_CONFIG_LIBDIR="$ROOT/$TOOLCHAIN/lib/pkgconfig:$ROOT/$TOOLCHAIN/share/pkgconfig"
       export PKG_CONFIG_SYSROOT_DIR=""
+      unset PKG_CONFIG_ALLOW_SYSTEM_CFLAGS
+      unset PKG_CONFIG_ALLOW_SYSTEM_LIBS
       export CMAKE_CONF=$ROOT/$TOOLCHAIN/etc/cmake-$HOST_NAME.conf
       export CMAKE="cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF -DCMAKE_INSTALL_PREFIX=$ROOT/$TOOLCHAIN"
       if [ ! -f $CMAKE_CONF ] ; then
@@ -82,6 +89,7 @@ setup_toolchain() {
         echo "SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM BOTH)" >> $CMAKE_CONF
         echo "SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH)" >> $CMAKE_CONF
         echo "SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE BOTH)" >> $CMAKE_CONF
+        echo "SET(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE BOTH)" >> $CMAKE_CONF
       fi
       export HOST_CC="$CC"
       export HOST_CXX="$CXX"
@@ -96,23 +104,11 @@ setup_toolchain() {
 }
 
 kernel_path() {
-  if [ -e $ROOT/projects/$PROJECT/packages/linux/package.mk ]; then
-    . $ROOT/projects/$PROJECT/packages/linux/package.mk
-  else
-    . $ROOT/packages/linux/package.mk
-  fi
-
-  echo $ROOT/$BUILD/${PKG_NAME}-${PKG_VERSION}
+  get_build_dir linux
 }
 
 kernel_version() {
-  if [ -e $ROOT/projects/$PROJECT/packages/linux/package.mk ]; then
-    . $ROOT/projects/$PROJECT/packages/linux/package.mk
-  else
-    . $ROOT/packages/linux/package.mk
-  fi
-
-  echo ${PKG_VERSION}
+  get_pkg_version linux
 }
 
 # get kernel module dir
@@ -122,22 +118,30 @@ get_module_dir() {
 
 # get package's build dir
 get_build_dir() {
-  if [ ! -z $1 ] ; then
-    local _PKG_DIR=$(find $ROOT/projects/$PROJECT/packages -name $1 2>/dev/null)
-    if [ -d "$_PKG_DIR" -a -f $_PKG_DIR/package.mk ] ; then
-      . $_PKG_DIR/package.mk
-    else
-      local _PKG_DIR=$(find $ROOT/packages -name $1 2>/dev/null)
-      if [ -d "$_PKG_DIR" -a -f $_PKG_DIR/package.mk ] ; then
-        . $_PKG_DIR/package.mk
-      fi
-    fi
-
-    echo $ROOT/$BUILD/${PKG_NAME}-${PKG_VERSION}
+  local _PKG_NAME="$(get_pkg_variable "$1" PKG_NAME)" _PKG_VERSION="$(get_pkg_version "$1")"
+  if [ -n "$_PKG_NAME" -a -n "$_PKG_VERSION" ]; then
+    echo $ROOT/$BUILD/${_PKG_NAME}-${_PKG_VERSION}
   fi
 }
 
-tolower(){
+get_pkg_version() {
+  get_pkg_variable "$1" PKG_VERSION
+}
+
+get_pkg_directory() {
+  get_pkg_variable "$1" PKG_DIR
+}
+
+# get variable ($2) for package ($1)
+get_pkg_variable() {
+  if [ -n "$1" -a -n "$2" ] ; then
+    cd $ROOT
+    . config/options $1
+    echo "${!2}"
+  fi
+}
+
+tolower() {
   echo "$@" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz
 }
 
@@ -270,6 +274,11 @@ enable_service () {
       fi
     done
   fi
+  for target in `grep '^Alias' $target_dir/$unit_dir/$unit | cut -f2 -d=` ; do
+    if [ -n "$target" ]; then
+      ln -sf ${unit} ${target_dir}/$unit_dir/${target}
+    fi
+  done
 }
 
 check_path() {

config/issue

@@ -1 +0,0 @@
-Welcome to OpenELEC - the powerful Mediacenter4you

config/path

@@ -187,11 +187,7 @@ XORG_PATH_DRIVERS=/usr/lib/xorg/modules/drivers
 . config/optimize
 
 if [ -z "$CCACHE_DIR" ]; then
-  if [ -n "$DEVICE" ]; then
-    export CCACHE_DIR=$ROOT/.ccache/$PROJECT.$DEVICE.$TARGET_ARCH-$OS_VERSION
-  else
-    export CCACHE_DIR=$ROOT/.ccache/$PROJECT.$TARGET_ARCH-$OS_VERSION
-  fi
+  export CCACHE_DIR=$ROOT/$BUILD/.ccache
 fi
 export MAKEFLAGS=-j$CONCURRENCY_MAKE_LEVEL
 export PKG_CONFIG=$ROOT/$TOOLCHAIN/bin/pkg-config

config/version

@@ -1,5 +1,5 @@
 # VERSION: set full version, use "devel" for development version
-  LIBREELEC_VERSION="devel"
+  LIBREELEC_VERSION="8.0.2"
 
 # OS_VERSION: OS Version
   OS_VERSION="8.0"

create_tar.sh

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-git archive --format=tar --prefix=OpenELEC-source-$1/ tags/$1 | bzip2 > OpenELEC-source-$1.tar.bz2
+git archive --format=tar --prefix=LibreELEC-source-$1/ tags/$1 | bzip2 > LibreELEC-source-$1.tar.bz2

packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_ADS1x15/package.mk

@@ -18,7 +18,6 @@
 
 PKG_NAME="Adafruit_Python_ADS1x15"
 PKG_VERSION="733d179"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/adafruit/${PKG_NAME}"

packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_ADXL345/package.mk

@@ -18,7 +18,6 @@
 
 PKG_NAME="Adafruit_Python_ADXL345"
 PKG_VERSION="b153663"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/adafruit/${PKG_NAME}"

packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_BMP/package.mk

@@ -18,7 +18,6 @@
 
 PKG_NAME="Adafruit_Python_BMP"
 PKG_VERSION="ad6521d"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/adafruit/${PKG_NAME}"

packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_CharLCD/package.mk

@@ -18,7 +18,6 @@
 
 PKG_NAME="Adafruit_Python_CharLCD"
 PKG_VERSION="e5952eb"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/adafruit/${PKG_NAME}"

packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_DHT/package.mk

@@ -18,7 +18,6 @@
 
 PKG_NAME="Adafruit_Python_DHT"
 PKG_VERSION="310c59b"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/adafruit/${PKG_NAME}"

packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_GPIO/package.mk

@@ -18,7 +18,6 @@
 
 PKG_NAME="Adafruit_Python_GPIO"
 PKG_VERSION="fdf0fca"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/adafruit/${PKG_NAME}"

packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_LED_Backpack/package.mk

@@ -18,7 +18,6 @@
 
 PKG_NAME="Adafruit_Python_LED_Backpack"
 PKG_VERSION="d3bd401"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/adafruit/${PKG_NAME}"

packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_LSM303/package.mk

@@ -18,7 +18,6 @@
 
 PKG_NAME="Adafruit_Python_LSM303"
 PKG_VERSION="03b344d"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/adafruit/${PKG_NAME}"

packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_MCP3008/package.mk

@@ -18,7 +18,6 @@
 
 PKG_NAME="Adafruit_Python_MCP3008"
 PKG_VERSION="705f090"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/adafruit/${PKG_NAME}"

packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_MCP4725/package.mk

@@ -18,7 +18,6 @@
 
 PKG_NAME="Adafruit_Python_MCP4725"
 PKG_VERSION="5b5fc87"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/adafruit/${PKG_NAME}"

packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_PCA9685/package.mk

@@ -18,7 +18,6 @@
 
 PKG_NAME="Adafruit_Python_PCA9685"
 PKG_VERSION="bfa4851"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/adafruit/${PKG_NAME}"

packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_PureIO/package.mk

@@ -18,7 +18,6 @@
 
 PKG_NAME="Adafruit_Python_PureIO"
 PKG_VERSION="a29d95a"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/adafruit/${PKG_NAME}"

packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_SI1145/package.mk

@@ -18,7 +18,6 @@
 
 PKG_NAME="Adafruit_Python_SI1145"
 PKG_VERSION="cbc6c62"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/THP-JOE/Python_SI1145"

packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_TCS34725/package.mk

@@ -18,7 +18,6 @@
 
 PKG_NAME="Adafruit_Python_TCS34725"
 PKG_VERSION="4ff05a3"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/adafruit/${PKG_NAME}"

packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_VCNL40xx/package.mk

@@ -18,7 +18,6 @@
 
 PKG_NAME="Adafruit_Python_VCNL40xx"
 PKG_VERSION="e54bff9"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/adafruit/${PKG_NAME}"

packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_WS2801/package.mk

@@ -18,7 +18,6 @@
 
 PKG_NAME="Adafruit_Python_WS2801"
 PKG_VERSION="699426a"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/adafruit/${PKG_NAME}"

packages/addons/addon-depends/atk/package.mk

@@ -20,7 +20,6 @@
 
 PKG_NAME="atk"
 PKG_VERSION="2.20.0"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://library.gnome.org/devel/atk/"

packages/addons/addon-depends/bash/package.mk

@@ -18,7 +18,6 @@
 
 PKG_NAME="bash"
 PKG_VERSION="4.3.46"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.gnu.org/software/bash/bash.html"

packages/addons/addon-depends/containerd/package.mk

@@ -17,13 +17,12 @@
 ################################################################################
 
 PKG_NAME="containerd"
-PKG_VERSION="0366d7e"
-PKG_REV="1"
+PKG_VERSION="aa8187d"
 PKG_ARCH="any"
 PKG_LICENSE="APL"
 PKG_SITE="https://containerd.tools/"
 PKG_URL="https://github.com/docker/containerd/archive/${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_HOST="toolchain go"
+PKG_DEPENDS_TARGET="toolchain go:host"
 PKG_SECTION="system"
 PKG_SHORTDESC="containerd is a daemon to control runC"
 PKG_LONGDESC="containerd is a daemon to control runC, built for performance and density. containerd leverages runC's advanced features such as seccomp and user namespace support as well as checkpoint and restore for cloning and live migration of containers."
@@ -75,4 +74,3 @@ make_target() {
 makeinstall_target() {
   :
 }
-

packages/addons/addon-depends/cxxtools/package.mk

@@ -18,7 +18,6 @@
 
 PKG_NAME="cxxtools"
 PKG_VERSION="2.2.1"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL-2"
 PKG_SITE="http://www.tntnet.org/cxxtools.html"

packages/addons/addon-depends/dvb-tools-depends/depends/bitstream/package.mk

@@ -1,6 +1,6 @@
 ################################################################################
-#      This file is part of LibreELEC - http://www.libreelec.tv
-#      Copyright (C) 2016 Team LibreELEC
+#      This file is part of LibreELEC - https://libreelec.tv
+#      Copyright (C) 2016-present Team LibreELEC
 #
 #  LibreELEC is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -17,8 +17,7 @@
 ################################################################################
 
 PKG_NAME="bitstream"
-PKG_VERSION="1.1"
-PKG_REV="1"
+PKG_VERSION="1.2"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.videolan.org"

packages/addons/addon-depends/dvb-tools-depends/depends/libev/package.mk

@@ -1,6 +1,6 @@
 ################################################################################
-#      This file is part of LibreELEC - http://www.libreelec.tv
-#      Copyright (C) 2016 Team LibreELEC
+#      This file is part of LibreELEC - https://libreelec.tv
+#      Copyright (C) 2016-present Team LibreELEC
 #
 #  LibreELEC is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -17,8 +17,7 @@
 ################################################################################
 
 PKG_NAME="libev"
-PKG_VERSION="4.22"
-PKG_REV="1"
+PKG_VERSION="4.24"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://software.schmorp.de/pkg/libev.html"

packages/addons/addon-depends/dvb-tools-depends/dvb-apps/package.mk

@@ -20,7 +20,6 @@
 
 PKG_NAME="dvb-apps"
 PKG_VERSION="3d43b280298c"
-PKG_REV="0"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://www.linuxtv.org/wiki/index.php/LinuxTV_dvb-apps"
@@ -30,12 +29,3 @@ PKG_SECTION="tools"
 PKG_SHORTDESC="Digitial Video Broadcasting (DVB) applications"
 PKG_LONGDESC="Applications and utilities geared towards the initial setup, testing and operation of an DVB device supporting the DVB-S, DVB-C, DVB-T, and ATSC standards."
 PKG_AUTORECONF="no"
-
-make_target() {
-  make -C lib
-  make -C util
-}
-
-makeinstall_target() {
-  : # nop
-}

packages/addons/addon-depends/dvb-tools-depends/dvb-fe-tool/package.mk

@@ -19,8 +19,7 @@
 ################################################################################
 
 PKG_NAME="dvb-fe-tool"
-PKG_VERSION="fa2f7d9"
-PKG_REV="1"
+PKG_VERSION="1388a04"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://linuxtv.org/"

packages/addons/addon-depends/dvb-tools-depends/dvblast/package.mk

@@ -19,8 +19,7 @@
 ################################################################################
 
 PKG_NAME="dvblast"
-PKG_VERSION="3.0"
-PKG_REV="1"
+PKG_VERSION="3.1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.videolan.org"

packages/addons/addon-depends/dvb-tools-depends/dvblast/patches/dvblast-ldflags.patch

@@ -1,17 +0,0 @@
-diff -Naur dvblast-3.0/Makefile dvblast-3.0.patch/Makefile
---- dvblast-3.0/Makefile	2015-10-05 17:51:14.000000000 +0200
-+++ dvblast-3.0.patch/Makefile	2016-03-26 22:54:59.953303040 +0100
-@@ -55,11 +55,11 @@
- 
- dvblast: $(OBJ_DVBLAST)
- 	@echo "LINK    $@"
--	$(Q)$(CROSS)$(CC) -o $@ $(OBJ_DVBLAST) $(LDLIBS_DVBLAST) $(LDLIBS)
-+	$(Q)$(CROSS)$(CC) -o $@ $(OBJ_DVBLAST) $(LDFLAGS) $(LDLIBS_DVBLAST) $(LDLIBS)
- 
- dvblastctl: $(OBJ_DVBLASTCTL)
- 	@echo "LINK    $@"
--	$(Q)$(CROSS)$(CC) -o $@ $(OBJ_DVBLASTCTL) $(LDLIBS)
-+	$(Q)$(CROSS)$(CC) -o $@ $(OBJ_DVBLASTCTL) $(LDFLAGS) $(LDLIBS)
- 
- clean:
- 	@echo "CLEAN   $(CLEAN_OBJS)"

packages/addons/addon-depends/dvb-tools-depends/mumudvb/package.mk

@@ -0,0 +1,34 @@
+################################################################################
+#      This file is part of LibreELEC - https://libreelec.tv
+#      Copyright (C) 2017-present Team LibreELEC
+#
+#  LibreELEC is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  LibreELEC is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with LibreELEC.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+PKG_NAME="mumudvb"
+PKG_VERSION="fa9ff6e"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://mumudvb.net/"
+PKG_URL="https://github.com/braice/MuMuDVB/archive/$PKG_VERSION.tar.gz"
+PKG_SOURCE_DIR="MuMuDVB-${PKG_VERSION}*"
+PKG_DEPENDS_TARGET="toolchain libdvbcsa"
+PKG_SECTION="tools"
+PKG_SHORTDESC="MuMuDVB (Multi Multicast DVB) is a program that streams from DVB on a network using multicasting or unicast"
+PKG_LONGDESC="MuMuDVB (Multi Multicast DVB) is a program that streams from DVB on a network using multicasting or unicast"
+PKG_AUTORECONF="yes"
+
+makeinstall_target() {
+  :
+}

packages/addons/addon-depends/dvb-tools-depends/w_scan/package.mk

@@ -1,6 +1,6 @@
 ################################################################################
-#      This file is part of LibreELEC - http://www.libreelec.tv
-#      Copyright (C) 2016 Team LibreELEC
+#      This file is part of LibreELEC - https://libreelec.tv
+#      Copyright (C) 2016-present Team LibreELEC
 #
 #  LibreELEC is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -17,8 +17,7 @@
 ################################################################################
 
 PKG_NAME="w_scan"
-PKG_VERSION="20141122"
-PKG_REV="1"
+PKG_VERSION="20170107"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://wirbel.htpc-forum.de/w_scan/index2.html"

packages/addons/addon-depends/emby-depends/ffmpegx/package.mk

@@ -18,7 +18,7 @@
 
 PKG_NAME="ffmpegx"
 PKG_VERSION="libreelec"
-PKG_REV="5"
+PKG_REV="8"
 PKG_ARCH="any"
 PKG_LICENSE="LGPLv2.1+"
 PKG_SITE="https://ffmpeg.org"
@@ -46,6 +46,11 @@ pre_configure_target() {
     FFMPEG_RPI_HADE="--enable-mmal --enable-omx-rpi"
   fi
 
+# ffmpeg does not build with libx264 on aarch64
+  if [ "$TARGET_ARCH" != "aarch64" ]; then
+    FFMPEG_X264="--enable-libx264"
+  fi
+
   if [ "$TARGET_ARCH" == "arm" ]; then
     FFMPEG_ARM_AO="--enable-hardcoded-tables"
   fi

packages/addons/addon-depends/emby-depends/imagemagick/package.mk

@@ -17,8 +17,7 @@
 ################################################################################
 
 PKG_NAME="imagemagick"
-PKG_VERSION="6.9.6-7"
-PKG_REV="1"
+PKG_VERSION="7.0.5-0"
 PKG_ARCH="any"
 PKG_LICENSE="http://www.imagemagick.org/script/license.php"
 PKG_SITE="http://www.imagemagick.org/"

packages/addons/addon-depends/emby-depends/x264/package.mk

@@ -17,8 +17,7 @@
 ################################################################################
 
 PKG_NAME="x264"
-PKG_VERSION="snapshot-20161203-2245-stable"
-PKG_REV="1"
+PKG_VERSION="snapshot-20170327-2245-stable"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.videolan.org/developers/x264.html"

packages/addons/addon-depends/enca/package.mk

@@ -18,7 +18,6 @@
 
 PKG_NAME="enca"
 PKG_VERSION="1.19"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://freshmeat.net/projects/enca/"

packages/addons/addon-depends/enet/package.mk

@@ -18,7 +18,6 @@
 
 PKG_NAME="enet"
 PKG_VERSION="1.3.13"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE=""
 PKG_SITE=""

packages/addons/addon-depends/enum34/package.mk

@@ -18,7 +18,6 @@
 
 PKG_NAME="enum34"
 PKG_VERSION="1.1.6"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="BSD"
 PKG_SITE="https://bitbucket.org/stoneleaf/enum34"

packages/addons/addon-depends/faad2/package.mk

@@ -18,7 +18,6 @@
 
 PKG_NAME="faad2"
 PKG_VERSION="2.7"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.audiocoding.com/"

packages/addons/addon-depends/gdk-pixbuf/package.mk

@@ -20,7 +20,6 @@
 
 PKG_NAME="gdk-pixbuf"
 PKG_VERSION="2.34.0"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.gtk.org/"

packages/addons/addon-depends/go/package.mk

@@ -17,8 +17,7 @@
 ################################################################################
 
 PKG_NAME="go"
-PKG_VERSION="1.6.3"
-PKG_REV="1"
+PKG_VERSION="1.7.5"
 PKG_ARCH="any"
 PKG_LICENSE="BSD"
 PKG_SITE="https://golang.org"
@@ -53,6 +52,11 @@ make_host() {
   bash make.bash --no-banner
 }
 
+pre_makeinstall_host() {
+  # need to cleanup old golang version when updating to a new version
+  rm -rf $ROOT/$TOOLCHAIN/lib/golang
+}
+
 makeinstall_host() {
   mkdir -p $ROOT/$TOOLCHAIN/lib/golang
   cp -av $ROOT/$PKG_BUILD/* $ROOT/$TOOLCHAIN/lib/golang/

packages/addons/addon-depends/gtk+/package.mk

@@ -20,7 +20,6 @@
 
 PKG_NAME="gtk+"
 PKG_VERSION="2.24.30"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.gtk.org/"

packages/addons/addon-depends/harfbuzz/package.mk

@@ -20,7 +20,6 @@
 
 PKG_NAME="harfbuzz"
 PKG_VERSION="1.3.3"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.freedesktop.org/wiki/Software/HarfBuzz"

packages/addons/addon-depends/icu/package.mk

@@ -18,7 +18,6 @@
 
 PKG_NAME="icu"
 PKG_VERSION="57.1"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="Custom"
 PKG_SITE="http://www.icu-project.org"

packages/addons/addon-depends/inadyn/libite/package.mk

@@ -1,6 +1,6 @@
 ################################################################################
 #      This file is part of LibreELEC - https://libreelec.tv
-#      Copyright (C) 2016 Team LibreELEC
+#      Copyright (C) 2016-2017 Team LibreELEC
 #
 #  LibreELEC is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="libite"
-PKG_VERSION="1.8.2"
+PKG_VERSION="1.8.3"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/troglobit/libite"
 PKG_URL="https://github.com/troglobit/libite/archive/v$PKG_VERSION.tar.gz"

packages/addons/addon-depends/jasper/package.mk

@@ -18,7 +18,6 @@
 
 PKG_NAME="jasper"
 PKG_VERSION="1.900.1"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OpenSource"
 PKG_SITE="http://www.ece.uvic.ca/~mdadams/jasper/"

packages/addons/addon-depends/lcdd-depends/libugpio/package.mk

@@ -0,0 +1,29 @@
+################################################################################
+#      This file is part of LibreELEC - https://libreelec.tv
+#      Copyright (C) 2017 Team LibreELEC
+#
+#  LibreELEC is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  LibreELEC is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with LibreELEC.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+PKG_NAME="libugpio"
+PKG_VERSION="0.0.6"
+PKG_ARCH="any"
+PKG_LICENSE="LGPLv2.1"
+PKG_SITE="https://github.com/mhei/libugpio"
+PKG_URL="https://github.com/mhei/$PKG_NAME/archive/v$PKG_VERSION.tar.gz"
+PKG_DEPENDS_TARGET="toolchain linux"
+PKG_LONGDESC="A free software library to ease the use of linux kernel's sysfs gpio interface from C programs and/or other libraries"
+PKG_AUTORECONF="yes"
+
+PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared"

packages/addons/addon-depends/lcdd-depends/serdisplib/package.mk

@@ -1,30 +1,29 @@
 ################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
+#      This file is part of LibreELEC - https://libreelec.tv
+#      Copyright (C) 2017 Team LibreELEC
 #      Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
 #
-#  OpenELEC is free software: you can redistribute it and/or modify
+#  LibreELEC is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
 #  the Free Software Foundation, either version 2 of the License, or
 #  (at your option) any later version.
 #
-#  OpenELEC is distributed in the hope that it will be useful,
+#  LibreELEC is distributed in the hope that it will be useful,
 #  but WITHOUT ANY WARRANTY; without even the implied warranty of
 #  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #  GNU General Public License for more details.
 #
 #  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
+#  along with LibreELEC.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
 PKG_NAME="serdisplib"
 PKG_VERSION="1.97.9"
-PKG_REV="0"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://serdisplib.sourceforge.net/"
 PKG_URL="$SOURCEFORGE_SRC/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain libusb-compat"
-PKG_SECTION="sysutils"
 PKG_SHORTDESC="serdisplib: a lcd control library"
 PKG_LONGDESC="Library to drive serial/parallel/usb displays with built-in controllers"
 
@@ -38,13 +37,17 @@ PKG_CONFIGURE_OPTS_TARGET="--prefix=$SYSROOT_PREFIX/usr \
                            --with-drivers=all"
 
 pre_configure_target() {
-  # serdisplib fails to build in subdirs (found this in packages/devel/attr/package.mk)
+  # serdisplib fails to build in subdirs
   cd $ROOT/$PKG_BUILD
     rmdir .$TARGET_NAME
+
+  # use libusb-config from sysroot
+  export ac_cv_path_LIBUSB_CONFIG=$SYSROOT_PREFIX/usr/bin/libusb-config
 }
 
 post_make_target() {
-  # copy necessary libs and headers to build the driver glcd from lcdproc
+  # copy necessary libs and headers to build serdisplib support
+  # into the driver glcd from lcdproc
   mkdir -p $SYSROOT_PREFIX/usr/include/serdisplib
   cp include/serdisplib/*.h $SYSROOT_PREFIX/usr/include/serdisplib
   mkdir -p $SYSROOT_PREFIX/usr/lib

packages/addons/addon-depends/libXScrnSaver/package.mk

@@ -18,7 +18,6 @@
 
 PKG_NAME="libXScrnSaver"
 PKG_VERSION="1.2.2"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://xorg.freedesktop.org/"

packages/addons/addon-depends/libXcursor/package.mk

@@ -20,7 +20,6 @@
 
 PKG_NAME="libXcursor"
 PKG_VERSION="1.1.14"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.X.org"

packages/addons/addon-depends/libXft/package.mk

@@ -18,7 +18,6 @@
 
 PKG_NAME="libXft"
 PKG_VERSION="2.3.2"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.X.org"

packages/addons/addon-depends/libconfig/package.mk

@@ -17,8 +17,7 @@
 ################################################################################
 
 PKG_NAME="libconfig"
-PKG_VERSION="1.6"
-PKG_REV="1"
+PKG_VERSION="1.5"
 PKG_ARCH="any"
 PKG_LICENSE="LGPL"
 PKG_SITE="http://hyperrealm.com/libconfig/libconfig.html"

packages/addons/addon-depends/libdvbcsa/package.mk

@@ -17,8 +17,7 @@
 ################################################################################
 
 PKG_NAME="libdvbcsa"
-PKG_VERSION="f988715"
-PKG_REV="1"
+PKG_VERSION="4ce8be8"
 PKG_ARCH="any"
 PKG_LICENSE="LGPL"
 PKG_SITE="http://www.videolan.org/developers/libdvbcsa.html"
@@ -36,6 +35,10 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-shared --enable-static --with-sysroot=$SYSR
 
 if echo "$TARGET_FPU" | grep -q '^neon'; then
   PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-neon"
+elif [ "$TARGET_ARCH" = aarch64 ]; then
+  # change this to --enable-neon when AArch64 NEON performance is improved
+  # check performance with test/benchbitslice
+  PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-uint64"
 elif [ "$TARGET_ARCH" = x86_64  ]; then
   if echo "$PROJECT_CFLAGS" | grep -q '\-mssse3'; then
     PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-ssse3"

packages/addons/addon-depends/libexif/package.mk

@@ -18,7 +18,6 @@
 
 PKG_NAME="libexif"
 PKG_VERSION="0.6.21"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="LGPL"
 PKG_SITE="http://sourceforge.net/projects/libexif"

packages/addons/addon-depends/libiconv/package.mk

@@ -18,7 +18,6 @@
 
 PKG_NAME="libiconv"
 PKG_VERSION="1.14"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://savannah.gnu.org/projects/libiconv/"

packages/addons/addon-depends/libid3tag/package.mk

@@ -20,7 +20,6 @@
 
 PKG_NAME="libid3tag"
 PKG_VERSION="0.15.1b"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.mars.org/home/rob/proj/mpeg/"

packages/addons/addon-depends/libmad/package.mk

@@ -18,7 +18,6 @@
 
 PKG_NAME="libmad"
 PKG_VERSION="0.15.1b"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.mars.org/home/rob/proj/mpeg/"

packages/addons/addon-depends/libnetwork/package.mk

@@ -0,0 +1,74 @@
+################################################################################
+#      This file is part of LibreELEC - https://libreelec.tv
+#      Copyright (C) 2009-2016 Lukas Rusak (lrusak@libreelec.tv)
+#
+#  LibreELEC is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  LibreELEC is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with LibreELEC.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+PKG_NAME="libnetwork"
+PKG_VERSION="0f53435"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="APL"
+PKG_SITE="https://github.com/docker/libnetwork"
+PKG_URL="https://github.com/docker/libnetwork/archive/${PKG_VERSION}.tar.gz"
+PKG_DEPENDS_TARGET="toolchain go:host"
+PKG_SECTION="system"
+PKG_SHORTDESC="Libnetwork provides a native Go implementation for connecting containers"
+PKG_LONGDESC="Libnetwork provides a native Go implementation for connecting containers"
+
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="no"
+
+pre_make_target() {
+  case $TARGET_ARCH in
+    x86_64)
+      export GOARCH=amd64
+      ;;
+    arm)
+      export GOARCH=arm
+
+      case $TARGET_CPU in
+        arm1176jzf-s)
+          export GOARM=6
+          ;;
+        cortex-a7)
+         export GOARM=7
+         ;;
+      esac
+      ;;
+    aarch64)
+      export GOARCH=arm64
+      ;;
+  esac
+
+  export GOOS=linux
+  export CGO_ENABLED=0
+  export CGO_NO_EMULATION=1
+  export CGO_CFLAGS=$CFLAGS
+  export LDFLAGS="-extld $CC"
+  export GOLANG=$ROOT/$TOOLCHAIN/lib/golang/bin/go
+  export GOPATH=$ROOT/$PKG_BUILD.gopath
+  export GOROOT=$ROOT/$TOOLCHAIN/lib/golang
+  export PATH=$PATH:$GOROOT/bin
+}
+
+make_target() {
+  mkdir -p bin
+  $GOLANG build -v -o bin/docker-proxy -a -ldflags "$LDFLAGS" ./cmd/proxy
+}
+
+makeinstall_target() {
+  :
+}

packages/addons/addon-depends/libva-vdpau-driver/package.mk

@@ -18,7 +18,6 @@
 
 PKG_NAME="libva-vdpau-driver"
 PKG_VERSION="0.7.4"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://freedesktop.org/wiki/Software/vaapi"

packages/addons/addon-depends/libvncserver/package.mk

@@ -18,7 +18,6 @@
 
 PKG_NAME="libvncserver"
 PKG_VERSION="0.9.10"
-PKG_REV="0"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://libvnc.github.io/"

packages/addons/addon-depends/libzip/package.mk

@@ -18,7 +18,6 @@
 
 PKG_NAME="libzip"
 PKG_VERSION="0.11.2"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.nih.at/libzip/"

packages/addons/addon-depends/mono-depends/libgdiplus/package.mk

@@ -18,7 +18,6 @@
 
 PKG_NAME="libgdiplus"
 PKG_VERSION="4.2"
-PKG_REV="0"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/mono/libgdiplus"

packages/addons/addon-depends/moonlight-common-c/package.mk

@@ -18,7 +18,6 @@
 
 PKG_NAME="moonlight-common-c"
 PKG_VERSION="1d058cb"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/irtimmer/moonlight-common-c"

packages/addons/addon-depends/moonlight-embedded/package.mk

@@ -17,12 +17,11 @@
 ################################################################################
 
 PKG_NAME="moonlight-embedded"
-PKG_VERSION="2.2.2"
-PKG_REV="1"
+PKG_VERSION="9301898"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/irtimmer/moonlight-embedded"
-PKG_URL="https://github.com/irtimmer/moonlight-embedded/archive/v$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/irtimmer/moonlight-embedded/archive/$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain curl libcec pulseaudio ffmpeg systemd alsa-lib moonlight-common-c libevdev enet opus"
 PKG_SECTION=""
 PKG_SHORTDESC="Gamestream client for embedded systems"
@@ -43,9 +42,7 @@ elif [ "$DISPLAYSERVER" = "x11" ]; then
   PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libvdpau SDL2 ffmpeg libxcb"
 fi
 
-PKG_CMAKE_OPTS_TARGET="-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \
-                       -DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \
-                       $FREESCALE_V4L_INCLUDE"
+PKG_CMAKE_OPTS_TARGET="$FREESCALE_V4L_INCLUDE"
 
 pre_build_target() {
   cp -a $(get_build_dir moonlight-common-c)/* $ROOT/$PKG_BUILD/third_party/moonlight-common-c

packages/addons/addon-depends/moonlight-embedded/patches/moonlight-embedded-0003-fix-libcec4-compilation.patch

@@ -1,63 +0,0 @@
-From 90bfcdcc4da4178b0fd6c6013947006cd1c07377 Mon Sep 17 00:00:00 2001
-From: Iwan Timmer <irtimmer@gmail.com>
-Date: Fri, 9 Dec 2016 20:05:31 +0100
-Subject: [PATCH] Update libCEC compatibility to version 4.0
-
----
- src/input/cec.c                 | 2 +-
- third_party/libcec/ceccloader.h | 8 ++++----
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/input/cec.c b/src/input/cec.c
-index 8c3892e..1a50d81 100644
---- a/src/input/cec.c
-+++ b/src/input/cec.c
-@@ -77,7 +77,7 @@ void cec_init() {
-   libcecc_reset_configuration(&g_config);
-   g_config.clientVersion = LIBCEC_VERSION_CURRENT;
-   g_config.bActivateSource = 0;
--  g_callbacks.CBCecKeyPress = &on_cec_keypress;
-+  g_callbacks.keyPress = &on_cec_keypress;
-   g_config.callbacks = &g_callbacks;
-   snprintf(g_config.strDeviceName, sizeof(g_config.strDeviceName), "Moonlight");
-   g_config.callbacks = &g_callbacks;
-diff --git a/third_party/libcec/ceccloader.h b/third_party/libcec/ceccloader.h
-index 1ae0c2a..2f8f760 100644
---- a/third_party/libcec/ceccloader.h
-+++ b/third_party/libcec/ceccloader.h
-@@ -84,7 +84,7 @@ typedef struct {
-   int                                 (CDECL *set_osd_string)(libcec_connection_t connection, CEC_NAMESPACE cec_logical_address iLogicalAddress, CEC_NAMESPACE cec_display_control duration, const char* strMessage);
-   int                                 (CDECL *switch_monitoring)(libcec_connection_t connection, int bEnable);
-   CEC_NAMESPACE cec_version           (CDECL *get_device_cec_version)(libcec_connection_t connection, CEC_NAMESPACE cec_logical_address iLogicalAddress);
--  int                                 (CDECL *get_device_menu_language)(libcec_connection_t connection, CEC_NAMESPACE cec_logical_address iLogicalAddress, CEC_NAMESPACE cec_menu_language* language);
-+  int                                 (CDECL *get_device_menu_language)(libcec_connection_t connection, CEC_NAMESPACE cec_logical_address iLogicalAddress, CEC_NAMESPACE cec_menu_language language);
-   uint64_t                            (CDECL *get_device_vendor_id)(libcec_connection_t connection, CEC_NAMESPACE cec_logical_address iLogicalAddress);
-   uint16_t                            (CDECL *get_device_physical_address)(libcec_connection_t connection, CEC_NAMESPACE cec_logical_address iLogicalAddress);
-   CEC_NAMESPACE cec_logical_address   (CDECL *get_active_source)(libcec_connection_t connection);
-@@ -100,7 +100,7 @@ typedef struct {
-   int                                 (CDECL *mute_audio)(libcec_connection_t connection, int bSendRelease);
-   int                                 (CDECL *send_keypress)(libcec_connection_t connection, CEC_NAMESPACE cec_logical_address iDestination, CEC_NAMESPACE cec_user_control_code key, int bWait);
-   int                                 (CDECL *send_key_release)(libcec_connection_t connection, CEC_NAMESPACE cec_logical_address iDestination, int bWait);
--  CEC_NAMESPACE cec_osd_name          (CDECL *get_device_osd_name)(libcec_connection_t connection, CEC_NAMESPACE cec_logical_address iAddress);
-+  int                                 (CDECL *get_device_osd_name)(libcec_connection_t connection, CEC_NAMESPACE cec_logical_address iAddress, CEC_NAMESPACE cec_osd_name name);
-   int                                 (CDECL *set_stream_path_logical)(libcec_connection_t connection, CEC_NAMESPACE cec_logical_address iAddress);
-   int                                 (CDECL *set_stream_path_physical)(libcec_connection_t connection, uint16_t iPhysicalAddress);
-   CEC_NAMESPACE cec_logical_addresses (CDECL *get_logical_addresses)(libcec_connection_t connection);
-@@ -161,7 +161,7 @@ static int libcecc_resolve_all(void* lib, libcec_interface_t* iface)
-   _libcecc_resolve(lib, iface->set_osd_string,                "libcec_set_osd_string",                int(CDECL *)(libcec_connection_t, CEC_NAMESPACE cec_logical_address, CEC_NAMESPACE cec_display_control, const char*));
-   _libcecc_resolve(lib, iface->switch_monitoring,             "libcec_switch_monitoring",             int(CDECL *)(libcec_connection_t, int));
-   _libcecc_resolve(lib, iface->get_device_cec_version,        "libcec_get_device_cec_version",        CEC_NAMESPACE cec_version(CDECL *)(libcec_connection_t, CEC_NAMESPACE cec_logical_address));
--  _libcecc_resolve(lib, iface->get_device_menu_language,      "libcec_get_device_menu_language",      int(CDECL *)(libcec_connection_t, CEC_NAMESPACE cec_logical_address, CEC_NAMESPACE cec_menu_language*));
-+  _libcecc_resolve(lib, iface->get_device_menu_language,      "libcec_get_device_menu_language",      int(CDECL *)(libcec_connection_t, CEC_NAMESPACE cec_logical_address, CEC_NAMESPACE cec_menu_language));
-   _libcecc_resolve(lib, iface->get_device_vendor_id,          "libcec_get_device_vendor_id",          uint64_t(CDECL *)(libcec_connection_t, CEC_NAMESPACE cec_logical_address));
-   _libcecc_resolve(lib, iface->get_device_physical_address,   "libcec_get_device_physical_address",   uint16_t(CDECL *)(libcec_connection_t, CEC_NAMESPACE cec_logical_address));
-   _libcecc_resolve(lib, iface->get_active_source,             "libcec_get_active_source",             CEC_NAMESPACE cec_logical_address(CDECL *)(libcec_connection_t));
-@@ -177,7 +177,7 @@ static int libcecc_resolve_all(void* lib, libcec_interface_t* iface)
-   _libcecc_resolve(lib, iface->mute_audio,                    "libcec_mute_audio",                    int(CDECL *)(libcec_connection_t, int));
-   _libcecc_resolve(lib, iface->send_keypress,                 "libcec_send_keypress",                 int(CDECL *)(libcec_connection_t, CEC_NAMESPACE cec_logical_address, CEC_NAMESPACE cec_user_control_code, int));
-   _libcecc_resolve(lib, iface->send_key_release,              "libcec_send_key_release",              int(CDECL *)(libcec_connection_t, CEC_NAMESPACE cec_logical_address, int));
--  _libcecc_resolve(lib, iface->get_device_osd_name,           "libcec_get_device_osd_name",           CEC_NAMESPACE cec_osd_name(CDECL *)(libcec_connection_t, CEC_NAMESPACE cec_logical_address));
-+  _libcecc_resolve(lib, iface->get_device_osd_name,           "libcec_get_device_osd_name",           int(CDECL *)(libcec_connection_t, CEC_NAMESPACE cec_logical_address, CEC_NAMESPACE cec_osd_name));
-   _libcecc_resolve(lib, iface->set_stream_path_logical,       "libcec_set_stream_path_logical",       int(CDECL *)(libcec_connection_t, CEC_NAMESPACE cec_logical_address));
-   _libcecc_resolve(lib, iface->set_stream_path_physical,      "libcec_set_stream_path_physical",      int(CDECL *)(libcec_connection_t, uint16_t));
-   _libcecc_resolve(lib, iface->get_logical_addresses,         "libcec_get_logical_addresses",         CEC_NAMESPACE cec_logical_addresses(CDECL *)(libcec_connection_t));

packages/addons/addon-depends/multimedia-tools-depends/depends/libmediainfo/package.mk

@@ -18,7 +18,6 @@
 
 PKG_NAME="libmediainfo"
 PKG_VERSION="0.7.83"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://mediaarea.net/en/MediaInfo/Download/Source"

packages/addons/addon-depends/multimedia-tools-depends/depends/libzen/package.mk

@@ -18,7 +18,6 @@
 
 PKG_NAME="libzen"
 PKG_VERSION="0.4.33"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://mediaarea.net/en/MediaInfo/"

packages/addons/addon-depends/multimedia-tools-depends/mediainfo/package.mk

@@ -18,7 +18,6 @@
 
 PKG_NAME="mediainfo"
 PKG_VERSION="0.7.83"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://mediaarea.net/en/MediaInfo/Download/Source"

packages/addons/addon-depends/multimedia-tools-depends/mesa-demos/package.mk

@@ -18,7 +18,6 @@
 
 PKG_NAME="mesa-demos"
 PKG_VERSION="8.3.0"
-PKG_REV="0"
 PKG_ARCH="i386 x86_64"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.mesa3d.org/"

packages/addons/addon-depends/multimedia-tools-depends/mpg123/package.mk

@@ -18,7 +18,6 @@
 
 PKG_NAME="mpg123"
 PKG_VERSION="1.23.6"
-PKG_REV="0"
 PKG_ARCH="any"
 PKG_LICENSE="LGPLv2"
 PKG_SITE="http://www.mpg123.org/"

packages/addons/addon-depends/multimedia-tools-depends/opencaster/package.mk

@@ -18,7 +18,6 @@
 
 PKG_NAME="opencaster"
 PKG_VERSION="3.2.2"
-PKG_REV="0"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.avalpa.com/the-key-values/15-free-software/33-opencaster"

packages/addons/addon-depends/multimedia-tools-depends/squeezelite/package.mk

@@ -17,8 +17,7 @@
 ################################################################################
 
 PKG_NAME="squeezelite"
-PKG_VERSION="33cca7e"
-PKG_REV="0"
+PKG_VERSION="a3d95ec"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/ralph-irving/squeezelite"
@@ -34,7 +33,7 @@ PKG_AUTORECONF="no"
 pre_make_target() {
   OPTS="-DDSD -DFFMPEG -DRESAMPLE -DVISEXPORT"
   CFLAGS="$CFLAGS $OPTS"
-  LDFLAGS="$LDFLAGS -lasound -lpthread -lm -lrt"
+  LDFLAGS="$LDFLAGS -lasound -lpthread -lm -lrt -lFLAC -lmad -lvorbisfile -lfaad -lmpg123"
 }
 
 makeinstall_target() {

packages/addons/addon-depends/multimedia-tools-depends/tsdecrypt/package.mk

@@ -20,7 +20,6 @@
 
 PKG_NAME="tsdecrypt"
 PKG_VERSION="10.0"
-PKG_REV="0"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://georgi.unixsol.org/programs/tsdecrypt"

packages/addons/addon-depends/multimedia-tools-depends/tstools/package.mk

@@ -20,7 +20,6 @@
 
 PKG_NAME="tstools"
 PKG_VERSION="1.11"
-PKG_REV="0"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://tstools.berlios.de/"

packages/addons/addon-depends/network-tools-depends/bwm-ng/package.mk

@@ -18,7 +18,6 @@
 
 PKG_NAME="bwm-ng"
 PKG_VERSION="0.6.1"
-PKG_REV="0"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.gropp.org/?id=projects&sub=bwm-ng"

packages/addons/addon-depends/network-tools-depends/depends/libpcap/package.mk

@@ -18,7 +18,6 @@
 
 PKG_NAME="libpcap"
 PKG_VERSION="1.7.4"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.tcpdump.org/"

packages/addons/addon-depends/network-tools-depends/depends/libstatgrab/package.mk

@@ -18,7 +18,6 @@
 
 PKG_NAME="libstatgrab"
 PKG_VERSION="0.91"
-PKG_REV="1"
 PKG_SITE="http://www.i-scream.org/libstatgrab/"
 PKG_URL="http://ftp.i-scream.org/pub/i-scream/libstatgrab/libstatgrab-$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"

packages/addons/addon-depends/network-tools-depends/iftop/package.mk

@@ -18,7 +18,6 @@
 
 PKG_NAME="iftop"
 PKG_VERSION="1.0pre4"
-PKG_REV="0"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://htop.sourceforge.net/"

packages/addons/addon-depends/network-tools-depends/iperf/package.mk

@@ -18,7 +18,6 @@
 
 PKG_NAME="iperf"
 PKG_VERSION="3.1.2"
-PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="https://iperf.fr/"

packages/addons/addon-depends/network-tools-depends/irssi/package.mk

@@ -18,7 +18,6 @@
 
 PKG_NAME="irssi"
 PKG_VERSION="0.8.19"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.irssi.org/"

packages/addons/addon-depends/network-tools-depends/iw/package.mk

@@ -18,7 +18,6 @@
 
 PKG_NAME="iw"
 PKG_VERSION="4.3"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="PUBLIC_DOMAIN"
 PKG_SITE="http://wireless.kernel.org/en/users/Documentation/iw"

packages/addons/addon-depends/network-tools-depends/lftp/package.mk

@@ -18,7 +18,6 @@
 
 PKG_NAME="lftp"
 PKG_VERSION="4.7.4"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://lftp.yar.ru/"

packages/addons/addon-depends/network-tools-depends/ncftp/package.mk

@@ -18,7 +18,6 @@
 
 PKG_NAME="ncftp"
 PKG_VERSION="3.2.5"
-PKG_REV="0"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.ncftp.com/ncftp/"

packages/addons/addon-depends/network-tools-depends/ngrep/package.mk

@@ -18,7 +18,6 @@
 
 PKG_NAME="ngrep"
 PKG_VERSION="1.45"
-PKG_REV="0"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://ngrep.sourceforge.net/"

packages/addons/addon-depends/network-tools-depends/nmap/package.mk

@@ -18,7 +18,6 @@
 
 PKG_NAME="nmap"
 PKG_VERSION="7.11"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://nmap.org/"

packages/addons/addon-depends/network-tools-depends/rsync/package.mk

@@ -18,7 +18,6 @@
 
 PKG_NAME="rsync"
 PKG_VERSION="3.1.2"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.samba.org/ftp/rsync/rsync.html"

packages/addons/addon-depends/network-tools-depends/sshfs/package.mk

@@ -18,7 +18,6 @@
 
 PKG_NAME="sshfs"
 PKG_VERSION="2.7"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/libfuse/sshfs"

packages/addons/addon-depends/network-tools-depends/tcpdump/package.mk

@@ -18,7 +18,6 @@
 
 PKG_NAME="tcpdump"
 PKG_VERSION="4.7.4"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_SITE="http://www.tcpdump.org/"
 PKG_URL="http://www.tcpdump.org/release/tcpdump-${PKG_VERSION}.tar.gz"

packages/addons/addon-depends/network-tools-depends/udpxy/package.mk

@@ -18,7 +18,6 @@
 
 PKG_NAME="udpxy"
 PKG_VERSION="1.0.23-0"
-PKG_REV="0"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.udpxy.com/download-en.html"

packages/addons/addon-depends/network-tools-depends/wireless_tools/package.mk

@@ -18,7 +18,6 @@
 
 PKG_NAME="wireless_tools"
 PKG_VERSION="29"
-PKG_REV="0"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html"

packages/addons/addon-depends/ninja/package.mk

@@ -18,7 +18,6 @@
 
 PKG_NAME="ninja"
 PKG_VERSION="1.6.0"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="Apache"
 PKG_SITE="http://martine.github.io/ninja/"

packages/addons/addon-depends/nspr/package.mk

@@ -20,7 +20,6 @@
 
 PKG_NAME="nspr"
 PKG_VERSION="4.13"
-PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="Mozilla Public License"
 PKG_SITE="http://www.linuxfromscratch.org/blfs/view/svn/general/nspr.html"

packages/addons/addon-depends/nss/package.mk

@@ -20,7 +20,6 @@
 
 PKG_NAME="nss"
 PKG_VERSION="3.27.1"
-PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="Mozilla Public License"
 PKG_SITE="http://ftp.mozilla.org/"

packages/addons/addon-depends/opus/package.mk

@@ -18,7 +18,6 @@
 
 PKG_NAME="opus"
 PKG_VERSION="1.1.2"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="BSD"
 PKG_SITE="http://www.opus-codec.org"

packages/addons/addon-depends/pango/package.mk

@@ -20,7 +20,6 @@
 
 PKG_NAME="pango"
 PKG_VERSION="1.40.3"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.pango.org/"

packages/addons/addon-depends/pcsc-lite/package.mk

@@ -18,7 +18,6 @@
 
 PKG_NAME="pcsc-lite"
 PKG_VERSION="1.8.16"
-PKG_REV="0"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://pcsclite.alioth.debian.org/pcsclite.html"

packages/addons/addon-depends/protobuf/package.mk

@@ -15,7 +15,6 @@
 
 PKG_NAME="protobuf"
 PKG_VERSION="3.1.0"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="https://developers.google.com/protocol-buffers/"
@@ -29,7 +28,7 @@ PKG_LONGDESC="protobuf: Protocol Buffers - Google's data interchange format"
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 
-PKG_CMAKE_SCRIPT="cmake/CMakeLists.txt"
+PKG_CMAKE_SCRIPT="$ROOT/$PKG_BUILD/cmake/CMakeLists.txt"
 
 PKG_CMAKE_OPTS_HOST="-DCMAKE_NO_SYSTEM_FROM_IMPORTED=1 \
                      -DBUILD_SHARED_LIBS=0 \

packages/addons/addon-depends/python-libusb1/package.mk

@@ -18,7 +18,6 @@
 
 PKG_NAME="python-libusb1"
 PKG_VERSION="1.5.3"
-PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="LGPL"
 PKG_SITE="https://github.com/vpelletier/python-libusb1"