From f5377abdfb0f03104dc22170274924f0f59db115 Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Wed, 10 Jul 2019 18:02:25 +0100
Subject: [PATCH] kodi: update patch after PR16325

---
 ...i-100.14-use-alsa-and-pulse-together.patch | 47 ++++++++++---------
 1 file changed, 25 insertions(+), 22 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 5d3ede8dc3..c1f0ac0c6a 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
@@ -1,20 +1,20 @@
-From 2e7de29a69b37ad0a7d8632c5aafcdd02a4f550d Mon Sep 17 00:00:00 2001
-From: 5schatten <supervisedthinking@gmail.com>
-Date: Tue, 7 May 2019 01:30:10 +0200
+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 ++------------------
- 5 files changed, 13 insertions(+), 110 deletions(-)
+ 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 5b0b155736b9..a3a3251a5d10 100644
+index 8ff2abd..1c00a93 100644
 --- a/xbmc/windowing/X11/WinSystemX11GLContext.cpp
 +++ b/xbmc/windowing/X11/WinSystemX11GLContext.cpp
-@@ -40,39 +40,8 @@ std::unique_ptr<CWinSystemBase> CWinSystemBase::CreateWinSystem()
+@@ -43,39 +43,8 @@ std::unique_ptr<CWinSystemBase> CWinSystemBase::CreateWinSystem()
  
  CWinSystemX11GLContext::CWinSystemX11GLContext()
  {
@@ -57,10 +57,10 @@ index 5b0b155736b9..a3a3251a5d10 100644
  }
  
 diff --git a/xbmc/windowing/gbm/WinSystemGbm.cpp b/xbmc/windowing/gbm/WinSystemGbm.cpp
-index 4a3291a55045..9ad1f2daf1af 100644
+index a714192..4b52e39 100644
 --- a/xbmc/windowing/gbm/WinSystemGbm.cpp
 +++ b/xbmc/windowing/gbm/WinSystemGbm.cpp
-@@ -33,38 +33,8 @@ CWinSystemGbm::CWinSystemGbm() :
+@@ -35,38 +35,8 @@ CWinSystemGbm::CWinSystemGbm() :
    m_GBM(new CGBMUtils),
    m_libinput(new CLibInputHandler)
  {
@@ -99,23 +99,23 @@ index 4a3291a55045..9ad1f2daf1af 100644
 +  OPTIONALS::ALSARegister();
 +  OPTIONALS::PulseAudioRegister();
  
+   m_dpms = std::make_shared<CGBMDPMSSupport>();
    CLinuxPowerSyscall::Register();
-   m_lirc.reset(OPTIONALS::LircRegister());
 diff --git a/xbmc/windowing/rpi/WinSystemRpi.cpp b/xbmc/windowing/rpi/WinSystemRpi.cpp
-index bdeb68c8c006..f5bc22c3cbdb 100644
+index 75fbe56..ac06490 100644
 --- a/xbmc/windowing/rpi/WinSystemRpi.cpp
 +++ b/xbmc/windowing/rpi/WinSystemRpi.cpp
-@@ -22,7 +22,9 @@
- #include "guilib/DispResource.h"
- #include "utils/log.h"
+@@ -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 "platform/linux/powermanagement/LinuxPowerSyscall.h"
- 
- #include <EGL/egl.h>
-@@ -45,19 +47,8 @@ CWinSystemRpi::CWinSystemRpi() :
+ #include "guilib/DispResource.h"
+ #include "settings/DisplaySettings.h"
+ #include "settings/Settings.h"
+@@ -46,19 +48,8 @@ CWinSystemRpi::CWinSystemRpi() :
    AE::CAESinkFactory::ClearSinks();
  
    CAESinkPi::Register();
@@ -138,7 +138,7 @@ index bdeb68c8c006..f5bc22c3cbdb 100644
    m_lirc.reset(OPTIONALS::LircRegister());
    m_libinput->Start();
 diff --git a/xbmc/windowing/wayland/WinSystemWayland.cpp b/xbmc/windowing/wayland/WinSystemWayland.cpp
-index 9d0031239c6e..2b76e773f329 100644
+index 9d00312..2b76e77 100644
 --- a/xbmc/windowing/wayland/WinSystemWayland.cpp
 +++ b/xbmc/windowing/wayland/WinSystemWayland.cpp
 @@ -137,38 +137,9 @@ struct MsgBufferScale
@@ -183,3 +183,6 @@ index 9d0031239c6e..2b76e773f329 100644
    m_winEvents.reset(new CWinEventsWayland());
    CLinuxPowerSyscall::Register();
    m_lirc.reset(OPTIONALS::LircRegister());
+-- 
+2.14.1
+