From afa3243eea97855ef1455df9bb737227baf294e8 Mon Sep 17 00:00:00 2001 From: thoradia <22841905+thoradia@users.noreply.github.com> Date: Sat, 24 Oct 2020 09:03:36 +0200 Subject: [PATCH 1/9] imagemagick: remove package --- .../emby-depends/imagemagick/package.mk | 22 ------------------- 1 file changed, 22 deletions(-) delete mode 100644 packages/addons/addon-depends/emby-depends/imagemagick/package.mk diff --git a/packages/addons/addon-depends/emby-depends/imagemagick/package.mk b/packages/addons/addon-depends/emby-depends/imagemagick/package.mk deleted file mode 100644 index b1223aa65d..0000000000 --- a/packages/addons/addon-depends/emby-depends/imagemagick/package.mk +++ /dev/null @@ -1,22 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) - -PKG_NAME="imagemagick" -PKG_VERSION="7.0.10-23" -PKG_SHA256="27f8a24858cc5658aa07a13002a41d342b88e5c4e1917ff4d503dbbf8cbff91c" -PKG_LICENSE="http://www.imagemagick.org/script/license.php" -PKG_SITE="http://www.imagemagick.org/" -PKG_URL="https://github.com/ImageMagick/ImageMagick/archive/$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain" -PKG_LONGDESC="Software suite to create, edit, compose, or convert bitmap images" - -PKG_CONFIGURE_OPTS_TARGET="--disable-openmp \ - --disable-static \ - --enable-shared \ - --with-pango=no \ - --with-utilities=no \ - --with-x=no" - -makeinstall_target() { - make install DESTDIR=$INSTALL $PKG_MAKEINSTALL_OPTS_TARGET -} From 3bd6ca9ba9df0a537feb0a45f982ec507d36df85 Mon Sep 17 00:00:00 2001 From: thoradia <22841905+thoradia@users.noreply.github.com> Date: Sat, 24 Oct 2020 21:23:37 +0200 Subject: [PATCH 2/9] emby: remove add-on --- packages/addons/service/emby/changelog.txt | 92 ------------------ packages/addons/service/emby/icon/icon.png | Bin 16122 -> 0 bytes packages/addons/service/emby/package.mk | 32 +++--- .../addons/service/emby/source/bin/emby.start | 12 --- .../addons/service/emby/source/default.py | 20 ---- .../resources/language/English/strings.po | 14 --- .../emby/source/resources/settings.xml | 6 -- .../service/emby/source/settings-default.xml | 3 - .../emby/source/system.d/service.emby.service | 13 --- 9 files changed, 11 insertions(+), 181 deletions(-) delete mode 100644 packages/addons/service/emby/changelog.txt delete mode 100644 packages/addons/service/emby/icon/icon.png delete mode 100644 packages/addons/service/emby/source/bin/emby.start delete mode 100644 packages/addons/service/emby/source/default.py delete mode 100644 packages/addons/service/emby/source/resources/language/English/strings.po delete mode 100644 packages/addons/service/emby/source/resources/settings.xml delete mode 100644 packages/addons/service/emby/source/settings-default.xml delete mode 100644 packages/addons/service/emby/source/system.d/service.emby.service diff --git a/packages/addons/service/emby/changelog.txt b/packages/addons/service/emby/changelog.txt deleted file mode 100644 index 731e2f8c94..0000000000 --- a/packages/addons/service/emby/changelog.txt +++ /dev/null @@ -1,92 +0,0 @@ -124 -- Update to 3.5.3.0 -- Update imagemagick to 7.0.8-11 - -123 -- Update to 3.5.2.0 -- Update imagemagick to 7.0.8-10 and build it without pango - -122 -- Bump addon - -121 -- Update to 3.5.1.0 for netcore - -120 -- Use ffmpeg instead of ffmpegx - -119 -- Update to 3.4.1.6 -- Add script (emby-update) to update Emby - -118 -- Update to 3.3.0.0 -- Moved ffmpegx to ffmpeg-tools add-on - -117 -- Update to 3.2.34.0 -- Use reworked ffmpegx - -116 -- Update to verson 3.2.27.0 -- Rename to Emby Server - -115 -- Update to version 3.2.26.0 - -114 -- Update to version 3.2.17.0 -- Rebuild libx264, ffmpegx and imagemagick -- Use ffmpgex by default - -113: -- Update to version 3.2.8 -- Rebuild x264 and ffmpegx - -112: -- Refer to libMagickWand-7 - -111: -- Updated to version 3.2.5 -- Rebuild libx264, ffmpegx and imagemagick - -110: -- Rebuild ffmpegx with libx264 - -109: -- Rebuild ffmpgex and imagemagick - -108: -- Update to version 3.0.8500 - -107: -- Update to version 3.0.8300 -- Rebuild ffmpegx - -106: -- Updat to version 3.0.8100 -- Rebuild ffmpegx - -105: -- Update to version 3.0.7100 - -104: -- Update to version 3.0.6300 -- Rebuild ffmpegx - -103: -- Update to version 3.0.6070 -- Build for all architectures -- Refer to libsqlite3.so.0 instead of libsqlite3.so - -102: -- Update to version 3.0.6030 -- Add dedicated ffmpeg and ffprobe -- Remove unused shared libraries - -101: -- Update to version 3.0.5985 -- Removed mono build dependency - -100: -- Initial release diff --git a/packages/addons/service/emby/icon/icon.png b/packages/addons/service/emby/icon/icon.png deleted file mode 100644 index 2674bc985b5cf5d5079ab906a7bacc10ef4d7296..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16122 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 - - - - - diff --git a/packages/addons/service/emby/source/settings-default.xml b/packages/addons/service/emby/source/settings-default.xml deleted file mode 100644 index 8d35529581..0000000000 --- a/packages/addons/service/emby/source/settings-default.xml +++ /dev/null @@ -1,3 +0,0 @@ - - 10 - diff --git a/packages/addons/service/emby/source/system.d/service.emby.service b/packages/addons/service/emby/source/system.d/service.emby.service deleted file mode 100644 index 5859e94281..0000000000 --- a/packages/addons/service/emby/source/system.d/service.emby.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Emby - streaming server -Documentation=http://emby.media -After=network.target -Requires=network.target - -[Service] -ExecStart=/bin/sh /storage/.kodi/addons/service.emby/bin/emby.start -Restart=always - -[Install] -WantedBy=kodi.target - From 24bf103e67ee518e72af6c812fc28b2ba8982f85 Mon Sep 17 00:00:00 2001 From: thoradia <22841905+thoradia@users.noreply.github.com> Date: Fri, 23 Oct 2020 09:56:48 +0200 Subject: [PATCH 3/9] curl3: remove package --- .../dotnet-runtime-depends/curl3/package.mk | 23 ------------------- 1 file changed, 23 deletions(-) delete mode 100644 packages/addons/addon-depends/dotnet-runtime-depends/curl3/package.mk diff --git a/packages/addons/addon-depends/dotnet-runtime-depends/curl3/package.mk b/packages/addons/addon-depends/dotnet-runtime-depends/curl3/package.mk deleted file mode 100644 index 14c7a2a80c..0000000000 --- a/packages/addons/addon-depends/dotnet-runtime-depends/curl3/package.mk +++ /dev/null @@ -1,23 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) - -. $(get_pkg_directory curl)/package.mk - -PKG_NAME="curl3" -PKG_URL="" -PKG_DEPENDS_UNPACK+=" curl" -PKG_LONGDESC="curl for dotnet" - -unpack() { - mkdir -p $PKG_BUILD - cp -r $(get_build_dir curl)/* $PKG_BUILD - sed -i 's/CURL_@CURL_LT_SHLIB_VERSIONED_FLAVOUR@4/CURL_@CURL_LT_SHLIB_VERSIONED_FLAVOUR@3/g' $PKG_BUILD/lib/libcurl.vers.in -} - -makeinstall_target() { - make install DESTDIR=$INSTALL $PKG_MAKEINSTALL_OPTS_TARGET -} - -post_makeinstall_target() { - : -} From f55c4f220f89cba4ba545c1fd140cab62de19b0d Mon Sep 17 00:00:00 2001 From: thoradia <22841905+thoradia@users.noreply.github.com> Date: Fri, 23 Oct 2020 09:57:08 +0200 Subject: [PATCH 4/9] krb5: remove package --- .../dotnet-runtime-depends/krb5/package.mk | 25 ------------------- 1 file changed, 25 deletions(-) delete mode 100644 packages/addons/addon-depends/dotnet-runtime-depends/krb5/package.mk diff --git a/packages/addons/addon-depends/dotnet-runtime-depends/krb5/package.mk b/packages/addons/addon-depends/dotnet-runtime-depends/krb5/package.mk deleted file mode 100644 index 195b301723..0000000000 --- a/packages/addons/addon-depends/dotnet-runtime-depends/krb5/package.mk +++ /dev/null @@ -1,25 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) - -PKG_NAME="krb5" -PKG_VERSION="1.18.2-final" -PKG_SHA256="3a92fb44d06a60a79c71a031a528246bf4cf3badad150a2b91dfa7c4702c6c19" -PKG_LICENSE="MIT" -PKG_SITE="http://web.mit.edu/kerberos/" -PKG_URL="https://github.com/krb5/krb5/archive/krb5-$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain" -PKG_LONGDESC="The Kerberos network authentication protocol." -PKG_TOOLCHAIN="autotools" - -PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_regcomp=yes \ - ac_cv_printf_positional=yes \ - krb5_cv_attr_constructor_destructor=yes,yes" - -post_unpack() { - rm -rf $PKG_BUILD/doc - mv $PKG_BUILD/src/* $PKG_BUILD -} - -makeinstall_target() { - make install DESTDIR=$INSTALL $PKG_MAKEINSTALL_OPTS_TARGET -} From d70044c510f00f41f56b623327dab95b5dbdabcd Mon Sep 17 00:00:00 2001 From: thoradia <22841905+thoradia@users.noreply.github.com> Date: Fri, 23 Oct 2020 09:57:40 +0200 Subject: [PATCH 5/9] lttng-ust: remove package --- .../lttng-ust/package.mk | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 packages/addons/addon-depends/dotnet-runtime-depends/lttng-ust/package.mk diff --git a/packages/addons/addon-depends/dotnet-runtime-depends/lttng-ust/package.mk b/packages/addons/addon-depends/dotnet-runtime-depends/lttng-ust/package.mk deleted file mode 100644 index 11c3eb6eb2..0000000000 --- a/packages/addons/addon-depends/dotnet-runtime-depends/lttng-ust/package.mk +++ /dev/null @@ -1,18 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) - -PKG_NAME="lttng-ust" -PKG_VERSION="2.12.0" -PKG_SHA256="ae9a7c7a9730deabacc6c690dcf1ba1c988f7f474326ba33d30b3f339d27a059" -PKG_LICENSE="LGPLv2.1" -PKG_SITE="https://lttng.org/" -PKG_URL="https://github.com/lttng/lttng-ust/archive/v$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain userspace-rcu" -PKG_LONGDESC="LTTng is an open source tracing framework for Linux" -PKG_TOOLCHAIN="autotools" - -PKG_CONFIGURE_OPTS_TARGET="--disable-man-pages --disable-numa" - -makeinstall_target() { - make install DESTDIR=$INSTALL $PKG_MAKEINSTALL_OPTS_TARGET -} From 219bf4b9a861de6643f553d2c2ea27b6e51f5e44 Mon Sep 17 00:00:00 2001 From: thoradia <22841905+thoradia@users.noreply.github.com> Date: Fri, 23 Oct 2020 09:58:14 +0200 Subject: [PATCH 6/9] userpace-rcu: remove package --- .../userspace-rcu/package.mk | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 packages/addons/addon-depends/dotnet-runtime-depends/userspace-rcu/package.mk diff --git a/packages/addons/addon-depends/dotnet-runtime-depends/userspace-rcu/package.mk b/packages/addons/addon-depends/dotnet-runtime-depends/userspace-rcu/package.mk deleted file mode 100644 index aeb4b6df76..0000000000 --- a/packages/addons/addon-depends/dotnet-runtime-depends/userspace-rcu/package.mk +++ /dev/null @@ -1,16 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) - -PKG_NAME="userspace-rcu" -PKG_VERSION="0.12.1" -PKG_SHA256="19f31563db5078f47cabbb06bd7a3935a0964e31449efedd267f311ae79443c6" -PKG_LICENSE="LGPLv2.1" -PKG_SITE="http://liburcu.org" -PKG_URL="https://github.com/urcu/userspace-rcu/archive/v$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain" -PKG_LONGDESC="userspace read-copy-update library" -PKG_TOOLCHAIN="autotools" -PKG_BUILD_FLAGS="+pic" - -PKG_CONFIGURE_OPTS_TARGET="--disable-shared \ - --enable-static" From 20cb0d64473ce69b50ebbb3b51f6287c0cf558f3 Mon Sep 17 00:00:00 2001 From: thoradia <22841905+thoradia@users.noreply.github.com> Date: Fri, 23 Oct 2020 09:59:09 +0200 Subject: [PATCH 7/9] icu: version 68.1 --- .../chrome-depends/icu/package.mk | 35 ------------------- packages/addons/addon-depends/icu/package.mk | 25 +++++++++++++ .../icu/patches/icu-01_ldflags.patch | 12 +++++++ 3 files changed, 37 insertions(+), 35 deletions(-) delete mode 100644 packages/addons/addon-depends/chrome-depends/icu/package.mk create mode 100644 packages/addons/addon-depends/icu/package.mk create mode 100644 packages/addons/addon-depends/icu/patches/icu-01_ldflags.patch diff --git a/packages/addons/addon-depends/chrome-depends/icu/package.mk b/packages/addons/addon-depends/chrome-depends/icu/package.mk deleted file mode 100644 index d354bc11b4..0000000000 --- a/packages/addons/addon-depends/chrome-depends/icu/package.mk +++ /dev/null @@ -1,35 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) - -PKG_NAME="icu" -PKG_VERSION="61.1" -PKG_SHA256="d007f89ae8a2543a53525c74359b65b36412fa84b3349f1400be6dcf409fafef" -PKG_LICENSE="Custom" -PKG_SITE="http://www.icu-project.org" -PKG_URL="http://download.icu-project.org/files/icu4c/${PKG_VERSION}/icu4c-${PKG_VERSION//./_}-src.tgz" -PKG_DEPENDS_HOST="toolchain:host" -PKG_DEPENDS_TARGET="toolchain icu:host" -PKG_LONGDESC="International Components for Unicode library." - -PKG_ICU_OPTS="--disable-extras \ - --disable-icuio \ - --disable-layout \ - --disable-renaming \ - --disable-samples \ - --disable-tests \ - --disable-tools" - -PKG_CONFIGURE_OPTS_HOST="--enable-static \ - --disable-shared \ - $PKG_ICU_OPTS" - -configure_package() { - PKG_CONFIGURE_OPTS_TARGET="--with-cross-build=$PKG_BUILD/.$HOST_NAME \ - $PKG_ICU_OPTS" - - PKG_CONFIGURE_SCRIPT="${PKG_BUILD}/source/configure" -} - -post_makeinstall_target() { - rm -rf $INSTALL -} diff --git a/packages/addons/addon-depends/icu/package.mk b/packages/addons/addon-depends/icu/package.mk new file mode 100644 index 0000000000..a08eb4e227 --- /dev/null +++ b/packages/addons/addon-depends/icu/package.mk @@ -0,0 +1,25 @@ +# SPDX-License-Identifier: GPL-2.0 +# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) + +PKG_NAME="icu" +PKG_VERSION="68.1" +PKG_SHA256="5b3cfb519c20511c1c0429b093ec16960f6a6a0d7968a9065fda393f9eba48fc" +PKG_LICENSE="Custom" +PKG_SITE="http://www.icu-project.org" +PKG_URL="https://github.com/unicode-org/icu/archive/release-${PKG_VERSION//./-}.tar.gz" +PKG_DEPENDS_HOST="toolchain:host" +PKG_DEPENDS_TARGET="toolchain icu:host" +PKG_LONGDESC="International Components for Unicode library." + +PKG_BUILD_FLAGS="-sysroot" + +configure_package() { + PKG_CONFIGURE_SCRIPT="${PKG_BUILD}/icu4c/source/configure" + PKG_CONFIGURE_OPTS_TARGET="--disable-layout \ + --disable-layoutex \ + --disable-renaming \ + --disable-samples \ + --disable-tests \ + --disable-tools \ + --with-cross-build=${PKG_BUILD}/.${HOST_NAME}" +} diff --git a/packages/addons/addon-depends/icu/patches/icu-01_ldflags.patch b/packages/addons/addon-depends/icu/patches/icu-01_ldflags.patch new file mode 100644 index 0000000000..8f740c86cd --- /dev/null +++ b/packages/addons/addon-depends/icu/patches/icu-01_ldflags.patch @@ -0,0 +1,12 @@ +diff -Naur icu4c-67-1/icu-release-67-1/icu4c/source/config/mh-linux icu4c-67-1-ldflags/icu-release-67-1/icu4c/source/config/mh-linux +--- icu-release-67-1/icu4c/source/config/mh-linux 2020-04-22 19:49:10.000000000 +0200 ++++ icu-release-67-1.ldflags/icu4c/source/config/mh-linux 2020-09-05 17:58:05.635014182 +0200 +@@ -23,7 +23,7 @@ + LD_RPATH_PRE = -Wl,-rpath, + + ## These are the library specific LDFLAGS +-LDFLAGSICUDT=-nodefaultlibs -nostdlib ++#LDFLAGSICUDT=-nodefaultlibs -nostdlib + + ## Compiler switch to embed a library name + # The initial tab in the next line is to prevent icu-config from reading it. From 42b1be492384110bb7d3780bde4b416cef74b221 Mon Sep 17 00:00:00 2001 From: thoradia <22841905+thoradia@users.noreply.github.com> Date: Fri, 23 Oct 2020 09:34:39 +0200 Subject: [PATCH 8/9] dotnet-runtime: update to ASP.NET Core Runtime 3.1.9 --- .../addons/tools/dotnet-runtime/changelog.txt | 6 ++ .../addons/tools/dotnet-runtime/package.mk | 58 ++++++++----------- .../tools/dotnet-runtime/source/bin/le_dotnet | 10 ---- 3 files changed, 31 insertions(+), 43 deletions(-) delete mode 100644 packages/addons/tools/dotnet-runtime/source/bin/le_dotnet diff --git a/packages/addons/tools/dotnet-runtime/changelog.txt b/packages/addons/tools/dotnet-runtime/changelog.txt index e13b8d5c61..40aa078fe7 100644 --- a/packages/addons/tools/dotnet-runtime/changelog.txt +++ b/packages/addons/tools/dotnet-runtime/changelog.txt @@ -1,3 +1,9 @@ +111 +- Update to ASP.NET Core Runtime 3.1.9 +- Download source to architecture specific file +- Add icu4c libraries +- Remove superfluous libraries + 110 - Update to 3.1.5 diff --git a/packages/addons/tools/dotnet-runtime/package.mk b/packages/addons/tools/dotnet-runtime/package.mk index cefb27e232..3d6d9d7564 100644 --- a/packages/addons/tools/dotnet-runtime/package.mk +++ b/packages/addons/tools/dotnet-runtime/package.mk @@ -1,31 +1,13 @@ # SPDX-License-Identifier: GPL-2.0 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) -case "$ARCH" in - "aarch64") - PKG_NC_ARCH="arm64" - PKG_SHA256="05875790fbfc487cefb04fc6ff6d9a3ade147f1ae554e859dca60ea6a3c232aa" - PKG_URL="https://download.visualstudio.microsoft.com/download/pr/65291ed8-e931-4605-9d5a-265928a835d0/1a15d18655c8b260170117e9bd1a1cb7/dotnet-runtime-3.1.5-linux-arm64.tar.gz" - ;; - "arm") - PKG_NC_ARCH="arm" - PKG_SHA256="5728786f517410f25c59799f443d0336129d6b1680fd40cb5b40202407949008" - PKG_URL="https://download.visualstudio.microsoft.com/download/pr/15132a5c-f0f4-4373-8b8b-b7e70834d899/cad479dda52359ad43956471274ec932/dotnet-runtime-3.1.5-linux-arm.tar.gz" - ;; - "x86_64") - PKG_NC_ARCH="x64" - PKG_SHA256="ae0a4e9a1e875b46d3201cdad2779572de1c12c0aae36688ae3c3978db319ff5" - PKG_URL="https://download.visualstudio.microsoft.com/download/pr/d00eaeea-6d7b-4e73-9d96-c0234ed3b665/0d25d9d1aeaebdeef01d15370d5cd22b/dotnet-runtime-3.1.5-linux-x64.tar.gz" - ;; -esac - PKG_NAME="dotnet-runtime" -PKG_VERSION="3.1.5" -PKG_REV="110" +PKG_VERSION="3.1.9" +PKG_REV="111" PKG_ARCH="any" PKG_LICENSE="MIT" PKG_SITE="https://dotnet.github.io/" -PKG_DEPENDS_TARGET="toolchain curl curl3 krb5 lttng-ust" +PKG_DEPENDS_TARGET="toolchain icu" PKG_SECTION="tools" PKG_SHORTDESC=".NET Core Runtime" PKG_LONGDESC=".NET Core Runtime ($PKG_VERSION) runs applications built with .NET Core, a cross-platform .NET implementation." @@ -33,22 +15,32 @@ PKG_TOOLCHAIN="manual" PKG_IS_ADDON="yes" PKG_ADDON_NAME=".Net Core Runtime" +PKG_ADDON_PROJECTS="any !RPi1" PKG_ADDON_TYPE="xbmc.python.script" PKG_MAINTAINER="Anton Voyl (awiouy)" +case "${ARCH}" in + "aarch64") + PKG_SHA256="1ffe06b0012feb52d75e748438695e11905343890de73a594e6540d535fd084c" + PKG_URL="https://download.visualstudio.microsoft.com/download/pr/dffd493f-9eb8-483f-81c7-a9e2201574ef/54e7464241e01e7031fd89e6fe88e6da/aspnetcore-runtime-3.1.9-linux-arm64.tar.gz" + ;; + "arm") + PKG_SHA256="496247dc5098a506accb0c3286f82e497a6da30f4d0b8262c29484c096d5f717" + PKG_URL="https://download.visualstudio.microsoft.com/download/pr/c8cd43dd-e9de-4ff9-9cea-2f02fba6869c/d5c653c12ec93cb71e30b21856acea66/aspnetcore-runtime-3.1.9-linux-arm.tar.gz" + ;; + "x86_64") + PKG_SHA256="b47a882277d4ef42d3cfebbd1f334559b8345fe8a8b05e2a7d83a37ffe5f775e" + PKG_URL="https://download.visualstudio.microsoft.com/download/pr/933b0cb8-3494-4ca4-8c9e-1bcfd3568ab0/8704eef073efdfecdaaad4a18beb05ac/aspnetcore-runtime-3.1.9-linux-x64.tar.gz" + ;; +esac +PKG_SOURCE_NAME="aspnetcore-runtime_${PKG_VERSION}_${ARCH}.tar.gz" + addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin - cp -r $PKG_BUILD/* \ - $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -r $PKG_BUILD/* \ + $ADDON_BUILD/$PKG_ADDON_ID/bin - mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/libs - cp -L $(get_install_dir curl3)/usr/lib/libcurl.so.? \ - $(get_install_dir krb5)/usr/lib/libcom_err.so.? \ - $(get_install_dir krb5)/usr/lib/libgssapi_krb5.so.? \ - $(get_install_dir krb5)/usr/lib/libk5crypto.so.? \ - $(get_install_dir krb5)/usr/lib/libkrb5.so.? \ - $(get_install_dir krb5)/usr/lib/libkrb5support.so.? \ - $(get_install_dir lttng-ust)/usr/lib/liblttng-ust.so.? \ - $(get_install_dir lttng-ust)/usr/lib/liblttng-ust-tracepoint.so.? \ - $ADDON_BUILD/$PKG_ADDON_ID/libs + mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib + cp -L $(get_install_dir icu)/usr/lib/lib*.so.?? \ + $ADDON_BUILD/$PKG_ADDON_ID/lib/ } diff --git a/packages/addons/tools/dotnet-runtime/source/bin/le_dotnet b/packages/addons/tools/dotnet-runtime/source/bin/le_dotnet deleted file mode 100644 index c5ed97d3c7..0000000000 --- a/packages/addons/tools/dotnet-runtime/source/bin/le_dotnet +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -# SPDX-License-Identifier: GPL-2.0 -# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) - -. /etc/profile -oe_setup_addon tools.dotnet-runtime - -DOTNET_SYSTEM_GLOBALIZATION_INVARIANT="1" \ -LD_LIBRARY_PATH="$ADDON_DIR/libs:$LD_LIBRARY_PATH" \ -dotnet "$@" 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 9/9] 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]