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

kodi: fix WAYLANDPP_PROTOCOLS_DIR path / update Pulse/Alsa patch to support Wayland

Browse Source
This commit is contained in:
5schatten 2019-05-13 22:31:06 +02:00
parent 19dcecb983
commit d19ab98bf3
2 changed files with 65 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,7 +52,9 @@ configure_package() {
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET wayland waylandpp"
CFLAGS="$CFLAGS -DMESA_EGL_NO_X11_HEADERS"
CXXFLAGS="$CXXFLAGS -DMESA_EGL_NO_X11_HEADERS"
KODI_XORG="-DCORE_PLATFORM_NAME=wayland -DWAYLAND_RENDER_SYSTEM=gles"
KODI_XORG="-DCORE_PLATFORM_NAME=wayland \
-DWAYLAND_RENDER_SYSTEM=gles \
-DWAYLANDPP_PROTOCOLS_DIR=${SYSROOT_PREFIX}/usr/share/waylandpp/protocols"
fi
if [ ! "$OPENGL" = "no" ]; then

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

@ -1,17 +1,18 @@
From 0bb21ebfe5f26545ccc9f105560c6c0fcbce77b3 Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Wed, 26 Sep 2018 02:47:03 +0100
From 2e7de29a69b37ad0a7d8632c5aafcdd02a4f550d Mon Sep 17 00:00:00 2001
From: 5schatten <supervisedthinking@gmail.com>
Date: Tue, 7 May 2019 01:30:10 +0200
Subject: [PATCH] allow using alsa and pulse together
---
xbmc/windowing/X11/WinSystemX11GLContext.cpp | 35 ++--------------------------
xbmc/windowing/X11/WinSystemX11GLContext.cpp | 35 ++------------------
xbmc/windowing/amlogic/WinSystemAmlogic.cpp | 2 ++
xbmc/windowing/gbm/WinSystemGbm.cpp | 34 ++-------------------------
xbmc/windowing/rpi/WinSystemRpi.cpp | 17 ++++----------
4 files changed, 10 insertions(+), 78 deletions(-)
xbmc/windowing/gbm/WinSystemGbm.cpp | 34 ++-----------------
xbmc/windowing/rpi/WinSystemRpi.cpp | 17 +++-------
xbmc/windowing/wayland/WinSystemWayland.cpp | 35 ++------------------
5 files changed, 13 insertions(+), 110 deletions(-)
diff --git a/xbmc/windowing/X11/WinSystemX11GLContext.cpp b/xbmc/windowing/X11/WinSystemX11GLContext.cpp
index 1980916..2524716 100644
index 5b0b155736b9..a3a3251a5d10 100644
--- a/xbmc/windowing/X11/WinSystemX11GLContext.cpp
+++ b/xbmc/windowing/X11/WinSystemX11GLContext.cpp
@@ -40,39 +40,8 @@ std::unique_ptr<CWinSystemBase> CWinSystemBase::CreateWinSystem()
@ -57,7 +58,7 @@ index 1980916..2524716 100644
}
diff --git a/xbmc/windowing/amlogic/WinSystemAmlogic.cpp b/xbmc/windowing/amlogic/WinSystemAmlogic.cpp
index 9df83a6..5d41c1f 100644
index 0637f83fc0fd..b1b41b05039e 100644
--- a/xbmc/windowing/amlogic/WinSystemAmlogic.cpp
+++ b/xbmc/windowing/amlogic/WinSystemAmlogic.cpp
@@ -20,6 +20,7 @@
@ -68,7 +69,7 @@ index 9df83a6..5d41c1f 100644
#include "windowing/GraphicContext.h"
#include "windowing/Resolution.h"
#include "platform/linux/powermanagement/LinuxPowerSyscall.h"
@@ -66,6 +67,7 @@ CWinSystemAmlogic::CWinSystemAmlogic() :
@@ -67,6 +68,7 @@ CWinSystemAmlogic::CWinSystemAmlogic() :
// Register sink
AE::CAESinkFactory::ClearSinks();
CAESinkALSA::Register();
@ -77,10 +78,10 @@ index 9df83a6..5d41c1f 100644
m_lirc.reset(OPTIONALS::LircRegister());
m_libinput->Start();
diff --git a/xbmc/windowing/gbm/WinSystemGbm.cpp b/xbmc/windowing/gbm/WinSystemGbm.cpp
index 12f2da6..c2bdd0e 100644
index 4a3291a55045..9ad1f2daf1af 100644
--- a/xbmc/windowing/gbm/WinSystemGbm.cpp
+++ b/xbmc/windowing/gbm/WinSystemGbm.cpp
@@ -31,38 +31,8 @@ CWinSystemGbm::CWinSystemGbm() :
@@ -33,38 +33,8 @@ CWinSystemGbm::CWinSystemGbm() :
m_GBM(new CGBMUtils),
m_libinput(new CLibInputHandler)
{
@ -122,10 +123,10 @@ index 12f2da6..c2bdd0e 100644
CLinuxPowerSyscall::Register();
m_lirc.reset(OPTIONALS::LircRegister());
diff --git a/xbmc/windowing/rpi/WinSystemRpi.cpp b/xbmc/windowing/rpi/WinSystemRpi.cpp
index a403464..6a68d9f 100644
index bdeb68c8c006..f5bc22c3cbdb 100644
--- a/xbmc/windowing/rpi/WinSystemRpi.cpp
+++ b/xbmc/windowing/rpi/WinSystemRpi.cpp
@@ -21,7 +21,9 @@
@@ -22,7 +22,9 @@
#include "guilib/DispResource.h"
#include "utils/log.h"
#include "cores/AudioEngine/AESinkFactory.h"
@ -135,7 +136,7 @@ index a403464..6a68d9f 100644
#include "platform/linux/powermanagement/LinuxPowerSyscall.h"
#include <EGL/egl.h>
@@ -44,19 +46,8 @@ CWinSystemRpi::CWinSystemRpi() :
@@ -45,19 +47,8 @@ CWinSystemRpi::CWinSystemRpi() :
AE::CAESinkFactory::ClearSinks();
CAESinkPi::Register();
@ -157,6 +158,49 @@ index a403464..6a68d9f 100644
CLinuxPowerSyscall::Register();
m_lirc.reset(OPTIONALS::LircRegister());
m_libinput->Start();
--
2.14.1
diff --git a/xbmc/windowing/wayland/WinSystemWayland.cpp b/xbmc/windowing/wayland/WinSystemWayland.cpp
index 9d0031239c6e..2b76e773f329 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());