From 55fb2e5bdb1664673c133d2333778c98b53f103e Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Thu, 21 Dec 2017 11:56:55 +0100 Subject: [PATCH 1/4] v4l-utils: install additional keymaps from files instead of patches Signed-off-by: Matthias Reichl --- packages/sysutils/v4l-utils/keymaps/cubox_i | 10 +++ packages/sysutils/v4l-utils/keymaps/hp_mce | 65 +++++++++++++++++ packages/sysutils/v4l-utils/keymaps/samsung | 31 ++++++++ packages/sysutils/v4l-utils/keymaps/xbox_360 | 66 +++++++++++++++++ packages/sysutils/v4l-utils/keymaps/xbox_one | 22 ++++++ .../sysutils/v4l-utils/keymaps/zotac_ad10 | 44 ++++++++++++ packages/sysutils/v4l-utils/package.mk | 13 ++++ .../v4l-utils-20-add-samsung-keytable.patch | 46 ------------ ...v4l-utils-21-add-newer-hp-mce-remote.patch | 71 ------------------ .../v4l-utils-22-add-xbox-one-remote.patch | 28 -------- .../v4l-utils-23-add-cubox-i-remote.patch | 16 ----- .../v4l-utils-24-add-xbox-360-remote.patch | 72 ------------------- .../v4l-utils-25-add-zotac-ad10-remote.patch | 50 ------------- 13 files changed, 251 insertions(+), 283 deletions(-) create mode 100644 packages/sysutils/v4l-utils/keymaps/cubox_i create mode 100644 packages/sysutils/v4l-utils/keymaps/hp_mce create mode 100644 packages/sysutils/v4l-utils/keymaps/samsung create mode 100644 packages/sysutils/v4l-utils/keymaps/xbox_360 create mode 100644 packages/sysutils/v4l-utils/keymaps/xbox_one create mode 100644 packages/sysutils/v4l-utils/keymaps/zotac_ad10 delete mode 100644 packages/sysutils/v4l-utils/patches/v4l-utils-20-add-samsung-keytable.patch delete mode 100644 packages/sysutils/v4l-utils/patches/v4l-utils-21-add-newer-hp-mce-remote.patch delete mode 100644 packages/sysutils/v4l-utils/patches/v4l-utils-22-add-xbox-one-remote.patch delete mode 100644 packages/sysutils/v4l-utils/patches/v4l-utils-23-add-cubox-i-remote.patch delete mode 100644 packages/sysutils/v4l-utils/patches/v4l-utils-24-add-xbox-360-remote.patch delete mode 100644 packages/sysutils/v4l-utils/patches/v4l-utils-25-add-zotac-ad10-remote.patch diff --git a/packages/sysutils/v4l-utils/keymaps/cubox_i b/packages/sysutils/v4l-utils/keymaps/cubox_i new file mode 100644 index 0000000000..e23b3f19a3 --- /dev/null +++ b/packages/sysutils/v4l-utils/keymaps/cubox_i @@ -0,0 +1,10 @@ +# table cubox_i, type: RC6 +0x1f020b0 KEY_MEDIA +0x1f02078 KEY_UP +0x1f02044 KEY_ENTER +0x1f020f8 KEY_DOWN +0x1f02004 KEY_LEFT +0x1f02084 KEY_RIGHT +0x1f020c4 KEY_BACKSPACE +0x1f02068 KEY_PLAYPAUSE +0x1f02064 KEY_EPG diff --git a/packages/sysutils/v4l-utils/keymaps/hp_mce b/packages/sysutils/v4l-utils/keymaps/hp_mce new file mode 100644 index 0000000000..0cdb3a66dc --- /dev/null +++ b/packages/sysutils/v4l-utils/keymaps/hp_mce @@ -0,0 +1,65 @@ +# table hp_mce, type: RC6 +0x80111200 KEY_NUMERIC_0 +0x80111201 KEY_NUMERIC_1 +0x80111202 KEY_NUMERIC_2 +0x80111203 KEY_NUMERIC_3 +0x80111204 KEY_NUMERIC_4 +0x80111205 KEY_NUMERIC_5 +0x80111206 KEY_NUMERIC_6 +0x80111207 KEY_NUMERIC_7 +0x80111208 KEY_NUMERIC_8 +0x80111209 KEY_NUMERIC_9 +0x80111256 KEY_DELETE +0x8011125c KEY_ENTER +0x801112a8 KEY_POWER +0x801112a1 KEY_MEDIA +0x8011120d KEY_MUTE +0x80111281 KEY_INFO +0x80111210 KEY_VOLUMEUP +0x80111211 KEY_VOLUMEDOWN +0x8011121e KEY_CHANNELUP +0x8011121f KEY_CHANNELDOWN +0x80111228 KEY_FASTFORWARD +0x80111229 KEY_REWIND +0x8011122c KEY_PLAY +0x80111237 KEY_RECORD +0x80111230 KEY_PAUSE +0x7011126e KEY_PLAYPAUSE +0x80111231 KEY_STOP +0x80111220 KEY_NEXT +0x80111221 KEY_PREVIOUS +0x801112a2 KEY_NUMERIC_POUND +0x801112ac KEY_NUMERIC_STAR +0x80111258 KEY_UP +0x80111259 KEY_DOWN +0x8011125a KEY_LEFT +0x8011125b KEY_RIGHT +0x8011125c KEY_OK +0x80111255 KEY_EXIT +0x70111224 KEY_DVD +0x80111292 KEY_TUNER +0x801112cc KEY_EPG +0x70111227 KEY_ZOOM +0x7011123a KEY_BRIGHTNESSUP +0x70111246 KEY_TV +0x70111247 KEY_AUDIO +0x801112a0 KEY_PVR +0x70111249 KEY_CAMERA +0x7011124a KEY_VIDEO +0x7011124c KEY_LANGUAGE +0x7011124d KEY_TITLE +0x7011124e KEY_PRINT +0x70111250 KEY_RADIO +0x7011125a KEY_SUBTITLE +0x801112e4 KEY_RED +0x801112e5 KEY_GREEN +0x801112e6 KEY_YELLOW +0x801112e7 KEY_BLUE +0x8011120c KEY_POWER2 +0x7011126e KEY_PLAYPAUSE +0x8011120b KEY_MEDIA +0x70111280 KEY_BRIGHTNESSDOWN +0x80111254 KEY_MENU +0x8011129f KEY_LAST +0x8011128b KEY_SETUP +0x801112a3 KEY_SCREEN diff --git a/packages/sysutils/v4l-utils/keymaps/samsung b/packages/sysutils/v4l-utils/keymaps/samsung new file mode 100644 index 0000000000..bd89567d5a --- /dev/null +++ b/packages/sysutils/v4l-utils/keymaps/samsung @@ -0,0 +1,31 @@ +# table samsung, type: NEC +0x43532f KEY_NUMERIC_0 +0x435341 KEY_NUMERIC_1 +0x435342 KEY_NUMERIC_2 +0x435343 KEY_NUMERIC_3 +0x435344 KEY_NUMERIC_4 +0x435345 KEY_NUMERIC_5 +0x435346 KEY_NUMERIC_6 +0x435347 KEY_NUMERIC_7 +0x43533f KEY_NUMERIC_8 +0x435337 KEY_NUMERIC_9 +0x435305 KEY_ENTER +0x435300 KEY_TITLE +0x435326 KEY_INFO +0x435323 KEY_VOLUMEUP +0x43532b KEY_VOLUMEDOWN +0x435375 KEY_FASTFORWARD +0x435374 KEY_REWIND +0x43537d KEY_PLAYPAUSE +0x43530b KEY_STOP +0x435313 KEY_NEXT +0x43531b KEY_PREVIOUS +0x43530d KEY_UP +0x435315 KEY_DOWN +0x435325 KEY_LEFT +0x43531d KEY_RIGHT +0x435336 KEY_MENU +0x43531c KEY_EXIT +0x43530f KEY_ZOOM +0x43530e KEY_SUBTITLE +0x43537e KEY_BACK diff --git a/packages/sysutils/v4l-utils/keymaps/xbox_360 b/packages/sysutils/v4l-utils/keymaps/xbox_360 new file mode 100644 index 0000000000..66b62adc7d --- /dev/null +++ b/packages/sysutils/v4l-utils/keymaps/xbox_360 @@ -0,0 +1,66 @@ +# table xbox_360, type: RC6 +0x800f7400 KEY_NUMERIC_0 +0x800f7401 KEY_NUMERIC_1 +0x800f7402 KEY_NUMERIC_2 +0x800f7403 KEY_NUMERIC_3 +0x800f7404 KEY_NUMERIC_4 +0x800f7405 KEY_NUMERIC_5 +0x800f7406 KEY_NUMERIC_6 +0x800f7407 KEY_NUMERIC_7 +0x800f7408 KEY_NUMERIC_8 +0x800f7409 KEY_NUMERIC_9 +0x800f740a KEY_DELETE +0x800f740b KEY_ENTER +0x800f740c KEY_SLEEP +0x800f740d KEY_MEDIA +0x800f7464 KEY_MEDIA +0x800f740e KEY_MUTE +0x800f740f KEY_INFO +0x800f7410 KEY_VOLUMEUP +0x800f7411 KEY_VOLUMEDOWN +0x800f7412 KEY_CHANNELUP +0x800f746C KEY_CHANNELUP +0x800f7413 KEY_CHANNELDOWN +0x800f746D KEY_CHANNELDOWN +0x800f7414 KEY_FASTFORWARD +0x800f7415 KEY_REWIND +0x800f7416 KEY_PLAY +0x800f7417 KEY_RECORD +0x800f7418 KEY_PAUSE +0x800f7419 KEY_STOP +0x800f741a KEY_NEXT +0x800f741b KEY_PREVIOUS +0x800f741c KEY_NUMERIC_POUND +0x800f741d KEY_NUMERIC_STAR +0x800f741e KEY_UP +0x800f741f KEY_DOWN +0x800f7420 KEY_LEFT +0x800f7421 KEY_RIGHT +0x800f7422 KEY_OK +0x800f7423 KEY_EXIT +0x800f7424 KEY_DVD +0x800f744f KEY_EPG +0x800f7427 KEY_ZOOM +0x800f7432 KEY_MODE +0x800f7433 KEY_PRESENTATION +0x800f7428 KEY_EJECTCD +0x800f743a KEY_BRIGHTNESSUP +0x800f7446 KEY_TV +0x800f7447 KEY_AUDIO +0x800f7448 KEY_PVR +0x800f7449 KEY_CAMERA +0x800f744a KEY_VIDEO +0x800f744c KEY_LANGUAGE +0x800f7451 KEY_TITLE +0x800f744e KEY_PRINT +0x800f7450 KEY_RADIO +0x800f745a KEY_SUBTITLE +0x800f7425 KEY_RED +0x800f7466 KEY_GREEN +0x800f7426 KEY_YELLOW +0x800f7468 KEY_BLUE +0x800f7465 KEY_POWER2 +0x800f746e KEY_PLAYPAUSE +0x800f746f KEY_PLAYER +0x800f7480 KEY_BRIGHTNESSDOWN +0x800f7481 KEY_PLAYPAUSE diff --git a/packages/sysutils/v4l-utils/keymaps/xbox_one b/packages/sysutils/v4l-utils/keymaps/xbox_one new file mode 100644 index 0000000000..366a58c8f6 --- /dev/null +++ b/packages/sysutils/v4l-utils/keymaps/xbox_one @@ -0,0 +1,22 @@ +# table xbox_one, type: NEC +0x80d864 KEY_MEDIA +0x80d820 KEY_LEFT +0x80d821 KEY_RIGHT +0x80d81e KEY_UP +0x80d81f KEY_DOWN +0x80d822 KEY_OK +0x80d823 KEY_EXIT +0x80d80e KEY_MUTE +0x80d810 KEY_VOLUMEUP +0x80d811 KEY_VOLUMEDOWN +0x80d812 KEY_CHANNELUP +0x80d813 KEY_CHANNELDOWN +0x80d814 KEY_FASTFORWARD +0x80d815 KEY_REWIND +0x80d870 KEY_PLAYPAUSE +0x80d819 KEY_STOP +0x80d81a KEY_NEXT +0x80d81b KEY_PREVIOUS +0x80d826 KEY_INFO +0x80d86f KEY_EPG +0x80d86e KEY_ZOOM diff --git a/packages/sysutils/v4l-utils/keymaps/zotac_ad10 b/packages/sysutils/v4l-utils/keymaps/zotac_ad10 new file mode 100644 index 0000000000..b46fdcee32 --- /dev/null +++ b/packages/sysutils/v4l-utils/keymaps/zotac_ad10 @@ -0,0 +1,44 @@ +# table zotac_ad10, type: RC6 +0x8034048e KEY_POWER +0x8034043d KEY_POWER +0x80340400 KEY_NUMERIC_0 +0x80340401 KEY_NUMERIC_1 +0x80340402 KEY_NUMERIC_2 +0x80340403 KEY_NUMERIC_3 +0x80340404 KEY_NUMERIC_4 +0x80340405 KEY_NUMERIC_5 +0x80340406 KEY_NUMERIC_6 +0x80340407 KEY_NUMERIC_7 +0x80340408 KEY_NUMERIC_8 +0x80340409 KEY_NUMERIC_9 +0x80340432 KEY_NUMERIC_POUND +0x80340433 KEY_NUMERIC_STAR +0x8034043a KEY_DELETE +0x80340434 KEY_ENTER +0x8034045d KEY_MEDIA +0x8034040d KEY_MUTE +0x803404cb KEY_INFO +0x80340410 KEY_VOLUMEUP +0x80340411 KEY_VOLUMEDOWN +0x8034041e KEY_CHANNELUP +0x8034041f KEY_CHANNELDOWN +0x80340428 KEY_FASTFORWARD +0x80340429 KEY_REWIND +0x8034042c KEY_PLAY +0x80340437 KEY_RECORD +0x80340430 KEY_PAUSE +0x80340431 KEY_STOP +0x80340420 KEY_NEXT +0x80340421 KEY_PREVIOUS +0x80340458 KEY_UP +0x80340459 KEY_DOWN +0x8034045a KEY_LEFT +0x8034045b KEY_RIGHT +0x8034045c KEY_OK +0x80340483 KEY_EXIT +0x8034043e KEY_EPG +0x8034042f KEY_TITLE +0x8034046d KEY_RED +0x8034046e KEY_GREEN +0x8034046f KEY_YELLOW +0x80340470 KEY_BLUE diff --git a/packages/sysutils/v4l-utils/package.mk b/packages/sysutils/v4l-utils/package.mk index 4cfffaa36c..23cf3680ea 100644 --- a/packages/sysutils/v4l-utils/package.mk +++ b/packages/sysutils/v4l-utils/package.mk @@ -55,6 +55,8 @@ makeinstall_target() { } post_makeinstall_target() { + local f keymap + rm -rf $INSTALL/etc/rc_keymaps ln -sf /storage/.config/rc_keymaps $INSTALL/etc/rc_keymaps @@ -65,6 +67,17 @@ post_makeinstall_target() { mkdir -p $INSTALL/usr/lib/udev/rules.d cp -PR $PKG_DIR/udev.d/*.rules $INSTALL/usr/lib/udev/rules.d + # install additional keymaps without overwriting upstream maps + ( + set -C + for f in $PKG_DIR/keymaps/* ; do + if [ -e $f ] ; then + keymap=$(basename $f) + cat $f > $INSTALL/usr/lib/udev/rc_keymaps/$keymap + fi + done + ) + ( echo "# table libreelec_multi, type: RC6 NEC" for f in rc6_mce xbox_360 zotac_ad10 hp_mce xbox_one cubox_i ; do diff --git a/packages/sysutils/v4l-utils/patches/v4l-utils-20-add-samsung-keytable.patch b/packages/sysutils/v4l-utils/patches/v4l-utils-20-add-samsung-keytable.patch deleted file mode 100644 index bb64cc3ed2..0000000000 --- a/packages/sysutils/v4l-utils/patches/v4l-utils-20-add-samsung-keytable.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff -Naur v4l-utils-1.8.1/utils/keytable/rc_keymaps/samsung v4l-utils-1.8.1.patch/utils/keytable/rc_keymaps/samsung ---- v4l-utils-1.8.1/utils/keytable/rc_keymaps/samsung 1970-01-01 01:00:00.000000000 +0100 -+++ v4l-utils-1.8.1.patch/utils/keytable/rc_keymaps/samsung 2015-11-18 12:21:30.202350149 +0100 -@@ -0,0 +1,31 @@ -+# table samsung, type: NEC -+0x43532f KEY_NUMERIC_0 -+0x435341 KEY_NUMERIC_1 -+0x435342 KEY_NUMERIC_2 -+0x435343 KEY_NUMERIC_3 -+0x435344 KEY_NUMERIC_4 -+0x435345 KEY_NUMERIC_5 -+0x435346 KEY_NUMERIC_6 -+0x435347 KEY_NUMERIC_7 -+0x43533f KEY_NUMERIC_8 -+0x435337 KEY_NUMERIC_9 -+0x435305 KEY_ENTER -+0x435300 KEY_TITLE -+0x435326 KEY_INFO -+0x435323 KEY_VOLUMEUP -+0x43532b KEY_VOLUMEDOWN -+0x435375 KEY_FASTFORWARD -+0x435374 KEY_REWIND -+0x43537d KEY_PLAYPAUSE -+0x43530b KEY_STOP -+0x435313 KEY_NEXT -+0x43531b KEY_PREVIOUS -+0x43530d KEY_UP -+0x435315 KEY_DOWN -+0x435325 KEY_LEFT -+0x43531d KEY_RIGHT -+0x435336 KEY_MENU -+0x43531c KEY_EXIT -+0x43530f KEY_ZOOM -+0x43530e KEY_SUBTITLE -+0x43537e KEY_BACK -diff -Naur v4l-utils-1.8.1/utils/keytable/rc_maps.cfg v4l-utils-1.8.1.patch/utils/keytable/rc_maps.cfg ---- v4l-utils-1.8.1/utils/keytable/rc_maps.cfg 2015-09-19 20:54:17.000000000 +0200 -+++ v4l-utils-1.8.1.patch/utils/keytable/rc_maps.cfg 2015-11-18 12:22:30.963487065 +0100 -@@ -112,6 +112,7 @@ - * rc-rc6-mce rc6_mce - * rc-real-audio-220-32-keys real_audio_220_32_keys - * rc-reddo reddo -+* rc-samsung samsung - * rc-snapstream-firefly snapstream_firefly - * rc-streamzap streamzap - * rc-su3000 su3000 diff --git a/packages/sysutils/v4l-utils/patches/v4l-utils-21-add-newer-hp-mce-remote.patch b/packages/sysutils/v4l-utils/patches/v4l-utils-21-add-newer-hp-mce-remote.patch deleted file mode 100644 index 08cc28de38..0000000000 --- a/packages/sysutils/v4l-utils/patches/v4l-utils-21-add-newer-hp-mce-remote.patch +++ /dev/null @@ -1,71 +0,0 @@ -diff --git a/utils/keytable/rc_keymaps/hp_mce b/utils/keytable/rc_keymaps/hp_mce -new file mode 100644 -index 0000000..266dc8a ---- /dev/null -+++ b/utils/keytable/rc_keymaps/hp_mce -@@ -0,0 +1,65 @@ -+# table hp_mce, type: RC6 -+0x80111200 KEY_NUMERIC_0 -+0x80111201 KEY_NUMERIC_1 -+0x80111202 KEY_NUMERIC_2 -+0x80111203 KEY_NUMERIC_3 -+0x80111204 KEY_NUMERIC_4 -+0x80111205 KEY_NUMERIC_5 -+0x80111206 KEY_NUMERIC_6 -+0x80111207 KEY_NUMERIC_7 -+0x80111208 KEY_NUMERIC_8 -+0x80111209 KEY_NUMERIC_9 -+0x80111256 KEY_DELETE -+0x8011125c KEY_ENTER -+0x801112a8 KEY_POWER -+0x801112a1 KEY_MEDIA -+0x8011120d KEY_MUTE -+0x80111281 KEY_INFO -+0x80111210 KEY_VOLUMEUP -+0x80111211 KEY_VOLUMEDOWN -+0x8011121e KEY_CHANNELUP -+0x8011121f KEY_CHANNELDOWN -+0x80111228 KEY_FASTFORWARD -+0x80111229 KEY_REWIND -+0x8011122c KEY_PLAY -+0x80111237 KEY_RECORD -+0x80111230 KEY_PAUSE -+0x7011126e KEY_PLAYPAUSE -+0x80111231 KEY_STOP -+0x80111220 KEY_NEXT -+0x80111221 KEY_PREVIOUS -+0x801112a2 KEY_NUMERIC_POUND -+0x801112ac KEY_NUMERIC_STAR -+0x80111258 KEY_UP -+0x80111259 KEY_DOWN -+0x8011125a KEY_LEFT -+0x8011125b KEY_RIGHT -+0x8011125c KEY_OK -+0x80111255 KEY_EXIT -+0x70111224 KEY_DVD -+0x80111292 KEY_TUNER -+0x801112cc KEY_EPG -+0x70111227 KEY_ZOOM -+0x7011123a KEY_BRIGHTNESSUP -+0x70111246 KEY_TV -+0x70111247 KEY_AUDIO -+0x801112a0 KEY_PVR -+0x70111249 KEY_CAMERA -+0x7011124a KEY_VIDEO -+0x7011124c KEY_LANGUAGE -+0x7011124d KEY_TITLE -+0x7011124e KEY_PRINT -+0x70111250 KEY_RADIO -+0x7011125a KEY_SUBTITLE -+0x801112e4 KEY_RED -+0x801112e5 KEY_GREEN -+0x801112e6 KEY_YELLOW -+0x801112e7 KEY_BLUE -+0x8011120c KEY_POWER2 -+0x7011126e KEY_PLAYPAUSE -+0x8011120b KEY_MEDIA -+0x70111280 KEY_BRIGHTNESSDOWN -+0x80111254 KEY_MENU -+0x8011129f KEY_LAST -+0x8011128b KEY_SETUP -+0x801112a3 KEY_SCREEN diff --git a/packages/sysutils/v4l-utils/patches/v4l-utils-22-add-xbox-one-remote.patch b/packages/sysutils/v4l-utils/patches/v4l-utils-22-add-xbox-one-remote.patch deleted file mode 100644 index 1b9c808ef2..0000000000 --- a/packages/sysutils/v4l-utils/patches/v4l-utils-22-add-xbox-one-remote.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/utils/keytable/rc_keymaps/xbox_one b/utils/keytable/rc_keymaps/xbox_one -new file mode 100644 -index 0000000..07614ee ---- /dev/null -+++ b/utils/keytable/rc_keymaps/xbox_one -@@ -0,0 +1,22 @@ -+# table xbox_one, type: NEC -+0x80d864 KEY_MEDIA -+0x80d820 KEY_LEFT -+0x80d821 KEY_RIGHT -+0x80d81e KEY_UP -+0x80d81f KEY_DOWN -+0x80d822 KEY_OK -+0x80d823 KEY_EXIT -+0x80d80e KEY_MUTE -+0x80d810 KEY_VOLUMEUP -+0x80d811 KEY_VOLUMEDOWN -+0x80d812 KEY_CHANNELUP -+0x80d813 KEY_CHANNELDOWN -+0x80d814 KEY_FASTFORWARD -+0x80d815 KEY_REWIND -+0x80d870 KEY_PLAYPAUSE -+0x80d819 KEY_STOP -+0x80d81a KEY_NEXT -+0x80d81b KEY_PREVIOUS -+0x80d826 KEY_INFO -+0x80d86f KEY_EPG -+0x80d86e KEY_ZOOM diff --git a/packages/sysutils/v4l-utils/patches/v4l-utils-23-add-cubox-i-remote.patch b/packages/sysutils/v4l-utils/patches/v4l-utils-23-add-cubox-i-remote.patch deleted file mode 100644 index 1f54a6e057..0000000000 --- a/packages/sysutils/v4l-utils/patches/v4l-utils-23-add-cubox-i-remote.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/utils/keytable/rc_keymaps/cuboxi b/utils/keytable/rc_keymaps/cubox_i -new file mode 100644 -index 0000000..1063253 ---- /dev/null -+++ b/utils/keytable/rc_keymaps/cubox_i -@@ -0,0 +1,10 @@ -+# table cubox_i, type: RC6 -+0x1f020b0 KEY_MEDIA -+0x1f02078 KEY_UP -+0x1f02044 KEY_ENTER -+0x1f020f8 KEY_DOWN -+0x1f02004 KEY_LEFT -+0x1f02084 KEY_RIGHT -+0x1f020c4 KEY_BACKSPACE -+0x1f02068 KEY_PLAYPAUSE -+0x1f02064 KEY_EPG diff --git a/packages/sysutils/v4l-utils/patches/v4l-utils-24-add-xbox-360-remote.patch b/packages/sysutils/v4l-utils/patches/v4l-utils-24-add-xbox-360-remote.patch deleted file mode 100644 index 85119d5fa6..0000000000 --- a/packages/sysutils/v4l-utils/patches/v4l-utils-24-add-xbox-360-remote.patch +++ /dev/null @@ -1,72 +0,0 @@ -diff --git a/utils/keytable/rc_keymaps/xbox_360 b/utils/keytable/rc_keymaps/xbox_360 -new file mode 100644 -index 0000000..b90ecfd ---- /dev/null -+++ b/utils/keytable/rc_keymaps/xbox_360 -@@ -0,0 +1,66 @@ -+# table xbox_360, type: RC6 -+0x800f7400 KEY_NUMERIC_0 -+0x800f7401 KEY_NUMERIC_1 -+0x800f7402 KEY_NUMERIC_2 -+0x800f7403 KEY_NUMERIC_3 -+0x800f7404 KEY_NUMERIC_4 -+0x800f7405 KEY_NUMERIC_5 -+0x800f7406 KEY_NUMERIC_6 -+0x800f7407 KEY_NUMERIC_7 -+0x800f7408 KEY_NUMERIC_8 -+0x800f7409 KEY_NUMERIC_9 -+0x800f740a KEY_DELETE -+0x800f740b KEY_ENTER -+0x800f740c KEY_SLEEP -+0x800f740d KEY_MEDIA -+0x800f7464 KEY_MEDIA -+0x800f740e KEY_MUTE -+0x800f740f KEY_INFO -+0x800f7410 KEY_VOLUMEUP -+0x800f7411 KEY_VOLUMEDOWN -+0x800f7412 KEY_CHANNELUP -+0x800f746C KEY_CHANNELUP -+0x800f7413 KEY_CHANNELDOWN -+0x800f746D KEY_CHANNELDOWN -+0x800f7414 KEY_FASTFORWARD -+0x800f7415 KEY_REWIND -+0x800f7416 KEY_PLAY -+0x800f7417 KEY_RECORD -+0x800f7418 KEY_PAUSE -+0x800f7419 KEY_STOP -+0x800f741a KEY_NEXT -+0x800f741b KEY_PREVIOUS -+0x800f741c KEY_NUMERIC_POUND -+0x800f741d KEY_NUMERIC_STAR -+0x800f741e KEY_UP -+0x800f741f KEY_DOWN -+0x800f7420 KEY_LEFT -+0x800f7421 KEY_RIGHT -+0x800f7422 KEY_OK -+0x800f7423 KEY_EXIT -+0x800f7424 KEY_DVD -+0x800f744f KEY_EPG -+0x800f7427 KEY_ZOOM -+0x800f7432 KEY_MODE -+0x800f7433 KEY_PRESENTATION -+0x800f7428 KEY_EJECTCD -+0x800f743a KEY_BRIGHTNESSUP -+0x800f7446 KEY_TV -+0x800f7447 KEY_AUDIO -+0x800f7448 KEY_PVR -+0x800f7449 KEY_CAMERA -+0x800f744a KEY_VIDEO -+0x800f744c KEY_LANGUAGE -+0x800f7451 KEY_TITLE -+0x800f744e KEY_PRINT -+0x800f7450 KEY_RADIO -+0x800f745a KEY_SUBTITLE -+0x800f7425 KEY_RED -+0x800f7466 KEY_GREEN -+0x800f7426 KEY_YELLOW -+0x800f7468 KEY_BLUE -+0x800f7465 KEY_POWER2 -+0x800f746e KEY_PLAYPAUSE -+0x800f746f KEY_PLAYER -+0x800f7480 KEY_BRIGHTNESSDOWN -+0x800f7481 KEY_PLAYPAUSE diff --git a/packages/sysutils/v4l-utils/patches/v4l-utils-25-add-zotac-ad10-remote.patch b/packages/sysutils/v4l-utils/patches/v4l-utils-25-add-zotac-ad10-remote.patch deleted file mode 100644 index 5e6af84fe4..0000000000 --- a/packages/sysutils/v4l-utils/patches/v4l-utils-25-add-zotac-ad10-remote.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff --git a/utils/keytable/rc_keymaps/zotac_ad10 b/utils/keytable/rc_keymaps/zotac_ad10 -new file mode 100644 -index 0000000..e93fad4 ---- /dev/null -+++ b/utils/keytable/rc_keymaps/zotac_ad10 -@@ -0,0 +1,44 @@ -+# table zotac_ad10, type: RC6 -+0x8034048e KEY_POWER -+0x8034043d KEY_POWER -+0x80340400 KEY_NUMERIC_0 -+0x80340401 KEY_NUMERIC_1 -+0x80340402 KEY_NUMERIC_2 -+0x80340403 KEY_NUMERIC_3 -+0x80340404 KEY_NUMERIC_4 -+0x80340405 KEY_NUMERIC_5 -+0x80340406 KEY_NUMERIC_6 -+0x80340407 KEY_NUMERIC_7 -+0x80340408 KEY_NUMERIC_8 -+0x80340409 KEY_NUMERIC_9 -+0x80340432 KEY_NUMERIC_POUND -+0x80340433 KEY_NUMERIC_STAR -+0x8034043a KEY_DELETE -+0x80340434 KEY_ENTER -+0x8034045d KEY_MEDIA -+0x8034040d KEY_MUTE -+0x803404cb KEY_INFO -+0x80340410 KEY_VOLUMEUP -+0x80340411 KEY_VOLUMEDOWN -+0x8034041e KEY_CHANNELUP -+0x8034041f KEY_CHANNELDOWN -+0x80340428 KEY_FASTFORWARD -+0x80340429 KEY_REWIND -+0x8034042c KEY_PLAY -+0x80340437 KEY_RECORD -+0x80340430 KEY_PAUSE -+0x80340431 KEY_STOP -+0x80340420 KEY_NEXT -+0x80340421 KEY_PREVIOUS -+0x80340458 KEY_UP -+0x80340459 KEY_DOWN -+0x8034045a KEY_LEFT -+0x8034045b KEY_RIGHT -+0x8034045c KEY_OK -+0x80340483 KEY_EXIT -+0x8034043e KEY_EPG -+0x8034042f KEY_TITLE -+0x8034046d KEY_RED -+0x8034046e KEY_GREEN -+0x8034046f KEY_YELLOW -+0x80340470 KEY_BLUE From 84e97c6cb91cf61341935984032cbf2e0498ec49 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Thu, 21 Dec 2017 12:07:22 +0100 Subject: [PATCH 2/4] v4l-utils: apply rc_maps.cfg changes via package.mk instead of patch Signed-off-by: Matthias Reichl --- packages/sysutils/v4l-utils/package.mk | 11 +++++++ ...s-50-use-multi-table-add-fake-tables.patch | 29 ------------------- 2 files changed, 11 insertions(+), 29 deletions(-) delete mode 100644 packages/sysutils/v4l-utils/patches/v4l-utils-50-use-multi-table-add-fake-tables.patch diff --git a/packages/sysutils/v4l-utils/package.mk b/packages/sysutils/v4l-utils/package.mk index 23cf3680ea..dca706b896 100644 --- a/packages/sysutils/v4l-utils/package.mk +++ b/packages/sysutils/v4l-utils/package.mk @@ -85,4 +85,15 @@ post_makeinstall_target() { grep -v "^#" $INSTALL/usr/lib/udev/rc_keymaps/$f done ) > $INSTALL/usr/lib/udev/rc_keymaps/libreelec_multi + + # use multi-keymap instead of default one + sed -i '/^\*\s*rc-rc6-mce\s*rc6_mce/d' $INSTALL/etc/rc_maps.cfg + cat << EOF >> $INSTALL/etc/rc_maps.cfg +# +# Custom LibreELEC configuration starts here +# +# use combined multi-table on MCE receivers +# * rc-rc6-mce rc6_mce +* rc-rc6-mce libreelec_multi +EOF } diff --git a/packages/sysutils/v4l-utils/patches/v4l-utils-50-use-multi-table-add-fake-tables.patch b/packages/sysutils/v4l-utils/patches/v4l-utils-50-use-multi-table-add-fake-tables.patch deleted file mode 100644 index 4e63d006a9..0000000000 --- a/packages/sysutils/v4l-utils/patches/v4l-utils-50-use-multi-table-add-fake-tables.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/utils/keytable/rc_maps.cfg b/utils/keytable/rc_maps.cfg -index e69fd6a..c0fe122 100644 ---- a/utils/keytable/rc_maps.cfg -+++ b/utils/keytable/rc_maps.cfg -@@ -109,7 +109,9 @@ - * rc-proteus-2309 proteus_2309 - * rc-purpletv purpletv - * rc-pv951 pv951 --* rc-rc6-mce rc6_mce -+# use combined multi-table on MCE receivers -+#* rc-rc6-mce rc6_mce -+* rc-rc6-mce libreelec_multi - * rc-real-audio-220-32-keys real_audio_220_32_keys - * rc-reddo reddo - * rc-snapstream-firefly snapstream_firefly -@@ -136,6 +138,13 @@ - * rc-videomate-tv-pvr videomate_tv_pvr - * rc-winfast-usbii-deluxe winfast_usbii_deluxe - * rc-winfast winfast -+# fake tables for LibreELEC keymaps -+* rc-cubox-i cubox-i -+* rc-hp-mce hp_mce -+* rc-samsung samsung -+* rc-xbox-360 xbox_360 -+* rc-xbox-one xbox_one -+* rc-zotac-ad10 zotac_ad10 - # * * a800 # found in a800.c - # * * af9005 # found in af9005-remote.c - # * * cinergyt2 # found in cinergyT2-core.c From 7f9926ef6b4d256cb182926d36591ffbaed115d7 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Thu, 21 Dec 2017 12:12:34 +0100 Subject: [PATCH 3/4] v4l-utils: add Odroid and Wetek Hub keymaps Signed-off-by: Matthias Reichl --- packages/sysutils/v4l-utils/keymaps/odroid | 13 +++++++++++++ packages/sysutils/v4l-utils/keymaps/wetek_hub | 13 +++++++++++++ packages/sysutils/v4l-utils/package.mk | 3 +++ 3 files changed, 29 insertions(+) create mode 100644 packages/sysutils/v4l-utils/keymaps/odroid create mode 100644 packages/sysutils/v4l-utils/keymaps/wetek_hub diff --git a/packages/sysutils/v4l-utils/keymaps/odroid b/packages/sysutils/v4l-utils/keymaps/odroid new file mode 100644 index 0000000000..49d7a17f11 --- /dev/null +++ b/packages/sysutils/v4l-utils/keymaps/odroid @@ -0,0 +1,13 @@ +# table odroid, type: NEC +0xb2dc KEY_POWER +0xb288 KEY_MUTE +0xb282 KEY_HOME +0xb2ce KEY_OK +0xb2ca KEY_UP +0xb299 KEY_LEFT +0xb2c1 KEY_RIGHT +0xb2d2 KEY_DOWN +0xb2c5 KEY_MENU +0xb29a KEY_BACK +0xb281 KEY_VOLUMEDOWN +0xb280 KEY_VOLUMEUP diff --git a/packages/sysutils/v4l-utils/keymaps/wetek_hub b/packages/sysutils/v4l-utils/keymaps/wetek_hub new file mode 100644 index 0000000000..67fe25fc3d --- /dev/null +++ b/packages/sysutils/v4l-utils/keymaps/wetek_hub @@ -0,0 +1,13 @@ +# table wetek_hub, type: NEC +0x77f1 KEY_POWER +0x77f2 KEY_HOME +0x77f3 KEY_MUTE +0x77f4 KEY_UP +0x77f5 KEY_DOWN +0x77f6 KEY_LEFT +0x77f7 KEY_RIGHT +0x77f8 KEY_OK +0x77f9 KEY_BACK +0x77fa KEY_MENU +0x77fb KEY_VOLUMEUP +0x77fc KEY_VOLUMEDOWN diff --git a/packages/sysutils/v4l-utils/package.mk b/packages/sysutils/v4l-utils/package.mk index dca706b896..a9cc79c823 100644 --- a/packages/sysutils/v4l-utils/package.mk +++ b/packages/sysutils/v4l-utils/package.mk @@ -95,5 +95,8 @@ post_makeinstall_target() { # use combined multi-table on MCE receivers # * rc-rc6-mce rc6_mce * rc-rc6-mce libreelec_multi +# additional non-upstreamed keymaps +* rc-odroid odroid +* rc-wetek-hub wetek_hub EOF } From 2768ded0094728a1568f8cb268916ed5cd8d1b4b Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Thu, 21 Dec 2017 12:22:17 +0100 Subject: [PATCH 4/4] v4l-utils: refactor multi-keymap creation Signed-off-by: Matthias Reichl --- packages/sysutils/v4l-utils/package.mk | 28 ++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/packages/sysutils/v4l-utils/package.mk b/packages/sysutils/v4l-utils/package.mk index a9cc79c823..7f4dbca6a9 100644 --- a/packages/sysutils/v4l-utils/package.mk +++ b/packages/sysutils/v4l-utils/package.mk @@ -54,8 +54,22 @@ makeinstall_target() { fi } +create_multi_keymap() { + local f name protocols + name="$1" + protocols="$2" + shift 2 + ( + echo "# table $name, type: $protocols" + for f in "$@" ; do + echo "# $f" + grep -v "^#" $INSTALL/usr/lib/udev/rc_keymaps/$f + done + ) > $INSTALL/usr/lib/udev/rc_keymaps/$name +} + post_makeinstall_target() { - local f keymap + local default_multi_maps f keymap rm -rf $INSTALL/etc/rc_keymaps ln -sf /storage/.config/rc_keymaps $INSTALL/etc/rc_keymaps @@ -78,13 +92,11 @@ post_makeinstall_target() { done ) - ( - echo "# table libreelec_multi, type: RC6 NEC" - for f in rc6_mce xbox_360 zotac_ad10 hp_mce xbox_one cubox_i ; do - echo "# $f" - grep -v "^#" $INSTALL/usr/lib/udev/rc_keymaps/$f - done - ) > $INSTALL/usr/lib/udev/rc_keymaps/libreelec_multi + # create multi keymap to support several remotes OOTB + + default_multi_maps="rc6_mce xbox_360 zotac_ad10 hp_mce xbox_one cubox_i" + + create_multi_keymap libreelec_multi "RC6 NEC" $default_multi_maps # use multi-keymap instead of default one sed -i '/^\*\s*rc-rc6-mce\s*rc6_mce/d' $INSTALL/etc/rc_maps.cfg