Merge pull request #1636 from chewitt/kodi_172

kodi: update to 17.2
2025-07-29 13:46:49 +00:00 · 2017-05-23 13:09:20 -07:00 · 2017-05-23 13:09:20 -07:00 · f781309802
commit f781309802
parent 0e53edf8c7 be0ac4b955
23 changed files with 36 additions and 28 deletions
--- a/packages/mediacenter/kodi-binary-addons/adsp.biquad.filters/package.mk
+++ b/packages/mediacenter/kodi-binary-addons/adsp.biquad.filters/package.mk
@ -17,7 +17,7 @@
 ################################################################################

 PKG_NAME="adsp.biquad.filters"
-PKG_VERSION="e08990f"
+PKG_VERSION="29bfe9d"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
--- a/packages/mediacenter/kodi-binary-addons/adsp.freesurround/package.mk
+++ b/packages/mediacenter/kodi-binary-addons/adsp.freesurround/package.mk
@ -17,7 +17,7 @@
 ################################################################################

 PKG_NAME="adsp.freesurround"
-PKG_VERSION="61568b9"
+PKG_VERSION="34f5040"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
--- a/packages/mediacenter/kodi-binary-addons/inputstream.adaptive/package.mk
+++ b/packages/mediacenter/kodi-binary-addons/inputstream.adaptive/package.mk
@ -17,7 +17,7 @@
 ################################################################################

 PKG_NAME="inputstream.adaptive"
-PKG_VERSION="f23ba39"
+PKG_VERSION="52eb1de"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.kodi.tv"
 PKG_URL="https://github.com/liberty-developer/inputstream.adaptive/archive/$PKG_VERSION.tar.gz"
--- a/packages/mediacenter/kodi-binary-addons/pvr.argustv/package.mk
+++ b/packages/mediacenter/kodi-binary-addons/pvr.argustv/package.mk
@ -17,7 +17,7 @@
 ################################################################################

 PKG_NAME="pvr.argustv"
-PKG_VERSION="00f03b2"
+PKG_VERSION="9040b14"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
--- a/packages/mediacenter/kodi-binary-addons/pvr.demo/package.mk
+++ b/packages/mediacenter/kodi-binary-addons/pvr.demo/package.mk
@ -17,7 +17,7 @@
 ################################################################################

 PKG_NAME="pvr.demo"
-PKG_VERSION="147fd97"
+PKG_VERSION="57a1c56"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
--- a/packages/mediacenter/kodi-binary-addons/pvr.dvblink/package.mk
+++ b/packages/mediacenter/kodi-binary-addons/pvr.dvblink/package.mk
@ -17,7 +17,7 @@
 ################################################################################

 PKG_NAME="pvr.dvblink"
-PKG_VERSION="2029eec"
+PKG_VERSION="17d1263"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
--- a/packages/mediacenter/kodi-binary-addons/pvr.dvbviewer/package.mk
+++ b/packages/mediacenter/kodi-binary-addons/pvr.dvbviewer/package.mk
@ -17,7 +17,7 @@
 ################################################################################

 PKG_NAME="pvr.dvbviewer"
-PKG_VERSION="ba78fd2"
+PKG_VERSION="602042c"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
--- a/packages/mediacenter/kodi-binary-addons/pvr.filmon/package.mk
+++ b/packages/mediacenter/kodi-binary-addons/pvr.filmon/package.mk
@ -17,7 +17,7 @@
 ################################################################################

 PKG_NAME="pvr.filmon"
-PKG_VERSION="d043da6"
+PKG_VERSION="ab9b519"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
--- a/packages/mediacenter/kodi-binary-addons/pvr.hdhomerun/package.mk
+++ b/packages/mediacenter/kodi-binary-addons/pvr.hdhomerun/package.mk
@ -17,7 +17,7 @@
 ################################################################################

 PKG_NAME="pvr.hdhomerun"
-PKG_VERSION="cb3f151"
+PKG_VERSION="60d89d1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
--- a/packages/mediacenter/kodi-binary-addons/pvr.hts/package.mk
+++ b/packages/mediacenter/kodi-binary-addons/pvr.hts/package.mk
@ -17,7 +17,7 @@
 ################################################################################

 PKG_NAME="pvr.hts"
-PKG_VERSION="5629396"
+PKG_VERSION="4e2a833"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
--- a/packages/mediacenter/kodi-binary-addons/pvr.iptvsimple/package.mk
+++ b/packages/mediacenter/kodi-binary-addons/pvr.iptvsimple/package.mk
@ -17,7 +17,7 @@
 ################################################################################

 PKG_NAME="pvr.iptvsimple"
-PKG_VERSION="c06f367"
+PKG_VERSION="d782816"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
--- a/packages/mediacenter/kodi-binary-addons/pvr.mediaportal.tvserver/package.mk
+++ b/packages/mediacenter/kodi-binary-addons/pvr.mediaportal.tvserver/package.mk
@ -17,7 +17,7 @@
 ################################################################################

 PKG_NAME="pvr.mediaportal.tvserver"
-PKG_VERSION="379658a"
+PKG_VERSION="d261c83"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
--- a/packages/mediacenter/kodi-binary-addons/pvr.nextpvr/package.mk
+++ b/packages/mediacenter/kodi-binary-addons/pvr.nextpvr/package.mk
@ -17,7 +17,7 @@
 ################################################################################

 PKG_NAME="pvr.nextpvr"
-PKG_VERSION="e7430e9"
+PKG_VERSION="a5b8f8b"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
--- a/packages/mediacenter/kodi-binary-addons/pvr.njoy/package.mk
+++ b/packages/mediacenter/kodi-binary-addons/pvr.njoy/package.mk
@ -17,7 +17,7 @@
 ################################################################################

 PKG_NAME="pvr.njoy"
-PKG_VERSION="57393bd"
+PKG_VERSION="b27ceba"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
--- a/packages/mediacenter/kodi-binary-addons/pvr.pctv/package.mk
+++ b/packages/mediacenter/kodi-binary-addons/pvr.pctv/package.mk
@ -17,7 +17,7 @@
 ################################################################################

 PKG_NAME="pvr.pctv"
-PKG_VERSION="b7b5fe0"
+PKG_VERSION="85d6eae"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
--- a/packages/mediacenter/kodi-binary-addons/pvr.stalker/package.mk
+++ b/packages/mediacenter/kodi-binary-addons/pvr.stalker/package.mk
@ -17,7 +17,7 @@
 ################################################################################

 PKG_NAME="pvr.stalker"
-PKG_VERSION="c396e47"
+PKG_VERSION="df111a0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
--- a/packages/mediacenter/kodi-binary-addons/pvr.vbox/package.mk
+++ b/packages/mediacenter/kodi-binary-addons/pvr.vbox/package.mk
@ -17,7 +17,7 @@
 ################################################################################

 PKG_NAME="pvr.vbox"
-PKG_VERSION="46a612d"
+PKG_VERSION="adc6c34"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
--- a/packages/mediacenter/kodi-binary-addons/pvr.vdr.vnsi/package.mk
+++ b/packages/mediacenter/kodi-binary-addons/pvr.vdr.vnsi/package.mk
@ -17,7 +17,7 @@
 ################################################################################

 PKG_NAME="pvr.vdr.vnsi"
-PKG_VERSION="7a17f89"
+PKG_VERSION="4ed7d60"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
--- a/packages/mediacenter/kodi-binary-addons/pvr.vuplus/package.mk
+++ b/packages/mediacenter/kodi-binary-addons/pvr.vuplus/package.mk
@ -17,7 +17,7 @@
 ################################################################################

 PKG_NAME="pvr.vuplus"
-PKG_VERSION="763a644"
+PKG_VERSION="25c4883"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
--- a/packages/mediacenter/kodi-binary-addons/pvr.wmc/package.mk
+++ b/packages/mediacenter/kodi-binary-addons/pvr.wmc/package.mk
@ -17,7 +17,7 @@
 ################################################################################

 PKG_NAME="pvr.wmc"
-PKG_VERSION="55218f5"
+PKG_VERSION="ed67cfe"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
--- a/packages/mediacenter/kodi-binary-addons/screensaver.shadertoy/package.mk
+++ b/packages/mediacenter/kodi-binary-addons/screensaver.shadertoy/package.mk
@ -17,7 +17,7 @@
 ################################################################################

 PKG_NAME="screensaver.shadertoy"
-PKG_VERSION="f576d4b"
+PKG_VERSION="2638205"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
--- a/packages/mediacenter/kodi/package.mk
+++ b/packages/mediacenter/kodi/package.mk
@ -17,7 +17,7 @@
 ################################################################################

 PKG_NAME="kodi"
-PKG_VERSION="fc1619b"
+PKG_VERSION="4f53fb5"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.kodi.tv"
--- a/tools/mkpkg/update_binary-addons
+++ b/tools/mkpkg/update_binary-addons
@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 ################################################################################
 #      This file is part of OpenELEC - http://www.openelec.tv
 #      Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
@ -22,13 +22,20 @@ if [ -z "$1" ]; then
  exit 0
 fi

-KODI_DIR="kodi-$1.git"
+KODI_BRANCH="$1"
+KODI_DIR="kodi-${KODI_BRANCH}.git"

 git_clone() {
  # git_clone https://repo.url branch ./target_dir [githash]
  echo "[mkpkg] Checking out $1 ..."
  if [ ! -d "$3" ]; then
-    git clone "$1" -b $2 "$3"
+    git clone "$1" "$3"
+    # Try to switch to specified branch if it exist, if not then use default branch
+    if [ -n "$2" ]; then
+      cd "$3"
+      git checkout $2 >/dev/null 2>/dev/null
+      cd ..
+    fi
  else
    if [ -d "$3" ] ; then
      cd "$3"
@ -37,6 +44,7 @@ git_clone() {
      cd ..
    fi
  fi
+
  if [ ! -z "$4" ] ; then
    cd "$3"
    git fetch >/dev/null 2>/dev/null
@ -126,7 +134,7 @@ for addontxt in $KODI_DIR/project/cmake/addons/bootstrap/repositories/*-addons.t
  ADDONS=$(cat $addontxt | awk '{print $1}')
  ADDONREPO=$(cat $addontxt | awk '{print $2}')
  GIT_HASH=$(cat $addontxt | awk '{print $3}')
-  git_clone $ADDONREPO master $ADDONS.git $GIT_HASH
+  git_clone $ADDONREPO ${KODI_BRANCH} $ADDONS.git $GIT_HASH
  for addon in $ADDONS.git/*.*/ ; do
    ADDON=$(basename $addon)
    REPO=$(cat $addon/$ADDON.txt | awk '{print $2}')
@ -144,7 +152,7 @@ for addontxt in $KODI_DIR/project/cmake/addons/bootstrap/repositories/*-addons.t
    fi

    if [ -f ../../packages/mediacenter/kodi-binary-addons/$ADDON/package.mk ] ; then
-      git_clone $REPO master $PKG_NAME.git $GIT_HASH
+      git_clone $REPO ${KODI_BRANCH} $PKG_NAME.git $GIT_HASH

      # update package.mk
      RESOLVED_HASH=$(resolve_hash $PKG_NAME.git $GIT_HASH)
@ -170,7 +178,7 @@ for ADDON in $(ls -1 ../../packages/mediacenter/kodi-binary-addons); do
  # Obtain git url - ignore if not a suitable repo
  REPO="$(geturl "${ADDON}")" || continue

-  git_clone $REPO master $ADDON.git HEAD
+  git_clone $REPO ${KODI_BRANCH} $ADDON.git HEAD

  # update package.mk for stale github.com packages
  RESOLVED_HASH=$(resolve_hash ${ADDON}.git HEAD) || continue