diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk index f6bcdf580f..c84106bf26 100644 --- a/packages/mediacenter/kodi/package.mk +++ b/packages/mediacenter/kodi/package.mk @@ -17,14 +17,14 @@ ################################################################################ PKG_NAME="kodi" -PKG_VERSION="72f69fc" -PKG_SHA256="25727662bc35a2564f7cf3f5a5c78a1c1932d6f6735f54c263723b1f8a527a3b" +PKG_VERSION="af4a548" +PKG_SHA256="17a03bf2e636bb5d4fca08e778147a631edf6a46bd73072473046199cd869d06" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.kodi.tv" PKG_URL="https://github.com/xbmc/xbmc/archive/$PKG_VERSION.tar.gz" PKG_SOURCE_DIR="xbmc-$PKG_VERSION*" -PKG_DEPENDS_TARGET="toolchain JsonSchemaBuilder:host TexturePacker:host Python2 zlib systemd pciutils lzo pcre swig:host libass curl fontconfig fribidi tinyxml libjpeg-turbo freetype libcdio taglib libxml2 libxslt rapidjson sqlite ffmpeg crossguid giflib libdvdnav libhdhomerun libfmt" +PKG_DEPENDS_TARGET="toolchain JsonSchemaBuilder:host TexturePacker:host Python2 zlib systemd pciutils lzo pcre swig:host libass curl fontconfig fribidi tinyxml libjpeg-turbo freetype libcdio taglib libxml2 libxslt rapidjson sqlite ffmpeg crossguid giflib libdvdnav libhdhomerun libfmt lirc" PKG_SECTION="mediacenter" PKG_SHORTDESC="kodi: Kodi Mediacenter" PKG_LONGDESC="Kodi Media Center (which was formerly named Xbox Media Center or XBMC) is a free and open source cross-platform media player and home entertainment system software with a 10-foot user interface designed for the living-room TV. Its graphical user interface allows the user to easily manage video, photos, podcasts, and music from a computer, optical disk, local network, and the internet using a remote control." @@ -217,12 +217,10 @@ PKG_CMAKE_OPTS_TARGET="-DNATIVEPREFIX=$TOOLCHAIN \ -DENABLE_INTERNAL_FFMPEG=OFF \ -DFFMPEG_INCLUDE_DIRS=$SYSROOT_PREFIX/usr \ -DENABLE_INTERNAL_CROSSGUID=OFF \ - -DENABLE_OPENSSL=ON \ -DENABLE_UDEV=ON \ -DENABLE_DBUS=ON \ -DENABLE_XSLT=ON \ -DENABLE_CCACHE=ON \ - -DENABLE_LIRC=ON \ -DENABLE_EVENTCLIENTS=ON \ -DENABLE_LDGOLD=ON \ -DENABLE_DEBUGFISSION=OFF \ diff --git a/packages/mediacenter/kodi/patches/kodi-100.04-use-udevil-to-umount.patch b/packages/mediacenter/kodi/patches/kodi-100.04-use-udevil-to-umount.patch index 09068256f6..65a5cae41b 100644 --- a/packages/mediacenter/kodi/patches/kodi-100.04-use-udevil-to-umount.patch +++ b/packages/mediacenter/kodi/patches/kodi-100.04-use-udevil-to-umount.patch @@ -1,19 +1,19 @@ -From 13eddbe7c95fb224a39991a288ed1102e0739c44 Mon Sep 17 00:00:00 2001 -From: Stefan Saraev -Date: Thu, 17 Apr 2014 12:12:50 +0300 -Subject: [PATCH 04/13] use udevil to umount +From 642638622009224d2da9a7633316f422071139a2 Mon Sep 17 00:00:00 2001 +From: MilhouseVH +Date: Thu, 5 Apr 2018 11:42:13 +0100 +Subject: [PATCH] use udevil to mount --- xbmc/platform/linux/PosixMountProvider.cpp | 2 +- - xbmc/storage/linux/UDevProvider.cpp | 2 +- + xbmc/platform/linux/storage/UDevProvider.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xbmc/platform/linux/PosixMountProvider.cpp b/xbmc/platform/linux/PosixMountProvider.cpp -index 218d10b..57e94ca 100644 +index 6dd1132..a262a7c 100644 --- a/xbmc/platform/linux/PosixMountProvider.cpp +++ b/xbmc/platform/linux/PosixMountProvider.cpp -@@ -133,7 +133,7 @@ bool CPosixMountProvider::Eject(const std::string& mountpath) - { +@@ -135,7 +135,7 @@ bool CPosixMountProvider::Eject(const std::string& mountpath) + #if !defined(TARGET_DARWIN_IOS) // just go ahead and try to umount the disk // if it does umount, life is good, if not, no loss. - std::string cmd = "umount \"" + mountpath + "\""; @@ -21,11 +21,11 @@ index 218d10b..57e94ca 100644 int status = system(cmd.c_str()); if (status == 0) -diff --git a/xbmc/storage/linux/UDevProvider.cpp b/xbmc/storage/linux/UDevProvider.cpp -index 0ca370b..dffee34 100644 ---- a/xbmc/storage/linux/UDevProvider.cpp -+++ b/xbmc/storage/linux/UDevProvider.cpp -@@ -207,7 +207,7 @@ bool CUDevProvider::Eject(const std::string& mountpath) +diff --git a/xbmc/platform/linux/storage/UDevProvider.cpp b/xbmc/platform/linux/storage/UDevProvider.cpp +index 4bcebf4..daf0d58 100644 +--- a/xbmc/platform/linux/storage/UDevProvider.cpp ++++ b/xbmc/platform/linux/storage/UDevProvider.cpp +@@ -205,7 +205,7 @@ bool CUDevProvider::Eject(const std::string& mountpath) { // just go ahead and try to umount the disk // if it does umount, life is good, if not, no loss. @@ -35,5 +35,5 @@ index 0ca370b..dffee34 100644 if (status == 0) -- -2.5.0 +2.14.1 diff --git a/packages/mediacenter/kodi/patches/kodi-100.07-disable-minimize.patch b/packages/mediacenter/kodi/patches/kodi-100.07-disable-minimize.patch index 877605afd8..ec5c69fcdf 100644 --- a/packages/mediacenter/kodi/patches/kodi-100.07-disable-minimize.patch +++ b/packages/mediacenter/kodi/patches/kodi-100.07-disable-minimize.patch @@ -15,7 +15,7 @@ index 95ae98c..9aca1e3 100644 void CApplication::Minimize() { -- CServiceBroker::GetWinSystem().Minimize(); +- CServiceBroker::GetWinSystem()->Minimize(); } PLAYERCOREID CApplication::GetCurrentPlayer() diff --git a/packages/mediacenter/kodi/patches/kodi-100.13-udevprovider-filter-out-OE-specific-mounts.patch b/packages/mediacenter/kodi/patches/kodi-100.13-udevprovider-filter-out-OE-specific-mounts.patch index 986e281bbf..1c23cf5c72 100644 --- a/packages/mediacenter/kodi/patches/kodi-100.13-udevprovider-filter-out-OE-specific-mounts.patch +++ b/packages/mediacenter/kodi/patches/kodi-100.13-udevprovider-filter-out-OE-specific-mounts.patch @@ -1,17 +1,17 @@ -From 62d1013382c328c8af9aeb598a253c4699accf8d Mon Sep 17 00:00:00 2001 -From: Stefan Saraev -Date: Sun, 26 Apr 2015 15:13:15 +0300 -Subject: [PATCH 13/13] udevprovider: filter out OE specific mounts +From ba4c814c7ff26ff821ea362632fd6bb47bf93066 Mon Sep 17 00:00:00 2001 +From: MilhouseVH +Date: Thu, 5 Apr 2018 11:42:48 +0100 +Subject: [PATCH] udevprovider: filter out OE specific mounts --- - xbmc/storage/linux/UDevProvider.cpp | 14 ++++++++++++++ + xbmc/platform/linux/storage/UDevProvider.cpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) -diff --git a/xbmc/storage/linux/UDevProvider.cpp b/xbmc/storage/linux/UDevProvider.cpp -index dffee34..b7cd25b 100644 ---- a/xbmc/storage/linux/UDevProvider.cpp -+++ b/xbmc/storage/linux/UDevProvider.cpp -@@ -152,6 +152,20 @@ void CUDevProvider::GetDisks(VECSOURCES& disks, bool removable) +diff --git a/xbmc/platform/linux/storage/UDevProvider.cpp b/xbmc/platform/linux/storage/UDevProvider.cpp +index daf0d58..31e574f 100644 +--- a/xbmc/platform/linux/storage/UDevProvider.cpp ++++ b/xbmc/platform/linux/storage/UDevProvider.cpp +@@ -150,6 +150,20 @@ void CUDevProvider::GetDisks(VECSOURCES& disks, bool removable) continue; } @@ -33,5 +33,5 @@ index dffee34..b7cd25b 100644 const char *bus = udev_device_get_property_value(device, "ID_BUS"); const char *optical = udev_device_get_property_value(device, "ID_CDROM"); // matches also DVD, Blu-ray -- -2.5.0 +2.14.1 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 d5346b2b20..ba07ff7999 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,14 +1,20 @@ -commit 81214c86f437863c0a8f4ac2e45de81fccc621b4 -Author: Lukas Rusak -Date: Mon Dec 11 23:44:41 2017 -0800 +From 5d3b9dae20b9c9b1c9236d98bf9ce64306d8b63f Mon Sep 17 00:00:00 2001 +From: MilhouseVH +Date: Thu, 5 Apr 2018 11:43:28 +0100 +Subject: [PATCH] allow using alsa and pulse together - [linux] allow using alsa and pulse together +--- + xbmc/windowing/X11/WinSystemX11GLContext.cpp | 28 ++-------------------------- + xbmc/windowing/amlogic/WinSystemAmlogic.cpp | 2 ++ + xbmc/windowing/gbm/WinSystemGbm.cpp | 27 ++------------------------- + xbmc/windowing/rpi/WinSystemRpi.cpp | 4 ++++ + 4 files changed, 10 insertions(+), 51 deletions(-) diff --git a/xbmc/windowing/X11/WinSystemX11GLContext.cpp b/xbmc/windowing/X11/WinSystemX11GLContext.cpp -index 398a311..6b3e6d8 100644 +index 17b83a0..2e76053 100644 --- a/xbmc/windowing/X11/WinSystemX11GLContext.cpp +++ b/xbmc/windowing/X11/WinSystemX11GLContext.cpp -@@ -52,31 +52,8 @@ std::unique_ptr CWinSystemBase::CreateWinSystem() +@@ -52,32 +52,8 @@ std::unique_ptr CWinSystemBase::CreateWinSystem() CWinSystemX11GLContext::CWinSystemX11GLContext() { @@ -17,33 +23,34 @@ index 398a311..6b3e6d8 100644 - envSink = getenv("AE_SINK"); - if (StringUtils::EqualsNoCase(envSink, "ALSA")) - { -- X11::ALSARegister(); +- OPTIONALS::ALSARegister(); - } - else if (StringUtils::EqualsNoCase(envSink, "PULSE")) - { -- X11::PulseAudioRegister(); +- OPTIONALS::PulseAudioRegister(); - } - else if (StringUtils::EqualsNoCase(envSink, "SNDIO")) - { -- X11::SndioRegister(); +- OPTIONALS::SndioRegister(); - } - else - { -- if (!X11::PulseAudioRegister()) +- if (!OPTIONALS::PulseAudioRegister()) - { -- if (!X11::ALSARegister()) +- if (!OPTIONALS::ALSARegister()) - { -- X11::SndioRegister(); +- OPTIONALS::SndioRegister(); - } - } - } -+ X11::ALSARegister(); -+ X11::PulseAudioRegister(); +- ++ OPTIONALS::ALSARegister(); ++ OPTIONALS::PulseAudioRegister(); + m_lirc.reset(OPTIONALS::LircRegister()); } - CWinSystemX11GLContext::~CWinSystemX11GLContext() diff --git a/xbmc/windowing/amlogic/WinSystemAmlogic.cpp b/xbmc/windowing/amlogic/WinSystemAmlogic.cpp -index 020e501..ed0f084 100644 +index 1db2ba7..517aeea 100644 --- a/xbmc/windowing/amlogic/WinSystemAmlogic.cpp +++ b/xbmc/windowing/amlogic/WinSystemAmlogic.cpp @@ -32,6 +32,7 @@ @@ -51,9 +58,9 @@ index 020e501..ed0f084 100644 #include "cores/AudioEngine/AESinkFactory.h" #include "cores/AudioEngine/Sinks/AESinkALSA.h" +#include "cores/AudioEngine/Sinks/AESinkPULSE.h" - #include "guilib/GraphicContext.h" - #include "guilib/Resolution.h" - #include "powermanagement/linux/LinuxPowerSyscall.h" + #include "windowing/GraphicContext.h" + #include "windowing/Resolution.h" + #include "platform/linux/powermanagement/LinuxPowerSyscall.h" @@ -79,6 +80,7 @@ CWinSystemAmlogic::CWinSystemAmlogic() // Register sink AE::CAESinkFactory::ClearSinks(); @@ -63,45 +70,45 @@ index 020e501..ed0f084 100644 } diff --git a/xbmc/windowing/gbm/WinSystemGbm.cpp b/xbmc/windowing/gbm/WinSystemGbm.cpp -index 854040f..7ea9e75 100644 +index 45783bd..7b5e2ba 100644 --- a/xbmc/windowing/gbm/WinSystemGbm.cpp +++ b/xbmc/windowing/gbm/WinSystemGbm.cpp -@@ -38,31 +38,8 @@ CWinSystemGbm::CWinSystemGbm() : - m_nativeDisplay(nullptr), - m_nativeWindow(nullptr) +@@ -43,31 +43,8 @@ CWinSystemGbm::CWinSystemGbm() : + m_GBM(new CGBMUtils), + m_delayDispReset(false) { - std::string envSink; - if (getenv("AE_SINK")) - envSink = getenv("AE_SINK"); - if (StringUtils::EqualsNoCase(envSink, "ALSA")) - { -- GBM::ALSARegister(); +- OPTIONALS::ALSARegister(); - } - else if (StringUtils::EqualsNoCase(envSink, "PULSE")) - { -- GBM::PulseAudioRegister(); +- OPTIONALS::PulseAudioRegister(); - } - else if (StringUtils::EqualsNoCase(envSink, "SNDIO")) - { -- GBM::SndioRegister(); +- OPTIONALS::SndioRegister(); - } - else - { -- if (!GBM::PulseAudioRegister()) +- if (!OPTIONALS::PulseAudioRegister()) - { -- if (!GBM::ALSARegister()) +- if (!OPTIONALS::ALSARegister()) - { -- GBM::SndioRegister(); +- OPTIONALS::SndioRegister(); - } - } - } -+ GBM::ALSARegister(); -+ GBM::PulseAudioRegister(); ++ OPTIONALS::ALSARegister(); ++ OPTIONALS::PulseAudioRegister(); m_winEvents.reset(new CWinEventsLinux()); CLinuxPowerSyscall::Register(); diff --git a/xbmc/windowing/rpi/WinSystemRpi.cpp b/xbmc/windowing/rpi/WinSystemRpi.cpp -index b1caf83..da1b59f 100644 +index 82534f2..d4e8ba9 100644 --- a/xbmc/windowing/rpi/WinSystemRpi.cpp +++ b/xbmc/windowing/rpi/WinSystemRpi.cpp @@ -34,7 +34,9 @@ @@ -111,7 +118,7 @@ index b1caf83..da1b59f 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 "platform/linux/powermanagement/LinuxPowerSyscall.h" #include @@ -56,6 +58,8 @@ CWinSystemRpi::CWinSystemRpi() @@ -121,5 +128,8 @@ index b1caf83..da1b59f 100644 + CAESinkALSA::Register(); + CAESinkPULSE::Register(); CLinuxPowerSyscall::Register(); + m_lirc.reset(OPTIONALS::LircRegister()); } - +-- +2.14.1 + diff --git a/packages/mediacenter/kodi/patches/kodi-999.99-filesytem-reduce-smb-chunksize-to-64K.patch b/packages/mediacenter/kodi/patches/kodi-999.99-filesytem-reduce-smb-chunksize-to-64K.patch index d123f4d83c..80faf4f4e2 100644 --- a/packages/mediacenter/kodi/patches/kodi-999.99-filesytem-reduce-smb-chunksize-to-64K.patch +++ b/packages/mediacenter/kodi/patches/kodi-999.99-filesytem-reduce-smb-chunksize-to-64K.patch @@ -1,17 +1,17 @@ -From 5c47c8c3c19faa9a9c5d754d0618b08706630fe7 Mon Sep 17 00:00:00 2001 +From a06d50ef78cf5df95de628e7b23bc94e0e4b4059 Mon Sep 17 00:00:00 2001 From: MilhouseVH -Date: Tue, 30 Jan 2018 05:07:26 +0000 +Date: Thu, 5 Apr 2018 11:44:03 +0100 Subject: [PATCH] filesystem: Reduce chunksize to 64K See: https://forum.kodi.tv/showthread.php?tid=298461&pid=2697818#pid2697818 --- - xbmc/filesystem/SMBFile.h | 2 +- + xbmc/platform/posix/filesystem/SMBFile.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/xbmc/filesystem/SMBFile.h b/xbmc/filesystem/SMBFile.h -index 39fb35e..75db1fe 100644 ---- a/xbmc/filesystem/SMBFile.h -+++ b/xbmc/filesystem/SMBFile.h +diff --git a/xbmc/platform/posix/filesystem/SMBFile.h b/xbmc/platform/posix/filesystem/SMBFile.h +index ed9e2cd..49fd20a 100644 +--- a/xbmc/platform/posix/filesystem/SMBFile.h ++++ b/xbmc/platform/posix/filesystem/SMBFile.h @@ -89,7 +89,7 @@ public: bool OpenForWrite(const CURL& url, bool bOverWrite = false) override; bool Delete(const CURL& url) override;