Merge remote-tracking branch 'LibreELEC.tv/libreelec-10.0' into coree…

…lec-19
CoreELEC · Jan 17, 2022 · 496b554 · 496b554
2 parents c46c3cb + 0a16a67
commit 496b554
Show file tree

Hide file tree

Showing 7 changed files with 61 additions and 5 deletions.
diff --git a/distributions/LibreELEC/options b/distributions/LibreELEC/options
@@ -87,6 +87,9 @@
 # build and install PulseAudio support (yes / no)
   PULSEAUDIO_SUPPORT="yes"
 
+# build and install eSpeak-NG support (yes / no)
+  ESPEAK_SUPPORT="no"
+
 # build and install with BluRay support (yes / no)
   KODI_BLURAY_SUPPORT="yes"
 

diff --git a/packages/audio/espeak-ng/package.mk b/packages/audio/espeak-ng/package.mk
@@ -0,0 +1,35 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv)
+
+PKG_NAME="espeak-ng"
+PKG_VERSION="1.50"
+PKG_SHA256="80ee6cd06fcd61888951ab49362b400e80dd1fac352a8b1131d90cfe8a210edb"
+PKG_LICENSE="GPL"
+PKG_SITE="https://github.com/espeak-ng/espeak-ng"
+PKG_URL="https://github.com/espeak-ng/espeak-ng/releases/download/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tgz"
+PKG_DEPENDS_HOST="gcc:host "
+PKG_DEPENDS_TARGET="toolchain espeak-ng:host"
+PKG_LONGDESC="eSpeak NG is an open source speech synthesizer that supports more than a hundred languages and accents"
+PKG_TOOLCHAIN="configure"
+
+pre_configure() {
+  cd ..
+  make distclean
+  ./autogen.sh
+}
+
+make_host() {
+  make -j1
+}
+
+make_target() {
+  make src/espeak-ng src/speak-ng
+}
+
+makeinstall_target() {
+  make src/espeak-ng src/speak-ng
+  make install-exec DESTDIR=$INSTALL
+  mkdir -p $INSTALL/usr/share/espeak-ng-data
+  cp -prf $TOOLCHAIN/share/espeak-ng-data $INSTALL/usr/share
+}
+
diff --git a/packages/linux/package.mk b/packages/linux/package.mk
@@ -22,8 +22,8 @@ case "${LINUX}" in
     PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz"
     ;;
   raspberrypi)
-    PKG_VERSION="e9bc4a48d97fcceb7097f11e14aa743b2a2e7849" # 5.10.90
-    PKG_SHA256="1c9014c69609a3a704693c02b0d11f838d4914fcf20c4fd2b6177fe957114f22"
+    PKG_VERSION="e13d4e98076f3698cfd03186159e652f5721a241" # 5.10.90
+    PKG_SHA256="939ce936b1ac22afcf64940e84c20cfaaedf45291f0ebac2fc4fd742d238016f"
     PKG_URL="https://github.com/raspberrypi/linux/archive/${PKG_VERSION}.tar.gz"
     PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz"
     ;;

diff --git a/packages/mediacenter/kodi-theme-Estuary/package.mk b/packages/mediacenter/kodi-theme-Estuary/package.mk
@@ -7,6 +7,7 @@ PKG_LICENSE="GPL"
 PKG_SITE="http://www.kodi.tv"
 PKG_URL=""
 PKG_DEPENDS_TARGET="kodi"
+PKG_DEPENDS_UNPACK="kodi"
 PKG_LONGDESC="Kodi Mediacenter default theme."
 PKG_TOOLCHAIN="manual"
 

diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk
@@ -3,8 +3,8 @@
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="kodi"
-PKG_VERSION="19.3-Matrix"
-PKG_SHA256="440f47e475dd8a48e0a6d41349e83b74890f3fbe8275d3e401d3c50f5b9ea09b"
+PKG_VERSION="e8cdc30b9da3125c62094b062c6c2f0f6b5acfb1"
+PKG_SHA256="cbc896cda55a31731e4a7d512466e3aafd730aac937ba157eb86e92cdb5ffb6e"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.kodi.tv"
 PKG_URL="https://github.com/xbmc/xbmc/archive/${PKG_VERSION}.tar.gz"
@@ -60,6 +60,10 @@ configure_package() {
     KODI_PULSEAUDIO="-DENABLE_PULSEAUDIO=OFF"
   fi
 
+  if [ "$ESPEAK_SUPPORT" = yes ]; then
+    PKG_DEPENDS_TARGET+=" espeak-ng"
+  fi
+
   if [ "${CEC_SUPPORT}" = yes ]; then
     PKG_DEPENDS_TARGET+=" libcec"
     KODI_CEC="-DENABLE_CEC=ON"

diff --git a/packages/mediacenter/kodi/patches/kodi-100.03-disable-online-check.patch b/packages/mediacenter/kodi/patches/kodi-100.03-disable-online-check.patch
@@ -21,7 +21,7 @@ Subject: disable online check
    m_info.videoEncoder      = GetVideoEncoder();
    m_info.cpuFrequency =
        StringUtils::Format("%4.0f MHz", CServiceBroker::GetCPUInfo()->GetCPUFrequency());
-@@ -1007,9 +1006,7 @@ int CSysInfo::GetXbmcBitness(void)
+@@ -1012,9 +1011,7 @@ int CSysInfo::GetXbmcBitness(void)
 
  bool CSysInfo::HasInternet()
  {

diff --git a/packages/mediacenter/kodi/patches/kodi-100.26-disable-internal-texturepacker.patch b/packages/mediacenter/kodi/patches/kodi-100.26-disable-internal-texturepacker.patch
@@ -0,0 +1,13 @@
+--- a/cmake/modules/FindTexturePacker.cmake
++++ b/cmake/modules/FindTexturePacker.cmake
+@@ -53,10 +53,6 @@ if(NOT TARGET TexturePacker::TexturePack
+       endif()
+     endif()
+
+-    # Ship TexturePacker only on Linux and FreeBSD
+-    if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "Linux")
+-      set(INTERNAL_TEXTUREPACKER_INSTALLABLE TRUE)
+-    endif()
+
+     # Use it during build if build architecture is same as host
+     # (not cross-compiling) and TEXTUREPACKER_EXECUTABLE is not found