diff --git a/build-install-mac.sh b/build-install-mac.sh new file mode 100755 index 00000000..6cc85127 --- /dev/null +++ b/build-install-mac.sh @@ -0,0 +1,59 @@ +#!/bin/bash + +set -e + +if [ "$#" -ne 1 ] || ! [ -d "$1" ]; then + echo "Usage: $0 " >&2 + exit 1 +fi + +if [[ "$OSTYPE" != "darwin"* ]]; then + echo "Error: Script only for use on MacOSX" >&2 + exit 1 +fi + +SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" +if [[ "$1" = /* ]] +then + #absolute path + SCRIPT_DIR="" +else + #relative + SCRIPT_DIR="$SCRIPT_DIR/" +fi + +BINARY_ADDONS_TARGET_DIR="$1/tools/depends/target/binary-addons" +MACOSX_BINARY_ADDONS_TARGET_DIR="" +KODI_ADDONS_DIR="$HOME/Library/Application Support/Kodi/addons" +ADDON_NAME=`basename -s .git \`git config --get remote.origin.url\`` + +if [ ! -d "$BINARY_ADDONS_TARGET_DIR" ]; then + echo "Error: Could not find binary addons directory at: $BINARY_ADDONS_TARGET_DIR" >&2 + exit 1 +fi + +for DIR in "$BINARY_ADDONS_TARGET_DIR/"macosx*; do + if [ -d "${DIR}" ]; then + MACOSX_BINARY_ADDONS_TARGET_DIR="${DIR}" + break + fi +done + +if [ -z "$MACOSX_BINARY_ADDONS_TARGET_DIR" ]; then + echo "Error: Could not find binary addons build directory at: $BINARY_ADDONS_TARGET_DIR/macosx*" >&2 + exit 1 +fi + +if [ ! -d "$KODI_ADDONS_DIR" ]; then + echo "Error: Kodi addons dir does not exist at: $KODI_ADDONS_DIR" >&2 + exit 1 +fi + +cd "$MACOSX_BINARY_ADDONS_TARGET_DIR" +make + +XBMC_BUILD_ADDON_INSTALL_DIR=$(cd "$SCRIPT_DIR$1/addons/$ADDON_NAME" 2> /dev/null && pwd -P) +rm -rf "$KODI_ADDONS_DIR/$ADDON_NAME" +echo "Removed previous addon build from: $KODI_ADDONS_DIR" +cp -rf "$XBMC_BUILD_ADDON_INSTALL_DIR" "$KODI_ADDONS_DIR" +echo "Copied new addon build to: $KODI_ADDONS_DIR" diff --git a/depends/common/zlib/zlib.sha256 b/depends/common/zlib/zlib.sha256 new file mode 100644 index 00000000..ec1ba07f --- /dev/null +++ b/depends/common/zlib/zlib.sha256 @@ -0,0 +1 @@ +c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1 diff --git a/pvr.mythtv/addon.xml.in b/pvr.mythtv/addon.xml.in index 40765963..b668f593 100644 --- a/pvr.mythtv/addon.xml.in +++ b/pvr.mythtv/addon.xml.in @@ -1,7 +1,7 @@ @ADDON_DEPENDS@ diff --git a/pvr.mythtv/changelog.txt b/pvr.mythtv/changelog.txt index 755b0df0..ffb88ae1 100644 --- a/pvr.mythtv/changelog.txt +++ b/pvr.mythtv/changelog.txt @@ -1,3 +1,8 @@ +v21.1.9 +- Update settings to new format +- Add build script for mac +- Adding missing shasum for zlib depends + v21.1.8 - Translations updates from Weblate - it_it diff --git a/pvr.mythtv/resources/settings.xml b/pvr.mythtv/resources/settings.xml index 64946c2e..ddc6a32e 100644 --- a/pvr.mythtv/resources/settings.xml +++ b/pvr.mythtv/resources/settings.xml @@ -1,48 +1,294 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +
+ + + + + 0 + 127.0.0.1 + + + + 0 + 6543 + + 1 + 1 + 65535 + + + + + 0 + 6544 + + 1 + 1 + 65535 + + + + + 0 + 0000 + + + + 0 + + + true + + + + + 0 + true + + + + 0 + true + + + + 0 + 0 + + + + + + + + + + + + + + + + + 0 + true + + + + 0 + true + + + + 0 + true + + + + 0 + 1 + + + + + + + + + + + 0 + false + + + + 0 + 0 + + + + + + + + + + + + 0 + true + + + + 0 + false + + + + 0 + false + + + + 0 + [COLOR yellow]yellow[/COLOR] + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + 1 + + + + + + + + + + 0 + true + + 0 + + + + + 0 + true + + 0 + + + + + 0 + true + + 0 + + + + + 0 + false + + 0 + + + + + 0 + 0 + + 0 + + + + + 0 + false + + 0 + + + + + 0 + false + + 0 + + + + + 0 + false + + 0 + + + + + 0 + false + + 0 + + + + + + + + + + + 0 + false + + + + 0 + false + + + + 0 + true + + + + 0 + 5 + + 5 + 1 + 30 + + + + + 0 + true + + + + 0 + true + + + + +