Merge pull request #2298 from MilhouseVH/le90_kodi18a1Jan2018

Kodi updates for Jan 2018
This commit is contained in:
Christian Hewitt 2018-01-01 19:14:06 +04:00 committed by GitHub
commit a2a585a745
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
35 changed files with 219 additions and 181 deletions

View File

@ -130,7 +130,6 @@ show_config() {
config_message="$config_message\n $dashes$dashes"
config_message="$config_message\n - Kodi version:\t\t\t $MEDIACENTER"
config_message="$config_message\n - Kodi nonfree support:\t\t $KODI_NONFREE_SUPPORT"
config_message="$config_message\n - Kodi Blu-Ray support:\t\t $KODI_BLURAY_SUPPORT"
if [ "$KODI_BLURAY_SUPPORT" = "yes" ] ; then
config_message="$config_message\n - Bluray BD+ support:\t\t $BLURAY_BDPLUS_SUPPORT"

View File

@ -43,10 +43,6 @@
# build and install espeak support (yes / no)
ESPEAK_SUPPORT="yes"
# build and install with non-free support
# (RAR compression support in KODI) (yes / no)
KODI_NONFREE_SUPPORT="yes"
# build and install with BluRay support (yes / no)
KODI_BLURAY_SUPPORT="yes"

View File

@ -33,7 +33,7 @@ PKG_CMAKE_SCRIPT="$(get_build_dir $MEDIACENTER)/tools/depends/native/TexturePack
PKG_CMAKE_OPTS_HOST="-Wno-dev"
pre_configure_host() {
export CXXFLAGS="$CXXFLAGS -std=c++11 -DTARGET_POSIX -DTARGET_LINUX -D_LINUX -I$(get_build_dir $MEDIACENTER)/xbmc/linux"
export CXXFLAGS="$CXXFLAGS -std=c++11 -DTARGET_POSIX -DTARGET_LINUX -D_LINUX -I$(get_build_dir $MEDIACENTER)/xbmc/platform/linux"
}
makeinstall_host() {

View File

@ -17,8 +17,8 @@
################################################################################
PKG_NAME="audiodecoder.sidplay"
PKG_VERSION="28bd921"
PKG_SHA256="e0f35803697d055f5defbb1a405804149860bc49a451819ade1b00fb2724a5dc"
PKG_VERSION="bbf0dda"
PKG_SHA256="8717f8626ea5530262ef084e99a3c7583408c7ceab94ce29875fe48592257585"
PKG_REV="2"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -17,8 +17,8 @@
################################################################################
PKG_NAME="inputstream.adaptive"
PKG_VERSION="d2081b2"
PKG_SHA256="3032079ede0f234781b7cf929010ce63d8af458389dd188c36be925eb301b669"
PKG_VERSION="fb0ca21"
PKG_SHA256="f20eb3c1037234c153955ab9c0a55fd22937776544c0530d1420e3ee4331cb15"
PKG_LICENSE="GPL"
PKG_SITE="http://www.kodi.tv"
PKG_URL="https://github.com/peak3d/inputstream.adaptive/archive/$PKG_VERSION.tar.gz"

View File

@ -17,8 +17,8 @@
################################################################################
PKG_NAME="inputstream.rtmp"
PKG_VERSION="c772497"
PKG_SHA256="7408e26e43b08f9b57adb660ac56c6313bec65f01178c78b30280050d2e58a9d"
PKG_VERSION="482f5c1"
PKG_SHA256="36852beafb3a61ac8c54a612c642fe182d027af025a431db0b71b2477e0ffec0"
PKG_LICENSE="GPL"
PKG_SITE="http://www.kodi.tv"
PKG_URL="https://github.com/notspiff/inputstream.rtmp/archive/$PKG_VERSION.tar.gz"

View File

@ -17,8 +17,8 @@
################################################################################
PKG_NAME="peripheral.joystick"
PKG_VERSION="33b43ce"
PKG_SHA256="1554469f4fbcbb2a37de9c1ece6b1b41c9e71f1087a48cb7f9ec3ae7d425dc41"
PKG_VERSION="3a93486"
PKG_SHA256="9a72ea32488128cf179fcc4a1ff5c9312719d2288ec9c85923ec16992e56fa84"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -17,8 +17,8 @@
################################################################################
PKG_NAME="pvr.argustv"
PKG_VERSION="1a48789"
PKG_SHA256="236a55371cae180ec755be055238d7edb145aab9e9e918bd8b797344aa74709a"
PKG_VERSION="a4d3ec7"
PKG_SHA256="e13c8da83480578e6f055af8c71f71e8615fc095b2f9e1d2200f05a575a6151e"
PKG_REV="2"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -17,8 +17,8 @@
################################################################################
PKG_NAME="pvr.demo"
PKG_VERSION="94c4817"
PKG_SHA256="a2511806f593d8281631b2ac745d091ff9dd1f0b84e26c2e56f0fb41c9c5487c"
PKG_VERSION="6284566"
PKG_SHA256="6572badf7da576b15c612345793d635e48e15f6611f37b805853ae8cd2c1cce5"
PKG_REV="2"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -17,8 +17,8 @@
################################################################################
PKG_NAME="pvr.dvblink"
PKG_VERSION="816f90c"
PKG_SHA256="da36250a838077775b3657b271e763bbf1abde07d819b3836859ae9783fe11d8"
PKG_VERSION="4ac2f2d"
PKG_SHA256="1ce065cf54ccbe537ffb6227371ce53d28405fe63e5b6384869d351e0b41fca2"
PKG_REV="2"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -17,8 +17,8 @@
################################################################################
PKG_NAME="pvr.dvbviewer"
PKG_VERSION="6129441"
PKG_SHA256="c924922900c4d7982ca826c666c467f541b311e8a61afe66a224f6c88690afd3"
PKG_VERSION="c2275e1"
PKG_SHA256="1d9261a223f2ad5f78e9e17bbf23ee199eebf269eac618cfac30bd228a07b7a8"
PKG_REV="2"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -17,8 +17,8 @@
################################################################################
PKG_NAME="pvr.filmon"
PKG_VERSION="2dee2ca"
PKG_SHA256="caf3bd4f31863584a72f60e176e3e07443a1ee748908bdf3e955b023a6caebbe"
PKG_VERSION="e754b4b"
PKG_SHA256="c90375e63cc191b63e1108cc2a7ce27d5341f815b1772141b672dab21ccca2c0"
PKG_REV="2"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -17,8 +17,8 @@
################################################################################
PKG_NAME="pvr.hdhomerun"
PKG_VERSION="3af3e91"
PKG_SHA256="d27003e108dea71d80f71649f9b2b98634d9093eb532f185e152c33719a648a9"
PKG_VERSION="7379fbc"
PKG_SHA256="70a58d624aab7a9f38df03876045aefa5c96a16f509cdb25a7c6b7b16722405c"
PKG_REV="2"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -17,8 +17,8 @@
################################################################################
PKG_NAME="pvr.hts"
PKG_VERSION="67fe2df"
PKG_SHA256="cd5bc330522a1a0d92bb7191dd296779ef2cddbb6f426235eed7eb359e1596e0"
PKG_VERSION="bf22a18"
PKG_SHA256="a3a0b5a41d899ab26902cd308d9ad77dd8a7c08da5c3796a5f03782b7860cc7f"
PKG_REV="2"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -17,8 +17,8 @@
################################################################################
PKG_NAME="pvr.iptvsimple"
PKG_VERSION="ac4f4bd"
PKG_SHA256="6342da61edd265b959f2818b2ae761bef15dc958781cd025426f12a31bb0ef29"
PKG_VERSION="a768d0e"
PKG_SHA256="0f2a6fd796740564261d80cd19d4e20e469b039564c0506220c4cc794a4bc021"
PKG_REV="2"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -17,8 +17,8 @@
################################################################################
PKG_NAME="pvr.mediaportal.tvserver"
PKG_VERSION="6c35e88"
PKG_SHA256="6355e47381023aed857c63c43c54dd610a123a077c19b74991e004879569f113"
PKG_VERSION="dcf0512"
PKG_SHA256="4bcf691b3cd0e3cde95a0bc71f11e8400697e99951d79a5ca2feb300a6940dd3"
PKG_REV="2"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -17,8 +17,8 @@
################################################################################
PKG_NAME="pvr.mythtv"
PKG_VERSION="ffaa1b5"
PKG_SHA256="997b44e35aa1b422bf7306449fe480d3996eaf40fe82286740c4561132d937e8"
PKG_VERSION="cab8839"
PKG_SHA256="c83c05b2f94a794a96520631f080f2845556e0bca4eaf5f517db11f438d7d3e6"
PKG_REV="2"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -17,8 +17,8 @@
################################################################################
PKG_NAME="pvr.nextpvr"
PKG_VERSION="938bb48"
PKG_SHA256="5ccd5d2acef47e6fdffaabe0caee2d5ecc19e577682201dc8da5ca34e4f7e48c"
PKG_VERSION="11dfdbb"
PKG_SHA256="7b02914050f5c6a81fc6fb67c50ef5991c82348b8ae83bde6ea7efb9a921e3e0"
PKG_REV="2"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -17,8 +17,8 @@
################################################################################
PKG_NAME="pvr.njoy"
PKG_VERSION="4a5efef"
PKG_SHA256="dd03dc9882a127053a0b255eaaedd467ff4822362d2d08eb0d51908192fb42be"
PKG_VERSION="67b837d"
PKG_SHA256="a561378bc93f984400f8f324b44e97bbe19201af8edb4c22fd89e3d6098cd206"
PKG_REV="2"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -17,8 +17,8 @@
################################################################################
PKG_NAME="pvr.pctv"
PKG_VERSION="6484615"
PKG_SHA256="a5d475207b504e59190d0659b5477d3a3ec0430c1c0c1c6420d51a500ac27d6d"
PKG_VERSION="c7a13d7"
PKG_SHA256="20cdbd4e3ff293355d20ea60ef1ae123e04c1fed99bb6939d9127b1982f436f7"
PKG_REV="2"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -17,8 +17,8 @@
################################################################################
PKG_NAME="pvr.stalker"
PKG_VERSION="44025a1"
PKG_SHA256="70f279c473eb2b2432908760e9003cdf05d32037b64bb7eacf6429caa390a31e"
PKG_VERSION="c91421d"
PKG_SHA256="5062ca5199f08d698aaae3625d8ccd1decdae49281e860b484719f84e5bea902"
PKG_REV="2"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -17,8 +17,8 @@
################################################################################
PKG_NAME="pvr.teleboy"
PKG_VERSION="e431126"
PKG_SHA256="c4945fb73890b3be738985f74c0a5b6e0f99ca337e2ba0d97397f23f6ec7423d"
PKG_VERSION="3ae0297"
PKG_SHA256="ab676f8630b0d0dfe1d52fb1e129b102610eda83857611ef07870f95decfa792"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -17,8 +17,8 @@
################################################################################
PKG_NAME="pvr.vbox"
PKG_VERSION="619c32b"
PKG_SHA256="d9b4a4f1053dad95fc44fbfeaf69b719931a0eb20cd6f3ca4dc911f76d483780"
PKG_VERSION="24126fd"
PKG_SHA256="e5ff139d29b53d56552201ed1efaad9599b4f7eca4ff96b7f3f358246dbbb723"
PKG_REV="2"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -17,8 +17,8 @@
################################################################################
PKG_NAME="pvr.vdr.vnsi"
PKG_VERSION="0ec3e77"
PKG_SHA256="f77fe1049233de6b7ff0d883783db0da9c98705221ba62cea208a86cf656993c"
PKG_VERSION="3c76791"
PKG_SHA256="170fbc2634180c2e6b9d672de59f15e949d98b3e4bdf4aaf0456314f55c59bb0"
PKG_REV="2"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -17,8 +17,8 @@
################################################################################
PKG_NAME="pvr.vuplus"
PKG_VERSION="7ea6b21"
PKG_SHA256="48ea86488ea9a7faf8baeed4cf0340dfb6c16c3ee2e6a1d1366d3c208dd712bd"
PKG_VERSION="020e1d2"
PKG_SHA256="815314ea7ed64e663be3e36ac94d1b7a850587cc13c39b9f9ac6dc54bcb17de3"
PKG_REV="2"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -17,8 +17,8 @@
################################################################################
PKG_NAME="pvr.wmc"
PKG_VERSION="55e701b"
PKG_SHA256="9e3dcc8d96934bc2959ebc2e9e89dbcce8f664b2a6cfdbdce8512fa68307d590"
PKG_VERSION="920ade6"
PKG_SHA256="32bf437c8a0cd7be606214b639394e8c580924be8c1548c26e1c23d123c5de27"
PKG_REV="2"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -17,8 +17,8 @@
################################################################################
PKG_NAME="pvr.zattoo"
PKG_VERSION="23d9993"
PKG_SHA256="4c9caad94059093f16a59865b72645d88d91357cb067db570d1c94ea274fb673"
PKG_VERSION="4940bcc"
PKG_SHA256="9a79bdba574a9b069443fd0040a86ece017dbc47f7d5fe5f34e20308450c7beb"
PKG_REV="2"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -17,8 +17,8 @@
################################################################################
PKG_NAME="vfs.libarchive"
PKG_VERSION="d3f3953"
PKG_SHA256="df094f8f217f25b9c288556cf1ca30c822d35d3e9dfc4973dd994e5f40508edd"
PKG_VERSION="568a2a1"
PKG_SHA256="781c2d3a26f5a4c4beadd5e3ec732dc0dc451e303f08e8a034bb584025db2358"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -17,8 +17,8 @@
################################################################################
PKG_NAME="visualization.waveform"
PKG_VERSION="8204be7"
PKG_SHA256="457d861a8ef5a054339effe803b4aae801256282b098db63ae45aa90a9c30c9e"
PKG_VERSION="9a8112f"
PKG_SHA256="067b90a64562bf314699a777fea8f0b120904a78b69057e7b4744fe4dc1b25b3"
PKG_REV="2"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -17,8 +17,8 @@
################################################################################
PKG_NAME="kodi"
PKG_VERSION="c356fa8"
PKG_SHA256="a2ee06b44d6d3e6306aef3df15c57e1a14022bb80a0cb25f2c98caa4cdf4fe56"
PKG_VERSION="dc587bd"
PKG_SHA256="91c41ecf4ef676cdc3259c6bd03d413518f980f5fdae0ab8d580865ab33e0944"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.kodi.tv"
@ -82,12 +82,6 @@ else
KODI_OPTICAL="-DENABLE_OPTICAL=OFF"
fi
if [ "$KODI_NONFREE_SUPPORT" = yes ]; then
KODI_NONFREE="-DENABLE_NONFREE=ON"
else
KODI_NONFREE="-DENABLE_NONFREE=OFF"
fi
if [ "$KODI_DVDCSS_SUPPORT" = yes ]; then
KODI_DVDCSS="-DENABLE_DVDCSS=ON \
-DLIBDVDCSS_URL=$SOURCES/libdvdcss/libdvdcss-$(get_pkg_version libdvdcss).tar.gz"
@ -205,6 +199,9 @@ KODI_LIBDVD="$KODI_DVDCSS \
-DLIBDVDNAV_URL=$SOURCES/libdvdnav/libdvdnav-$(get_pkg_version libdvdnav).tar.gz \
-DLIBDVDREAD_URL=$SOURCES/libdvdread/libdvdread-$(get_pkg_version libdvdread).tar.gz"
# Build Kodi using parallel LTO
[ "$LTO_SUPPORT" = "yes" ] && PKG_KODI_USE_LTO="-DUSE_LTO=$CONCURRENCY_MAKE_LEVEL"
PKG_CMAKE_OPTS_TARGET="-DNATIVEPREFIX=$TOOLCHAIN \
-DWITH_TEXTUREPACKER=$TOOLCHAIN/bin/TexturePacker \
-DDEPENDS_PATH=$PKG_BUILD/depends \
@ -215,7 +212,6 @@ PKG_CMAKE_OPTS_TARGET="-DNATIVEPREFIX=$TOOLCHAIN \
-DENABLE_INTERNAL_FFMPEG=OFF \
-DFFMPEG_INCLUDE_DIRS=$SYSROOT_PREFIX/usr \
-DENABLE_INTERNAL_CROSSGUID=OFF \
-DENABLE_SDL=OFF \
-DENABLE_OPENSSL=ON \
-DENABLE_UDEV=ON \
-DENABLE_DBUS=ON \
@ -226,6 +222,7 @@ PKG_CMAKE_OPTS_TARGET="-DNATIVEPREFIX=$TOOLCHAIN \
-DENABLE_LDGOLD=ON \
-DENABLE_DEBUGFISSION=OFF \
-DENABLE_APP_AUTONAME=OFF \
$PKG_KODI_USE_LTO \
$KODI_ARCH \
$KODI_NEON \
$KODI_VDPAU \
@ -241,13 +238,12 @@ PKG_CMAKE_OPTS_TARGET="-DNATIVEPREFIX=$TOOLCHAIN \
$KODI_SSH \
$KODI_AIRPLAY \
$KODI_AIRTUNES \
$KODI_NONFREE \
$KODI_OPTICAL \
$KODI_BLURAY \
$KODI_PLAYER"
pre_configure_target() {
# kodi should never be built with lto
# Single threaded LTO is very slow so rely on Kodi for LTO support
strip_lto
export LIBS="$LIBS -lncurses"

View File

@ -4,14 +4,14 @@ Date: Thu, 17 Apr 2014 12:12:50 +0300
Subject: [PATCH 04/13] use udevil to umount
---
xbmc/linux/PosixMountProvider.cpp | 2 +-
xbmc/platform/linux/PosixMountProvider.cpp | 2 +-
xbmc/storage/linux/UDevProvider.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/xbmc/linux/PosixMountProvider.cpp b/xbmc/linux/PosixMountProvider.cpp
diff --git a/xbmc/platform/linux/PosixMountProvider.cpp b/xbmc/platform/linux/PosixMountProvider.cpp
index 218d10b..57e94ca 100644
--- a/xbmc/linux/PosixMountProvider.cpp
+++ b/xbmc/linux/PosixMountProvider.cpp
--- a/xbmc/platform/linux/PosixMountProvider.cpp
+++ b/xbmc/platform/linux/PosixMountProvider.cpp
@@ -133,7 +133,7 @@ bool CPosixMountProvider::Eject(const std::string& mountpath)
{
// just go ahead and try to umount the disk

View File

@ -7,13 +7,13 @@ on TZ country setting change, store the value in format
TIMEZONE=Xx/Yyy to /storage/.cache/timezone to be used with
tz-data.service
---
xbmc/linux/LinuxTimezone.cpp | 12 ++++++++++++
xbmc/platform/linux/LinuxTimezone.cpp | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/xbmc/linux/LinuxTimezone.cpp b/xbmc/linux/LinuxTimezone.cpp
diff --git a/xbmc/platform/linux/LinuxTimezone.cpp b/xbmc/platform/linux/LinuxTimezone.cpp
index 372c119..0759a3b 100644
--- a/xbmc/linux/LinuxTimezone.cpp
+++ b/xbmc/linux/LinuxTimezone.cpp
--- a/xbmc/platform/linux/LinuxTimezone.cpp
+++ b/xbmc/platform/linux/LinuxTimezone.cpp
@@ -43,6 +43,8 @@
#include <algorithm>

View File

@ -1,6 +1,6 @@
From f7b15b94254a0af6009ed38cc45bcf63cb1b510d Mon Sep 17 00:00:00 2001
From 006bcc66f7bc25f0df8aa52efa3b151766f9a5ec Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Tue, 4 Jul 2017 20:51:08 +0100
Date: Wed, 20 Dec 2017 07:26:55 +0000
Subject: [PATCH] handle SIGTERM
0. CApplication::Stop cant be trusted. (deadlocks crashes and boo)
@ -23,16 +23,16 @@ so, when shutdown/reboot is requested:
5 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
index ee50f37..28034c8 100644
index 334ecec..e3101ff 100644
--- a/xbmc/Application.cpp
+++ b/xbmc/Application.cpp
@@ -2355,12 +2355,12 @@ void CApplication::OnApplicationMessage(ThreadMessage* pMsg)
switch (pMsg->dwMessage)
@@ -2373,12 +2373,12 @@ void CApplication::OnApplicationMessage(ThreadMessage* pMsg)
switch (msg)
{
case TMSG_POWERDOWN:
- Stop(EXITCODE_POWERDOWN);
+ SetExitCode(EXITCODE_POWERDOWN);
g_powerManager.Powerdown();
CServiceBroker::GetPowerManager().Powerdown();
break;
case TMSG_QUIT:
@ -41,13 +41,13 @@ index ee50f37..28034c8 100644
break;
case TMSG_SHUTDOWN:
@@ -2381,12 +2381,13 @@ void CApplication::OnApplicationMessage(ThreadMessage* pMsg)
@@ -2399,12 +2399,13 @@ void CApplication::OnApplicationMessage(ThreadMessage* pMsg)
case TMSG_RESTART:
case TMSG_RESET:
- Stop(EXITCODE_REBOOT);
+ SetExitCode(EXITCODE_REBOOT);
g_powerManager.Reboot();
CServiceBroker::GetPowerManager().Reboot();
break;
case TMSG_RESTARTAPP:
@ -56,7 +56,7 @@ index ee50f37..28034c8 100644
Stop(EXITCODE_RESTARTAPP);
#endif
break;
@@ -2805,6 +2806,17 @@ bool CApplication::Cleanup()
@@ -2821,6 +2822,17 @@ bool CApplication::Cleanup()
}
}
@ -74,7 +74,7 @@ index ee50f37..28034c8 100644
void CApplication::Stop(int exitCode)
{
try
@@ -2812,7 +2824,7 @@ void CApplication::Stop(int exitCode)
@@ -2828,7 +2840,7 @@ void CApplication::Stop(int exitCode)
m_frameMoveGuard.unlock();
CVariant vExitCode(CVariant::VariantTypeObject);
@ -83,7 +83,7 @@ index ee50f37..28034c8 100644
CAnnouncementManager::GetInstance().Announce(System, "xbmc", "OnQuit", vExitCode);
// Abort any active screensaver
@@ -2846,7 +2858,6 @@ void CApplication::Stop(int exitCode)
@@ -2860,7 +2872,6 @@ void CApplication::Stop(int exitCode)
// Needs cleaning up
CApplicationMessenger::GetInstance().Stop();
m_AppFocused = false;
@ -92,22 +92,22 @@ index ee50f37..28034c8 100644
// cancel any jobs from the jobmanager
diff --git a/xbmc/Application.h b/xbmc/Application.h
index 1402787..c21ab93 100644
index 9d0b2d4..7b0e18b 100644
--- a/xbmc/Application.h
+++ b/xbmc/Application.h
@@ -147,6 +147,7 @@ public:
@@ -153,6 +153,7 @@ public:
bool StartServer(enum ESERVERS eServer, bool bStart, bool bWait = false);
bool IsCurrentThread() const;
+ void SetExitCode(int exitCode);
void Stop(int exitCode);
void RestartApp();
void UnloadSkin(bool forReload = false);
bool LoadCustomWindows();
diff --git a/xbmc/XBApplicationEx.cpp b/xbmc/XBApplicationEx.cpp
index 035aed2..34102f5 100644
index edfea4f..96f245f 100644
--- a/xbmc/XBApplicationEx.cpp
+++ b/xbmc/XBApplicationEx.cpp
@@ -46,6 +46,7 @@ CXBApplicationEx::CXBApplicationEx()
@@ -42,6 +42,7 @@ CXBApplicationEx::CXBApplicationEx()
m_bStop = false;
m_AppFocused = true;
m_ExitCode = EXITCODE_QUIT;
@ -116,7 +116,7 @@ index 035aed2..34102f5 100644
}
diff --git a/xbmc/XBApplicationEx.h b/xbmc/XBApplicationEx.h
index 3c8dffd..e96bd5e 100644
index 6fb2f6c..4bc11fc 100644
--- a/xbmc/XBApplicationEx.h
+++ b/xbmc/XBApplicationEx.h
@@ -42,6 +42,7 @@ public:
@ -128,7 +128,7 @@ index 3c8dffd..e96bd5e 100644
bool m_renderGUI;
diff --git a/xbmc/platform/posix/main.cpp b/xbmc/platform/posix/main.cpp
index bee93da..e36af76 100644
index fccef84..88e928f 100644
--- a/xbmc/platform/posix/main.cpp
+++ b/xbmc/platform/posix/main.cpp
@@ -63,7 +63,7 @@ protected:
@ -141,5 +141,5 @@ index bee93da..e36af76 100644
};
--
2.7.4
2.14.1

View File

@ -1,79 +1,126 @@
diff -Naur a/xbmc/cores/AudioEngine/AESinkFactory.cpp b/xbmc/cores/AudioEngine/AESinkFactory.cpp
--- a/xbmc/cores/AudioEngine/AESinkFactory.cpp 2016-01-12 22:00:19.000000000 +0100
+++ b/xbmc/cores/AudioEngine/AESinkFactory.cpp 2016-01-25 10:25:46.375653966 +0100
@@ -28,6 +28,9 @@
#elif defined(TARGET_RASPBERRY_PI)
#include "Sinks/AESinkPi.h"
#include "Sinks/AESinkALSA.h"
+ #if defined(HAS_PULSEAUDIO)
+ #include "Sinks/AESinkPULSE.h"
+ #endif
#elif defined(TARGET_DARWIN_IOS)
#include "Sinks/AESinkDARWINIOS.h"
#elif defined(TARGET_DARWIN_OSX)
@@ -67,6 +70,9 @@
#elif defined(TARGET_RASPBERRY_PI)
driver == "PI" ||
driver == "ALSA" ||
+ #if defined(HAS_PULSEAUDIO)
+ driver == "PULSE" ||
+ #endif
#elif defined(TARGET_DARWIN_IOS)
driver == "DARWINIOS" ||
#elif defined(TARGET_DARWIN_OSX)
@@ -108,6 +114,10 @@
#elif defined(TARGET_RASPBERRY_PI)
if (driver == "PI")
sink = new CAESinkPi();
+ #if defined(HAS_PULSEAUDIO)
+ if (driver == "PULSE")
+ sink = new CAESinkPULSE();
+ #endif
#if defined(HAS_ALSA)
if (driver == "ALSA")
sink = new CAESinkALSA();
@@ -209,6 +219,16 @@
if(!info.m_deviceInfoList.empty())
list.push_back(info);
#endif
+ #if defined(HAS_PULSEAUDIO)
+ info.m_deviceInfoList.clear();
+ info.m_sinkName = "PULSE";
+ CAESinkPULSE::EnumerateDevicesEx(info.m_deviceInfoList, force);
+ if(!info.m_deviceInfoList.empty())
+ {
+ list.push_back(info);
+ return;
+ }
+ #endif
#elif defined(TARGET_DARWIN_IOS)
commit 81214c86f437863c0a8f4ac2e45de81fccc621b4
Author: Lukas Rusak <lorusak@gmail.com>
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
--- a/xbmc/windowing/X11/WinSystemX11GLContext.cpp
+++ b/xbmc/windowing/X11/WinSystemX11GLContext.cpp
@@ -52,31 +52,8 @@ std::unique_ptr<CWinSystemBase> CWinSystemBase::CreateWinSystem()
info.m_deviceInfoList.clear();
@@ -253,21 +273,20 @@
CLog::Log(LOGNOTICE, "User specified Sink %s could not be enumerated", envSink.c_str());
}
CWinSystemX11GLContext::CWinSystemX11GLContext()
{
- std::string envSink;
- if (getenv("AE_SINK"))
- envSink = getenv("AE_SINK");
- if (StringUtils::EqualsNoCase(envSink, "ALSA"))
- {
- X11::ALSARegister();
- }
- else if (StringUtils::EqualsNoCase(envSink, "PULSE"))
- {
- X11::PulseAudioRegister();
- }
- else if (StringUtils::EqualsNoCase(envSink, "SNDIO"))
- {
- X11::SndioRegister();
- }
- else
- {
- if (!X11::PulseAudioRegister())
- {
- if (!X11::ALSARegister())
- {
- X11::SndioRegister();
- }
- }
- }
+ X11::ALSARegister();
+ X11::PulseAudioRegister();
}
- #if defined(HAS_PULSEAUDIO)
+ #if defined(HAS_ALSA)
info.m_deviceInfoList.clear();
- info.m_sinkName = "PULSE";
- CAESinkPULSE::EnumerateDevicesEx(info.m_deviceInfoList, force);
+ info.m_sinkName = "ALSA";
+ CAESinkALSA::EnumerateDevicesEx(info.m_deviceInfoList, force);
if(!info.m_deviceInfoList.empty())
{
list.push_back(info);
- return;
}
#endif
CWinSystemX11GLContext::~CWinSystemX11GLContext()
diff --git a/xbmc/windowing/amlogic/WinSystemAmlogic.cpp b/xbmc/windowing/amlogic/WinSystemAmlogic.cpp
index 4b8199760e..e50a31daf9 100644
--- a/xbmc/windowing/amlogic/WinSystemAmlogic.cpp
+++ b/xbmc/windowing/amlogic/WinSystemAmlogic.cpp
@@ -32,6 +32,7 @@
// AESink Factory
#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 "settings/Settings.h"
@@ -78,6 +79,7 @@ CWinSystemAmlogic::CWinSystemAmlogic()
// Register sink
AE::CAESinkFactory::ClearSinks();
CAESinkALSA::Register();
+ CAESinkPULSE::Register();
}
- #if defined(HAS_ALSA)
+ #if defined(HAS_PULSEAUDIO)
info.m_deviceInfoList.clear();
- info.m_sinkName = "ALSA";
- CAESinkALSA::EnumerateDevicesEx(info.m_deviceInfoList, force);
+ info.m_sinkName = "PULSE";
+ CAESinkPULSE::EnumerateDevicesEx(info.m_deviceInfoList, force);
if(!info.m_deviceInfoList.empty())
{
list.push_back(info);
CWinSystemAmlogic::~CWinSystemAmlogic()
diff --git a/xbmc/windowing/gbm/WinSystemGbm.cpp b/xbmc/windowing/gbm/WinSystemGbm.cpp
index 3ef426f677..7a1dfe1c8e 100644
--- a/xbmc/windowing/gbm/WinSystemGbm.cpp
+++ b/xbmc/windowing/gbm/WinSystemGbm.cpp
@@ -37,31 +37,8 @@ CWinSystemGbm::CWinSystemGbm() :
m_nativeDisplay(nullptr),
m_nativeWindow(nullptr)
{
- std::string envSink;
- if (getenv("AE_SINK"))
- envSink = getenv("AE_SINK");
- if (StringUtils::EqualsNoCase(envSink, "ALSA"))
- {
- GBM::ALSARegister();
- }
- else if (StringUtils::EqualsNoCase(envSink, "PULSE"))
- {
- GBM::PulseAudioRegister();
- }
- else if (StringUtils::EqualsNoCase(envSink, "SNDIO"))
- {
- GBM::SndioRegister();
- }
- else
- {
- if (!GBM::PulseAudioRegister())
- {
- if (!GBM::ALSARegister())
- {
- GBM::SndioRegister();
- }
- }
- }
+ GBM::ALSARegister();
+ GBM::PulseAudioRegister();
m_winEvents.reset(new CWinEventsLinux());
}
diff --git a/xbmc/windowing/rpi/WinSystemRpi.cpp b/xbmc/windowing/rpi/WinSystemRpi.cpp
index 9e7f8bd9be..464cf1342b 100644
--- a/xbmc/windowing/rpi/WinSystemRpi.cpp
+++ b/xbmc/windowing/rpi/WinSystemRpi.cpp
@@ -34,7 +34,9 @@
#include "utils/log.h"
#include "../WinEventsLinux.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 <EGL/egl.h>
#include <EGL/eglplatform.h>
@@ -55,6 +57,8 @@ CWinSystemRpi::CWinSystemRpi()
m_winEvents.reset(new CWinEventsLinux());
AE::CAESinkFactory::ClearSinks();
CAESinkPi::Register();
+ CAESinkALSA::Register();
+ CAESinkPULSE::Register();
}
CWinSystemRpi::~CWinSystemRpi()

View File

@ -1,17 +1,17 @@
From f040af300925c03a1547ff02d71921bde9893330 Mon Sep 17 00:00:00 2001
From 94476cdec9d11160e201ba431fb4e4d6a7c481c8 Mon Sep 17 00:00:00 2001
From: fritsch <Peter.Fruehberger@gmail.com>
Date: Sat, 14 Jan 2017 10:23:11 +0100
Subject: [PATCH] VAAPI/VDPAU: Integration specific to LibreELEC
---
xbmc/settings/Settings.cpp | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
xbmc/settings/Settings.cpp | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/xbmc/settings/Settings.cpp b/xbmc/settings/Settings.cpp
index 9940b6a..d7575f0 100644
index 96a1e95..78545a0 100644
--- a/xbmc/settings/Settings.cpp
+++ b/xbmc/settings/Settings.cpp
@@ -77,6 +77,7 @@
@@ -76,6 +76,7 @@
#include "utils/log.h"
#include "utils/RssManager.h"
#include "utils/StringUtils.h"
@ -19,12 +19,11 @@ index 9940b6a..d7575f0 100644
#include "utils/SystemInfo.h"
#include "utils/Weather.h"
#include "utils/XBMCTinyXML.h"
@@ -914,8 +915,24 @@ void CSettings::InitializeDefaults()
@@ -666,6 +667,21 @@ void CSettings::InitializeDefaults()
if (g_application.IsStandAlone())
std::static_pointer_cast<CSettingInt>(GetSettingsManager()->GetSetting(CSettings::SETTING_POWERMANAGEMENT_SHUTDOWNSTATE))->SetDefault(POWERSTATE_SHUTDOWN);
+
+
+// LibreELEC integration patch. We ship a special limited range intel kernel patch
+// that enables us to control the full / limited / clamping with just altering
+// the kodi limitedrange setting.
@ -39,8 +38,9 @@ index 9940b6a..d7575f0 100644
+ std::static_pointer_cast<CSettingBool>(GetSettingsManager()->GetSetting(CSettings::SETTING_VIDEOPLAYER_USEVAAPI))->SetDefault(isIntel);
+ std::static_pointer_cast<CSettingBool>(GetSettingsManager()->GetSetting(CSettings::SETTING_VIDEOPLAYER_USEVDPAU))->SetDefault(!isIntel);
+#endif
g_powerManager.SetDefaults();
}
void CSettings::InitializeOptionFillers()
--
2.14.1