jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-30 14:16:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4048 from MilhouseVH/le10_kodi19-next02

Browse Source 
kodi: update to latest 19-alpha (Dec 2019)
This commit is contained in:
Matthias Reichl 2019-12-17 10:50:19 +01:00 committed by GitHub
commit 77ecb0d7c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 25 additions and 212 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/mediacenter/kodi-binary-addons/audioencoder.flac/package.mk
View File

@ -3,8 +3,8 @@
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="audioencoder.flac"
PKG_VERSION="2.0.4-Leia"
PKG_SHA256="7ec525ec7c4ecfb6e832333869f77df03f71fd59209e8d6e22b3da8a72074db2"
PKG_VERSION="2.0.5-Leia"
PKG_SHA256="e6b8ad024c171eb463339a1f136f3ee9465267ef7fd3b80a5f0007b0180f36e5"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

4
packages/mediacenter/kodi-binary-addons/inputstream.adaptive/package.mk
View File

@ -2,8 +2,8 @@
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="inputstream.adaptive"
PKG_VERSION="2.5.1-Matrix"
PKG_SHA256="90eb9a3196cba5efa16efcd43ae599adf0a546e9401cb00e505538b94f01db1e"
PKG_VERSION="2.5.3-Matrix"
PKG_SHA256="db1645eb003a618b35689af81f01110f99677e348155f69a14804eb479abee55"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

4
packages/mediacenter/kodi-binary-addons/pvr.iptvsimple/package.mk
View File

@ -3,8 +3,8 @@
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="pvr.iptvsimple"
PKG_VERSION="4.7.1-Matrix"
PKG_SHA256="1f27b3bd0e809080245889810bdae778485de7bfcfe97923a7194e8bff6d6872"
PKG_VERSION="4.8.4-Matrix"
PKG_SHA256="3ce216a6ec6e039b669160fd31370f58bb512473989b77727247e9a8083f1551"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

4
packages/mediacenter/kodi-binary-addons/pvr.mythtv/package.mk
View File

@ -3,8 +3,8 @@
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="pvr.mythtv"
PKG_VERSION="6.2.4-Matrix"
PKG_SHA256="178576ab5625ed1e793f3802cd318a42746792dd4880a731488789a7b6f6c332"
PKG_VERSION="6.2.5-Matrix"
PKG_SHA256="b89653365508503522113d83a97c913b8ddb396ad3d790661db277eb1c2b0da2"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

4
packages/mediacenter/kodi-binary-addons/pvr.teleboy/package.mk
View File

@ -2,8 +2,8 @@
# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="pvr.teleboy"
PKG_VERSION="19.2.0-Matrix"
PKG_SHA256="0c3dd3695c2da9c28ba0d41cca6f9cc45aeafd56492ab6c0fe769e1f956968df"
PKG_VERSION="19.3.5-Matrix"
PKG_SHA256="1876e8599975b19293f942bf57462d0200baae542c8482095b40241f060431e3"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

4
packages/mediacenter/kodi-binary-addons/pvr.vuplus/package.mk
View File

@ -3,8 +3,8 @@
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="pvr.vuplus"
PKG_VERSION="4.9.3-Matrix"
PKG_SHA256="98f9dd2160fd837720612d7e249c585885018a6590a14919583a884a1ba5ed20"
PKG_VERSION="4.9.4-Matrix"
PKG_SHA256="0ff96455118fa7540ab8233cfeec16238df2134932c598be4aa51b753b35747b"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

4
packages/mediacenter/kodi-binary-addons/pvr.waipu/package.mk
View File

@ -2,8 +2,8 @@
# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="pvr.waipu"
PKG_VERSION="1.2.1-Matrix"
PKG_SHA256="4d4f1338f72f345d53452dd7f105f57f6603457bec795bf09694d572a61b4ac3"
PKG_VERSION="1.3.1-Matrix"
PKG_SHA256="c10945d70f9f24099644a31da29fecda454e92a2fa28c649a13f9e25c992a6b6"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

4
packages/mediacenter/kodi-binary-addons/pvr.zattoo/package.mk
View File

@ -2,8 +2,8 @@
# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="pvr.zattoo"
PKG_VERSION="19.2.0-Matrix"
PKG_SHA256="8be6fe04c1038c75fdd7006845c306dc082ecdd63ce2579b2145368253689ab8"
PKG_VERSION="19.2.5-Matrix"
PKG_SHA256="e33df8e53510d015a8d3b0b88a8ae249487c5f213b557894e67b21d1b875f0d5"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

4
packages/mediacenter/kodi-binary-addons/visualization.waveform/package.mk
View File

@ -3,8 +3,8 @@
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="visualization.waveform"
PKG_VERSION="3.1.0-Leia"
PKG_SHA256="d5d92688e44d2c05159267bfffe9a14b8e8073065635ecde7f4f0c570365f7d3"
PKG_VERSION="3.1.1-Leia"
PKG_SHA256="c5fbf48c2251b61d9abfcd679a750199f5efc78e63fded9a1482cfd9b41d0b5b"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

10
packages/mediacenter/kodi/package.mk
View File

@ -13,8 +13,8 @@ PKG_PATCH_DIRS="$KODI_VENDOR"
case $KODI_VENDOR in
raspberrypi)
PKG_VERSION="60bef867ee45a6eba15abc7cd021220cc30d6910" # kodi19-pre-Python3
PKG_SHA256="1804b2e494472810a71e604fc9e05b2a47fe7d0d775e42f91ac180ec417dde9a"
PKG_VERSION="5f134adfcee6fd031c7b8f905bce892dc6d88f7a" # kodi19-pre-Python3
PKG_SHA256="9acec0b04f802b8bcd24922a1664ee47198f384b6ba8f0704718dde176a81858"
PKG_URL="https://github.com/popcornmix/xbmc/archive/$PKG_VERSION.tar.gz"
PKG_SOURCE_NAME="kodi-$KODI_VENDOR-$PKG_VERSION.tar.gz"
;;
@ -25,8 +25,8 @@ case $KODI_VENDOR in
PKG_SOURCE_NAME="kodi-$KODI_VENDOR-$PKG_VERSION.tar.gz"
;;
*)
PKG_VERSION="29f64ce850040abc9972fcf015a02a3804bdf8c6"
PKG_SHA256="1ee23b6d1b72f4224f9b0011195c65357cdab88579144e852967f6d3dd298c6c"
PKG_VERSION="dea0a9d318750547adcfb2e9dd0732962c1ce6ba"
PKG_SHA256="6b71705216402e36e72449298a834892481bd1969de058bd84a5bd083db01caa"
PKG_URL="https://github.com/xbmc/xbmc/archive/$PKG_VERSION.tar.gz"
PKG_SOURCE_NAME="kodi-$PKG_VERSION.tar.gz"
;;
@ -48,7 +48,7 @@ configure_package() {
if [ "$DISPLAYSERVER" = "x11" ]; then
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libX11 libXext libdrm libXrandr"
KODI_XORG="-DCORE_PLATFORM_NAME=x11"
KODI_XORG="-DCORE_PLATFORM_NAME=x11 -DX11_RENDER_SYSTEM=gl"
elif [ "$DISPLAYSERVER" = "weston" ]; then
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET wayland waylandpp"
CFLAGS="$CFLAGS -DMESA_EGL_NO_X11_HEADERS"

188
packages/mediacenter/kodi/patches/kodi-100.14-use-alsa-and-pulse-together.patch
View File

@ -1,188 +0,0 @@
From c8265155b5aa6716c6c74e15f255dd1bdbdf2441 Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Wed, 10 Jul 2019 17:52:11 +0100
Subject: [PATCH] allow using alsa and pulse together
---
xbmc/windowing/X11/WinSystemX11GLContext.cpp | 35 ++--------------------------
xbmc/windowing/gbm/WinSystemGbm.cpp | 34 ++-------------------------
xbmc/windowing/rpi/WinSystemRpi.cpp | 17 ++++----------
xbmc/windowing/wayland/WinSystemWayland.cpp | 35 +++-------------------------
4 files changed, 11 insertions(+), 110 deletions(-)
diff --git a/xbmc/windowing/X11/WinSystemX11GLContext.cpp b/xbmc/windowing/X11/WinSystemX11GLContext.cpp
index 8ff2abd..1c00a93 100644
--- a/xbmc/windowing/X11/WinSystemX11GLContext.cpp
+++ b/xbmc/windowing/X11/WinSystemX11GLContext.cpp
@@ -43,39 +43,8 @@ std::unique_ptr<CWinSystemBase> CWinSystemBase::CreateWinSystem()
CWinSystemX11GLContext::CWinSystemX11GLContext()
{
- std::string envSink;
- if (getenv("KODI_AE_SINK"))
- envSink = getenv("KODI_AE_SINK");
- if (StringUtils::EqualsNoCase(envSink, "ALSA"))
- {
- OPTIONALS::ALSARegister();
- }
- else if (StringUtils::EqualsNoCase(envSink, "PULSE"))
- {
- OPTIONALS::PulseAudioRegister();
- }
- else if (StringUtils::EqualsNoCase(envSink, "OSS"))
- {
- OPTIONALS::OSSRegister();
- }
- else if (StringUtils::EqualsNoCase(envSink, "SNDIO"))
- {
- OPTIONALS::SndioRegister();
- }
- else
- {
- if (!OPTIONALS::PulseAudioRegister())
- {
- if (!OPTIONALS::ALSARegister())
- {
- if (!OPTIONALS::SndioRegister())
- {
- OPTIONALS::OSSRegister();
- }
- }
- }
- }
-
+ OPTIONALS::ALSARegister();
+ OPTIONALS::PulseAudioRegister();
m_lirc.reset(OPTIONALS::LircRegister());
}
diff --git a/xbmc/windowing/gbm/WinSystemGbm.cpp b/xbmc/windowing/gbm/WinSystemGbm.cpp
index a714192..4b52e39 100644
--- a/xbmc/windowing/gbm/WinSystemGbm.cpp
+++ b/xbmc/windowing/gbm/WinSystemGbm.cpp
@@ -35,38 +35,8 @@ CWinSystemGbm::CWinSystemGbm() :
m_GBM(new CGBMUtils),
m_libinput(new CLibInputHandler)
{
- std::string envSink;
- if (getenv("KODI_AE_SINK"))
- envSink = getenv("KODI_AE_SINK");
- if (StringUtils::EqualsNoCase(envSink, "ALSA"))
- {
- OPTIONALS::ALSARegister();
- }
- else if (StringUtils::EqualsNoCase(envSink, "PULSE"))
- {
- OPTIONALS::PulseAudioRegister();
- }
- else if (StringUtils::EqualsNoCase(envSink, "OSS"))
- {
- OPTIONALS::OSSRegister();
- }
- else if (StringUtils::EqualsNoCase(envSink, "SNDIO"))
- {
- OPTIONALS::SndioRegister();
- }
- else
- {
- if (!OPTIONALS::PulseAudioRegister())
- {
- if (!OPTIONALS::ALSARegister())
- {
- if (!OPTIONALS::SndioRegister())
- {
- OPTIONALS::OSSRegister();
- }
- }
- }
- }
+ OPTIONALS::ALSARegister();
+ OPTIONALS::PulseAudioRegister();
m_dpms = std::make_shared<CGBMDPMSSupport>();
CLinuxPowerSyscall::Register();
diff --git a/xbmc/windowing/rpi/WinSystemRpi.cpp b/xbmc/windowing/rpi/WinSystemRpi.cpp
index 75fbe56..ac06490 100644
--- a/xbmc/windowing/rpi/WinSystemRpi.cpp
+++ b/xbmc/windowing/rpi/WinSystemRpi.cpp
@@ -10,7 +10,9 @@
#include "ServiceBroker.h"
#include "cores/AudioEngine/AESinkFactory.h"
+#include "cores/AudioEngine/Sinks/AESinkALSA.h"
#include "cores/AudioEngine/Sinks/AESinkPi.h"
+#include "cores/AudioEngine/Sinks/AESinkPULSE.h"
#include "guilib/DispResource.h"
#include "settings/DisplaySettings.h"
#include "settings/Settings.h"
@@ -46,19 +48,8 @@ CWinSystemRpi::CWinSystemRpi() :
AE::CAESinkFactory::ClearSinks();
CAESinkPi::Register();
- std::string envSink;
- if (getenv("KODI_AE_SINK"))
- envSink = getenv("KODI_AE_SINK");
-
- if (StringUtils::EqualsNoCase(envSink, "PULSE"))
- {
- OPTIONALS::PulseAudioRegister();
- }
- else
- {
- OPTIONALS::ALSARegister();
- }
-
+ CAESinkALSA::Register();
+ CAESinkPULSE::Register();
CLinuxPowerSyscall::Register();
m_lirc.reset(OPTIONALS::LircRegister());
m_libinput->Start();
diff --git a/xbmc/windowing/wayland/WinSystemWayland.cpp b/xbmc/windowing/wayland/WinSystemWayland.cpp
index 9d00312..2b76e77 100644
--- a/xbmc/windowing/wayland/WinSystemWayland.cpp
+++ b/xbmc/windowing/wayland/WinSystemWayland.cpp
@@ -137,38 +137,9 @@ struct MsgBufferScale
CWinSystemWayland::CWinSystemWayland()
: CWinSystemBase{}, m_protocol{"WinSystemWaylandInternal"}
{
- std::string envSink;
- if (getenv("KODI_AE_SINK"))
- envSink = getenv("KODI_AE_SINK");
- if (StringUtils::EqualsNoCase(envSink, "ALSA"))
- {
- OPTIONALS::ALSARegister();
- }
- else if (StringUtils::EqualsNoCase(envSink, "PULSE"))
- {
- OPTIONALS::PulseAudioRegister();
- }
- else if (StringUtils::EqualsNoCase(envSink, "OSS"))
- {
- OPTIONALS::OSSRegister();
- }
- else if (StringUtils::EqualsNoCase(envSink, "SNDIO"))
- {
- OPTIONALS::SndioRegister();
- }
- else
- {
- if (!OPTIONALS::PulseAudioRegister())
- {
- if (!OPTIONALS::ALSARegister())
- {
- if (!OPTIONALS::SndioRegister())
- {
- OPTIONALS::OSSRegister();
- }
- }
- }
- }
+ OPTIONALS::ALSARegister();
+ OPTIONALS::PulseAudioRegister();
+
m_winEvents.reset(new CWinEventsWayland());
CLinuxPowerSyscall::Register();
m_lirc.reset(OPTIONALS::LircRegister());
--
2.14.1

1
packages/mediacenter/kodi/system.d/kodi.service
View File

@ -5,6 +5,7 @@ Requires=graphical.target
Wants=network-online.target
[Service]
Environment=KODI_AE_SINK=ALSA+PULSE
Environment=__GL_YIELD=USLEEP
Environment=DISPLAY=:0.0
Environment=WAYLAND_DISPLAY=wayland-0

2
projects/RPi/options
View File

@ -91,7 +91,7 @@
GRAPHIC_DRIVERS=""
# Use a vendor specific KODI repo
# KODI_VENDOR="raspberrypi"
KODI_VENDOR="raspberrypi"
# KODI Player implementation to use (default / bcm2835-driver / mesa)
KODIPLAYER_DRIVER="bcm2835-driver"