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

Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-settings

Browse Source
This commit is contained in:
Stephan Raue 2013-03-15 17:38:14 +01:00
commit 13185111fe
12 changed files with 103 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="xbmc-theme-Confluence"
PKG_VERSION="12.0.6"
PKG_VERSION="12.0.7"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

2
packages/mediacenter/xbmc/meta
View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="xbmc"
PKG_VERSION="12.0.6"
PKG_VERSION="12.0.7"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

8
packages/mediacenter/xbmc/patches/xbmc-453-add_openelec.tv_RSS_news-0.1.patch
View File

@ -1,11 +1,11 @@
diff -Naur xbmc-10.1-Dharma/userdata/RssFeeds.xml xbmc-10.1-Dharma.patch/userdata/RssFeeds.xml
--- xbmc-10.1-Dharma/userdata/RssFeeds.xml 2011-03-08 02:49:24.000000000 +0100
+++ xbmc-10.1-Dharma.patch/userdata/RssFeeds.xml 2011-06-14 17:07:08.450880123 +0200
diff -Naur xbmc-12.0.7/userdata/RssFeeds.xml xbmc-12.0.7.patch/userdata/RssFeeds.xml
--- xbmc-12.0.7/userdata/RssFeeds.xml 2013-03-15 14:25:26.000000000 +0100
+++ xbmc-12.0.7.patch/userdata/RssFeeds.xml 2013-03-15 14:40:54.695338102 +0100
@@ -3,6 +3,7 @@
<!-- RSS feeds. To have multiple feeds, just add a feed to the set. You can also have multiple sets. !-->
<!-- To use different sets in your skin, each must be called from skin with a unique id. !-->
<set id="1">
+ <feed updateinterval="30">http://openelec.tv/news?format=feed&type=rss</feed>
<feed updateinterval="30">http://feeds.feedburner.com/xbmc</feed>
<feed updateinterval="30">http://feeds.xbmc.org/xbmc</feed>
</set>
</rssfeeds>

51
packages/mediacenter/xbmc/patches/xbmc-990.21-cec-extra-guards-around-m_queryThread.patch
View File

@ -1,51 +0,0 @@
From 5385b26621a8d966f187f7b63dfaa8f336beb9a5 Mon Sep 17 00:00:00 2001
From: Lars Op den Kamp <lars@opdenkamp.eu>
Date: Tue, 12 Mar 2013 10:20:27 +0100
Subject: [PATCH] [cec] extra guards around m_queryThread
---
xbmc/peripherals/devices/PeripheralCecAdapter.cpp | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp
index 4cdd3c4..6509c5d 100644
--- a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp
+++ b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp
@@ -99,8 +99,8 @@ class DllLibCEC : public DllDynamic, DllLibCECInterface
m_bStop = true;
}
- SAFE_DELETE(m_queryThread);
StopThread(true);
+ delete m_queryThread;
if (m_dll && m_cecAdapter)
{
@@ -389,7 +389,7 @@ void CPeripheralCecAdapter::Process(void)
Sleep(5);
}
- SAFE_DELETE(m_queryThread);
+ m_queryThread->StopThread(true);
bool bSendStandbyCommands(false);
{
@@ -1105,9 +1105,12 @@ void CPeripheralCecAdapter::OnSettingChanged(const CStdString &strChangedSetting
}
else if (IsRunning())
{
- CLog::Log(LOGDEBUG, "%s - sending the updated configuration to libCEC", __FUNCTION__);
- SetConfigurationFromSettings();
- m_queryThread->UpdateConfiguration(&m_configuration);
+ if (m_queryThread->IsRunning())
+ {
+ CLog::Log(LOGDEBUG, "%s - sending the updated configuration to libCEC", __FUNCTION__);
+ SetConfigurationFromSettings();
+ m_queryThread->UpdateConfiguration(&m_configuration);
+ }
}
else
{
--
1.7.10

25
packages/mediacenter/xbmc/patches/xbmc-990.22-cec-init_m_queryThread_to_NULL.patch
View File

@ -1,25 +0,0 @@
From 9526c4ce7da5c70d8ba79a5c21e9d95c918ebadb Mon Sep 17 00:00:00 2001
From: Lars Op den Kamp <lars@opdenkamp.eu>
Date: Tue, 12 Mar 2013 11:08:55 +0100
Subject: [PATCH] [cec] and let's init m_queryThread to NULL so we won't crash
on exit when CEC has been disabled
---
xbmc/peripherals/devices/PeripheralCecAdapter.cpp | 1 +
1 file changed, 1 insertion(+)
diff --git a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp
index 6509c5d..61233bb 100644
--- a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp
+++ b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp
@@ -135,6 +135,7 @@ void CPeripheralCecAdapter::ResetMembers(void)
m_bActiveSourceBeforeStandby = false;
m_bOnPlayReceived = false;
m_bPlaybackPaused = false;
+ m_queryThread = NULL;
m_currentButton.iButton = 0;
m_currentButton.iDuration = 0;
--
1.7.10

22
packages/mediacenter/xbmc/patches/xbmc-990.23-Fix_code_generate_problem_with_binary_string.patch
View File

@ -1,22 +0,0 @@
From 1a5e251cc4382ad3e918af68072f2ba08e26574b Mon Sep 17 00:00:00 2001
From: ulion <ulion2002@gmail.com>
Date: Tue, 12 Mar 2013 06:40:54 +0800
Subject: [PATCH] Fix code generate problem with binary string.
---
xbmc/interfaces/python/typemaps/python.string.outtm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/xbmc/interfaces/python/typemaps/python.string.outtm b/xbmc/interfaces/python/typemaps/python.string.outtm
index cdfba2e..c396166 100644
--- a/xbmc/interfaces/python/typemaps/python.string.outtm
+++ b/xbmc/interfaces/python/typemaps/python.string.outtm
@@ -22,4 +22,4 @@
%>
${result} = <%
if(method.@feature_python_coerceToUnicode) { %>PyUnicode_DecodeUTF8(${api}.c_str(),${api}.size(),"replace");<% }
- else { %>PyString_FromString(${api}.c_str());<% } %>
+ else { %>PyString_FromStringAndSize(${api}.c_str(), ${api}.length());<% } %>
--
1.7.10

94
packages/mediacenter/xbmc/patches/xbmc-990.24-PR2403-01.patch Normal file
View File

@ -0,0 +1,94 @@
diff -Naur xbmc-12.0.6/xbmc/powermanagement/linux/FallbackPowerSyscall.h xbmc-12.0.6.patch/xbmc/powermanagement/linux/FallbackPowerSyscall.h
--- xbmc-12.0.6/xbmc/powermanagement/linux/FallbackPowerSyscall.h 1970-01-01 01:00:00.000000000 +0100
+++ xbmc-12.0.6.patch/xbmc/powermanagement/linux/FallbackPowerSyscall.h 2013-03-13 22:25:29.220700789 +0100
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2005-2013 Team XBMC
+ * http://www.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_LINUX)
+
+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
diff -Naur xbmc-12.0.6/xbmc/powermanagement/PowerManager.cpp xbmc-12.0.6.patch/xbmc/powermanagement/PowerManager.cpp
--- xbmc-12.0.6/xbmc/powermanagement/PowerManager.cpp 2013-03-11 18:01:45.000000000 +0100
+++ xbmc-12.0.6.patch/xbmc/powermanagement/PowerManager.cpp 2013-03-14 00:20:43.263315592 +0100
@@ -41,14 +41,17 @@
#include "osx/CocoaPowerSyscall.h"
#elif defined(TARGET_ANDROID)
#include "android/AndroidPowerSyscall.h"
-#elif defined(_LINUX) && defined(HAS_DBUS)
+#elif defined(TARGET_LINUX)
+#include "linux/FallbackPowerSyscall.h"
+#if defined(HAS_DBUS)
#include "linux/ConsoleUPowerSyscall.h"
#include "linux/ConsoleDeviceKitPowerSyscall.h"
#include "linux/SystemdUPowerSyscall.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(_WIN32)
#include "powermanagement/windows/Win32PowerSyscall.h"
extern HWND g_hWnd;
@@ -74,7 +77,8 @@
m_instance = new CCocoaPowerSyscall();
#elif defined(TARGET_ANDROID)
m_instance = new CAndroidPowerSyscall();
-#elif defined(_LINUX) && defined(HAS_DBUS)
+#elif defined(TARGET_LINUX)
+#if defined(HAS_DBUS)
if (CConsoleUPowerSyscall::HasConsoleKitAndUPower())
m_instance = new CConsoleUPowerSyscall();
else if (CConsoleDeviceKitPowerSyscall::HasDeviceConsoleKit())
@@ -83,10 +87,13 @@
m_instance = new CSystemdUPowerSyscall();
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
+#endif // HAS_DBUS
+ else
+ m_instance = new CFallbackPowerSyscall();
#elif defined(_WIN32)
m_instance = new CWin32PowerSyscall();
#endif

14
packages/mediacenter/xbmc/patches/xbmc-990.24-PR2403.patch
View File

@ -1,14 +0,0 @@
diff -Naur xbmc-12.0.6/xbmc/powermanagement/PowerManager.h xbmc-12.0.6.patch/xbmc/powermanagement/PowerManager.h
--- xbmc-12.0.6/xbmc/powermanagement/PowerManager.h 2013-03-11 18:01:45.000000000 +0100
+++ xbmc-12.0.6.patch/xbmc/powermanagement/PowerManager.h 2013-03-12 13:42:28.698769168 +0100
@@ -32,8 +32,8 @@
virtual bool Reboot() { return false; }
virtual bool CanPowerdown() { return true; }
- virtual bool CanSuspend() { return true; }
- virtual bool CanHibernate() { return true; }
+ virtual bool CanSuspend() { return false; }
+ virtual bool CanHibernate() { return false; }
virtual bool CanReboot() { return true; }
virtual int BatteryLevel() { return 0; }

3
packages/x11/driver/xf86-video-nvidia-legacy/config/xorg-nvidia.conf
View File

@ -5,7 +5,6 @@ Section "Device"
Option "NoFlip" "false"
Option "NoLogo" "true"
Option "ConnectToAcpid" "0"
Option "FlatPanelProperties" "Scaling = Native"
Option "ModeValidation" "NoVesaModes, NoXServerModes"
Option "HWCursor" "false"
# To put Xorg in debug mode change "false" to "true" in the line below:
@ -31,4 +30,4 @@ EndSection
Section "Extensions"
Option "Composite" "false"
EndSection
EndSection

3
packages/x11/driver/xf86-video-nvidia/config/xorg-nvidia.conf
View File

@ -5,7 +5,6 @@ Section "Device"
Option "NoFlip" "false"
Option "NoLogo" "true"
Option "ConnectToAcpid" "0"
Option "FlatPanelProperties" "Scaling = Native"
Option "ModeValidation" "NoVesaModes, NoXServerModes"
Option "HWCursor" "false"
# To put Xorg in debug mode change "false" to "true" in the line below:
@ -31,4 +30,4 @@ EndSection
Section "Extensions"
Option "Composite" "false"
EndSection
EndSection

1
projects/ATV/filesystem/etc/X11/xorg-nvidia.conf
View File

@ -5,7 +5,6 @@ Section "Device"
Option "NoFlip" "false"
Option "NoLogo" "true"
Option "ConnectToAcpid" "0"
Option "FlatPanelProperties" "Scaling = Native"
Option "ModeValidation" "NoVesaModes, NoXServerModes"
Option "HWCursor" "false"
Option "RegistryDwords" "RMDisableRenderToSysmem=1"

2
tools/mkpkg/mkpkg_xbmc-frodo
View File

@ -20,7 +20,7 @@
################################################################################
PKG_NAME="xbmc"
PKG_VERSION="12.0.6"
PKG_VERSION="12.0.7"
GIT_REPO="-b Frodo git://github.com/xbmc/xbmc.git"
DEST_DIR="$PKG_NAME-frodo"