Merge remote branch 'upstream/openelec-pxe' into openelec-pxe

This commit is contained in:
Lars Op den Kamp 2011-04-06 13:37:10 +02:00
commit 27a6d472b5
15 changed files with 38801 additions and 1680 deletions

View File

@ -11,7 +11,7 @@
#KEY_LEFT = KEY_LEFT # Left
#KEY_RIGHT = KEY_RIGHT # Right
KEY_BACKSPACE = KEY_BACK # Back
#KEY_ENTER = KEY_ENTER # Ok
KEY_ENTER = KEY_OK # Ok
KEY_TAB = KEY_TAB # Tab
ctrl+KEY_B = KEY_PREVIOUS # Previous
ctrl+KEY_P = KEY_PLAYPAUSE # Play/Pause

View File

@ -44,7 +44,6 @@ shift+KEY_8 = KEY_NUMERIC_STAR
shift+KEY_3 = KEY_NUMERIC_POUND
KEY_ESC = KEY_DELETE
KEY_TEXT = KEY_TEXT
KEY_ENTER = KEY_OK
KEY_RED = KEY_RED
KEY_GREEN = KEY_GREEN
KEY_YELLOW = KEY_YELLOW

View File

@ -12,7 +12,7 @@
KEY_DOWN = KEY_DOWN # Down Arrow
KEY_LEFT = KEY_LEFT # Left Arrow
KEY_RIGHT = KEY_RIGHT # Right Arrow
KEY_ENTER = KEY_ENTER # Enter & Ok
KEY_ENTER = KEY_OK # Enter & Ok
KEY_DELETE = KEY_CLEAR # Clear
KEY_HOME = KEY_HOME # Home
KEY_SLEEP = KEY_POWER # Power

View File

@ -15,7 +15,7 @@
KEY_F6 = KEY_PREVIOUS # KEY_GREEN
KEY_F7 = KEY_NEXT # KEY_YELLOW
KEY_F8 = KEY_BLUE
KEY_ENTER = KEY_ENTER
KEY_ENTER = KEY_OK
KEY_UP = KEY_UP
KEY_DOWN = KEY_DOWN
KEY_LEFT = KEY_LEFT

View File

@ -20,3 +20,5 @@ KEY_KP8 = KEY_NUMERIC_8
KEY_KP9 = KEY_NUMERIC_9
KEY_KP0 = KEY_NUMERIC_0
KEY_KPASTERISK = KEY_NUMERIC_STAR
KEY_ENTER = KEY_OK

View File

@ -32,3 +32,5 @@ KEY_ANGLE = KEY_ZOOM
KEY_MP3 = KEY_AUDIO
KEY_TEXT = KEY_TEXT
KEY_EPG = KEY_EPG
KEY_ENTER = KEY_OK

View File

@ -2,7 +2,7 @@ KEY_UP = KEY_UP
KEY_DOWN = KEY_DOWN
KEY_LEFT = KEY_LEFT
KEY_RIGHT = KEY_RIGHT
KEY_ENTER = KEY_ENTER
KEY_ENTER = KEY_OK
KEY_PAGEDOWN = KEY_PAGEDOWN
KEY_PAGEUP = KEY_PAGEUP
alt+meta+KEY_ENTER = KEY_MENU

View File

@ -25,9 +25,9 @@
mkdir -p $INSTALL/usr/bin
cp $PKG_BUILD/utils/keytable/ir-keytable $INSTALL/usr/bin
#mkdir -p $INSTALL/lib/udev/rules.d
# cp $PKG_BUILD/utils/keytable/*.rules $INSTALL/lib/udev/rules.d
mkdir -p $INSTALL/lib/udev/rules.d
cp $PKG_BUILD/utils/keytable/*.rules $INSTALL/lib/udev/rules.d
mkdir -p $INSTALL/etc
# cp $PKG_BUILD/utils/keytable/rc_maps.cfg $INSTALL/etc
cp $PKG_BUILD/utils/keytable/rc_maps.cfg $INSTALL/etc
cp -R $PKG_BUILD/utils/keytable/rc_keymaps $INSTALL/etc

View File

@ -0,0 +1,68 @@
diff -Naur v4l-utils-0.8.3/utils/keytable/rc_keymaps/imon_mce v4l-utils-0.8.3.patch/utils/keytable/rc_keymaps/imon_mce
--- v4l-utils-0.8.3/utils/keytable/rc_keymaps/imon_mce 2011-02-09 23:04:27.000000000 +0100
+++ v4l-utils-0.8.3.patch/utils/keytable/rc_keymaps/imon_mce 2011-04-05 17:55:00.641736994 +0200
@@ -16,7 +16,7 @@
0x800ff420 KEY_LEFT
0x800ff421 KEY_RIGHT
0x800ff40b KEY_ENTER
-0x02000028 KEY_ENTER
+# 0x02000028 KEY_ENTER # same as KEY_OK
0x02000028 KEY_OK
0x800ff422 KEY_OK
0x0200002a KEY_EXIT
@@ -67,7 +67,7 @@
0x800ff45d KEY_YELLOW
0x800ff45e KEY_BLUE
0x800ff466 KEY_RED
-0x800ff425 KEY_GREEN
+# 0x800ff425 KEY_GREEN # same as KEY_TUNER
0x800ff468 KEY_YELLOW
0x800ff41d KEY_BLUE
0x800ff40f KEY_INFO
@@ -75,4 +75,4 @@
0x800ff45a KEY_SUBTITLE
0x800ff44d KEY_TITLE
0x800ff40c KEY_POWER
-0x800ff40d KEY_LEFTMETA
+0x800ff40d KEY_PROG1
diff -Naur v4l-utils-0.8.3/utils/keytable/rc_keymaps/imon_pad v4l-utils-0.8.3.patch/utils/keytable/rc_keymaps/imon_pad
--- v4l-utils-0.8.3/utils/keytable/rc_keymaps/imon_pad 2011-02-09 23:04:27.000000000 +0100
+++ v4l-utils-0.8.3.patch/utils/keytable/rc_keymaps/imon_pad 2011-04-05 17:38:46.644003338 +0200
@@ -72,3 +72,15 @@
0x2aa395b7 KEY_SCREEN
0x299115b7 KEY_KEYBOARD
0x299135b7 KEY_KEYBOARD
+
+0x29b195b7 KEY_EJECTCD
+0x02000065 KEY_COMPOSE
+0x02800000 KEY_CONTEXT_MENU
+0x01020000 BTN_RIGHT
+0x01010000 BTN_LEFT
+0x29b715b7 KEY_DASHBOARD
+0x2a9395b7 KEY_CYCLEWINDOWS
+0x299395b7 KEY_EJECTCLOSECD
+0x2ab195b7 KEY_PROG1
+0x2b8395b7 KEY_TIME
+0x289115b7 KEY_POWER
diff -Naur v4l-utils-0.8.3/utils/keytable/rc_keymaps/kworld_plus_tv_analog v4l-utils-0.8.3.patch/utils/keytable/rc_keymaps/kworld_plus_tv_analog
--- v4l-utils-0.8.3/utils/keytable/rc_keymaps/kworld_plus_tv_analog 2011-02-09 23:04:27.000000000 +0100
+++ v4l-utils-0.8.3.patch/utils/keytable/rc_keymaps/kworld_plus_tv_analog 2011-04-05 17:38:46.645003319 +0200
@@ -1,5 +1,5 @@
# table kworld_plus_tv_analog, type: UNKNOWN
-0x0c KEY_LEFTMETA
+0x0c KEY_PROG1
0x16 KEY_CLOSECD
0x1d KEY_POWER2
0x00 KEY_1
diff -Naur v4l-utils-0.8.3/utils/keytable/rc_keymaps/rc6_mce v4l-utils-0.8.3.patch/utils/keytable/rc_keymaps/rc6_mce
--- v4l-utils-0.8.3/utils/keytable/rc_keymaps/rc6_mce 2011-02-09 23:04:27.000000000 +0100
+++ v4l-utils-0.8.3.patch/utils/keytable/rc_keymaps/rc6_mce 2011-04-05 17:38:46.801000225 +0200
@@ -12,7 +12,7 @@
0x800f040a KEY_DELETE
0x800f040b KEY_ENTER
0x800f040c KEY_POWER
-0x800f040d KEY_LEFTMETA
+0x800f040d KEY_PROG1
0x800f040e KEY_MUTE
0x800f040f KEY_INFO
0x800f0410 KEY_VOLUMEUP

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="mpfr"
PKG_VERSION="3.0.0"
PKG_VERSION="3.0.1"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="LGPL"

View File

@ -31,6 +31,7 @@ XKBCOMP="/usr/bin/xkbcomp" \
--enable-compat-rules \
--with-xkb-base=$XORG_PATH_XKB \
--without-xkb-rules-symlink \
--disable-runtime-deps
make
make DESTDIR=`pwd`/.install install

View File

@ -19,12 +19,12 @@
################################################################################
PKG_NAME="xkeyboard-config"
PKG_VERSION="2.0"
PKG_VERSION="2.2"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="OSS"
PKG_SITE="http://www.X.org"
PKG_URL="http://people.freedesktop.org/~svu/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_URL="http://www.x.org/releases/individual/data/xkeyboard-config/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_DEPENDS=""
PKG_BUILD_DEPENDS="toolchain util-macros xkbcomp libiconv"
PKG_PRIORITY="optional"

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="libX11"
PKG_VERSION="1.4.2"
PKG_VERSION="1.4.3"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="OSS"