Merge pull request #2996 from awiouy/emby-fix

Emby: update to 3.5.3.0

packages/addons/addon-depends/dotnet-runtime-depends/curl3/package.mk

@@ -14,7 +14,7 @@ unpack() {
 }
 
 makeinstall_target() {
-  :
+  make install DESTDIR=$INSTALL $PKG_MAKEINSTALL_OPTS_TARGET
 }
 
 post_makeinstall_target() {

packages/addons/addon-depends/dotnet-runtime-depends/krb5/package.mk

@@ -4,7 +4,6 @@
 PKG_NAME="krb5"
 PKG_VERSION="1.16.1-final"
 PKG_SHA256="d46a676bd6cfe58b8684ffd881bc7ed2c9c90cb43ccfa45a9500530e84aa262b"
-PKG_ARCH="any"
 PKG_LICENSE="MIT"
 PKG_SITE="http://web.mit.edu/kerberos/"
 PKG_URL="https://github.com/krb5/krb5/archive/krb5-$PKG_VERSION.tar.gz"
@@ -21,3 +20,7 @@ post_unpack() {
   rm -rf $PKG_BUILD/doc
   mv $PKG_BUILD/src/* $PKG_BUILD
 }
+
+makeinstall_target() {
+  make install DESTDIR=$INSTALL $PKG_MAKEINSTALL_OPTS_TARGET
+}

packages/addons/addon-depends/dotnet-runtime-depends/lttng-ust/package.mk

@@ -4,7 +4,6 @@
 PKG_NAME="lttng-ust"
 PKG_VERSION="2.10.2"
 PKG_SHA256="015452be6f94e4468315d0478cd5a4d01d9e52672bcea122b4ff7426198d5803"
-PKG_ARCH="any"
 PKG_LICENSE="LGPLv2.1"
 PKG_SITE="https://lttng.org/"
 PKG_URL="https://github.com/lttng/lttng-ust/archive/v$PKG_VERSION.tar.gz"
@@ -13,3 +12,7 @@ PKG_LONGDESC="LTTng is an open source tracing framework for Linux"
 PKG_TOOLCHAIN="autotools"
 
 PKG_CONFIGURE_OPTS_TARGET="--disable-man-pages"
+
+makeinstall_target() {
+  make install DESTDIR=$INSTALL $PKG_MAKEINSTALL_OPTS_TARGET
+}

packages/addons/addon-depends/dotnet-runtime-depends/userspace-rcu/package.mk

@@ -4,17 +4,13 @@
 PKG_NAME="userspace-rcu"
 PKG_VERSION="0.10.1"
 PKG_SHA256="4ddbca9927b459b7a295dec612cf43df5886d398161d50c59d0097995e368a3b"
-PKG_ARCH="any"
 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"
-
-pre_configure_target() {
-  CFLAGS="$CFLAGS -fPIC"
-}

packages/addons/addon-depends/emby-depends/imagemagick/package.mk

@@ -2,13 +2,11 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="imagemagick"
-PKG_VERSION="7.0.8-10"
-PKG_SHA256="119f99e7849805741fbf0a7890bae0b0a6530fdab35dd3f39185b2dddba272f8"
-PKG_ARCH="any"
+PKG_VERSION="7.0.8-11"
+PKG_SHA256="95e4da5fa109bc8b59b5e7a54cdfcf1af3230067c95adf608ff21c08eca1de20"
 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_SOURCE_DIR="ImageMagick-$PKG_VERSION"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="Software suite to create, edit, compose, or convert bitmap images"
 
@@ -18,3 +16,7 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-openmp \
                            --with-pango=no \
                            --with-utilities=no \
                            --with-x=no"
+
+makeinstall_target() {
+  make install DESTDIR=$INSTALL $PKG_MAKEINSTALL_OPTS_TARGET
+}

packages/addons/service/emby/changelog.txt

@@ -1,3 +1,7 @@
+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

packages/addons/service/emby/package.mk

@@ -2,10 +2,9 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="emby"
-PKG_VERSION="3.5.2.0"
-PKG_SHA256="fe5561c27a5d2bbe79a9717ecb2eb8ce4f243592494b813250d2db56da5a3710"
-PKG_REV="123"
-PKG_ARCH="any"
+PKG_VERSION="3.5.3.0"
+PKG_SHA256="f25abb6d34f888c467db561ad333a222626febdc69b6353de86c04848753210c"
+PKG_REV="124"
 PKG_LICENSE="OSS"
 PKG_SITE="http://emby.media"
 PKG_URL="https://github.com/MediaBrowser/Emby.Releases/releases/download/$PKG_VERSION/embyserver-netcore_$PKG_VERSION.zip"

packages/addons/tools/dotnet-runtime/changelog.txt

@@ -1,3 +1,6 @@
+102
+- Update to 2.1.4
+
 101
 - Update to 2.1.3
 

packages/addons/tools/dotnet-runtime/package.mk

@@ -4,26 +4,24 @@
 case "$ARCH" in
   "aarch64")
     PKG_NC_ARCH="arm64"
-    PKG_SHA256="771904d72f06eb816e5a4adbaa76c4352c097fbf5ed7dee9e4059e776278223a"
+    PKG_SHA256="ac0991ac76706da429e37167563114e911920bb512bb4cda61a6d401f65ffa5f"
     ;;
   "arm")
     PKG_NC_ARCH="arm"
-    PKG_SHA256="cbdc689bff4dc01cb89e792d34a296bf9971f251719b6d60bbe5c5caeda846c7"
+    PKG_SHA256="c74f75feed614a1b764915d462c0a9965ba435f6c343f0ad1834ecf95f9f2dfa"
     ;;
   "x86_64")
     PKG_NC_ARCH="x64"
-    PKG_SHA256="dd5d52fdc439fce37b2cc706ecdaf8900c36870654bbce4ae693a66279821b2e"
+    PKG_SHA256="55e6d5c93ab5bb492c82b8d0d57d0d67ac720733f10c18605d8b93d26866adb2"
     ;;
 esac
 
 PKG_NAME="dotnet-runtime"
-PKG_VERSION="2.1.3"
-PKG_REV="101"
-PKG_ARCH="any"
+PKG_VERSION="2.1.4"
+PKG_REV="102"
 PKG_LICENSE="MIT"
 PKG_SITE="https://dotnet.github.io/"
-PKG_URL="https://download.microsoft.com/download/6/E/B/6EBD972D-2E2F-41EB-9668-F73F5FDDC09C/dotnet-runtime-$PKG_VERSION-linux-$PKG_NC_ARCH.tar.gz"
-PKG_SOURCE_NAME="$PKG_NAME-$PKG_VERSION-$ARCH.tar.gz"
+PKG_URL="https://download.microsoft.com/download/A/7/8/A78F1D25-8D5C-4411-B544-C7D527296D5E/dotnet-runtime-$PKG_VERSION-linux-$PKG_NC_ARCH.tar.gz"
 PKG_DEPENDS_TARGET="toolchain curl curl3 krb5 lttng-ust"
 PKG_SECTION="tools"
 PKG_SHORTDESC=".NET Core Runtime"
@@ -42,11 +40,11 @@ unpack() {
 
 addon() {
   mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
-  cp -r $PKG_BUILD/* \
+  cp -r $PKG_BUILD/$PKG_NAME-$PKG_VERSION/* \
         $ADDON_BUILD/$PKG_ADDON_ID/bin
 
   mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/libs
-  cp -L $(get_build_dir curl3)/.$TARGET_NAME/lib/.libs/libcurl.so.? \
+  cp -L $(get_build_dir curl3)/.install_pkg/usr/lib/libcurl.so.? \
         $(get_build_dir krb5)/.install_pkg/usr/lib/libcom_err.so.? \
         $(get_build_dir krb5)/.install_pkg/usr/lib/libgssapi_krb5.so.? \
         $(get_build_dir krb5)/.install_pkg/usr/lib/libk5crypto.so.? \