From be274883abf330d67334e392011be92acf9457d0 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Sat, 1 Jun 2019 01:55:42 +0100 Subject: [PATCH] kodi: update patch after PR16043 --- ...i-100.14-use-alsa-and-pulse-together.patch | 21 ------------------- 1 file changed, 21 deletions(-) diff --git a/packages/mediacenter/kodi/patches/kodi-100.14-use-alsa-and-pulse-together.patch b/packages/mediacenter/kodi/patches/kodi-100.14-use-alsa-and-pulse-together.patch index c12d5cca24..5d3ede8dc3 100644 --- a/packages/mediacenter/kodi/patches/kodi-100.14-use-alsa-and-pulse-together.patch +++ b/packages/mediacenter/kodi/patches/kodi-100.14-use-alsa-and-pulse-together.patch @@ -5,7 +5,6 @@ Subject: [PATCH] allow using alsa and pulse together --- xbmc/windowing/X11/WinSystemX11GLContext.cpp | 35 ++------------------ - xbmc/windowing/amlogic/WinSystemAmlogic.cpp | 2 ++ xbmc/windowing/gbm/WinSystemGbm.cpp | 34 ++----------------- xbmc/windowing/rpi/WinSystemRpi.cpp | 17 +++------- xbmc/windowing/wayland/WinSystemWayland.cpp | 35 ++------------------ @@ -57,26 +56,6 @@ index 5b0b155736b9..a3a3251a5d10 100644 m_lirc.reset(OPTIONALS::LircRegister()); } -diff --git a/xbmc/windowing/amlogic/WinSystemAmlogic.cpp b/xbmc/windowing/amlogic/WinSystemAmlogic.cpp -index 0637f83fc0fd..b1b41b05039e 100644 ---- a/xbmc/windowing/amlogic/WinSystemAmlogic.cpp -+++ b/xbmc/windowing/amlogic/WinSystemAmlogic.cpp -@@ -20,6 +20,7 @@ - // AESink Factory - #include "cores/AudioEngine/AESinkFactory.h" - #include "cores/AudioEngine/Sinks/AESinkALSA.h" -+#include "cores/AudioEngine/Sinks/AESinkPULSE.h" - #include "windowing/GraphicContext.h" - #include "windowing/Resolution.h" - #include "platform/linux/powermanagement/LinuxPowerSyscall.h" -@@ -67,6 +68,7 @@ CWinSystemAmlogic::CWinSystemAmlogic() : - // Register sink - AE::CAESinkFactory::ClearSinks(); - CAESinkALSA::Register(); -+ CAESinkPULSE::Register(); - CLinuxPowerSyscall::Register(); - m_lirc.reset(OPTIONALS::LircRegister()); - m_libinput->Start(); diff --git a/xbmc/windowing/gbm/WinSystemGbm.cpp b/xbmc/windowing/gbm/WinSystemGbm.cpp index 4a3291a55045..9ad1f2daf1af 100644 --- a/xbmc/windowing/gbm/WinSystemGbm.cpp