Merge pull request #3734 from MilhouseVH/le92_backports4

le92 backports (9.1.003)

packages/addons/addon-depends/jre-depends/apache-ant/package.mk

@@ -0,0 +1,25 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (C) 2019-present Peter Vicman (peter.vicman@gmail.com)
+
+PKG_NAME="apache-ant"
+PKG_VERSION="1.10.6"
+PKG_SHA256="a4adf371696089e1730d4f55fd4d0c6f3784dea1eee402fcc981f2330f8d6fc1"
+PKG_LICENSE="Apache License 2.0"
+PKG_SITE="https://ant.apache.org/"
+PKG_URL="https://archive.apache.org/dist/ant/source/${PKG_NAME}-${PKG_VERSION}-src.tar.xz"
+PKG_DEPENDS_HOST="jdk-x86_64-zulu:host"
+PKG_LONGDESC="Apache Ant is a Java library and command-line tool that help building software."
+PKG_TOOLCHAIN="manual"
+
+make_host() {
+  (
+  export JAVA_HOME=$(get_build_dir jdk-x86_64-zulu)
+
+  ./bootstrap.sh
+  ./bootstrap/bin/ant -f fetch.xml -Ddest=optional
+  ./build.sh -Ddist.dir=${PKG_BUILD}/binary dist
+
+  cp binary/bin/ant ${TOOLCHAIN}/bin
+  cp -r binary/lib ${TOOLCHAIN}
+  )
+}

packages/addons/addon-depends/jre-depends/jdk-aarch64-zulu/package.mk

@@ -0,0 +1,15 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (C) 2019-present Peter Vicman (peter.vicman@gmail.com)
+
+PKG_NAME="jdk-aarch64-zulu"
+PKG_VERSION="8.38.0.162-1.8.0_212"
+PKG_SHA256="2afa6b9a86fea6f9275856506b5cc1efd8420f674c5e2dc3e1b04e140d6ad852"
+PKG_LICENSE="GPLv2"
+PKG_SITE="https://www.azul.com/products/zulu-embedded/"
+PKG_URL="http://cdn.azul.com/zulu-embedded/bin/zulu${PKG_VERSION%%-*}-ca-jdk${PKG_VERSION##*-}-linux_aarch64.tar.gz"
+PKG_LONGDESC="Zulu, the open Java(TM) platform from Azul Systems."
+PKG_TOOLCHAIN="manual"
+
+post_unpack() {
+  rm -f $PKG_BUILD/src.zip
+}

packages/addons/addon-depends/jre-depends/jdk-arm-zulu/package.mk

@@ -0,0 +1,19 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (C) 2019-present Peter Vicman (peter.vicman@gmail.com)
+
+PKG_NAME="jdk-arm-zulu"
+PKG_VERSION="8.38.0.163-1.8.0_212"
+PKG_SHA256="bc45f41eab6e55c4e740e980001831c5e35db85745ec61a2b110e816e1074715"
+PKG_LICENSE="GPLv2"
+PKG_SITE="https://www.azul.com/products/zulu-embedded/"
+PKG_URL="https://cdn.azul.com/zulu-embedded/bin/zulu${PKG_VERSION%%-*}-ca-jdk${PKG_VERSION##*-}-linux_aarch32hf.tar.gz"
+PKG_LONGDESC="Zulu, the open Java(TM) platform from Azul Systems."
+PKG_TOOLCHAIN="manual"
+
+post_unpack() {
+  rm -f $PKG_BUILD/src.zip
+
+  # libbluray needs arm/server
+  mv $PKG_BUILD/jre/lib/aarch32    $PKG_BUILD/jre/lib/arm
+  mv $PKG_BUILD/jre/lib/arm/client $PKG_BUILD/jre/lib/arm/server
+}

packages/addons/addon-depends/jre-depends/jdk-x86_64-zulu/package.mk

@@ -0,0 +1,15 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (C) 2019-present Peter Vicman (peter.vicman@gmail.com)
+
+PKG_NAME="jdk-x86_64-zulu"
+PKG_VERSION="8.38.0.13-8.0.212"
+PKG_SHA256="568e7578f1b20b1e62a8ed2c374bad4eb0e75d221323ccfa6ba8d7bc56cf33cf"
+PKG_LICENSE="GPLv2"
+PKG_SITE="https://www.azul.com/products/zulu-enterprise/"
+PKG_URL="https://cdn.azul.com/zulu/bin/zulu${PKG_VERSION%%-*}-ca-jdk${PKG_VERSION##*-}-linux_x64.tar.gz"
+PKG_LONGDESC="Zulu, the open Java(TM) platform from Azul Systems."
+PKG_TOOLCHAIN="manual"
+
+post_unpack() {
+  rm -f $PKG_BUILD/src.zip
+}

packages/addons/addon-depends/jre-depends/jre-libXinerama/package.mk

@@ -0,0 +1,20 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
+
+. $(get_pkg_directory libXinerama)/package.mk
+
+PKG_NAME="jre-libXinerama"
+PKG_LONGDESC="libXinerama for JRE"
+PKG_URL=""
+PKG_DEPENDS_UNPACK+=" libXinerama"
+
+PKG_CONFIGURE_OPTS_TARGET+=" --disable-static --enable-shared"
+
+unpack() {
+  mkdir -p $PKG_BUILD
+  tar --strip-components=1 -xf $SOURCES/${PKG_NAME:4}/${PKG_NAME:4}-$PKG_VERSION.tar.bz2 -C $PKG_BUILD
+}
+
+makeinstall_target() {
+  :
+}

packages/addons/addon-depends/jre-depends/jre-libbluray/package.mk

@@ -0,0 +1,33 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
+
+. $(get_pkg_directory libbluray)/package.mk
+
+PKG_NAME="jre-libbluray"
+PKG_DEPENDS_TARGET+=" jdk-x86_64-zulu:host apache-ant:host"
+PKG_LONGDESC="libbluray jar for BD-J menus"
+PKG_URL=""
+PKG_DEPENDS_UNPACK+=" libbluray"
+PKG_PATCH_DIRS+=" $(get_pkg_directory libbluray)/patches"
+
+unpack() {
+  mkdir -p $PKG_BUILD
+  tar --strip-components=1 -xf $SOURCES/${PKG_NAME:4}/${PKG_NAME:4}-$PKG_VERSION.tar.bz2 -C $PKG_BUILD
+}
+
+pre_configure_target() {
+  # build also jar
+  PKG_CONFIGURE_OPTS_TARGET="${PKG_CONFIGURE_OPTS_TARGET/disable-bdjava-jar/enable-bdjava-jar}"
+}
+
+make_target() {
+  (
+  export JAVA_HOME="$(get_build_dir jdk-x86_64-zulu)"
+
+  make all-local
+  )
+}
+
+makeinstall_target() {
+  :
+}

packages/addons/tools/jre.zulu/changelog.txt

@@ -0,0 +1,2 @@
+100
+- Initial release

packages/addons/tools/jre.zulu/package.mk

@@ -0,0 +1,42 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (C) 2019-present Peter Vicman (peter.vicman@gmail.com)
+
+PKG_NAME="jre.zulu"
+PKG_VERSION="1.0"
+PKG_REV="100"
+PKG_LICENSE="GPL2"
+PKG_DEPENDS_TARGET="jdk-${TARGET_ARCH}-zulu jre-libbluray libXext chrome-libXtst chrome-libXi chrome-libXrender jre-libXinerama"
+PKG_SECTION="tools"
+PKG_SHORTDESC="Java Runtime Environment 8 for Blu-ray Disc Java menus from Azul Systems."
+PKG_LONGDESC="$PKG_SHORTDESC"
+PKG_TOOLCHAIN="manual"
+
+PKG_IS_ADDON="yes"
+PKG_ADDON_NAME="JRE for BD-J menus"
+PKG_ADDON_TYPE="xbmc.python.script"
+
+# find $1.so.[0-9]* in $2 and copy it to dest
+_pkg_copy_lib() {
+  find "$2" -regextype sed -regex ".*/$1\.so\.[0-9]*" \
+    -exec cp {} "$ADDON_BUILD/$PKG_ADDON_ID/lib" \;
+}
+
+addon() {
+  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib
+
+  cp -a $(get_build_dir jdk-${TARGET_ARCH}-zulu)/jre \
+        $(get_build_dir jre-libbluray)/.$TARGET_NAME/.libs/*.jar \
+        ${PKG_DIR}/profile.d \
+    $ADDON_BUILD/$PKG_ADDON_ID
+
+  # copy required libraries for JRE
+  _pkg_copy_lib libXtst $(get_build_dir chrome-libXtst)/.$TARGET_NAME/src/.libs
+  _pkg_copy_lib libXi $(get_build_dir chrome-libXi)/.$TARGET_NAME/src/.libs
+  _pkg_copy_lib libXrender $(get_build_dir chrome-libXrender)/.$TARGET_NAME/src/.libs
+  _pkg_copy_lib libXinerama $(get_build_dir jre-libXinerama)/.$TARGET_NAME/src/.libs
+
+  if [ "$TARGET_ARCH" = "arm" ]; then
+    _pkg_copy_lib libX11 $(get_build_dir libX11)/.$TARGET_NAME/src/.libs
+    _pkg_copy_lib libXext $(get_build_dir libXext)/.$TARGET_NAME/src/.libs
+  fi
+}

packages/addons/tools/jre.zulu/profile.d/jre.profile

@@ -0,0 +1,8 @@
+# point to folder with jre
+export JAVA_HOME="/storage/.kodi/addons/tools.jre.zulu"
+
+# libbluray-*.jar in this folder (need / at the end)
+export LIBBLURAY_CP="/storage/.kodi/addons/tools.jre.zulu/"
+
+# or set file directly
+# export LIBBLURAY_CP="/storage/.kodi/addons/tools.jre.zulu/libbluray-j2se-1.0.2.jar"

packages/addons/tools/jre.zulu/source/default.py

@@ -0,0 +1,2 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)

packages/compress/zstd/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="zstd"
-PKG_VERSION="1.4.0"
-PKG_SHA256="7f323f0e0c18488748f3d9b2d4353f00e904ea2ccd0372ea04d7f77aa1156557"
+PKG_VERSION="1.4.2"
+PKG_SHA256="12730983b521f9a604c6789140fcb94fadf9a3ca99199765e33c56eb65b643c9"
 PKG_LICENSE="BSD/GPLv2"
 PKG_SITE="http://www.zstd.net"
 PKG_URL="https://github.com/facebook/zstd/releases/download/v${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.gz"
@@ -12,5 +12,5 @@ PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="A fast real-time compression algorithm."
 
 configure_package() {
-  PKG_CMAKE_SCRIPT="$PKG_BUILD/build/cmake/CMakeLists.txt"
+  PKG_CMAKE_SCRIPT="${PKG_BUILD}/build/cmake/CMakeLists.txt"
 }

packages/devel/parallel/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="parallel"
-PKG_VERSION="20190122"
-PKG_SHA256="ae735f201a8ceeff2ace48ff779bda9d19846e629bcc02ea7c8768a42394190c"
+PKG_VERSION="20190722"
+PKG_SHA256="0ed0863184dbb396b4c030848e754b1ea76329c06ae9e43314bc0915eb6cbca7"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://www.gnu.org/software/parallel/"
 PKG_URL="http://ftpmirror.gnu.org/parallel/$PKG_NAME-$PKG_VERSION.tar.bz2"

packages/graphics/mesa/package.mk

@@ -3,8 +3,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="mesa"
-PKG_VERSION="19.1.2"
-PKG_SHA256="08d424da157cd8d00c38584a193aab96873be43d617d1cd78b5b8d33cbcb4ef8"
+PKG_VERSION="19.1.5"
+PKG_SHA256="501cc19343aa81108589e2c1d0621055219a612399869e46c935de7ae93277b0"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.mesa3d.org/"
 PKG_URL="https://github.com/mesa3d/mesa/archive/mesa-$PKG_VERSION.tar.gz"

packages/sysutils/busybox/config/suspend-modules.conf

@@ -1 +1 @@
-SUSPEND_MODULES="jme asix anysee rtl8192se imon r8712u cx23885 cdc_acm ddbridge brcmfmac 8812au"
+SUSPEND_MODULES="jme asix anysee rtl8192se imon r8712u cx23885 cdc_acm ddbridge brcmfmac 8812au xpad"

packages/sysutils/busybox/scripts/getedid

@@ -186,7 +186,7 @@ intel_amd() {
   if [ "$kernel" -lt "415000" ]; then
     sed -i "/ APPEND/s/$/ initrd=\/edid.cpio drm_kms_helper.edid_firmware=$hdmi:edid\/edid.bin video=$hdmi:D/" "$file"
   else
-    sed -i "/ APPEND/s/$/ initrd=\/edid.cpio drm.edid_firmware=edid\/edid.bin/" "$file"
+    sed -i "/ APPEND/s/$/ initrd=\/edid.cpio drm.edid_firmware=edid\/edid.bin video=$hdmi:D/" "$file"
   fi
 
   # reboot

packages/sysutils/busybox/sleep.d.serial/99-suspend-modules.sh

@@ -3,8 +3,18 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 # Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
 
+if [ -f /storage/.config/suspend-modules.conf ]; then
+    . /storage/.config/suspend-modules.conf
+    custom_modules="${SUSPEND_MODULES}"
+    SUSPEND_MODULES=""
+fi
+
 . /etc/suspend-modules.conf
 
+if [ -n "${custom_modules}" ]; then
+    SUSPEND_MODULES="${SUSPEND_MODULES} ${custom_modules}"
+fi
+
 modunload()
 {
     local MOD D C USED MODS I

packages/sysutils/util-linux/scripts/mount-swap

@@ -34,7 +34,7 @@ case $1 in
   mount)
     [ -z "$SWAP" -a -f "$SWAPFILE" ] && SWAP=$SWAPFILE
     for i in $SWAP; do
-      swapon -p 10000 $SWAP
+      swapon -p 10000 $i
     done
     ;;
   unmount)

packages/web/curl/package.mk

@@ -11,8 +11,8 @@
 #   there: http://forum.xbmc.org/showthread.php?tid=177557
 
 PKG_NAME="curl"
-PKG_VERSION="7.65.1"
-PKG_SHA256="f6c22074877f235aebc7c53057dbc7ee82358f8ae58bfb767e955c18c859a77a"
+PKG_VERSION="7.65.3"
+PKG_SHA256="f2d98854813948d157f6a91236ae34ca4a1b4cb302617cebad263d79b0235fea"
 PKG_LICENSE="MIT"
 PKG_SITE="http://curl.haxx.se"
 PKG_URL="http://curl.haxx.se/download/$PKG_NAME-$PKG_VERSION.tar.xz"

packages/x11/driver/xf86-video-nvidia/package.mk

@@ -6,8 +6,8 @@ PKG_NAME="xf86-video-nvidia"
 # Remember to run "python packages/x11/driver/xf86-video-nvidia/scripts/make_nvidia_udev.py" and commit changes to
 # "packages/x11/driver/xf86-video-nvidia/udev.d/96-nvidia.rules" whenever bumping version.
 # Host may require installation of python-lxml and python-requests packages.
-PKG_VERSION="430.34"
-PKG_SHA256="248ed9d3dee62eba86d0e0c7737218666aae204a0c0bb9c557b114db75edc523"
+PKG_VERSION="430.40"
+PKG_SHA256="669ff38532ff05c78e1edc3c6df2055fd96437107f5919b6e5a774c3a495501b"
 PKG_ARCH="x86_64"
 PKG_LICENSE="nonfree"
 PKG_SITE="http://www.nvidia.com/"

packages/x11/driver/xf86-video-nvidia/udev.d/96-nvidia.rules

@@ -231,6 +231,7 @@ ATTRS{device}=="0x1e02", GOTO="configure_nvidia"
 ATTRS{device}=="0x1e04", GOTO="configure_nvidia"
 ATTRS{device}=="0x1e07", GOTO="configure_nvidia"
 ATTRS{device}=="0x1e30", GOTO="configure_nvidia"
+ATTRS{device}=="0x1e81", GOTO="configure_nvidia"
 ATTRS{device}=="0x1e82", GOTO="configure_nvidia"
 ATTRS{device}=="0x1e84", GOTO="configure_nvidia"
 ATTRS{device}=="0x1e87", GOTO="configure_nvidia"