From a187e1833b89f53f556e0d37bc12f062e5e6f2c0 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sun, 22 Sep 2013 21:06:22 +0300 Subject: [PATCH 1/4] Revert "eventlircd: add support for MS-Tech remotes" This reverts commit 1af8dc26a1012ca09e6ebd15a7f5fff71a2acce6. nah. breaks some stuff here with tvheadend. --- .../eventlircd/evmap/03_1d57_ac01.evmap | 49 ------------------- .../eventlircd/udev.d/98-eventlircd.rules | 4 -- 2 files changed, 53 deletions(-) delete mode 100644 packages/sysutils/remote/eventlircd/evmap/03_1d57_ac01.evmap diff --git a/packages/sysutils/remote/eventlircd/evmap/03_1d57_ac01.evmap b/packages/sysutils/remote/eventlircd/evmap/03_1d57_ac01.evmap deleted file mode 100644 index 979e7d6421..0000000000 --- a/packages/sysutils/remote/eventlircd/evmap/03_1d57_ac01.evmap +++ /dev/null @@ -1,49 +0,0 @@ -# 1d57:ac01 MS-Tech - - KEY_POWER = KEY_POWER # Power - - KEY_1 = KEY_NUMERIC_1 # 1 - KEY_2 = KEY_NUMERIC_2 # 2 - KEY_3 = KEY_NUMERIC_3 # 3 - KEY_4 = KEY_NUMERIC_4 # 4 - KEY_5 = KEY_NUMERIC_5 # 5 - KEY_6 = KEY_NUMERIC_6 # 6 - KEY_7 = KEY_NUMERIC_7 # 7 - KEY_8 = KEY_NUMERIC_8 # 8 - KEY_9 = KEY_NUMERIC_9 # 9 - KEY_0 = KEY_NUMERIC_0 # 0 - shift+KEY_8 = KEY_NUMERIC_STAR # * - shift+KEY_3 = KEY_NUMERIC_POUND # # - - KEY_VOLUMEUP = KEY_VOLUMEUP # Vol + - KEY_VOLUMEDOWN = KEY_VOLUMEDOWN # Vol - - KEY_MUTE = KEY_MUTE # Mute - KEY_PAGEUP = KEY_CHANNELUP # CH/PG up - KEY_PAGEDOWN = KEY_CHANNELDOWN # CH/PG down - ctrl+KEY_F = KEY_NEXT # Next - ctrl+KEY_B = KEY_PREVIOUS # Prev - - KEY_DELETE = KEY_DELETE # Delete/Clear - alt+KEY_F4 = KEY_EXIT # Exit - KEY_BACKSPACE = KEY_EXIT # Back - - KEY_LEFT = KEY_LEFT # Left Arrow - KEY_RIGHT = KEY_RIGHT # Right Arrow - KEY_UP = KEY_UP # Up Arrow - KEY_DOWN = KEY_DOWN # Down Arrow - KEY_ENTER = KEY_OK # Enter & Ok - - KEY_COMPOSE = KEY_INFO # Info - ctrl+KEY_R = KEY_RECORD # Record - ctrl+KEY_P = KEY_PAUSE # Pause - ctrl+shift+KEY_S = KEY_STOP # Stop - ctrl+shift+KEY_B = KEY_REWIND # Rev - ctrl+shift+KEY_P = KEY_PLAY # Play - ctrl+shift+KEY_F = KEY_FASTFORWARD # Fwd - - ctrl+shift+KEY_M = KEY_DVD # DVD - ctrl+shift+KEY_A = KEY_AUDIO # Audio - ctrl+shift+KEY_T = KEY_TUNER # LiveTV - ctrl+KEY_U = KEY_SUBTITLE # Subtitles - ctrl+KEY_G = KEY_EPG # Guide # remapped to EPG (Contextmenu) - alt+KEY_ENTER = KEY_PROG1 # Media/Switch Windows diff --git a/packages/sysutils/remote/eventlircd/udev.d/98-eventlircd.rules b/packages/sysutils/remote/eventlircd/udev.d/98-eventlircd.rules index 6d81c180c1..d9936b36ec 100644 --- a/packages/sysutils/remote/eventlircd/udev.d/98-eventlircd.rules +++ b/packages/sysutils/remote/eventlircd/udev.d/98-eventlircd.rules @@ -147,10 +147,6 @@ ENV{ID_VENDOR_ID}=="18b1", ENV{ID_MODEL_ID}=="0037", \ ENV{eventlircd_enable}="true", \ ENV{eventlircd_evmap}="03_$env{ID_VENDOR_ID}_$env{ID_MODEL_ID}.evmap" -ENV{ID_VENDOR_ID}=="1d57", ENV{ID_MODEL_ID}=="ac01", \ - ENV{eventlircd_enable}="true", \ - ENV{eventlircd_evmap}="03_$env{ID_VENDOR_ID}_$env{ID_MODEL_ID}.evmap" - #ENV{ID_VENDOR_ID}=="9022", ENV{ID_MODEL_ID}=="d660", \ ATTRS{idVendor}=="9022", ATTRS{idProduct}=="d660", \ ENV{eventlircd_enable}="true", \ From d3c47e3c23e641a495f23f9477954357a9efdfd3 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sun, 22 Sep 2013 21:16:03 +0300 Subject: [PATCH 2/4] Revert "Revert "eventlircd: add support for MS-Tech remotes"" This reverts commit a187e1833b89f53f556e0d37bc12f062e5e6f2c0. --- .../eventlircd/evmap/03_1d57_ac01.evmap | 49 +++++++++++++++++++ .../eventlircd/udev.d/98-eventlircd.rules | 4 ++ 2 files changed, 53 insertions(+) create mode 100644 packages/sysutils/remote/eventlircd/evmap/03_1d57_ac01.evmap diff --git a/packages/sysutils/remote/eventlircd/evmap/03_1d57_ac01.evmap b/packages/sysutils/remote/eventlircd/evmap/03_1d57_ac01.evmap new file mode 100644 index 0000000000..979e7d6421 --- /dev/null +++ b/packages/sysutils/remote/eventlircd/evmap/03_1d57_ac01.evmap @@ -0,0 +1,49 @@ +# 1d57:ac01 MS-Tech + + KEY_POWER = KEY_POWER # Power + + KEY_1 = KEY_NUMERIC_1 # 1 + KEY_2 = KEY_NUMERIC_2 # 2 + KEY_3 = KEY_NUMERIC_3 # 3 + KEY_4 = KEY_NUMERIC_4 # 4 + KEY_5 = KEY_NUMERIC_5 # 5 + KEY_6 = KEY_NUMERIC_6 # 6 + KEY_7 = KEY_NUMERIC_7 # 7 + KEY_8 = KEY_NUMERIC_8 # 8 + KEY_9 = KEY_NUMERIC_9 # 9 + KEY_0 = KEY_NUMERIC_0 # 0 + shift+KEY_8 = KEY_NUMERIC_STAR # * + shift+KEY_3 = KEY_NUMERIC_POUND # # + + KEY_VOLUMEUP = KEY_VOLUMEUP # Vol + + KEY_VOLUMEDOWN = KEY_VOLUMEDOWN # Vol - + KEY_MUTE = KEY_MUTE # Mute + KEY_PAGEUP = KEY_CHANNELUP # CH/PG up + KEY_PAGEDOWN = KEY_CHANNELDOWN # CH/PG down + ctrl+KEY_F = KEY_NEXT # Next + ctrl+KEY_B = KEY_PREVIOUS # Prev + + KEY_DELETE = KEY_DELETE # Delete/Clear + alt+KEY_F4 = KEY_EXIT # Exit + KEY_BACKSPACE = KEY_EXIT # Back + + KEY_LEFT = KEY_LEFT # Left Arrow + KEY_RIGHT = KEY_RIGHT # Right Arrow + KEY_UP = KEY_UP # Up Arrow + KEY_DOWN = KEY_DOWN # Down Arrow + KEY_ENTER = KEY_OK # Enter & Ok + + KEY_COMPOSE = KEY_INFO # Info + ctrl+KEY_R = KEY_RECORD # Record + ctrl+KEY_P = KEY_PAUSE # Pause + ctrl+shift+KEY_S = KEY_STOP # Stop + ctrl+shift+KEY_B = KEY_REWIND # Rev + ctrl+shift+KEY_P = KEY_PLAY # Play + ctrl+shift+KEY_F = KEY_FASTFORWARD # Fwd + + ctrl+shift+KEY_M = KEY_DVD # DVD + ctrl+shift+KEY_A = KEY_AUDIO # Audio + ctrl+shift+KEY_T = KEY_TUNER # LiveTV + ctrl+KEY_U = KEY_SUBTITLE # Subtitles + ctrl+KEY_G = KEY_EPG # Guide # remapped to EPG (Contextmenu) + alt+KEY_ENTER = KEY_PROG1 # Media/Switch Windows diff --git a/packages/sysutils/remote/eventlircd/udev.d/98-eventlircd.rules b/packages/sysutils/remote/eventlircd/udev.d/98-eventlircd.rules index d9936b36ec..6d81c180c1 100644 --- a/packages/sysutils/remote/eventlircd/udev.d/98-eventlircd.rules +++ b/packages/sysutils/remote/eventlircd/udev.d/98-eventlircd.rules @@ -147,6 +147,10 @@ ENV{ID_VENDOR_ID}=="18b1", ENV{ID_MODEL_ID}=="0037", \ ENV{eventlircd_enable}="true", \ ENV{eventlircd_evmap}="03_$env{ID_VENDOR_ID}_$env{ID_MODEL_ID}.evmap" +ENV{ID_VENDOR_ID}=="1d57", ENV{ID_MODEL_ID}=="ac01", \ + ENV{eventlircd_enable}="true", \ + ENV{eventlircd_evmap}="03_$env{ID_VENDOR_ID}_$env{ID_MODEL_ID}.evmap" + #ENV{ID_VENDOR_ID}=="9022", ENV{ID_MODEL_ID}=="d660", \ ATTRS{idVendor}=="9022", ATTRS{idProduct}=="d660", \ ENV{eventlircd_enable}="true", \ From 3a9bd41289628775b57cdb3f8e935b4123639ef0 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sun, 22 Sep 2013 21:16:11 +0300 Subject: [PATCH 3/4] Revert "linux: dvbsky: delsys auto off" This reverts commit 725edb4ce0af7171dd4fd0e6abc16b20ca0e9184. --- .../3.11.1/linux-210.01-dvbsky-auto-off.patch | 31 ------------------- 1 file changed, 31 deletions(-) delete mode 100644 packages/linux/patches/3.11.1/linux-210.01-dvbsky-auto-off.patch diff --git a/packages/linux/patches/3.11.1/linux-210.01-dvbsky-auto-off.patch b/packages/linux/patches/3.11.1/linux-210.01-dvbsky-auto-off.patch deleted file mode 100644 index 381e8b9bc9..0000000000 --- a/packages/linux/patches/3.11.1/linux-210.01-dvbsky-auto-off.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/drivers/media/dvb-frontends/m88ds3103.c b/drivers/media/dvb-frontends/m88ds3103.c -index 315809d..54dff7c 100644 ---- a/drivers/media/dvb-frontends/m88ds3103.c -+++ b/drivers/media/dvb-frontends/m88ds3103.c -@@ -1244,6 +1244,8 @@ static int m88ds3103_set_frontend(struct dvb_frontend *fe) - dprintk("symbol rate = %d\n", c->symbol_rate); - dprintk("delivery system = %d\n", c->delivery_system); - -+ state->delivery_system = c->delivery_system; -+ - realFreq = c->frequency; - lpf_offset_KHz = 0; - if(c->symbol_rate < 5000000){ -@@ -1501,7 +1503,7 @@ static int m88ds3103_set_frontend(struct dvb_frontend *fe) - } - msleep(20); - } -- -+/* - if((status & FE_HAS_LOCK) == 0){ - state->delivery_system = (state->delivery_system == SYS_DVBS) ? SYS_DVBS2 : SYS_DVBS; - m88ds3103_demod_connect(fe, offset_khz); -@@ -1514,7 +1516,7 @@ static int m88ds3103_set_frontend(struct dvb_frontend *fe) - msleep(20); - } - } -- -+*/ - if (status & FE_HAS_LOCK){ - if(state->config->ci_mode == 2) - m88ds3103_set_clock_ratio(state); From d8ad75cd87648d5b499f9a21ea0abadd719bc09e Mon Sep 17 00:00:00 2001 From: Jan-Hendrik Peters Date: Sun, 22 Sep 2013 20:51:40 +0200 Subject: [PATCH 4/4] save some ascii art --- packages/tools/syslinux/files/create_livestick | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/tools/syslinux/files/create_livestick b/packages/tools/syslinux/files/create_livestick index ee13e635f0..3371a4a027 100755 --- a/packages/tools/syslinux/files/create_livestick +++ b/packages/tools/syslinux/files/create_livestick @@ -27,7 +27,7 @@ if [ "$(id -u)" != "0" ]; then clear echo "#########################################################" echo "# please execute with 'sudo' or -DANGEROUS!!!- as root #" - echo "# example: sudo ./create_livestick #" + echo "# example: sudo ./create_livestick #" echo "#########################################################" exit 1 fi @@ -36,7 +36,7 @@ if [ -z "$1" ]; then clear echo "#########################################################" echo "# please execute with your drive as option #" - echo "# example: sudo ./create_livestick /dev/sdb #" + echo "# example: sudo ./create_livestick /dev/sdb #" echo "#########################################################" exit 1 fi @@ -71,7 +71,7 @@ echo "#########################################################" echo "# #" echo "# OpenELEC missing tool - Installation will quit #" echo "# #" - echo "# We can't find the required tool \"syslinux\" #" + echo "# We can't find the required tool \"syslinux\" #" echo "# on your system. #" echo "# Please install it via your package manager. #" echo "# #" @@ -87,11 +87,11 @@ echo "#########################################################" echo "# #" echo "# OpenELEC missing tool - Installation will quit #" echo "# #" - echo "# We can't find the required tool \"mcopy\" #" + echo "# We can't find the required tool \"mcopy\" #" echo "# on your system. #" echo "# Please install it via your package manager. #" echo "# NOTE: Some distributions call this package #" - echo "# \"mtools\". #" + echo "# \"mtools\". #" echo "# #" echo "#########################################################" exit 1 @@ -105,7 +105,7 @@ echo "#########################################################" echo "# #" echo "# OpenELEC missing tool - Installation will quit #" echo "# #" - echo "# We can't find the required tool \"parted\" #" + echo "# We can't find the required tool \"parted\" #" echo "# on your system. #" echo "# Please install it via your package manager. #" echo "# #" @@ -121,7 +121,7 @@ echo "#########################################################" echo "# #" echo "# OpenELEC.tv missing tool - Installation will quit #" echo "# #" - echo "# We can't find the required tool \"mkfs.vfat\" #" + echo "# We can't find the required tool \"mkfs.vfat\" #" echo "# on your system. #" echo "# Please install it via your package manager. #" echo "# #"