Merge pull request #4578 from OpenELEC/oe6-update

Oe6 update
This commit is contained in:
Lukas Rusak 2016-01-04 23:23:44 -08:00
commit 392612e94d
4 changed files with 74 additions and 6 deletions

View File

@ -0,0 +1,68 @@
diff -Naur kodi-15.2-02e7013/system/keymaps/keyboard.xml kodi-15.2-02e7013.patch/system/keymaps/keyboard.xml
--- kodi-15.2-02e7013/system/keymaps/keyboard.xml 2016-01-04 10:29:34.001845961 +0100
+++ kodi-15.2-02e7013.patch/system/keymaps/keyboard.xml 2016-01-05 06:23:38.100043689 +0100
@@ -100,6 +100,7 @@
<sleep>ActivateWindow(shutdownmenu)</sleep>
<!-- PVR windows -->
<e>ActivateWindow(TVGuide)</e>
+ <epg>ActivateWindow(TVGuide)</epg>
<h>ActivateWindow(TVChannels)</h>
<j>ActivateWindow(RadioChannels)</j>
<k>ActivateWindow(TVRecordings)</k>
@@ -234,6 +235,12 @@
<blue>Blue</blue>
</keyboard>
</MyRadioTimers>
+ <TVGuide>
+ <keyboard>
+ <e>PreviousMenu</e>
+ <epg>PreviousMenu</epg>
+ </keyboard>
+ </TVGuide>
<MyFiles>
<keyboard>
<space>Highlight</space>
diff -Naur kodi-15.2-02e7013/xbmc/input/linux/LinuxInputDevices.cpp kodi-15.2-02e7013.patch/xbmc/input/linux/LinuxInputDevices.cpp
--- kodi-15.2-02e7013/xbmc/input/linux/LinuxInputDevices.cpp 2016-01-04 10:29:34.050846059 +0100
+++ kodi-15.2-02e7013.patch/xbmc/input/linux/LinuxInputDevices.cpp 2016-01-05 06:18:19.577596687 +0100
@@ -268,6 +268,7 @@
{ KEY_FILE , XBMCK_LAUNCH_FILE_BROWSER},
{ KEY_SELECT , XBMCK_RETURN },
{ KEY_CONFIG , XBMCK_CONFIG },
+ { KEY_EPG , XBMCK_EPG },
// The Little Black Box Remote Additions
{ 384 , XBMCK_LEFT }, // Red
{ 378 , XBMCK_RIGHT }, // Green
diff -Naur kodi-15.2-02e7013/xbmc/input/XBMC_keysym.h kodi-15.2-02e7013.patch/xbmc/input/XBMC_keysym.h
--- kodi-15.2-02e7013/xbmc/input/XBMC_keysym.h 2016-01-04 10:29:34.002845963 +0100
+++ kodi-15.2-02e7013.patch/xbmc/input/XBMC_keysym.h 2016-01-05 06:19:13.652671442 +0100
@@ -229,6 +229,7 @@
XBMCK_FAVORITES = 0x14d,
XBMCK_HOMEPAGE = 0x14e,
XBMCK_CONFIG = 0x14f,
+ XBMCK_EPG = 0x150,
// Add any other keys here
diff -Naur kodi-15.2-02e7013/xbmc/input/XBMC_keytable.cpp kodi-15.2-02e7013.patch/xbmc/input/XBMC_keytable.cpp
--- kodi-15.2-02e7013/xbmc/input/XBMC_keytable.cpp 2016-01-04 10:29:34.002845963 +0100
+++ kodi-15.2-02e7013.patch/xbmc/input/XBMC_keytable.cpp 2016-01-05 06:19:59.320734540 +0100
@@ -243,6 +243,7 @@
, { XBMCK_FAVORITES, 0, 0, XBMCVK_FAVORITES, "favorites" }
, { XBMCK_HOMEPAGE , 0, 0, XBMCVK_HOMEPAGE, "homepage" }
, { XBMCK_CONFIG, 0, 0, XBMCVK_CONFIG, "config" }
+, { XBMCK_EPG , 0, 0, XBMCVK_EPG, "epg" }
};
static int XBMCKeyTableSize = sizeof(XBMCKeyTable)/sizeof(XBMCKEYTABLE);
diff -Naur kodi-15.2-02e7013/xbmc/input/XBMC_vkeys.h kodi-15.2-02e7013.patch/xbmc/input/XBMC_vkeys.h
--- kodi-15.2-02e7013/xbmc/input/XBMC_vkeys.h 2016-01-04 10:29:34.002845963 +0100
+++ kodi-15.2-02e7013.patch/xbmc/input/XBMC_vkeys.h 2016-01-05 06:20:30.192777231 +0100
@@ -221,6 +221,7 @@
XBMCVK_FAVORITES = 0xE9,
XBMCVK_HOMEPAGE = 0xEA,
XBMCVK_CONFIG = 0xEB,
+ XBMCVK_EPG = 0xEC,
XBMCVK_LAST = 0xFF
} XBMCVKey;

View File

@ -17,7 +17,7 @@
################################################################################
PKG_NAME="pciutils"
PKG_VERSION="3.4.0"
PKG_VERSION="3.4.1"
PKG_REV="1"
PKG_ARCH="x86_64"
PKG_LICENSE="GPL"

View File

@ -17,7 +17,7 @@
################################################################################
PKG_NAME="libinput"
PKG_VERSION="1.1.3"
PKG_VERSION="1.1.4"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -42,10 +42,10 @@ diff -Naur linux-amlogic-3.10-9df7905/drivers/hid/hid-hbgic-kbd.c linux-amlogic-
+ unsigned long **bit, int *max)
+{
+ switch (usage->hid) {
+ case 0x00070029: hbgic_map_key(KEY_BACK); break;
+ case 0x00070029: hbgic_map_key(KEY_ESC); break;
+ case 0x0007002a: hbgic_map_key(KEY_BACK); break;
+ case 0x0007003a: hbgic_map_key(KEY_BACK); break;
+ case 0x0007003b: hbgic_map_key(KEY_HOME); break;
+ case 0x0007003a: hbgic_map_key(KEY_ZOOM); break;
+ case 0x0007003b: hbgic_map_key(KEY_EPG); break;
+ case 0x0007003c: hbgic_map_key(KEY_HOMEPAGE); break;
+ case 0x0007003d: hbgic_map_key(KEY_MENU); break;
+ case 0x0007003e: hbgic_map_key(KEY_ZOOM); break;
@ -56,7 +56,7 @@ diff -Naur linux-amlogic-3.10-9df7905/drivers/hid/hid-hbgic-kbd.c linux-amlogic-
+ case 0x00070043: hbgic_map_key(KEY_YELLOW); break;
+ case 0x00070044: hbgic_map_key(KEY_TEXT); break;
+ case 0x0007004a: hbgic_map_key(KEY_HOMEPAGE); break;
+ case 0x000700f1: hbgic_map_key(KEY_BACK); break;
+ case 0x000700f1: hbgic_map_key(KEY_ESC); break;
+ case 0x000c00e2: hbgic_map_key(KEY_MUTE); break;
+ case 0x000c019e: hbgic_map_key(KEY_MUTE); break;
+ case 0x000c01c2: hbgic_map_key(KEY_BLUE); break;