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

Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv

Browse Source
This commit is contained in:
Stephan Raue 2014-12-21 13:21:32 +01:00
commit 8d912c0bac
3 changed files with 72 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/linux/package.mk
View File

@ -140,14 +140,14 @@ make_target() {
$SCRIPTS/install initramfs $SCRIPTS/install initramfs
) )
LDFLAGS="" make $KERNEL_IMAGE $KERNEL_MAKE_EXTRACMD
if [ "$BOOTLOADER" = "u-boot" -a -n "$KERNEL_UBOOT_EXTRA_TARGET" ]; then if [ "$BOOTLOADER" = "u-boot" -a -n "$KERNEL_UBOOT_EXTRA_TARGET" ]; then
for extra_target in "$KERNEL_UBOOT_EXTRA_TARGET"; do for extra_target in "$KERNEL_UBOOT_EXTRA_TARGET"; do
LDFLAGS="" make $extra_target LDFLAGS="" make $extra_target
done done
fi fi
LDFLAGS="" make $KERNEL_IMAGE $KERNEL_MAKE_EXTRACMD
if [ "$PERF_SUPPORT" = "yes" -a "$DEVTOOLS" = "yes" ]; then if [ "$PERF_SUPPORT" = "yes" -a "$DEVTOOLS" = "yes" ]; then
( cd tools/perf ( cd tools/perf

59
projects/imx6/patches/kodi/kodi-999.95-iMX6-powermanager.patch
View File

@ -1,12 +1,13 @@
From fa31c513986f8429f8e8e4b1ca39455769cd0a1c Mon Sep 17 00:00:00 2001 From fc4ab34876077a012c4d0749b872703f46546255 Mon Sep 17 00:00:00 2001
From: fritsch <peter.fruehberger@gmail.com> From: fritsch <peter.fruehberger@gmail.com>
Date: Sat, 13 Dec 2014 18:36:00 +0100 Date: Sat, 13 Dec 2014 18:36:00 +0100
Subject: [PATCH] IMX: PowerManager - do nothing besides rebooting Subject: [PATCH] IMX: PowerManager - do nothing besides rebooting (wrap
Login1)
--- ---
xbmc/powermanagement/PowerManager.cpp | 4 +++ xbmc/powermanagement/PowerManager.cpp | 4 ++
xbmc/powermanagement/linux/CIMXPowerSyscall.h | 40 +++++++++++++++++++++++++++ xbmc/powermanagement/linux/CIMXPowerSyscall.h | 70 +++++++++++++++++++++++++++
2 files changed, 44 insertions(+) 2 files changed, 74 insertions(+)
create mode 100644 xbmc/powermanagement/linux/CIMXPowerSyscall.h create mode 100644 xbmc/powermanagement/linux/CIMXPowerSyscall.h
diff --git a/xbmc/powermanagement/PowerManager.cpp b/xbmc/powermanagement/PowerManager.cpp diff --git a/xbmc/powermanagement/PowerManager.cpp b/xbmc/powermanagement/PowerManager.cpp
@ -33,10 +34,10 @@ index 5900f98..f669894 100644
if (CConsoleUPowerSyscall::HasConsoleKitAndUPower()) if (CConsoleUPowerSyscall::HasConsoleKitAndUPower())
diff --git a/xbmc/powermanagement/linux/CIMXPowerSyscall.h b/xbmc/powermanagement/linux/CIMXPowerSyscall.h diff --git a/xbmc/powermanagement/linux/CIMXPowerSyscall.h b/xbmc/powermanagement/linux/CIMXPowerSyscall.h
new file mode 100644 new file mode 100644
index 0000000..27e644e index 0000000..2bf428e
--- /dev/null --- /dev/null
+++ b/xbmc/powermanagement/linux/CIMXPowerSyscall.h +++ b/xbmc/powermanagement/linux/CIMXPowerSyscall.h
@@ -0,0 +1,40 @@ @@ -0,0 +1,70 @@
+/* +/*
+ * Copyright (C) 2005-2013 Team XBMC + * Copyright (C) 2005-2013 Team XBMC
+ * http://xbmc.org + * http://xbmc.org
@ -60,22 +61,50 @@ index 0000000..27e644e
+#pragma once +#pragma once
+#include "powermanagement/IPowerSyscall.h" +#include "powermanagement/IPowerSyscall.h"
+#include "system.h" +#include "system.h"
+#if defined(TARGET_POSIX) +#if defined(TARGET_POSIX) && defined(HAS_DBUS)
+#include "powermanagement/linux/LogindUPowerSyscall.h"
+#endif
+ +
+class CIMXPowerSyscall : public CPowerSyscallWithoutEvents +class CIMXPowerSyscall : public CPowerSyscallWithoutEvents
+{ +{
+public: +public:
+ CIMXPowerSyscall()
+ {
+ m_instance = NULL;
+ #if defined(TARGET_POSIX) && defined(HAS_DBUS)
+ if (CLogindUPowerSyscall::HasLogind())
+ {
+ m_instance = new CLogindUPowerSyscall();
+ }
+ #endif
+ }
+ ~CIMXPowerSyscall()
+ {
+ delete m_instance;
+ }
+ virtual bool Powerdown() {return false; } + virtual bool Powerdown() {return false; }
+ virtual bool Suspend() {return false; } + virtual bool Suspend() {return false; }
+ virtual bool Hibernate() {return false; } + virtual bool Hibernate() {return false; }
+ virtual bool Reboot() {return true; } + virtual bool Reboot()
+ {
+ if (m_instance)
+ return m_instance->Reboot();
+ else
+ return false;
+ }
+ +
+ virtual bool CanPowerdown() {return false; } + virtual bool CanPowerdown() {return false; }
+ virtual bool CanSuspend() {return false; } + virtual bool CanSuspend() {return false; }
+ virtual bool CanHibernate() {return false; } + virtual bool CanHibernate() {return false;}
+ virtual bool CanReboot() {return true; } + virtual bool CanReboot()
+ virtual int BatteryLevel() {return 0; } + {
+ if (m_instance)
+ return m_instance->CanReboot();
+ else
+ return false;
+ }
+ virtual int BatteryLevel() {return 0; }
+
+private:
+ IPowerSyscall * m_instance;
+}; +};
+#endif
--
1.9.1

26
projects/imx6/patches/kodi/kodi-999.96-iMX6-disable-deinterlace-by-default.patch Normal file
View File

@ -0,0 +1,26 @@
From 467c583ca00c3512d93745ae6bee7ae26ebcb13e Mon Sep 17 00:00:00 2001
From: fritsch <Peter.Fruehberger@gmail.com>
Date: Sun, 21 Dec 2014 12:58:30 +0100
Subject: [PATCH] IMX: Disable deinterlacing by default (user can enable it if
he wants)
---
xbmc/settings/VideoSettings.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/xbmc/settings/VideoSettings.cpp b/xbmc/settings/VideoSettings.cpp
index 65105e8..e61f49a 100644
--- a/xbmc/settings/VideoSettings.cpp
+++ b/xbmc/settings/VideoSettings.cpp
@@ -29,7 +29,7 @@
CVideoSettings::CVideoSettings()
{
- m_DeinterlaceMode = VS_DEINTERLACEMODE_AUTO;
+ m_DeinterlaceMode = VS_DEINTERLACEMODE_OFF;
m_InterlaceMethod = VS_INTERLACEMETHOD_AUTO;
m_ScalingMethod = VS_SCALINGMETHOD_LINEAR;
m_ViewMode = ViewModeNormal;
--
1.9.1