Merge remote-tracking branch 'upstream/master'

config/arch.aarch64

@@ -0,0 +1,43 @@
+# determines TARGET_CPU, if not forced by user
+  if [ -z "$TARGET_CPU" ]; then
+    TARGET_CPU=cortex-a53
+  fi
+
+# TARGET_CPU:
+# arm2 arm250 arm3 arm6 arm60 arm600 arm610 arm620 arm7 arm7m arm7d
+# arm7dm arm7di arm7dmi arm70 arm700 arm700i arm710 arm710c arm7100
+# arm720 arm7500 arm7500fe arm7tdmi arm7tdmi-s arm710t arm720t
+# arm740t strongarm strongarm110 strongarm1100 strongarm1110 arm8
+# arm810 arm9 arm9e arm920 arm920t arm922t arm946e-s arm966e-s
+# arm968e-s arm926ej-s arm940t arm9tdmi arm10tdmi arm1020t
+# arm1026ej-s arm10e arm1020e arm1022e arm1136j-s arm1136jf-s
+# mpcore mpcorenovfp arm1156t2-s arm1156t2f-s arm1176jz-s
+# arm1176jzf-s generic-armv7-a cortex-a5 cortex-a7 cortex-a8
+# cortex-a9 cortex-a12 cortex-a15 cortex-a17 cortex-a53
+# cortex-a57 cortex-a72 cortex-r4 cortex-r4f cortex-r5 cortex-r7
+# cortex-m7 cortex-m4 cortex-m3 cortex-m1 cortex-m0 cortex-m0plus
+# cortex-m1.small-multiply cortex-m0.small-multiply
+# cortex-m0plus.small-multiply exynos-m1 qdf24xx marvell-pj4
+# xscale iwmmxt iwmmxt2 ep9312 fa526 fa626 fa606te fa626te fmp626
+# fa726te xgene1 cortex-a15.cortex-a7 cortex-a17.cortex-a7
+# cortex-a57.cortex-a53 cortex-a72.cortex-a53
+
+# determine architecture's family
+  case $TARGET_CPU in
+    cortex-a53)
+      TARGET_SUBARCH=aarch64
+      TARGET_VARIANT=armv8-a
+      TARGET_ABI=eabi
+      TARGET_CPU_FLAGS="+crc+crypto"
+      TARGET_EXTRA_FLAGS="-mcpu=${TARGET_CPU}${TARGET_CPU_FLAGS}"
+      SIMD_SUPPORT="yes"
+      ;;
+  esac
+
+  TARGET_GCC_ARCH=$(echo $TARGET_SUBARCH | sed -e "s,-,,")
+  TARGET_KERNEL_ARCH=arm64
+
+# setup ARCH specific *FLAGS
+  TARGET_CFLAGS="-march=${TARGET_VARIANT}${TARGET_CPU_FLAGS} -mabi=lp64 -Wno-psabi $TARGET_EXTRA_FLAGS"
+  TARGET_LDFLAGS="-march=${TARGET_VARIANT}${TARGET_CPU_FLAGS} -mtune=$TARGET_CPU"
+  GCC_OPTS="--with-abi=lp64 --with-arch=$TARGET_VARIANT"

config/arch.arm

@@ -47,6 +47,9 @@
       ;;
   esac
 
+  TARGET_GCC_ARCH=$(echo $TARGET_SUBARCH | sed -e "s,-,,")
+  TARGET_KERNEL_ARCH=arm
+
 # setup ARCH specific *FLAGS
   TARGET_CFLAGS="-march=$TARGET_SUBARCH -mabi=aapcs-linux -Wno-psabi -Wa,-mno-warn-deprecated $TARGET_EXTRA_FLAGS"
   [ -n "$TARGET_FPU" ] && TARGET_CFLAGS="$TARGET_CFLAGS $TARGET_FPU_FLAGS"

config/arch.x86_64

@@ -6,6 +6,9 @@
 # determine architecture's family
   TARGET_SUBARCH=x86_64
 
+  TARGET_GCC_ARCH=$(echo $TARGET_SUBARCH | sed -e "s,-,,")
+  TARGET_KERNEL_ARCH=x86
+
 # setup ARCH specific *FLAGS
   TARGET_CFLAGS="-march=$TARGET_CPU -m64"
   TARGET_LDFLAGS="-march=$TARGET_CPU -m64"

config/functions

@@ -22,6 +22,11 @@ setup_toolchain() {
     export PKG_CONFIG_LIBDIR="$TARGET_PKG_CONFIG_LIBDIR"
     export PKG_CONFIG_SYSROOT_DIR="$TARGET_PKG_CONFIG_SYSROOT_DIR"
 
+  # set python defaults
+    export _python_sysroot="$SYSROOT_PREFIX"
+    export _python_prefix=/usr
+    export _python_exec_prefix=/usr
+
   # set CMAKE configfile for target
     export CMAKE_CONF=$ROOT/$TOOLCHAIN/etc/cmake-$TARGET_NAME.conf
 
@@ -55,7 +60,11 @@ setup_toolchain() {
 }
 
 kernel_path() {
-  if [ -e $ROOT/projects/$PROJECT/packages/linux/package.mk ]; then
+  if [ -e $HOME/.openelec/projects/$PROJECT/packages/linux/package.mk ]; then
+    . $HOME/.openelec/projects/$PROJECT/packages/linux/package.mk
+  elif [ -e $HOME/.openelec/packages/linux/package.mk ]; then
+    . $HOME/.openelec/packages/linux/package.mk
+  elif [ -e $ROOT/projects/$PROJECT/packages/linux/package.mk ]; then
     . $ROOT/projects/$PROJECT/packages/linux/package.mk
   else
     . $ROOT/packages/linux/package.mk
@@ -65,7 +74,11 @@ kernel_path() {
 }
 
 kernel_version() {
-  if [ -e $ROOT/projects/$PROJECT/packages/linux/package.mk ]; then
+  if [ -e $HOME/.openelec/projects/$PROJECT/packages/linux/package.mk ]; then
+    . $HOME/.openelec/projects/$PROJECT/packages/linux/package.mk
+  elif [ -e $HOME/.openelec/packages/linux/package.mk ]; then
+    . $HOME/.openelec/packages/linux/package.mk
+  elif [ -e $ROOT/projects/$PROJECT/packages/linux/package.mk ]; then
     . $ROOT/projects/$PROJECT/packages/linux/package.mk
   else
     . $ROOT/packages/linux/package.mk
@@ -82,13 +95,23 @@ 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)
+    local _PKG_DIR=$(find $HOME/.openelec/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)
+      local _PKG_DIR=$(find $HOME/.openelec/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/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
       fi
     fi
 
@@ -250,13 +273,13 @@ dashes="==========================="
 
 check_config() {
 dashes="==========================="
-  if [ ! -d $PROJECT_DIR/$PROJECT ]; then
+  if [ ! -d $PROJECT_DIR/$PROJECT -a ! -d $HOME/.openelec/projects/$PROJECT ]; then
     check_project="$check_project\n $dashes$dashes$dashes"
     check_project="$check_project\n ERROR: Project not found, use a valid project or create a new config"
     check_project="$check_project\n $dashes$dashes$dashes"
     check_project="$check_project\n\n Valid projects:"
 
-    for projects in $PROJECT_DIR/*; do
+    for projects in $PROJECT_DIR/* $HOME/.openelec/projects/*; do
       check_project="$check_project\n - $(basename $projects)"
     done
     echo -e $check_project
@@ -282,14 +305,14 @@ dashes="==========================="
     linux_config_dir="$PROJECT_DIR/$PROJECT/linux"
   fi
 
-  if [ ! -f $linux_config_dir/linux.$TARGET_ARCH.conf ]; then
+  if [ ! -f $linux_config_dir/linux.$TARGET_ARCH.conf -a ! -f $HOME/.openelec/projects/$PROJECT/linux/linux.$TARGET_ARCH.conf ]; then
     check_arch="$check_arch\n $dashes$dashes$dashes"
     check_arch="$check_arch\n ERROR: Architecture not found, use a valid Architecture"
     check_arch="$check_arch\n for your project or create a new config"
     check_arch="$check_arch\n $dashes$dashes$dashes"
     check_arch="$check_arch\n\n Valid Architectures for your project: $PROJECT"
 
-    for arch in $linux_config_dir/linux/*.conf; do
+    for arch in $linux_config_dir/*.conf $HOME/.openelec/projects/$PROJECT/linux/*.conf; do
       check_arch="$check_arch\n - $(basename $arch | cut -f2 -d".")"
     done
     echo -e $check_arch
@@ -389,6 +412,8 @@ show_config() {
   config_message="$config_message\n - SAMBA mounting support:\t\t $SAMBA_SUPPORT"
   config_message="$config_message\n - SAMBA server support:\t\t $SAMBA_SERVER"
   config_message="$config_message\n - SFTP server support:\t\t\t $SFTP_SERVER"
+  config_message="$config_message\n - PPTP support:\t\t\t $PPTP_SUPPORT"
+  config_message="$config_message\n - OpenVPN support:\t\t\t $OPENVPN_SUPPORT"
 
   # OS configuration
 
@@ -424,6 +449,7 @@ show_config() {
   config_message="$config_message\n $dashes$dashes"
 
   config_message="$config_message\n - Kodi version:\t\t\t $MEDIACENTER"
+  config_message="$config_message\n - Kodi include language files:\t\t $KODI_LANGUAGE_ADDONS"
   config_message="$config_message\n - Kodi nonfree support:\t\t $KODI_NONFREE_SUPPORT"
   config_message="$config_message\n - Kodi Blu-Ray support:\t\t $KODI_BLURAY_SUPPORT"
   if [ "$KODI_BLURAY_SUPPORT" = "yes" ] ; then
@@ -441,12 +467,12 @@ show_config() {
   config_message="$config_message\n - Kodi UPNP support:\t\t\t $KODI_UPNP_SUPPORT"
   config_message="$config_message\n - Kodi Webserver support:\t\t $KODI_WEBSERVER_SUPPORT"
 
-
   for config_skin in $SKINS; do
     config_message="$config_message\n - Include Skin:\t\t\t $config_skin"
   done
 
   config_message="$config_message\n - Default Skin:\t\t\t $SKIN_DEFAULT"
+  config_message="$config_message\n - Remove shipped skins:\t\t $SKIN_REMOVE_SHIPPED"
   config_message="$config_message\n - Include extra fonts:\t\t\t $KODI_EXTRA_FONTS"
 
   config_message="$config_message\n"

config/noobs/os.json

@@ -6,5 +6,6 @@
   "description": "@DESCRIPTION@",
   "username": "root",
   "password": "@ROOT_PASSWORD@",
+  "supported_models": [@NOOBS_SUPPORTED_MODELS@],
   "supported_hex_revisions": "@NOOBS_HEX@"
 }

config/path

@@ -17,7 +17,7 @@ set -e
   fi
 
 HOST_NAME=`$LOCAL_CC -dumpmachine`
-TARGET_NAME=$(echo $TARGET_SUBARCH | sed -e "s,-,,")-openelec-linux-gnu${TARGET_ABI}
+TARGET_NAME=$TARGET_GCC_ARCH-openelec-linux-gnu${TARGET_ABI}
 
 if [ -n "$DEVICE" ]; then
   BUILD=$BUILD_BASE.$DISTRONAME-$PROJECT.$DEVICE.$TARGET_ARCH-$OPENELEC_VERSION
@@ -68,6 +68,8 @@ SED="sed -i"
   PKG_LICENSE="unknown"
   PKG_SITE=""
   PKG_URL=""
+  PKG_GIT_URL=""
+  PKG_GIT_BRANCH=""
   PKG_DEPENDS_TARGET=""
   PKG_DEPENDS_HOST=""
   PKG_DEPENDS_INIT=""

distributions/OpenELEC/options

@@ -23,9 +23,12 @@
 # Skins to install (Confluence)
 # Space separated list is supported,
 # e.g. SKINS="Confluence"
-  SKINS="Confluence"
+  SKINS=""
 
-# Default Skin (Confluence)
+# remove default skin included in Kodi (yes/no)
+  SKIN_REMOVE_SHIPPED="no"
+
+# Default Skin (Confluence, or any from above)
   SKIN_DEFAULT="Confluence"
 
 # install extra subtitle Fonts for KODI (yes / no)
@@ -60,7 +63,7 @@
 # for a list of additinoal drivers see packages/linux-drivers
 # Space separated list is supported,
 # e.g. ADDITIONAL_DRIVERS="DRIVER1 DRIVER2"
-  ADDITIONAL_DRIVERS="RTL8192CU RTL8192DU RTL8192EU RTL8188EU RTL8812AU dvbhdhomerun"
+  ADDITIONAL_DRIVERS="RTL8192CU RTL8192DU RTL8192EU RTL8812AU dvbhdhomerun"
 
 # build and install bluetooth support (yes / no)
   BLUETOOTH_SUPPORT="yes"
@@ -95,6 +98,9 @@
 # build with Samba Client support (mounting SAMBA shares with KODI) (yes / no)
   KODI_SAMBA_SUPPORT="yes"
 
+# include initial language addons for Kodi (yes / no)
+  KODI_LANGUAGE_ADDONS="yes"
+
 # build with NFS support (mounting nfs shares via the OS) (yes / no)
   NFS_SUPPORT="yes"
 
@@ -107,6 +113,12 @@
 # build and install SFTP Server (yes / no)
   SFTP_SERVER="yes"
 
+# build and install PPP support (yes / no)
+  PPTP_SUPPORT="yes"
+
+# build and install OpenVPN support (yes / no)
+  OPENVPN_SUPPORT="yes"
+
 # build and install diskmounter support (udevil)
 # this service provide auto mounting support for external drives in the
 # mediacenter also automount internally drives at boottime via udev (yes / no)

packages/addons/service/multimedia/vdr-addon/package.mk

@@ -24,7 +24,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.openelec.tv"
 PKG_URL=""
-PKG_DEPENDS_TARGET="toolchain attr libcap vdr vdr-plugin-vnsiserver vdr-iptv vdr-wirbelscan vdr-wirbelscancontrol vdr-plugin-dvbapi vdr-plugin-streamdev vdr-live vdr-epgsearch vdr-plugin-xmltv2vdr vdr-plugin-eepg vdr-dummydevice vdr-satip vdr-plugin-epgfixer vdr-plugin-restfulapi"
+PKG_DEPENDS_TARGET="toolchain vdr vdr-plugin-vnsiserver vdr-iptv vdr-wirbelscan vdr-wirbelscancontrol vdr-plugin-dvbapi vdr-plugin-streamdev vdr-live vdr-epgsearch vdr-plugin-xmltv2vdr vdr-plugin-eepg vdr-dummydevice vdr-satip vdr-plugin-epgfixer vdr-plugin-restfulapi"
 PKG_PRIORITY="optional"
 PKG_SECTION="service.multimedia"
 PKG_SHORTDESC="vdr: A powerful DVB TV application"

packages/audio/asplib/package.mk

@@ -22,7 +22,8 @@ PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/AchimTuran/asplib"
-PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_GIT_URL="https://github.com/AchimTuran/asplib.git"
+PKG_GIT_BRANCH="master"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="audio"

packages/audio/dcadec/package.mk

@@ -17,12 +17,13 @@
 ################################################################################
 
 PKG_NAME="dcadec"
-PKG_VERSION="37d8e68"
+PKG_VERSION="0e07438"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/foo86/dcadec"
-PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_GIT_URL="https://github.com/foo86/dcadec.git"
+PKG_GIT_BRANCH="master"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="audio"

packages/audio/espeak/package.mk

@@ -22,7 +22,7 @@ PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://espeak.sourceforge.net/"
-PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.zip"
+PKG_URL="http://sourceforge.net/projects/espeak/files/espeak/espeak-1.48/$PKG_NAME-$PKG_VERSION.zip"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="audio"

tools/mkpkg/mkpkg_json-c → packages/audio/speex/package.mk

@@ -1,4 +1,3 @@
-#!/bin/sh
 ################################################################################
 #      This file is part of OpenELEC - http://www.openelec.tv
 #      Copyright (C) 2009-2016 Stephan Raue ([email protected])
@@ -17,25 +16,19 @@
 #  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
-echo "getting sources..."
-  if [ ! -d json-c.git ]; then
-    git clone https://github.com/json-c/json-c.git json-c.git
-  fi
+PKG_NAME="speex"
+PKG_VERSION="1.2rc2"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="BSD"
+PKG_SITE="http://downloads.us.xiph.org/releases/speex"
+#PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="$PKG_SITE/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_DEPENDS_TARGET="toolchain"
+PKG_PRIORITY="optional"
+PKG_SECTION="audio"
+PKG_SHORTDESC="Speex / OPUS audio codec"
+PKG_LONGDESC="Speex / OPUS audio codec"
 
-  cd json-c.git
-    git pull
-    GIT_REV=`git log -n1 --format=%h`
-  cd ..
-
-echo "copying sources..."
-  rm -rf json-c-$GIT_REV
-  cp -R json-c.git json-c-$GIT_REV
-
-echo "cleaning sources..."
-  rm -rf json-c-$GIT_REV/.git
-
-echo "packing sources..."
-  tar cvJf json-c-$GIT_REV.tar.xz json-c-$GIT_REV
-
-echo "remove temporary sourcedir..."
-  rm -rf json-c-$GIT_REV
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="yes"

packages/compress/zlib/package.mk

@@ -22,7 +22,7 @@ PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.zlib.net"
-PKG_URL="$DISTRO_MIRROR/zlib/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="http://zlib.net/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_DEPENDS_HOST=""
 PKG_PRIORITY="optional"

packages/databases/mysql/package.mk

@@ -24,7 +24,7 @@ PKG_LICENSE="LGPL"
 PKG_SITE="http://www.mysql.com"
 PKG_URL="http://ftp.gwdg.de/pub/misc/$PKG_NAME/Downloads/MySQL-5.1/$PKG_NAME-$PKG_VERSION.tar.gz"
 PKG_DEPENDS_HOST="zlib:host"
-PKG_DEPENDS_TARGET="toolchain zlib ncurses mysql:host"
+PKG_DEPENDS_TARGET="toolchain zlib ncurses libressl mysql:host"
 PKG_PRIORITY="optional"
 PKG_SECTION="database"
 PKG_SHORTDESC="mysql: A database server"
@@ -43,6 +43,7 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_c_stack_direction=-1 \
                            --with-unix-socket-path=/var/tmp/mysql.socket \
                            --with-tcp-port=3306 \
                            --enable-static \
+                           --with-ssl=$SYSROOT_PREFIX/usr/lib \
                            --disable-shared \
                            --with-low-memory \
                            --enable-largefile \

packages/databases/sqlite/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="sqlite"
-PKG_VERSION="autoconf-3110000"
+PKG_VERSION="autoconf-3110100"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="PublicDomain"

packages/debug/gdb/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="gdb"
-PKG_VERSION="7.10.1"
+PKG_VERSION="7.11"
 PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"