mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-30 22:26:42 +00:00
kodi: update to kodi-f621a02
This commit is contained in:
parent
ae0e1ecb5e
commit
243b6f565a
@ -17,8 +17,8 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="kodi"
|
||||
PKG_VERSION="dc587bd"
|
||||
PKG_SHA256="91c41ecf4ef676cdc3259c6bd03d413518f980f5fdae0ab8d580865ab33e0944"
|
||||
PKG_VERSION="f621a02"
|
||||
PKG_SHA256="ac4b2e5d5858ed2d07cd547dadae8394430da80bde39e5f191572b6e1f20df01"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://www.kodi.tv"
|
||||
|
@ -5,7 +5,7 @@ Date: Mon Dec 11 23:44:41 2017 -0800
|
||||
[linux] allow using alsa and pulse together
|
||||
|
||||
diff --git a/xbmc/windowing/X11/WinSystemX11GLContext.cpp b/xbmc/windowing/X11/WinSystemX11GLContext.cpp
|
||||
index 24394d7631..0914d28820 100644
|
||||
index 398a311..6b3e6d8 100644
|
||||
--- a/xbmc/windowing/X11/WinSystemX11GLContext.cpp
|
||||
+++ b/xbmc/windowing/X11/WinSystemX11GLContext.cpp
|
||||
@@ -52,31 +52,8 @@ std::unique_ptr<CWinSystemBase> CWinSystemBase::CreateWinSystem()
|
||||
@ -43,7 +43,7 @@ index 24394d7631..0914d28820 100644
|
||||
|
||||
CWinSystemX11GLContext::~CWinSystemX11GLContext()
|
||||
diff --git a/xbmc/windowing/amlogic/WinSystemAmlogic.cpp b/xbmc/windowing/amlogic/WinSystemAmlogic.cpp
|
||||
index 4b8199760e..e50a31daf9 100644
|
||||
index 020e501..ed0f084 100644
|
||||
--- a/xbmc/windowing/amlogic/WinSystemAmlogic.cpp
|
||||
+++ b/xbmc/windowing/amlogic/WinSystemAmlogic.cpp
|
||||
@@ -32,6 +32,7 @@
|
||||
@ -53,20 +53,20 @@ index 4b8199760e..e50a31daf9 100644
|
||||
+#include "cores/AudioEngine/Sinks/AESinkPULSE.h"
|
||||
#include "guilib/GraphicContext.h"
|
||||
#include "guilib/Resolution.h"
|
||||
#include "settings/Settings.h"
|
||||
@@ -78,6 +79,7 @@ CWinSystemAmlogic::CWinSystemAmlogic()
|
||||
#include "powermanagement/linux/LinuxPowerSyscall.h"
|
||||
@@ -79,6 +80,7 @@ CWinSystemAmlogic::CWinSystemAmlogic()
|
||||
// Register sink
|
||||
AE::CAESinkFactory::ClearSinks();
|
||||
CAESinkALSA::Register();
|
||||
+ CAESinkPULSE::Register();
|
||||
CLinuxPowerSyscall::Register();
|
||||
}
|
||||
|
||||
CWinSystemAmlogic::~CWinSystemAmlogic()
|
||||
diff --git a/xbmc/windowing/gbm/WinSystemGbm.cpp b/xbmc/windowing/gbm/WinSystemGbm.cpp
|
||||
index 3ef426f677..7a1dfe1c8e 100644
|
||||
index 854040f..7ea9e75 100644
|
||||
--- a/xbmc/windowing/gbm/WinSystemGbm.cpp
|
||||
+++ b/xbmc/windowing/gbm/WinSystemGbm.cpp
|
||||
@@ -37,31 +37,8 @@ CWinSystemGbm::CWinSystemGbm() :
|
||||
@@ -38,31 +38,8 @@ CWinSystemGbm::CWinSystemGbm() :
|
||||
m_nativeDisplay(nullptr),
|
||||
m_nativeWindow(nullptr)
|
||||
{
|
||||
@ -99,9 +99,9 @@ index 3ef426f677..7a1dfe1c8e 100644
|
||||
+ GBM::PulseAudioRegister();
|
||||
|
||||
m_winEvents.reset(new CWinEventsLinux());
|
||||
}
|
||||
CLinuxPowerSyscall::Register();
|
||||
diff --git a/xbmc/windowing/rpi/WinSystemRpi.cpp b/xbmc/windowing/rpi/WinSystemRpi.cpp
|
||||
index 9e7f8bd9be..464cf1342b 100644
|
||||
index b1caf83..da1b59f 100644
|
||||
--- a/xbmc/windowing/rpi/WinSystemRpi.cpp
|
||||
+++ b/xbmc/windowing/rpi/WinSystemRpi.cpp
|
||||
@@ -34,7 +34,9 @@
|
||||
@ -111,16 +111,15 @@ index 9e7f8bd9be..464cf1342b 100644
|
||||
+#include "cores/AudioEngine/Sinks/AESinkALSA.h"
|
||||
#include "cores/AudioEngine/Sinks/AESinkPi.h"
|
||||
+#include "cores/AudioEngine/Sinks/AESinkPULSE.h"
|
||||
#include "powermanagement/linux/LinuxPowerSyscall.h"
|
||||
|
||||
#include <EGL/egl.h>
|
||||
#include <EGL/eglplatform.h>
|
||||
@@ -55,6 +57,8 @@ CWinSystemRpi::CWinSystemRpi()
|
||||
@@ -56,6 +58,8 @@ CWinSystemRpi::CWinSystemRpi()
|
||||
m_winEvents.reset(new CWinEventsLinux());
|
||||
AE::CAESinkFactory::ClearSinks();
|
||||
CAESinkPi::Register();
|
||||
+ CAESinkALSA::Register();
|
||||
+ CAESinkPULSE::Register();
|
||||
CLinuxPowerSyscall::Register();
|
||||
}
|
||||
|
||||
CWinSystemRpi::~CWinSystemRpi()
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user