jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-24 11:16:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

xbmc: update to xbmc-13.alpha-6edea14

Browse Source 
Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2013-08-02 18:23:21 +02:00
parent a29491a968
commit 1f41a1541e
12 changed files with 703 additions and 9213 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/mediacenter/xbmc-theme-Confluence/meta
View File

@ -21,7 +21,7 @@
PKG_NAME="xbmc-theme-Confluence"
PKG_VERSION="12.2-e40d13d"
if [ "$XBMC" = "master" ]; then
PKG_VERSION="f68634b"
PKG_VERSION="13.alpha-6edea14"
elif [ "$XBMC" = "xbmc-aml" ]; then
PKG_VERSION="aml-frodo-d9119f2"
fi

2
packages/mediacenter/xbmc/package.mk
View File

@ -21,7 +21,7 @@
PKG_NAME="xbmc"
PKG_VERSION="12.2-e40d13d"
if [ "$XBMC" = "master" ]; then
PKG_VERSION="f68634b"
PKG_VERSION="13.alpha-6edea14"
elif [ "$XBMC" = "xbmc-aml" ]; then
PKG_VERSION="aml-frodo-d9119f2"
fi

0
packages/mediacenter/xbmc/patches/f68634b/xbmc-321-texturepacker-hostflags-and-rework.patch → packages/mediacenter/xbmc/patches/13.alpha-6edea14/xbmc-321-texturepacker-hostflags-and-rework.patch
View File

0
packages/mediacenter/xbmc/patches/f68634b/xbmc-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch → packages/mediacenter/xbmc/patches/13.alpha-6edea14/xbmc-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch
View File

0
packages/mediacenter/xbmc/patches/f68634b/xbmc-453-add_openelec.tv_RSS_news-0.1.patch → packages/mediacenter/xbmc/patches/13.alpha-6edea14/xbmc-453-add_openelec.tv_RSS_news-0.1.patch
View File

57
packages/mediacenter/xbmc/patches/13.alpha-6edea14/xbmc-602-add_as.xml_busy_dialog_delay_control.patch Normal file
View File

@ -0,0 +1,57 @@
diff -Naur xbmc-13.alpha-6edea14/xbmc/cores/dvdplayer/DVDPlayer.cpp xbmc-13.alpha-6edea14.patch/xbmc/cores/dvdplayer/DVDPlayer.cpp
--- xbmc-13.alpha-6edea14/xbmc/cores/dvdplayer/DVDPlayer.cpp 2013-08-02 16:28:51.000000000 +0200
+++ xbmc-13.alpha-6edea14.patch/xbmc/cores/dvdplayer/DVDPlayer.cpp 2013-08-02 17:19:34.162512140 +0200
@@ -479,7 +479,7 @@
#endif
Create();
- if(!m_ready.WaitMSec(100))
+ if(!m_ready.WaitMSec(g_advancedSettings.m_videoBusyDialogDelay_ms))
{
CGUIDialogBusy* dialog = (CGUIDialogBusy*)g_windowManager.GetWindow(WINDOW_DIALOG_BUSY);
if(dialog)
diff -Naur xbmc-13.alpha-6edea14/xbmc/cores/omxplayer/OMXPlayer.cpp xbmc-13.alpha-6edea14.patch/xbmc/cores/omxplayer/OMXPlayer.cpp
--- xbmc-13.alpha-6edea14/xbmc/cores/omxplayer/OMXPlayer.cpp 2013-08-02 16:28:51.000000000 +0200
+++ xbmc-13.alpha-6edea14.patch/xbmc/cores/omxplayer/OMXPlayer.cpp 2013-08-02 17:19:34.164512143 +0200
@@ -522,7 +522,7 @@
#endif
Create();
- if(!m_ready.WaitMSec(100))
+ if(!m_ready.WaitMSec(g_advancedSettings.m_videoBusyDialogDelay_ms))
{
CGUIDialogBusy* dialog = (CGUIDialogBusy*)g_windowManager.GetWindow(WINDOW_DIALOG_BUSY);
if(dialog)
diff -Naur xbmc-13.alpha-6edea14/xbmc/settings/AdvancedSettings.cpp xbmc-13.alpha-6edea14.patch/xbmc/settings/AdvancedSettings.cpp
--- xbmc-13.alpha-6edea14/xbmc/settings/AdvancedSettings.cpp 2013-08-02 16:28:51.000000000 +0200
+++ xbmc-13.alpha-6edea14.patch/xbmc/settings/AdvancedSettings.cpp 2013-08-02 17:21:43.772739525 +0200
@@ -184,6 +184,7 @@
m_videoDefaultLatency = 0.0;
m_videoDisableHi10pMultithreading = false;
+ m_videoBusyDialogDelay_ms = 100;
m_musicUseTimeSeeking = true;
m_musicTimeSeekForward = 10;
@@ -700,6 +701,10 @@
//0 = disable fps detect, 1 = only detect on timestamps with uniform spacing, 2 detect on all timestamps
XMLUtils::GetInt(pElement, "fpsdetect", m_videoFpsDetect, 0, 2);
+ // controls the delay, in milliseconds, until
+ // the busy dialog is shown when starting video playback.
+ XMLUtils::GetInt(pElement, "busydialogdelayms", m_videoBusyDialogDelay_ms, 0, 1000);
+
// Store global display latency settings
TiXmlElement* pVideoLatency = pElement->FirstChildElement("latency");
if (pVideoLatency)
diff -Naur xbmc-13.alpha-6edea14/xbmc/settings/AdvancedSettings.h xbmc-13.alpha-6edea14.patch/xbmc/settings/AdvancedSettings.h
--- xbmc-13.alpha-6edea14/xbmc/settings/AdvancedSettings.h 2013-08-02 16:28:51.000000000 +0200
+++ xbmc-13.alpha-6edea14.patch/xbmc/settings/AdvancedSettings.h 2013-08-02 17:21:29.790714897 +0200
@@ -190,6 +190,7 @@
bool m_DXVANoDeintProcForProgressive;
int m_videoFpsDetect;
bool m_videoDisableHi10pMultithreading;
+ int m_videoBusyDialogDelay_ms;
StagefrightConfig m_stagefrightConfig;
CStdString m_videoDefaultPlayer;

0
packages/mediacenter/xbmc/patches/f68634b/xbmc-990.15-depends-mark_our_wrapped_functions_as_used.patch → packages/mediacenter/xbmc/patches/13.alpha-6edea14/xbmc-990.15-depends-mark_our_wrapped_functions_as_used.patch
View File

9673
packages/mediacenter/xbmc/patches/f68634b/xbmc-995.01-xvba_support-275709a.patch → packages/mediacenter/xbmc/patches/13.alpha-6edea14/xbmc-995.01-xvba_support-8fdcc86.patch
View File

File diff suppressed because it is too large Load Diff

0
packages/mediacenter/xbmc/patches/f68634b/xbmc-995.10-disable-alt-tab.patch → packages/mediacenter/xbmc/patches/13.alpha-6edea14/xbmc-995.10-disable-alt-tab.patch
View File

113
packages/mediacenter/xbmc/patches/13.alpha-6edea14/xbmc-999.02-rpipower.patch Normal file
View File

@ -0,0 +1,113 @@
From 3c27e947a2c52c7b124b1bcf32f554b82b60f690 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Fri, 2 Aug 2013 01:32:03 +0200
Subject: [PATCH] Disable Hibernate and Suspend related power options for
Raspberry & Co. without (working) Upower/HAL/CK/Systemd support. Usually this
devices dont support Suspend & Hibernate.
---
xbmc/powermanagement/PowerManager.cpp | 21 ++++++++----
xbmc/powermanagement/linux/FallbackPowerSyscall.h | 39 +++++++++++++++++++++++
2 files changed, 53 insertions(+), 7 deletions(-)
create mode 100644 xbmc/powermanagement/linux/FallbackPowerSyscall.h
diff --git a/xbmc/powermanagement/PowerManager.cpp b/xbmc/powermanagement/PowerManager.cpp
index d658a97..993477e 100644
--- a/xbmc/powermanagement/PowerManager.cpp
+++ b/xbmc/powermanagement/PowerManager.cpp
@@ -40,14 +40,17 @@
#include "osx/CocoaPowerSyscall.h"
#elif defined(TARGET_ANDROID)
#include "android/AndroidPowerSyscall.h"
-#elif defined(TARGET_POSIX) && defined(HAS_DBUS)
+#elif defined(TARGET_POSIX)
+#include "linux/FallbackPowerSyscall.h"
+#if defined(HAS_DBUS)
#include "linux/ConsoleUPowerSyscall.h"
#include "linux/ConsoleDeviceKitPowerSyscall.h"
#include "linux/LogindUPowerSyscall.h"
#include "linux/UPowerSyscall.h"
-#ifdef HAS_HAL
+#if defined(HAS_HAL)
#include "linux/HALPowerSyscall.h"
-#endif
+#endif // HAS_HAL
+#endif // HAS_DBUS
#elif defined(TARGET_WINDOWS)
#include "powermanagement/windows/Win32PowerSyscall.h"
extern HWND g_hWnd;
@@ -73,7 +76,8 @@ void CPowerManager::Initialize()
m_instance = new CCocoaPowerSyscall();
#elif defined(TARGET_ANDROID)
m_instance = new CAndroidPowerSyscall();
-#elif defined(TARGET_POSIX) && defined(HAS_DBUS)
+#elif defined(TARGET_POSIX)
+#if defined(HAS_DBUS)
if (CConsoleUPowerSyscall::HasConsoleKitAndUPower())
m_instance = new CConsoleUPowerSyscall();
else if (CConsoleDeviceKitPowerSyscall::HasDeviceConsoleKit())
@@ -82,10 +86,13 @@ void CPowerManager::Initialize()
m_instance = new CLogindUPowerSyscall();
else if (CUPowerSyscall::HasUPower())
m_instance = new CUPowerSyscall();
-#ifdef HAS_HAL
- else
+#if defined(HAS_HAL)
+ else if(1)
m_instance = new CHALPowerSyscall();
-#endif
+#endif // HAS_HAL
+ else
+#endif // HAS_DBUS
+ m_instance = new CFallbackPowerSyscall();
#elif defined(TARGET_WINDOWS)
m_instance = new CWin32PowerSyscall();
#endif
diff --git a/xbmc/powermanagement/linux/FallbackPowerSyscall.h b/xbmc/powermanagement/linux/FallbackPowerSyscall.h
new file mode 100644
index 0000000..a6ed27b
--- /dev/null
+++ b/xbmc/powermanagement/linux/FallbackPowerSyscall.h
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2005-2013 Team XBMC
+ * http://xbmc.org
+ *
+ * This Program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This Program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with XBMC; see the file COPYING. If not, see
+ * <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+#include "powermanagement/IPowerSyscall.h"
+#include "system.h"
+#if defined(TARGET_POSIX)
+
+class CFallbackPowerSyscall : public CPowerSyscallWithoutEvents
+{
+public:
+ virtual bool Powerdown() {return true; }
+ virtual bool Suspend() {return false; }
+ virtual bool Hibernate() {return false; }
+ virtual bool Reboot() {return true; }
+
+ virtual bool CanPowerdown() {return true; }
+ virtual bool CanSuspend() {return false; }
+ virtual bool CanHibernate() {return false; }
+ virtual bool CanReboot() {return true; }
+ virtual int BatteryLevel() {return 0; }
+};
+#endif
--
1.8.1.6

57
packages/mediacenter/xbmc/patches/f68634b/xbmc-602-add_as.xml_busy_dialog_delay_control.patch
View File

@ -1,57 +0,0 @@
diff -Naur xbmc-12.1.8/xbmc/cores/dvdplayer/DVDPlayer.cpp xbmc-12.1.8.patch/xbmc/cores/dvdplayer/DVDPlayer.cpp
--- xbmc-12.1.8/xbmc/cores/dvdplayer/DVDPlayer.cpp 2013-04-24 23:38:36.000000000 +0200
+++ xbmc-12.1.8.patch/xbmc/cores/dvdplayer/DVDPlayer.cpp 2013-04-26 00:49:07.732011721 +0200
@@ -470,7 +470,7 @@
#endif
Create();
- if(!m_ready.WaitMSec(100))
+ if(!m_ready.WaitMSec(g_advancedSettings.m_videoBusyDialogDelay_ms))
{
CGUIDialogBusy* dialog = (CGUIDialogBusy*)g_windowManager.GetWindow(WINDOW_DIALOG_BUSY);
if(dialog)
diff -Naur xbmc-12.1.8/xbmc/cores/omxplayer/OMXPlayer.cpp xbmc-12.1.8.patch/xbmc/cores/omxplayer/OMXPlayer.cpp
--- xbmc-12.1.8/xbmc/cores/omxplayer/OMXPlayer.cpp 2013-04-24 23:38:36.000000000 +0200
+++ xbmc-12.1.8.patch/xbmc/cores/omxplayer/OMXPlayer.cpp 2013-04-26 00:50:56.974691417 +0200
@@ -474,7 +474,7 @@
g_renderManager.PreInit();
Create();
- if(!m_ready.WaitMSec(100))
+ if(!m_ready.WaitMSec(g_advancedSettings.m_videoBusyDialogDelay_ms))
{
CGUIDialogBusy* dialog = (CGUIDialogBusy*)g_windowManager.GetWindow(WINDOW_DIALOG_BUSY);
if(dialog)
diff -Naur xbmc-12.1.8/xbmc/settings/AdvancedSettings.cpp xbmc-12.1.8.patch/xbmc/settings/AdvancedSettings.cpp
--- xbmc-12.1.8/xbmc/settings/AdvancedSettings.cpp 2013-04-26 00:48:59.375036542 +0200
+++ xbmc-12.1.8.patch/xbmc/settings/AdvancedSettings.cpp 2013-04-26 00:49:07.732011721 +0200
@@ -111,6 +111,7 @@
m_DXVAForceProcessorRenderer = true;
m_DXVANoDeintProcForProgressive = false;
m_videoFpsDetect = 1;
+ m_videoBusyDialogDelay_ms = 100;
m_videoDefaultLatency = 0.0;
m_videoDisableHi10pMultithreading = false;
@@ -592,6 +593,10 @@
//0 = disable fps detect, 1 = only detect on timestamps with uniform spacing, 2 detect on all timestamps
XMLUtils::GetInt(pElement, "fpsdetect", m_videoFpsDetect, 0, 2);
+ // controls the delay, in milliseconds, until
+ // the busy dialog is shown when starting video playback.
+ XMLUtils::GetInt(pElement, "busydialogdelayms", m_videoBusyDialogDelay_ms, 0, 1000);
+
// Store global display latency settings
TiXmlElement* pVideoLatency = pElement->FirstChildElement("latency");
if (pVideoLatency)
diff -Naur xbmc-12.1.8/xbmc/settings/AdvancedSettings.h xbmc-12.1.8.patch/xbmc/settings/AdvancedSettings.h
--- xbmc-12.1.8/xbmc/settings/AdvancedSettings.h 2013-04-26 00:48:59.383036518 +0200
+++ xbmc-12.1.8.patch/xbmc/settings/AdvancedSettings.h 2013-04-26 00:49:07.732011721 +0200
@@ -165,6 +165,7 @@
bool m_DXVANoDeintProcForProgressive;
int m_videoFpsDetect;
bool m_videoDisableHi10pMultithreading;
+ int m_videoBusyDialogDelay_ms;
CStdString m_videoDefaultPlayer;
CStdString m_videoDefaultDVDPlayer;

12
packages/mediacenter/xbmc/patches/f68634b/xbmc-999.01-automake-1.13.patch
View File

@ -1,12 +0,0 @@
diff -Naur xbmc-8ad691a/lib/libdvd/libdvdcss/configure.ac xbmc-8ad691a.patch/lib/libdvd/libdvdcss/configure.ac
--- xbmc-8ad691a/lib/libdvd/libdvdcss/configure.ac 2013-04-08 12:03:51.000000000 +0200
+++ xbmc-8ad691a.patch/lib/libdvd/libdvdcss/configure.ac 2013-04-08 14:20:14.793113682 +0200
@@ -5,7 +5,7 @@
AC_CANONICAL_SYSTEM
AM_INIT_AUTOMAKE(libdvdcss, 1.2.12)
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS(config.h)
AC_PROG_CC
AC_STDC_HEADERS