From a3e0f1019db385f88617a6b1f8e16f610580b332 Mon Sep 17 00:00:00 2001
From: thoradia <22841905+thoradia@users.noreply.github.com>
Date: Fri, 23 Oct 2020 09:54:07 +0200
Subject: [PATCH] emby4: bootstrap

---
 packages/addons/service/emby4/changelog.txt   |  3 ++
 packages/addons/service/emby4/package.mk      | 22 ++++---------
 .../service/emby4/source/bin/emby4.start      | 31 ++++++++++++++-----
 .../source/system.d/service.emby4.service     |  4 +--
 4 files changed, 35 insertions(+), 25 deletions(-)

diff --git a/packages/addons/service/emby4/changelog.txt b/packages/addons/service/emby4/changelog.txt
index cf7eb36ca3..c5249766b5 100644
--- a/packages/addons/service/emby4/changelog.txt
+++ b/packages/addons/service/emby4/changelog.txt
@@ -1,3 +1,6 @@
+109
+- Bootstrap
+
 108
 - Update to 4.4.2.0
 - Fix system.d
diff --git a/packages/addons/service/emby4/package.mk b/packages/addons/service/emby4/package.mk
index a9b275f1d7..41009be784 100644
--- a/packages/addons/service/emby4/package.mk
+++ b/packages/addons/service/emby4/package.mk
@@ -2,34 +2,24 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="emby4"
-PKG_VERSION="4.4.3.0"
-PKG_SHA256="9f14243bdc400ca9da2bb1b3e2ca3755f96293a6016bfbb5689cd7fcbc963f6b"
-PKG_REV="108"
+PKG_VERSION="bootstrap"
+PKG_REV="109"
 PKG_ARCH="any"
 PKG_LICENSE="prop."
 PKG_SITE="http://emby.media"
-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_DEPENDS_TARGET="toolchain"
 PKG_SECTION="service"
 PKG_SHORTDESC="Emby Server: a personal media server"
-PKG_LONGDESC="Emby Server ($PKG_VERSION) brings your home videos, music, and photos together, automatically converting and streaming your media on-the-fly to any device."
+PKG_LONGDESC="Emby Server brings your home videos, music, and photos together, automatically converting and streaming your media on-the-fly to any device."
 PKG_TOOLCHAIN="manual"
 
 PKG_IS_ADDON="yes"
 PKG_ADDON_NAME="Emby Server 4"
 PKG_ADDON_TYPE="xbmc.service"
+PKG_ADDON_PROJECTS="any !RPi1"
 PKG_ADDON_REQUIRES="tools.ffmpeg-tools:0.0.0 tools.dotnet-runtime:0.0.0"
 PKG_MAINTAINER="Anton Voyl (awiouy)"
 
 addon() {
-  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_install_dir imagemagick)/usr/lib/libMagickCore-7.Q16HDRI.so.? \
-        $ADDON_BUILD/$PKG_ADDON_ID/lib/
-  cp -L $(get_install_dir imagemagick)/usr/lib/libMagickWand-7.Q16HDRI.so \
-        $ADDON_BUILD/$PKG_ADDON_ID/lib/CORE_RL_Wand_.so
+  :
 }
diff --git a/packages/addons/service/emby4/source/bin/emby4.start b/packages/addons/service/emby4/source/bin/emby4.start
index 7e445e04cd..a700bd9eca 100644
--- a/packages/addons/service/emby4/source/bin/emby4.start
+++ b/packages/addons/service/emby4/source/bin/emby4.start
@@ -1,15 +1,32 @@
 #!/bin/sh
-
 # SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 . /etc/profile
 oe_setup_addon service.emby4
 
-LD_PRELOAD="$ADDON_DIR/lib/libMagickCore-7.Q16HDRI.so.7 \
-            $ADDON_DIR/lib/CORE_RL_Wand_.so" \
+libs="${ADDON_DIR}/libs"
+ff="/storage/.kodi/addons/tools.ffmpeg-tools/bin"
+
+if [ ! -e "${libs}" ]; then
+  url="https://github.com/MediaBrowser/Emby.Releases/releases"
+  url_latest="${url}/latest"
+  release="$(basename $(curl -fso /dev/null -w %{redirect_url} ${url_latest}))"
+  url_download="${url}/download/${release}/embyserver-netcore_${release}.zip"
+  zip="${ADDON_DIR}/bootstrap.zip"
+  tmp="${ADDON_DIR}/tmp"
+  rm -fr "${tmp}" "${zip}"
+  mkdir -p "${tmp}"
+  wget -q "${url_download}" -O "${zip}" && \
+  unzip "${zip}" -d "${tmp}" && \
+  mv "${tmp}" "${libs}" && \
+  rm -f "${zip}" || \
+  exit 1
+fi
+
+exec \
 nice -n "$emby_nice" \
-le_dotnet $ADDON_DIR/emby/EmbyServer.dll \
-  -programdata $ADDON_HOME \
-  -ffmpeg /storage/.kodi/addons/tools.ffmpeg-tools/bin/ffmpeg \
-  -ffprobe /storage/.kodi/addons/tools.ffmpeg-tools/bin/ffprobe
+dotnet "${libs}/system/EmbyServer.dll" \
+  -programdata "${ADDON_HOME}" \
+  -ffmpeg "${ff}/ffmpeg" \
+  -ffprobe "${ff}/ffprobe"
diff --git a/packages/addons/service/emby4/source/system.d/service.emby4.service b/packages/addons/service/emby4/source/system.d/service.emby4.service
index dde2457408..37a75c1a01 100644
--- a/packages/addons/service/emby4/source/system.d/service.emby4.service
+++ b/packages/addons/service/emby4/source/system.d/service.emby4.service
@@ -3,10 +3,10 @@ Description=Emby 4 - streaming server
 Documentation=http://emby.media
 Wants=multi-user.target
 After=multi-user.target
-Conflicts=service.emby.service
 
 [Service]
-ExecStart=/bin/sh /storage/.kodi/addons/service.emby4/bin/emby4.start
+SyslogIdentifier=%N
+ExecStart=/bin/sh /storage/.kodi/addons/%N/bin/emby4.start
 Restart=always
 
 [Install]