mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-29 21:56:42 +00:00
Merge pull request #1186 from MilhouseVH/kodi18a1
kodi: update to Kodi 18 alpha 1
This commit is contained in:
commit
7efe259378
@ -33,8 +33,7 @@ PKG_AUTORECONF="no"
|
|||||||
|
|
||||||
PKG_CMAKE_SCRIPT="$(get_build_dir $MEDIACENTER)/tools/depends/native/TexturePacker/CMakeLists.txt"
|
PKG_CMAKE_SCRIPT="$(get_build_dir $MEDIACENTER)/tools/depends/native/TexturePacker/CMakeLists.txt"
|
||||||
|
|
||||||
PKG_CMAKE_OPTS_HOST="-DCORE_SOURCE_DIR=$(get_build_dir $MEDIACENTER) \
|
PKG_CMAKE_OPTS_HOST="-Wno-dev"
|
||||||
-Wno-dev"
|
|
||||||
|
|
||||||
pre_build_host() {
|
pre_build_host() {
|
||||||
$SCRIPTS/clean $PKG_NAME
|
$SCRIPTS/clean $PKG_NAME
|
||||||
|
@ -17,7 +17,7 @@
|
|||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
PKG_NAME="kodi"
|
PKG_NAME="kodi"
|
||||||
PKG_VERSION="4d93228"
|
PKG_VERSION="1f12c2f"
|
||||||
PKG_ARCH="any"
|
PKG_ARCH="any"
|
||||||
PKG_LICENSE="GPL"
|
PKG_LICENSE="GPL"
|
||||||
PKG_SITE="http://www.kodi.tv"
|
PKG_SITE="http://www.kodi.tv"
|
||||||
@ -31,11 +31,9 @@ PKG_LONGDESC="Kodi Media Center (which was formerly named Xbox Media Center or X
|
|||||||
PKG_IS_ADDON="no"
|
PKG_IS_ADDON="no"
|
||||||
PKG_AUTORECONF="no"
|
PKG_AUTORECONF="no"
|
||||||
|
|
||||||
PKG_CMAKE_SCRIPT="$ROOT/$PKG_BUILD/project/cmake/CMakeLists.txt"
|
get_graphicdrivers
|
||||||
|
|
||||||
get_graphicdrivers
|
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET dbus"
|
||||||
|
|
||||||
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET dbus"
|
|
||||||
|
|
||||||
if [ "$DISPLAYSERVER" = "x11" ]; then
|
if [ "$DISPLAYSERVER" = "x11" ]; then
|
||||||
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libX11 libXext libdrm libXrandr"
|
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libX11 libXext libdrm libXrandr"
|
||||||
|
@ -1,7 +1,6 @@
|
|||||||
diff --git a/project/cmake/modules/FindSmbClient.cmake b/project/cmake/modules/FindSmbClient.cmake
|
diff -Naur a/cmake/modules/FindSmbClient.cmake b/cmake/modules/FindSmbClient.cmake
|
||||||
index 6455cce..379d79c 100644
|
--- a/cmake/modules/FindSmbClient.cmake 2016-09-17 08:35:33.000000000 -0700
|
||||||
--- a/project/cmake/modules/FindSmbClient.cmake
|
+++ b/cmake/modules/FindSmbClient.cmake 2016-09-25 13:38:38.969125892 -0700
|
||||||
+++ b/project/cmake/modules/FindSmbClient.cmake
|
|
||||||
@@ -14,7 +14,7 @@
|
@@ -14,7 +14,7 @@
|
||||||
#
|
#
|
||||||
# SmbClient::SmbClient - The SmbClient library
|
# SmbClient::SmbClient - The SmbClient library
|
||||||
|
@ -0,0 +1,9 @@
|
|||||||
|
diff -Naur a/tools/depends/native/TexturePacker/CMakeLists.txt b/tools/depends/native/TexturePacker/CMakeLists.txt
|
||||||
|
--- a/tools/depends/native/TexturePacker/CMakeLists.txt 2016-12-23 17:10:28.593185862 +0000
|
||||||
|
+++ b/tools/depends/native/TexturePacker/CMakeLists.txt 2016-12-23 17:10:39.469253011 +0000
|
||||||
|
@@ -1,3 +1,5 @@
|
||||||
|
+set(CMAKE_SOURCE_DIR ${CMAKE_SOURCE_DIR}/../../../..)
|
||||||
|
+
|
||||||
|
list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
|
||||||
|
|
||||||
|
if(APPLE)
|
File diff suppressed because it is too large
Load Diff
@ -19,7 +19,7 @@ index 9940b6a..d7575f0 100644
|
|||||||
#include "utils/SystemInfo.h"
|
#include "utils/SystemInfo.h"
|
||||||
#include "utils/Weather.h"
|
#include "utils/Weather.h"
|
||||||
#include "utils/XBMCTinyXML.h"
|
#include "utils/XBMCTinyXML.h"
|
||||||
@@ -914,6 +915,22 @@ void CSettings::InitializeDefaults()
|
@@ -914,8 +915,24 @@ void CSettings::InitializeDefaults()
|
||||||
|
|
||||||
if (g_application.IsStandAlone())
|
if (g_application.IsStandAlone())
|
||||||
((CSettingInt*)m_settingsManager->GetSetting(CSettings::SETTING_POWERMANAGEMENT_SHUTDOWNSTATE))->SetDefault(POWERSTATE_SHUTDOWN);
|
((CSettingInt*)m_settingsManager->GetSetting(CSettings::SETTING_POWERMANAGEMENT_SHUTDOWNSTATE))->SetDefault(POWERSTATE_SHUTDOWN);
|
||||||
@ -39,6 +39,8 @@ index 9940b6a..d7575f0 100644
|
|||||||
+ ((CSettingBool*)GetSetting(CSettings::SETTING_VIDEOPLAYER_USEVAAPI))->SetDefault(isIntel);
|
+ ((CSettingBool*)GetSetting(CSettings::SETTING_VIDEOPLAYER_USEVAAPI))->SetDefault(isIntel);
|
||||||
+ ((CSettingBool*)GetSetting(CSettings::SETTING_VIDEOPLAYER_USEVDPAU))->SetDefault(!isIntel);
|
+ ((CSettingBool*)GetSetting(CSettings::SETTING_VIDEOPLAYER_USEVDPAU))->SetDefault(!isIntel);
|
||||||
+#endif
|
+#endif
|
||||||
|
|
||||||
|
g_powerManager.SetDefaults();
|
||||||
}
|
}
|
||||||
|
|
||||||
void CSettings::InitializeOptionFillers()
|
void CSettings::InitializeOptionFillers()
|
||||||
|
Loading…
x
Reference in New Issue
Block a user