Skip to content
Permalink
Browse files

Merge remote-tracking branch 'LibreELEC/libreelec-9.2' into coreelec-9.2

  • Loading branch information
adamg88 committed Jan 10, 2020
2 parents 2c27074 + 36a98f1 commit 76033039bba4fa6bf9970c9931d9e25d2c88f925
@@ -3,9 +3,9 @@
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)

PKG_NAME="pvr.nextpvr"
PKG_VERSION="3.3.15-Leia"
PKG_SHA256="3ee070de148d9473d5ad9a3b27cd5f22a81a9da24193c82bf793e1bb590ba054"
PKG_REV="4"
PKG_VERSION="3.3.17-Leia"
PKG_SHA256="86a643bb55fa7f5ee4782f2bbffef8bc5a3561b2767d0f984973da247a608d99"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="https://github.com/kodi-pvr/pvr.nextpvr"
@@ -2,8 +2,8 @@
# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)

PKG_NAME="pvr.teleboy"
PKG_VERSION="18.1.8-Leia"
PKG_SHA256="57f2f77e825f267d1d0acfddb54aacd76b738c6f25b2e94cfb1442d3d1c3aeab"
PKG_VERSION="18.2.0-Leia"
PKG_SHA256="c88a523046b8006a9c451cab319fa626c8d55019a2029a4800882f39511c81e9"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
@@ -2,8 +2,8 @@
# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)

PKG_NAME="pvr.zattoo"
PKG_VERSION="18.1.10-Leia"
PKG_SHA256="a3cbaa98192660e4269a4dac99fdd57b31b59367601af17c5e465b35e2f30e84"
PKG_VERSION="18.1.11-Leia"
PKG_SHA256="b159980804d6c862f9305db0567f63448781df1d988ec7a2ee8509d219d68415"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
@@ -3,9 +3,9 @@
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)

PKG_NAME="visualization.pictureit"
PKG_VERSION="4060888ba482e99e9c08753a385ecf164a9ac821"
PKG_SHA256="dbd9d355b62042887bcaed69cb58033a71447e0ae3143ca2e319fd5cac7bd292"
PKG_REV="4"
PKG_VERSION="d246c1493d5c4e21236449bf7d15d62fcb7a8bf8"
PKG_SHA256="041d086c473d7dfb44f8f9d90924185491a16e813a5995d3af65710198646c3e"
PKG_REV="5"
PKG_ARCH="x86_64"
PKG_LICENSE="GPL"
PKG_SITE="http://www.kodi.tv"
@@ -92,7 +92,10 @@ fi
cat_file "${KODI_ROOT}/.smb/smb.conf"
cat_file "${KODI_ROOT}/.smb/user.conf"
cat_file "/run/samba/smb.conf"
if cmp -s /etc/ssl/cacert.pem.system /run/libreelec/cacert.pem; then

pem_sys="$(sha256sum /etc/ssl/cacert.pem.system | cut -d' ' -f1)"
pem_run="$(sha256sum /run/libreelec/cacert.pem | cut -d' ' -f1)"
if [ "${pem_sys}" = "${pem_run}" ]; then
cat_data "/run/libreelec/cacert.pem is default" </dev/null
else
cat_file /run/libreelec/cacert.pem "/run/libreelec/cacert.pem (modified)"
@@ -3,8 +3,8 @@
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)

PKG_NAME="tz"
PKG_VERSION="2019a"
PKG_SHA256="b8d449925e7883cbeb656fd660737cc5dcc7689f961b0b44c65d6644baf1a21a"
PKG_VERSION="2019c"
PKG_SHA256="38b1f7c7a050daa14fb07f6b72cdde1fc895fece40758d4d55736847041ad9e2"
PKG_LICENSE="Public Domain"
PKG_SITE="http://www.iana.org/time-zones"
PKG_URL="https://github.com/eggert/tz/archive/$PKG_VERSION.tar.gz"
@@ -8,7 +8,7 @@ BUMP_PKG_REV=""
KEEP_GIT_DIRS="yes"

usage() {
echo "Usage: $0 [options] <branch-name>"
echo "Usage: $0 [options] <kodi-branch> [<unofficial-addon-branch>]"
echo " -b, --bump-pkg-rev: bump PKG_REV if package was not updated"
echo " -d, --delete-git-dirs: delete cloned git dirs after update"
echo " -h, --help: display help and exit"
@@ -40,7 +40,7 @@ while [ $# -ne 0 ]; do
esac
done

if [ $# -ne 1 ]; then
if [ $# -eq 0 -o $# -gt 2 ]; then
usage
exit 1
fi
@@ -60,6 +60,12 @@ mkdir -p "${TMPDIR}"
KODI_BRANCH="$1"
KODI_DIR="kodi.git"

if [ $# -eq 1 ]; then
UNOFFICIAL_ADDON_BRANCH="${KODI_BRANCH}"
else
UNOFFICIAL_ADDON_BRANCH="$2"
fi

. "${MY_DIR}/update_common_functions"

git_clone https://github.com/xbmc/xbmc ${KODI_DIR} ${KODI_BRANCH}
@@ -165,9 +171,15 @@ for ADDON in $(ls -1 "${ROOT}/packages/mediacenter/kodi-binary-addons"); do

git_clone ${GIT_REPO} ${GIT_DIR}

# update package.mk for stale github.com packages
RESOLVED_HASH=$(resolve_hash_in_branch ${ADDON}.git HEAD) || continue
echo "Resolving hash for ${ADDON}: HEAD => ${RESOLVED_HASH}"
if RESOLVED_HASH=$(resolve_hash_in_branch ${ADDON}.git ${UNOFFICIAL_ADDON_BRANCH}); then
echo "Resolved hash for ${ADDON}: ${UNOFFICIAL_ADDON_BRANCH} => ${RESOLVED_HASH}"
elif RESOLVED_HASH=$(resolve_hash_in_branch ${ADDON}.git HEAD); then
echo "Resolved hash for ${ADDON}: HEAD => ${RESOLVED_HASH}"
else
msg_warn "WARNING: Could not resolve hash for ${ADDON}"
continue
fi

if update_pkg "${ADDON_PATH}" "${ADDON}" "${RESOLVED_HASH}"; then
# always bump PKG_REV when updating untagged addons
bump_pkg_rev "${ADDON_PATH}" "${ADDON}"

0 comments on commit 7603303

Please sign in to comment.
You can’t perform that action at this time.