From 5fba137798f06e23b2f3e29dfa41419685692344 Mon Sep 17 00:00:00 2001 From: Albert Lee Date: Mon, 8 Jul 2013 22:48:05 -0400 Subject: [PATCH 1/3] Additional support for Cypress remote buttons Add Stop, Repeat, Guide, Menu, TV, DVD buttons for "WitheHome" remote. Fix existing Menu, pound, and Radio button mappings. --- .../remote/eventlircd/evmap/cypress.evmap | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/packages/sysutils/remote/eventlircd/evmap/cypress.evmap b/packages/sysutils/remote/eventlircd/evmap/cypress.evmap index 494effdfc9..844729cd88 100644 --- a/packages/sysutils/remote/eventlircd/evmap/cypress.evmap +++ b/packages/sysutils/remote/eventlircd/evmap/cypress.evmap @@ -1,20 +1,23 @@ # Cypress Receiver support # Bus=0003 Vendor=04b4 Product=0101 Version=0100 # N: Name="Cypress Cypress USB Keyboard / PS2 Mouse" +# Bus=0003 Vendor=04b4 Product=0100 Version=0001 +# N: Name="Cyp Se WitheHome" KEY_POWER = KEY_POWER # Power alt+meta+KEY_ENTER = KEY_PROG1 # Start Key ctrl+shift+KEY_P = KEY_PLAY # Play ctrl+KEY_R = KEY_RECORD # Record ctrl+KEY_P = KEY_PAUSE # Pause + ctrl+KEY_S = KEY_STOP # Stop ctrl+shift+KEY_S = KEY_STOP # Stop KEY_VOLUMEUP = KEY_VOLUMEUP # Volume Up KEY_VOLUMEDOWN = KEY_VOLUMEDOWN # Volume Down KEY_MUTE = KEY_MUTE # Mute - ctrl+shift+KEY_F = KEY_FASTFORWARD # Forward ctrl+shift+KEY_B = KEY_REWIND # Reverse + ctrl+shift+KEY_R = KEY_MEDIA_REPEAT # Repeat ctrl+KEY_F = KEY_NEXT # Next track ctrl+KEY_B = KEY_PREVIOUS # Pre-track KEY_PAGEDOWN = KEY_CHANNELDOWN # Channel Up @@ -31,7 +34,7 @@ KEY_8 = KEY_NUMERIC_8 # 8 KEY_9 = KEY_NUMERIC_9 # 9 KEY_KPASTERISK = KEY_NUMERIC_STAR # * - shift+KEY_3 = KEY_POUND # # + shift+KEY_3 = KEY_NUMERIC_POUND # # KEY_UP = KEY_UP # Direction Up KEY_DOWN = KEY_DOWN # Direction Down @@ -41,14 +44,17 @@ KEY_BACKSPACE = KEY_EXIT # Back KEY_DELETE = KEY_DELETE # Clear - KEY_COMPOSE = KEY_INFO # Information (also used for Mouse Right) # maybe contextmenu (KEY_EPG) + ctrl+KEY_V = KEY_MENU # Menu + ctrl+shift+KEY_M = KEY_MENU # Menu + KEY_COMPOSE = KEY_INFO # Information (also used for Mouse Right) + KEY_F1 = KEY_EPG # Guide (also contextmenu) alt+KEY_ENTER = KEY_ZOOM # Zoom ctrl+KEY_E = KEY_VIDEO # My Videos ctrl+KEY_M = KEY_AUDIO # My Music - ctrl+KEY_A = KEY_INFO # My Audio ctrl+KEY_I = KEY_CAMERA # My Pictures + ctrl+KEY_T = KEY_TV # My TV ctrl+shift+KEY_T = KEY_TV # My TV ctrl+KEY_A = KEY_RADIO # Radio ctrl+KEY_O = KEY_TUNER # Record TV - ctrl+shift+KEY_M = KEY_DVD # DVD Menu + ctrl+KEY_N = KEY_DVD # DVD From 554a36a0721f10d12fafcc46c2556a6b9b47eaff Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 9 Jul 2013 15:07:32 +0200 Subject: [PATCH 2/3] Revert "iptables: build as static library" This reverts commit be982317689d01b5f6252719069b86ad08107ddf. --- packages/network/iptables/build | 4 ++-- packages/network/iptables/install | 12 +++++++++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/packages/network/iptables/build b/packages/network/iptables/build index 5ec24d57f1..d9a7117f47 100755 --- a/packages/network/iptables/build +++ b/packages/network/iptables/build @@ -29,8 +29,8 @@ cd $PKG_BUILD --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ - --enable-static \ - --disable-shared \ + --disable-static \ + --enable-shared \ --with-kernel="$SYSROOT_PREFIX/usr" \ make V=1 diff --git a/packages/network/iptables/install b/packages/network/iptables/install index a67a5ed6b5..822e19dc4d 100755 --- a/packages/network/iptables/install +++ b/packages/network/iptables/install @@ -22,8 +22,18 @@ . config/options $1 +mkdir -p $INSTALL/usr/lib + cp -P $PKG_BUILD/libxtables/.libs/libxtables.so* $INSTALL/usr/lib/ + cp -P $PKG_BUILD/libiptc/.libs/libip4tc.so* $INSTALL/usr/lib/ + cp -P $PKG_BUILD/libiptc/.libs/libip6tc.so* $INSTALL/usr/lib/ + cp -P $PKG_BUILD/libiptc/.libs/libiptc.so* $INSTALL/usr/lib/ + rm -rf $INSTALL/usr/lib/libiptc.so*T + +mkdir -p $INSTALL/usr/lib/xtables + cp -P $PKG_BUILD/extensions/.libs/*.so* $INSTALL/usr/lib/xtables + mkdir -p $INSTALL/usr/sbin - cp -P $PKG_BUILD/iptables/xtables-multi $INSTALL/usr/sbin + cp -P $PKG_BUILD/iptables/.libs/xtables-multi $INSTALL/usr/sbin ln -sf /usr/sbin/xtables-multi $INSTALL/usr/sbin/ip6tables ln -sf /usr/sbin/xtables-multi $INSTALL/usr/sbin/ip6tables-restore ln -sf /usr/sbin/xtables-multi $INSTALL/usr/sbin/ip6tables-save From 4ee5748b4d8600819684cd4e1b5918de8caa2975 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 9 Jul 2013 15:35:58 +0200 Subject: [PATCH 3/3] iptables: fix install after revert to shared build Signed-off-by: Stephan Raue --- packages/network/iptables/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/network/iptables/install b/packages/network/iptables/install index 822e19dc4d..e51de30702 100755 --- a/packages/network/iptables/install +++ b/packages/network/iptables/install @@ -30,7 +30,7 @@ mkdir -p $INSTALL/usr/lib rm -rf $INSTALL/usr/lib/libiptc.so*T mkdir -p $INSTALL/usr/lib/xtables - cp -P $PKG_BUILD/extensions/.libs/*.so* $INSTALL/usr/lib/xtables + cp -P $PKG_BUILD/extensions/*.so* $INSTALL/usr/lib/xtables mkdir -p $INSTALL/usr/sbin cp -P $PKG_BUILD/iptables/.libs/xtables-multi $INSTALL/usr/sbin