From 8701fc2022be88214c3f80ecf77737aa94ab46ed Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Mon, 27 Jun 2016 08:27:14 +0100 Subject: [PATCH 1/3] update_binary-addons: Extend support to unofficial addons --- tools/mkpkg/update_binary-addons | 42 ++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/tools/mkpkg/update_binary-addons b/tools/mkpkg/update_binary-addons index f6b7434efce..7ac6d7635f0 100755 --- a/tools/mkpkg/update_binary-addons +++ b/tools/mkpkg/update_binary-addons @@ -54,6 +54,24 @@ resolve_hash() { fi } +# Get url in git:// notation for a package.mk, assuming it is a github.com url +# Return 1 if not a github domain +geturl() { + local addon="$1" + local domain owner repo + + . ../../packages/mediacenter/kodi-binary-addons/${addon}/package.mk 1>/dev/null 2>/dev/null + + domain="$(echo "${PKG_URL}" | cut -d/ -f3)" + [ "${domain}" = "github.com" ] || return 1 + + owner="$(echo "${PKG_URL}" | cut -d/ -f4)" + repo="$(echo "${PKG_URL}" | cut -d/ -f5)" + + echo "git://${domain}/${owner}/${repo}.git" + return 0 +} + if [ ! -d $KODI_DIR ] ; then echo "meh.. $KODI_DIR does not exist" exit 127 @@ -87,6 +105,9 @@ if [ -f ../../packages/mediacenter/kodi-platform/package.mk ] ; then fi rm -rf $PKG_NAME.git +PROCESSED=/tmp/update_binary_addons.dat +rm -f ${PROCESSED} + # addons for addontxt in $KODI_DIR/project/cmake/addons/bootstrap/repositories/*-addons.txt ; do ADDONS=$(cat $addontxt | awk '{print $1}') @@ -99,6 +120,8 @@ for addontxt in $KODI_DIR/project/cmake/addons/bootstrap/repositories/*-addons.t GIT_HASH=$(cat $addon/$ADDON.txt | awk '{print $3}') PKG_NAME="$ADDON" + echo "${PKG_NAME}" >> ${PROCESSED} + if ! grep -q all $addon/platforms.txt && ! grep -q linux $addon/platforms.txt && ! grep -q ! $addon/platforms.txt; then continue fi @@ -122,3 +145,22 @@ for addontxt in $KODI_DIR/project/cmake/addons/bootstrap/repositories/*-addons.t echo "followed addons was skipped, please add packages for this:" echo "$SKIPPED_ADDONS" done + +# finally, any other unofficial addons +for ADDON in $(ls -1 ../../packages/mediacenter/kodi-binary-addons); do + # ignore already processed addons + grep -qE "^${ADDON}$" ${PROCESSED} && continue + + # Obtain git url - ignore if not a suitable repo + REPO="$(geturl "${ADDON}")" || continue + + git_clone $REPO master $ADDON.git HEAD + + # update package.mk for stale github.com packages + RESOLVED_HASH=$(resolve_hash ${ADDON}.git HEAD) || continue + + sed -e "s|PKG_VERSION=.*|PKG_VERSION=\"$RESOLVED_HASH\"|g" \ + -i ../../packages/mediacenter/kodi-binary-addons/$ADDON/package.mk + + rm -rf $ADDON.git +done From f43de444401b568a1648c4d6c81ce893eab0b0a3 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Mon, 27 Jun 2016 08:28:15 +0100 Subject: [PATCH 2/3] kodi-binary-addons: update to latest versions --- .../mediacenter/kodi-binary-addons/audiodecoder.asap/package.mk | 2 +- .../mediacenter/kodi-binary-addons/audiodecoder.upse/package.mk | 2 +- .../mediacenter/kodi-binary-addons/audiodecoder.usf/package.mk | 2 +- .../mediacenter/kodi-binary-addons/audiodecoder.wsr/package.mk | 2 +- .../mediacenter/kodi-binary-addons/inputstream.mpd/package.mk | 2 +- .../kodi-binary-addons/visualization.wavforhue/package.mk | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/audiodecoder.asap/package.mk b/packages/mediacenter/kodi-binary-addons/audiodecoder.asap/package.mk index f37ef23e5fb..0273fdf0fa6 100644 --- a/packages/mediacenter/kodi-binary-addons/audiodecoder.asap/package.mk +++ b/packages/mediacenter/kodi-binary-addons/audiodecoder.asap/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="audiodecoder.asap" -PKG_VERSION="53566f4" +PKG_VERSION="e56a821" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/kodi-binary-addons/audiodecoder.upse/package.mk b/packages/mediacenter/kodi-binary-addons/audiodecoder.upse/package.mk index 074013303af..485aa29400d 100644 --- a/packages/mediacenter/kodi-binary-addons/audiodecoder.upse/package.mk +++ b/packages/mediacenter/kodi-binary-addons/audiodecoder.upse/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="audiodecoder.upse" -PKG_VERSION="a6a41d1" +PKG_VERSION="23a5430" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/kodi-binary-addons/audiodecoder.usf/package.mk b/packages/mediacenter/kodi-binary-addons/audiodecoder.usf/package.mk index 150746be774..a8174831d66 100644 --- a/packages/mediacenter/kodi-binary-addons/audiodecoder.usf/package.mk +++ b/packages/mediacenter/kodi-binary-addons/audiodecoder.usf/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="audiodecoder.usf" -PKG_VERSION="85bd171" +PKG_VERSION="ce4b75c" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/kodi-binary-addons/audiodecoder.wsr/package.mk b/packages/mediacenter/kodi-binary-addons/audiodecoder.wsr/package.mk index 6e7e6fff1b8..5a847959454 100644 --- a/packages/mediacenter/kodi-binary-addons/audiodecoder.wsr/package.mk +++ b/packages/mediacenter/kodi-binary-addons/audiodecoder.wsr/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="audiodecoder.wsr" -PKG_VERSION="f5aff29" +PKG_VERSION="746fcbb" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/kodi-binary-addons/inputstream.mpd/package.mk b/packages/mediacenter/kodi-binary-addons/inputstream.mpd/package.mk index 6f68f857aec..553b949db17 100644 --- a/packages/mediacenter/kodi-binary-addons/inputstream.mpd/package.mk +++ b/packages/mediacenter/kodi-binary-addons/inputstream.mpd/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="inputstream.mpd" -PKG_VERSION="84d294f" +PKG_VERSION="350838d" PKG_LICENSE="GPL" PKG_SITE="http://www.kodi.tv" PKG_URL="https://github.com/liberty-developer/inputstream.mpd/archive/$PKG_VERSION.tar.gz" diff --git a/packages/mediacenter/kodi-binary-addons/visualization.wavforhue/package.mk b/packages/mediacenter/kodi-binary-addons/visualization.wavforhue/package.mk index d34efaa43f9..c3104ef1ac1 100644 --- a/packages/mediacenter/kodi-binary-addons/visualization.wavforhue/package.mk +++ b/packages/mediacenter/kodi-binary-addons/visualization.wavforhue/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="visualization.wavforhue" -PKG_VERSION="e57e436" +PKG_VERSION="b1805db" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" From 484abf07553e933f003870b329d01c0a0a9cf970 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Mon, 27 Jun 2016 08:38:27 +0100 Subject: [PATCH 3/3] visualization.pictureit: [cmake] Rename find_package(kodi) to Kodi --- ...n.pictureit-01-rename_find_package_to_Kodi.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 packages/mediacenter/kodi-binary-addons/visualization.pictureit/patches/visualization.pictureit-01-rename_find_package_to_Kodi.patch diff --git a/packages/mediacenter/kodi-binary-addons/visualization.pictureit/patches/visualization.pictureit-01-rename_find_package_to_Kodi.patch b/packages/mediacenter/kodi-binary-addons/visualization.pictureit/patches/visualization.pictureit-01-rename_find_package_to_Kodi.patch new file mode 100644 index 00000000000..f8db99f8490 --- /dev/null +++ b/packages/mediacenter/kodi-binary-addons/visualization.pictureit/patches/visualization.pictureit-01-rename_find_package_to_Kodi.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ada0ea8..0162b63 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 2.6) + + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}) + +-find_package(kodi REQUIRED) ++find_package(Kodi REQUIRED) + find_package(OpenGL) + + if(OPENGL_FOUND)