From 8bd0e4aa566aee40618c31738da57aaf1cf9d7de Mon Sep 17 00:00:00 2001 From: awiouy Date: Sat, 2 Jun 2018 12:02:30 +0200 Subject: [PATCH] emby: update to 3.5.1.0 for netcore-runtime --- packages/addons/service/emby/changelog.txt | 3 ++ packages/addons/service/emby/package.mk | 32 +++++------ .../service/emby/source/bin/emby-update | 53 ------------------- .../addons/service/emby/source/bin/emby.start | 14 ++--- .../addons/service/emby/source/default.py | 2 +- .../resources/language/English/strings.po | 2 +- .../emby/source/resources/settings.xml | 2 +- .../service/emby/source/settings-default.xml | 3 ++ 8 files changed, 25 insertions(+), 86 deletions(-) delete mode 100644 packages/addons/service/emby/source/bin/emby-update create mode 100644 packages/addons/service/emby/source/settings-default.xml diff --git a/packages/addons/service/emby/changelog.txt b/packages/addons/service/emby/changelog.txt index 28da3b2115..a08e38eef0 100644 --- a/packages/addons/service/emby/changelog.txt +++ b/packages/addons/service/emby/changelog.txt @@ -1,3 +1,6 @@ +121 +- Update to 3.5.1.0 for netcore + 120 - Use ffmpeg instead of ffmpegx diff --git a/packages/addons/service/emby/package.mk b/packages/addons/service/emby/package.mk index 82dafe714d..fb20f7a71a 100644 --- a/packages/addons/service/emby/package.mk +++ b/packages/addons/service/emby/package.mk @@ -2,13 +2,14 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="emby" -PKG_VERSION="3.4.1.6" -PKG_SHA256="8eb129f538cefec612239932fd85ddc6bd5221cd97613e142f41f2126412ea04" -PKG_REV="120" +PKG_VERSION="3.5.1.0" +PKG_SHA256="378c2b23f9c7359434c7790581b885b2c8c526ba3377502b86260b18b927e48c" +PKG_REV="121" PKG_ARCH="any" PKG_LICENSE="OSS" PKG_SITE="http://emby.media" -PKG_URL="https://github.com/MediaBrowser/Emby/releases/download/$PKG_VERSION/Emby.Mono.zip" +PKG_URL="https://github.com/MediaBrowser/Emby.Releases/releases/download/$PKG_VERSION/embyserver-netcore_$PKG_VERSION.zip" +PKG_SOURCE_DIR="system" PKG_DEPENDS_TARGET="toolchain imagemagick" PKG_SECTION="service" PKG_SHORTDESC="Emby Server: a personal media server" @@ -18,26 +19,17 @@ PKG_TOOLCHAIN="manual" PKG_IS_ADDON="yes" PKG_ADDON_NAME="Emby Server" PKG_ADDON_TYPE="xbmc.service" -PKG_ADDON_REQUIRES="tools.ffmpeg-tools:0.0.0 tools.mono:0.0.0" +PKG_ADDON_REQUIRES="tools.ffmpeg-tools:0.0.0 tools.dotnet-runtime:0.0.0" PKG_MAINTAINER="Anton Voyl (awiouy)" -unpack() { - mkdir -p $PKG_BUILD -} - addon() { - mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/Emby.Mono - unzip -q $SOURCES/$PKG_NAME/$PKG_SOURCE_NAME \ - -d $ADDON_BUILD/$PKG_ADDON_ID/Emby.Mono - - sed -i 's/libMagickWand-6./libMagickWand-7./g' \ - $ADDON_BUILD/$PKG_ADDON_ID/Emby.Mono/ImageMagickSharp.dll.config - - sed -i 's/libsqlite3.so/libsqlite3.so.0/g' \ - $ADDON_BUILD/$PKG_ADDON_ID/Emby.Mono/SQLitePCLRaw.provider.sqlite3.dll.config + mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/emby + cp -r $PKG_BUILD/* \ + -d $ADDON_BUILD/$PKG_ADDON_ID/emby mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib - cp -L $(get_build_dir imagemagick)/.install_pkg/usr/lib/libMagickCore-7.Q8.so.? \ - $(get_build_dir imagemagick)/.install_pkg/usr/lib/libMagickWand-7.Q8.so \ + cp -L $(get_build_dir imagemagick)/.install_pkg/usr/lib/libMagickCore-7.Q16HDRI.so.? \ $ADDON_BUILD/$PKG_ADDON_ID/lib/ + cp -L $(get_build_dir imagemagick)/.install_pkg/usr/lib/libMagickWand-7.Q16HDRI.so \ + $ADDON_BUILD/$PKG_ADDON_ID/lib/CORE_RL_Wand_.so } diff --git a/packages/addons/service/emby/source/bin/emby-update b/packages/addons/service/emby/source/bin/emby-update deleted file mode 100644 index 1305822e76..0000000000 --- a/packages/addons/service/emby/source/bin/emby-update +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/sh - -# SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) - -. /etc/profile -oe_setup_addon service.emby - -# set version to use -if [ -z "$1" ]; then -# if no input - echo -e "\nUsage:" - echo -e "${0##*/} 3.4.1.0" - echo -e "${0##*/} latest" - echo -e "\n====== last releases ======" - curl --silent "https://api.github.com/repos/MediaBrowser/Emby/releases" | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/' | head -n 20 - echo -e "===========================" - exit 0 - -# if input = latest -elif [ "$1" = "latest" ]; then - EMBY_VERSION=$(curl --silent "https://api.github.com/repos/MediaBrowser/Emby/releases/latest" | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/') - echo "latest is $EMBY_VERSION" - read -p "continue (y/n)? " EMBY_CONT - if [ $EMBY_CONT = "Y" ] || [ $EMBY_CONT = "y" ]; then - echo "" - else - exit 0 - fi - -# if input = 1.2.3.4 -else - EMBY_VERSION="$1" -fi - -echo "1. stopping Emby service" && sleep 1 - systemctl stop service.emby - -echo "2. download Emby version $EMBY_VERSION" && sleep 1 - rm -f /storage/.kodi/temp/Emby.Mono.zip - curl --progress-bar --fail -L -o /storage/.kodi/temp/Emby.Mono.zip https://github.com/MediaBrowser/Emby/releases/download/$EMBY_VERSION/Emby.Mono.zip || exit 1 - -echo "3. removing old install" && sleep 1 - rm -rf $ADDON_DIR/Emby/system/* - -echo "4. extracting Emby" && sleep 1 - unzip -q /storage/.kodi/temp/Emby.Mono.zip -d $ADDON_DIR/Emby/system - -echo "5. restarting Emby service" && sleep 1 - systemctl start service.emby - -echo "... done" -exit 0 diff --git a/packages/addons/service/emby/source/bin/emby.start b/packages/addons/service/emby/source/bin/emby.start index bfaa739cc0..7c674a5cb8 100644 --- a/packages/addons/service/emby/source/bin/emby.start +++ b/packages/addons/service/emby/source/bin/emby.start @@ -6,13 +6,7 @@ . /etc/profile oe_setup_addon service.emby -chmod +x $ADDON_DIR/bin/* -mkdir -p $ADDON_HOME - -if [ "$emby_ffmpeg" != "false" ] -then - emby_flags="-ffmpeg /storage/.kodi/addons/tools.ffmpeg-tools/bin/ffmpeg -ffprobe /storage/.kodi/addons/tools.ffmpeg-tools/bin/ffprobe" -fi - -mono $ADDON_DIR/Emby.Mono/MediaBrowser.Server.Mono.exe -programdata $ADDON_HOME \ - $emby_flags +LD_PRELOAD="$ADDON_DIR/lib/libMagickCore-7.Q16HDRI.so.6 \ + $ADDON_DIR/lib/CORE_RL_Wand_.so" \ +nice -n "$emby_nice" \ +le_dotnet $ADDON_DIR/emby/EmbyServer.dll -programdata $ADDON_HOME diff --git a/packages/addons/service/emby/source/default.py b/packages/addons/service/emby/source/default.py index 252cf5c277..0b9d649ccd 100644 --- a/packages/addons/service/emby/source/default.py +++ b/packages/addons/service/emby/source/default.py @@ -16,5 +16,5 @@ class Monitor(xbmc.Monitor): subprocess.call(['systemctl', 'restart', self.id]) -if __name__ == "__main__": +if __name__ == '__main__': Monitor().waitForAbort() diff --git a/packages/addons/service/emby/source/resources/language/English/strings.po b/packages/addons/service/emby/source/resources/language/English/strings.po index 37e80a8c99..609e47bd59 100644 --- a/packages/addons/service/emby/source/resources/language/English/strings.po +++ b/packages/addons/service/emby/source/resources/language/English/strings.po @@ -10,5 +10,5 @@ msgid "Configuration" msgstr "" msgctxt "#30001" -msgid "Use dedicated ffmpeg/ffprobe" +msgid "Priority (nice, 0=max, 19=min)" msgstr "" diff --git a/packages/addons/service/emby/source/resources/settings.xml b/packages/addons/service/emby/source/resources/settings.xml index 0d08d8d297..2325485e41 100644 --- a/packages/addons/service/emby/source/resources/settings.xml +++ b/packages/addons/service/emby/source/resources/settings.xml @@ -1,6 +1,6 @@ - + diff --git a/packages/addons/service/emby/source/settings-default.xml b/packages/addons/service/emby/source/settings-default.xml new file mode 100644 index 0000000000..8d35529581 --- /dev/null +++ b/packages/addons/service/emby/source/settings-default.xml @@ -0,0 +1,3 @@ + + 10 +