Merge branch 'master' of nharris@knoppmyth.net:LinHES-PKGBUILD

10 files changed, 178 insertions, 790 deletions

diff --git a/abs/core-testing/LinHES-config/PKGBUILD b/abs/core-testing/LinHES-config/PKGBUILD
index ebe19fa..45dcdd7 100755
--- a/abs/core-testing/LinHES-config/PKGBUILD
+++ b/abs/core-testing/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=LinHES-config
 pkgver=1.0
-pkgrel=269
+pkgrel=270
 conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev )
 pkgdesc="Install and configure your system"
 depends=(bc libstatgrab  mysql-python expect curl dnsutils parted sg3_utils nmbscan )
diff --git a/abs/core-testing/LinHES-config/templates/remotes/ATI_wonder/lircd.ATI.conf b/abs/core-testing/LinHES-config/templates/remotes/ATI_wonder/lircd.ATI.conf
deleted file mode 100644
index e7c1539..0000000
--- a/abs/core-testing/LinHES-config/templates/remotes/ATI_wonder/lircd.ATI.conf
+++ /dev/null
@@ -1,357 +0,0 @@
-
-# Please make this file available to others
-# by sending it to <lirc@bartelmus.de>
-#
-# this config file was automatically generated
-# using lirc-0.7.0pre2(atiusb) on Fri Jan  2 19:09:02 2004
-#
-# contributed by 
-#
-# brand:     ATI Remote Wonder
-# model no. of remote control: 
-# devices being controlled by this remote:
-#
-
-begin remote
-
-  name  wonder
-  bits           32
-  eps            30
-  aeps          100
-
-  one             0     0
-  zero            0     0
-  gap          147987
-  toggle_bit      0
-
-
-      begin codes
-          A                        0x0000000014C500F0
-          B                        0x0000000014C601F0
-          POWER                    0x0000000014C702F0
-          TV                       0x0000000014C803F0
-          DVD                      0x0000000014C904F0
-          WEB                      0x0000000014CA05F0
-          GUIDE                    0x0000000014CB06F0
-          GRAB                     0x0000000014CC07F0
-          VOL_DOWN                 0x0000000014CE09F0
-          VOL_UP                   0x0000000014CD08F0
-          MUTE                     0x0000000014CF0AF0
-          CH_DOWN                  0x0000000014D10CF0
-          CH_UP                    0x0000000014D00BF0
-          A                        0x0000000014C500F0
-          B                        0x0000000014C601F0
-          1                        0x0000000014D20DF0
-          2                        0x0000000014D30EF0
-          3                        0x0000000014D40FF0
-          4                        0x0000000014D510F0
-          5                        0x0000000014D611F0
-          6                        0x0000000014D712F0
-          7                        0x0000000014D813F0
-          8                        0x0000000014D914F0
-          9                        0x0000000014DA15F0
-          0                        0x0000000014DC17F0
-          MENU                     0x0000000014DB16F0
-          CHECK                    0x0000000014DD18F0
-          C                        0x0000000014DE19F0
-          D                        0x0000000014E01BF0
-          UP                       0x0000000014DF1AF0
-          LEFT                     0x0000000014E21DF0
-          DOWN                     0x0000000014E722F0
-          RIGHT                    0x0000000014E41FF0
-          OK                       0x0000000014E31EF0
-          REPLAY                   0x0000000014E11CF0
-          FULLSCREEN               0x0000000014E520F0
-          E                        0x0000000014E621F0
-          F                        0x0000000014E823F0
-          REWIND                   0x0000000014E924F0
-          FORWARD                  0x0000000014EB26F0
-          PLAY                     0x0000000014EA25F0
-          RECORD                   0x0000000014EC27F0
-          STOP                     0x0000000014ED28F0
-          PAUSE                    0x0000000014EE29F0
-      end codes
-
-end remote
-
-
-
-# this config file was automatically generated
-# using lirc-0.7.0(atiusb) on Sat Feb 12 13:22:29 2005
-#
-# contributed by Steffen
-#
-# brand: ATI Sapphire Remote Bob II USB
-# model no. of remote control: 5000024400
-# devices being controlled by this remote: MythTV
-#
-
-begin remote
-
-name       wonder II
-bits       16
-eps        30
-aeps       100
-
-one            0 0
-zero           0 0
-pre_data_bits  8
-pre_data       0x0
-post_data_bits 16
-post_data      0x0
-gap            299851
-toggle_bit     0
-
-
-begin codes
-aux1                0x023F
-aux2                0x023F
-aux3                0x023F
-aux4                0x023F
-mouse_left_btn      0x02A9
-mouse_right_btn     0x02AA
-a                   0x0278
-b                   0x0279
-power               0x020C
-dvd                 0x0238
-tv                  0x0239
-help                0x02BE
-pc                  0x023F
-resize              0x02D5
-hand                0x02D0
-ati                 0x028E
-vol_up              0x0210
-vol_down            0x0211
-mute                0x020D
-ch_up               0x0220
-ch_down             0x0221
-mouse_up            0x013F
-mouse_down          0x013F
-mouse_left          0x013F
-mouse_right         0x013F
-1                   0x0201
-2                   0x0202
-3                   0x0203
-4                   0x0204
-5                   0x0205
-6                   0x0206
-7                   0x0207
-8                   0x0208
-9                   0x0209
-0                   0x0200
-list                0x0254
-check               0x0282
-info                0x02F9
-timer               0x0296
-arrow_up            0x0258
-arrow_left          0x025A
-arrow_right         0x025B
-arrow_down          0x0259
-ok                  0x025C
-c                   0x017A
-d                   0x027B
-play                0x022C
-e                   0x027C
-f                   0x027D
-rewind              0x0229
-rec                 0x0237
-stop                0x0231
-pause               0x0230
-ffwd                0x0228
-end codes
-
-end remote
-
-
-# Please make this file available to others
-# by sending it to <lirc at bartelmus.de>
-#
-# this config file was automatically generated
-# using lirc-0.7.0-CVS(atiusb) on Sat Jun 19 16:27:14 2004
-#
-# contributed by gLaNDix
-#
-# brand: ATI
-# model no. of remote control: 5000023600
-# devices being controlled by this remote: MythTV 0.14
-#
-# USB ID: 0bc7:0004
-#
-
-begin remote
-
-   name           REMOTE_WONDER
-   bits           16
-   eps            30
-   aeps          100
-
-   one             0     0
-   zero            0     0
-   pre_data_bits   8
-   pre_data       0x14
-   post_data_bits  16
-   post_data      0x0
-   gap          227933
-   toggle_bit      0
-
-
-       begin codes
-           A                        0x000000000000D500
-           B                        0x000000000000D601
-           C                        0x000000000000EE19
-           D                        0x000000000000F01B
-           E                        0x000000000000F621
-           F                        0x000000000000F823
-           POWER                    0x000000000000D702
-           TV                       0x000000000000D803
-           DVD                      0x000000000000D904
-           WEB                      0x000000000000DA05
-           BOOK                     0x000000000000DB06
-           HAND                     0x000000000000DC07
-           MOUSE_LEFT_BTN	          0x0000000000004D78
-           MOUSE_LEFTBUTTONUP       0x0000000000004E79
-           MOUSE_LEFTBUTTONDBLCLICK 0x0000000000004E79
-           MOUSE_RIGHT_BTN          0x000000000000517C
-           MOUSE_RIGHTBUTTONUP      0x000000000000527D
-           MOUSE_RIGHTBUTTONDBLCLICK 0x000000000000537E
-           MOUSE_LEFT               0x0000000000004570
-           MOUSE_RIGHT              0x0000000000004671
-           MOUSE_UP                 0x0000000000004772
-           MOUSE_DOWN               0x0000000000004873
-           MOUSE_UPRIGHT            0x0000000000004A75
-           MOUSE_DOWNRIGHT          0x0000000000004B76
-           MOUSE_DOWNLEFT           0x0000000000004C77
-           MOUSE_UPLEFT             0x0000000000004974
-           VOL_UP                   0x000000000000DD08
-           VOL_DOWN                 0x000000000000DE09
-           MUTE                     0x000000000000DF0A
-           CH_DOWN                  0x000000000000E10C
-           CH_UP                    0x000000000000E00B
-           1                        0x000000000000E20D
-           2                        0x000000000000E30E
-           3                        0x000000000000E40F
-           4                        0x000000000000E510
-           5                        0x000000000000E611
-           6                        0x000000000000E712
-           7                        0x000000000000E813
-           8                        0x000000000000E914
-           9                        0x000000000000EA15
-           0                        0x000000000000EC17
-           DVD_ROOTMENU             0x000000000000EB16
-           SETUP                    0x000000000000ED18
-           ARROW_UP                 0x000000000000EF1A
-           ARROW_RIGHT              0x000000000000F41F
-           ARROW_DOWN               0x000000000000F722
-           ARROW_LEFT               0x000000000000F21D
-           OK                       0x000000000000F31E
-           MAXAMIZE                 0x000000000000F520
-           TV_ON_DEMAND             0x000000000000F11C
-           BACK                     0x000000000000F924
-           PLAY                     0x000000000000FA25
-           NEXT                     0x000000000000FB26
-           RECORD                   0x000000000000FC27
-           STOP                     0x000000000000FD28
-           PAUSE                    0x000000000000FE29
-       end codes
-
-end remote
-
-
-# Please make this file available to others
-# by sending it to <lirc@bartelmus.de>
-#
-# this config file was automatically generated
-# using lirc-0.7.0pre1(atiusb) on Fri Nov 28 16:56:46 2003
-#
-# contributed by Jason Piterak
-#
-# brand:                       ati
-#                                   This uses the atiusb driver
-#=20
-# model no. of remote control: 5000022000
-#
-# devices being controlled by this remote:
-# MythTV PVR using knopmyth by Cecil and Dale at
-#  http://mysettopbox.tv
-# Key map names are as per ATI's website:
-#http://www.ati.com/support/connectors/remotecontrol/atiremotecontrolbutton=s.html
-# Feel free to change them as you see fit :-)
-#
-# NOTE:  There are 16 channels for this remote; this file only
-# supports one channel.  See the GATOS project for information
-# on how to change the channel.  Not tested.  Unknown channel.
-#
-
-begin remote
-
-  name  atiusb
-  bits           16
-  eps            30
-  aeps          100
-
-  one             0     0
-  zero            0     0
-  pre_data_bits   8
-  pre_data       0x14
-  post_data_bits  16
-  post_data      0xF000
-  gap          139891
-  toggle_bit      0
-
-
-      begin codes
-          a                        0x000000000000C500
-          b                        0x000000000000C601
-          power                    0x000000000000C702
-          tv                       0x000000000000C803
-          dvd                      0x000000000000C904
-          web                      0x000000000000CA05
-          media_library            0x000000000000CB06
-          drag                     0x000000000000CC07
-          mouse-button_left        0x0000000000003D78
-          mouse-button_right       0x000000000000417C
-          mouse-up                 0x0000000000003772
-          mouse-down               0x0000000000003873
-          mouse-left               0x0000000000003570
-          mouse-right              0x0000000000003671
-          mouse-left_up            0x0000000000003974
-          mouse-right_up           0x0000000000003A75
-          mouse-left_down          0x0000000000003C77
-          mouse-right_down         0x0000000000003B76
-          vol-up                   0x000000000000CD08
-          vol-down                 0x000000000000CE09
-          mute                     0x000000000000CF0A
-          chan-up                  0x000000000000D00B
-          chan-down                0x000000000000D10C
-          1                        0x000000000000D20D
-          2                        0x000000000000D30E
-          3                        0x000000000000D40F
-          4                        0x000000000000D510
-          5                        0x000000000000D611
-          6                        0x000000000000D712
-          7                        0x000000000000D813
-          8                        0x000000000000D914
-          9                        0x000000000000DA15
-          0                        0x000000000000DC17
-          dvd-root_menu            0x000000000000DB16
-          launch_setup             0x000000000000DD18
-          c                        0x000000000000DE19
-          d                        0x000000000000E01B
-          tv_on_demand             0x000000000000E11C
-          max_window               0x000000000000E520
-          cursor-up                0x000000000000DF1A
-          cursor-down              0x000000000000E722
-          cursor-left              0x000000000000E21D
-          cursor-right             0x000000000000E41F
-          ok                       0x000000000000E31E
-          e                        0x000000000000E621
-          f                        0x000000000000E823
-          rewind                   0x000000000000E924
-          play                     0x000000000000EA25
-          fast_forward             0x000000000000EB26
-          record                   0x000000000000EC27
-          stop                     0x000000000000ED28
-          pause                    0x000000000000EE29
-      end codes
-
-end remote
diff --git a/abs/core-testing/LinHES-config/templates/remotes/ATI_wonder/lircd.conf b/abs/core-testing/LinHES-config/templates/remotes/ATI_wonder/lircd.conf
new file mode 100644
index 0000000..087b9ad
--- /dev/null
+++ b/abs/core-testing/LinHES-config/templates/remotes/ATI_wonder/lircd.conf
@@ -0,0 +1,76 @@
+# brand: ATI Remote Wonder
+# model no. of remote control: 5000023600
+# devices being controlled by this remote: ATI USB Receiver
+#
+# Found on a linpvr.org forum, thanks.
+
+begin remote
+
+  name  ati_remote
+  bits           40
+  eps            30
+  aeps          100
+
+  one             0     0
+  zero            0     0
+  gap          235966
+  toggle_bit      0
+
+
+      begin codes
+          a                        0x00000014D5000000
+          b                        0x00000014D6010000
+          power                    0x00000014D7020000
+          tv                       0x00000014D8030000
+          dvd                      0x00000014D9040000
+          web                      0x00000014DA050000
+          media_library            0x00000014DB060000
+          drag                     0x00000014DC070000
+          mouse-button_left        0x000000144D780000
+          mouse-button_right       0x00000014517C0000
+          mouse-up                 0x0000001447720000
+          mouse-down               0x0000001448730000
+          mouse-left               0x0000001445700000
+          mouse-right              0x0000001446710000
+          mouse-left_up            0x0000001449740000
+          mouse-right_up           0x000000144A750000
+          mouse-left_down          0x000000144C770000
+          mouse-right_down         0x000000144B760000
+          vol-up                   0x00000014DD080000
+          vol-down                 0x00000014DE090000
+          mute                     0x00000014DF0A0000
+          chan-up                  0x00000014E00B0000
+          chan-down                0x00000014E10C0000
+          1                        0x00000014E20D0000
+          2                        0x00000014E30E0000
+          3                        0x00000014E40F0000
+          4                        0x00000014E5100000
+          5                        0x00000014E6110000
+          6                        0x00000014E7120000
+          7                        0x00000014E8130000
+          8                        0x00000014E9140000
+          9                        0x00000014EA150000
+          0                        0x00000014EC170000
+          dvd-root_menu            0x00000014EB160000
+          launch_setup             0x00000014ED180000
+          c                        0x00000014EE190000
+          d                        0x00000014F01B0000
+          tv_on_demand             0x00000014F11C0000
+          max_window               0x00000014F5200000
+          cursor-up                0x00000014EF1A0000
+          cursor-down              0x00000014F7220000
+          cursor-left              0x00000014F21D0000
+          cursor-right             0x00000014F41F0000
+          ok                       0x00000014F31E0000
+          e                        0x00000014F6210000
+          f                        0x00000014F8230000
+          rewind                   0x00000014F9240000
+          play                     0x00000014FA250000
+          fastforward              0x00000014FB260000
+          record                   0x00000014FC270000
+          stop                     0x00000014FD280000
+          pause                    0x00000014FE290000
+      end codes
+
+end remote
+
diff --git a/abs/core-testing/LinHES-config/templates/remotes/ATI_wonder/lircrc-atiwonder.txt b/abs/core-testing/LinHES-config/templates/remotes/ATI_wonder/lircrc
index 80eec07..a2f1ebb 100644
--- a/abs/core-testing/LinHES-config/templates/remotes/ATI_wonder/lircrc-atiwonder.txt
+++ b/abs/core-testing/LinHES-config/templates/remotes/ATI_wonder/lircrc
@@ -6,339 +6,30 @@
 # 
 
 begin
-prog = mythtv
-button = a
-config = E
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = A
-config = E
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = b
-config = O
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = B
-config = O
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = B
-config = O
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = stop
-config = Esc
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = STOP
-config = Esc
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = ffwd
-config = Right
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = FORWARD
-config = Right
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = rewind
-config = Left
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = REWIND
-config = Left
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = pause
-config = P
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = PAUSE
-config = P
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = play
-config = P
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = PLAY
-config = P
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = mute
-config = |
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = MUTE
-config = |
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = vol_down
-config = F10
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = VOL_DOWN
-config = F10
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = vol_up
-config = F11
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = VOL_UP
-config = F11
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = f
-config = PgDown
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = F
-config = PgDown
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = e
-config = Esc
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = E
-config = Esc
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = ch_up
-config = Up
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = CH_UP
-config = Up
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = ch_down
-config = Down
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = CH_DOWN
-config = Down
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = ok
-config = Enter
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = OK
-config = Enter
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = 1
-config = 1
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = 2
-config = 2
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = 3
-config = 3
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = 4
-config = 4
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = 5
-config = 5
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = 6
-config = 6
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = 7
-config = 7
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = 8
-config = 8
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = 9
-config = 9
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = 0
-config = 0
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = rec
-config = R
-repeat = 5
-end 
-
-begin
-prog = mythtv
-button = RECORD
-config = R
-repeat = 5
-end 
-
-
-# ~/.mythtv/lircrc
-# 
-# MythTV native LIRC config file for
-# the ATI-Wonder Remote
-# using lirc_atiusb driver
-# 
-
-begin
 #Jumppoint for Program Guide created in Mythweb
     prog = mythtv
-    button = TV
+    button = tv
     config = ! 
 end
 
 begin
 #Jumppoint for DVD playback created in Mythweb
     prog = mythtv
-    button = DVD
+    button = dvd
     config = @
 end
 
 begin
     prog = mythtv
 #Jumppoint for MythWeater created in Mythweb
-    button = WEB
+    button = web
     config = #
 end
 
 begin
     prog = mythtv
 #Jumppoint for MythVideo created in Mythweb
-    button = BOOK
+    button = media_library
     config = $
 end
 
@@ -421,75 +112,75 @@ end
 
 begin
     prog = mythtv
-    button = MOUSE_UP
+    button = mouse-up
     config = Up
 end
 
 begin
     prog = mythtv
-    button = MOUSE_DOWN
+    button = mouse-down
     config = Down
 end
 
 begin
     prog = mythtv
-    button = MOUSE_LEFT
+    button = mouse-left
     config = Left
 end
 
 begin
     prog = mythtv
-    button = MOUSE_RIGHT 
+    button = mouse-right
     config = Right
 end
 
 begin
     prog = mythtv
-    button = MOUSE_RIGHT_BTN
+    button = mouse-button-right
     config = Esc
 end
 
 begin
     prog = mythtv
 # Enter button
-    button = MOUSE_LEFT_BTN 
+    button = mouse-button-left
     config = Return
 end
 
 begin
     prog = mythtv
-    button = POWER
+    button = power
     config = Esc
 end
 
 begin
     prog = mythtv
 # Enter button
-    button = OK
+    button = ok
     config = Return
 end
 
 begin
     prog = mythtv
-    button = ARROW_UP
+    button = cursor-up
     config = Up
 end
 
 begin
     prog = mythtv
-    button = ARROW_DOWN
+    button = cursor-down
     config = Down
 end
 
 begin
     prog = mythtv
-    button = ARROW_LEFT
+    button = cursor-left
     config = Left
 end
 
 begin
     prog = mythtv
-    button = ARROW_RIGHT 
+    button = cursor-right
     config = Right
 end
 
@@ -501,154 +192,135 @@ end
 
 begin
 prog = mythtv
-button = CH_UP
+button = chan-up
 config = Up
 end
 
 begin
 prog = mythtv
-button = CH_DOWN
+button = chan-down
 config = Down
 end
 
 begin
   prog = mythtv
-  button = VOL_DOWN
+  button = vol-down
   repeat = 3
   config = F10  
 end
 
 begin
   prog = mythtv
-  button = VOL_UP
+  button = vol-up
   repeat = 3
   config = F11  
 end
+begin
+    prog = mythtv
+    button = mute
+    config = F9  
+end
 
 begin
+# Mute for MythMusic
     prog = mythtv
-    button = MUTE
+    button = mute
     config = |  
 end
 
 begin
     prog = mythtv
-    button = DVD_ROOTMENU
+    button = dvd-root_menu
     config = M  
 end
 
 begin
     prog = mythtv
 # Enter button
-    button = SETUP 
+    button = launch_setup
     config = Return
 end
 
 
 begin
     prog = mythtv
-    button = A 
+    button = a 
     config = S  
 end
 
 begin
     prog = mythtv
-    button = B
+    button = b
     config = I   
 end
 
 begin
     prog = mythtv
-    button = C
+    button = c
     config = T   
 end
 
 begin
 prog = mythtv
 # Change focus for PiP (to change channel in the other window)
-button = MAXAMIZE
+button = max_window
 config = B
 end
 
 begin
 prog = mythtv
 # Toggle PiP on/off
-button = TV_ON_DEMAND
+button = tv_on_demand
 config = V
 end
 
 begin
     prog = mythtv
-    button = BACK
-    config = <  
-end
-
-begin
-    prog = mythtv
-    button = NEXT
-    config = >  
-end
-
-begin
-    prog = mythtv
-    button = BACK
+    button = rewind
     config = Left  
 end
 
 
 begin
     prog = mythtv
-    button = NEXT
+    button = fastforward
     config = Right  
 end
 
 begin
 prog = mythtv
-button = RECORD
+button = record
 config = R
 end
 
 begin
 prog = mythtv
-button = STOP
+button = stop
 config = Esc
 end
 
 begin
 prog = mythtv
-button = PLAY
+button = play
 config = P
 end
 
 begin
 prog = mythtv
-button = PAUSE
+button = pause
 config = P
 end
 
-#Page Up/Down
 begin
 prog = mythtv
-button = E
-config = PgUp
-end
-
-begin
-prog = mythtv
-button = F
-config = PgDown
-end
-
-begin
-prog = mythtv
-button = E
+button = e
 # Use for backwards commercial skip
 config = Q
 end
 
 begin
 prog = mythtv
-button = F
+button = f
 # Use for forward commercial skip
 config = Z
 end
@@ -657,84 +329,84 @@ end
 
 begin
 prog = mplayer
-button = PLAY
+button = play
 config = pause
 end
 
 begin
 prog = mplayer
-button = PAUSE
+button = pause
 config = pause
 end
 
 begin
 prog = mplayer
-button = STOP
+button = stop
 config = quit
 end
 
 begin
 prog = mplayer
-button = POWER
+button = power
 config = quit
 end
 
 begin
 prog = mplayer
-button = D
+button = d
 config = quit
 end
 
 begin
 prog = mplayer
-button = MOUSE_RIGHT_BTN
+button = mouse-button-right
 config = quit
 end
 
 begin
 prog = mplayer
-button = MUTE
+button = mute
 config = mute
 end
 
 begin
 prog = mplayer
-button = E
+button = e
 repeat = 6
 config = seek -10
 end
 
 begin
 prog = mplayer
-button = F
+button = r
 repeat = 6
 config = seek 10
 end
 
 begin
 prog = mplayer
-button = BACK
+button = rewind
 repeat = 6
 config = seek -70
 end
 
 begin
 prog = mplayer
-button = NEXT
+button = fastforward
 repeat = 6
 config = seek 70
 end
 
 begin
 prog = mplayer
-button = VOL_DOWN
+button = vol-down
 repeat = 6
 config = volume -1
 end
 
 begin
 prog = mplayer
-button = VOL_UP
+button = vol-up
 repeat = 6
 config = volume 1
 end
@@ -743,119 +415,113 @@ end
 
 begin
 prog = xine
-button = PLAY
+button = play
 config = Play
 end
 
 begin
 prog = xine
-button = PAUSE
+button = pause
 config = PAUSE
 end
 
 begin
 prog = xine
-button = Mute
-config = Mute
-end
-
-begin
-prog = xine
-button = STOP
+button = stop
 config = Stop
 end
 
 begin
 prog = xine
-button = POWER
+button = power
 config = Quit
 end
 
 begin
 prog = xine
-button = D
+button = d
 config = quit
 end
 
 begin
 prog = xine
-button = MOUSE_RIGHT_BTN
+button = mouse-button-right
 config = quit
 end
 
 begin
 prog = xine
-button = ARROW_UP
+button = cursor-up
 repeat = 4
 config = EventUp
 end
 
 begin
 prog = xine
-button = ARROW_DOWN
+button = cursor-down
 repeat = 4
 config = EventDown
 end
 
 begin
 prog = xine
-button = ARROW_LEFT
+button = cursor-left
 repeat = 4
 config = EventLeft
 end
 
 begin
 prog = xine
-button = ARROW_RIGHT
+button = corsor-right
 repeat = 4
 config = EventRight
 end
 
 begin
 prog = xine
-button = OK
+button = ok
 repeat = 0
 config = EventSelect
 end
 
 begin
 prog = xine
-button = MOUSE_UP
+button = mouse-up
 repeat = 4
 config = EventUp
 end
 
 begin
 prog = xine
-button = MOUSE_DOWN
+button = mouse-down
 repeat = 4
 config = EventDown
 end
 
 begin
 prog = xine
-button = MOUSE_LEFT
+button = mouse-left
 repeat = 4
 config = EventLeft
 end
 
 begin
 prog = xine
-button = MOUSE_RIGHT
+button = mouse-right
 repeat = 4
 config = EventRight
 end
 
 begin
 prog = xine
-button = MOUSE_LEFT_BTN
+button = mouse-button-left
 repeat = 0
 config = EventSelect
 end
 
 begin
 prog = xine
-button = DVD_ROOTMENU
+button = dvd-root_menu
 repeat = 0
 config = Menu
 end
@@ -863,7 +529,7 @@ end
 #vol down
 begin
 prog = xine
-button = VOL_DOWN
+button = vol-down
 repeat = 1
 config = Volume-
 end
@@ -871,21 +537,21 @@ end
 #vol up
 begin
 prog = xine
-button = VOL_UP
+button = vol-up
 repeat = 1
 config = Volume+
 end
 
 begin
 prog = xine
-button = TV_ON_DEMAND
+button = tv_on_demand
 repeat = 1
 config = ZoomIn
 end
 
 begin
 prog = xine
-button = MAXAMIZE
+button = max_window
 repeat = 1
 config = ZoomOut
 end
@@ -893,7 +559,7 @@ end
 #skip chapter forward
 begin
 prog = xine
-button = NEXT
+button = fastforward
 repeat = 1
 config = EventNext
 end
@@ -901,22 +567,26 @@ end
 #skip chapter backward
 begin
 prog = xine
-button = BACK
+button = rewind
 repeat = 1
 config = EventPrior
 end
 
 begin
 prog = xine
-button = F
+button = f
 repeat = 2
 config = SeekRelative+45
 end
 
 begin
 prog = xine
-button = E
+button = e
 repeat = 2
 config = SeekRelative-45
 end 
 
+
+
+
+
diff --git a/abs/core-testing/libavc1394/PKGBUILD b/abs/core-testing/libavc1394/PKGBUILD
index 8138916..23aa5cc 100644
--- a/abs/core-testing/libavc1394/PKGBUILD
+++ b/abs/core-testing/libavc1394/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=libavc1394
 pkgver=0.5.3
-pkgrel=1
+pkgrel=2
 pkgdesc="A library to control A/V devices using the 1394ta AV/C commands."
 arch=("i686" "x86_64")
 url="http://sourceforge.net/projects/libavc1394/"
diff --git a/abs/core-testing/libdc1394/PKGBUILD b/abs/core-testing/libdc1394/PKGBUILD
index 75f3704..90ad87b 100644
--- a/abs/core-testing/libdc1394/PKGBUILD
+++ b/abs/core-testing/libdc1394/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=libdc1394
 pkgver=2.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="High level programming interface to control IEEE 1394 based cameras"
 arch=(i686 x86_64)
 license=('LGPL')
diff --git a/abs/core-testing/libiec61883/PKGBUILD b/abs/core-testing/libiec61883/PKGBUILD
index 6c11122..8159d36 100644
--- a/abs/core-testing/libiec61883/PKGBUILD
+++ b/abs/core-testing/libiec61883/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=libiec61883
 pkgver=1.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A higher level API for streaming DV, MPEG-2 and audio over Linux IEEE 1394"
 arch=('i686' 'x86_64')
 url="http://www.linux1394.org/"
diff --git a/abs/core-testing/mplayer/PKGBUILD b/abs/core-testing/mplayer/PKGBUILD
index 9a7f8aa..89db9f2 100644
--- a/abs/core-testing/mplayer/PKGBUILD
+++ b/abs/core-testing/mplayer/PKGBUILD
@@ -3,13 +3,13 @@
 
 pkgname=mplayer
 pkgver=28347
-pkgrel=4
+pkgrel=5
 pkgdesc="A movie player for linux"
 arch=('i686' 'x86_64')
 depends=('libxxf86dga' 'libxv' 'libmad' 'giflib' 'cdparanoia' 'gtk2'
          'sdl' 'lame' 'libtheora' 'xvidcore' 'zlib' 'libmng' 'libxss'
          'libgl' 'smbclient' 'aalib' 'jack-audio-connection-kit'
-         'x264>=20090108' 'faac' 'lirc-utils' 'ttf-dejavu' 'fribidi')
+         'x264>=20090108' 'faac' 'lirc-utils' 'ttf-dejavu' 'fribidi' )
 license=('GPL')
 url="http://www.mplayerhq.hu/"
 makedepends=('libcaca' 'unzip' 'live-media' 'libdca' 'mesa')
@@ -32,7 +32,7 @@ build() {
       --enable-fribidi --disable-libdv --disable-musepack \
       --language=all --disable-dvdnav --disable-esd --disable-mga \
       --disable-libamr_nb --enable-lirc \
-      --with-extraincdir=/usr/lib/live-media --enable-freetype
+      --with-extraincdir=/usr/lib/live-media --enable-freetype --disable-directfb
 
   [ "$CARCH" = "i686" ] &&  sed 's|-march=i486|-march=i686|g' -i config.mak
 
diff --git a/abs/core-testing/mythtv/stable/mythtv/PKGBUILD b/abs/core-testing/mythtv/stable/mythtv/PKGBUILD
index 7b9c2a4..ae95780 100644
--- a/abs/core-testing/mythtv/stable/mythtv/PKGBUILD
+++ b/abs/core-testing/mythtv/stable/mythtv/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=mythtv
 pkgver=0.21
-pkgrel=40
+pkgrel=41
 pkgdesc="A Homebrew PVR project"
 arch=('i686' 'x86_64')
 depends=('bash' 'mysql-clients>=5.0' 'qt3' 'lame' 'lirc-utils' 'ffmpeg' \
@@ -77,10 +77,10 @@ build() {
 #Patch the xml LinHES style
   cp -r $startdir/menu-xml/*.xml $startdir/pkg/usr/share/mythtv
   cd $startdir/pkg/usr/share/mythtv
-  patch -p0 < $startdir/menu-xml/mainmenu.xml.patch
-  patch -p0 < $startdir/menu-xml/optical_menu.xml.patch
-  patch -p0 < $startdir/menu-xml/library.xml.patch
-  patch -p0 < $startdir/menu-xml/util_menu.xml.patch
+  patch -Np0 < $startdir/menu-xml/mainmenu.xml.patch || return 1
+  patch -Np0 <  $startdir/menu-xml/optical_menu.xml.patch || return 1
+  patch -Np0 < $startdir/menu-xml/library.xml.patch || return 1
+  patch -Np0  < $startdir/menu-xml/util_menu.xml.patch || return 1
 
 #Make log dir
   mkdir -p $startdir/pkg/var/log/mythtv
diff --git a/abs/core-testing/mythtv/stable/mythtv/menu-xml/library.xml.patch b/abs/core-testing/mythtv/stable/mythtv/menu-xml/library.xml.patch
index efc8623..c811970 100644
--- a/abs/core-testing/mythtv/stable/mythtv/menu-xml/library.xml.patch
+++ b/abs/core-testing/mythtv/stable/mythtv/menu-xml/library.xml.patch
@@ -1,15 +1,14 @@
---- library.xml.orig	2009-02-09 04:30:04.000000000 +0000
-+++ library.xml	2009-02-09 04:31:50.000000000 +0000
-@@ -119,10 +119,9 @@
+--- library.xml.orig	2008-08-31 03:27:59.000000000 +0000
++++ library.xml	2009-02-19 18:55:23.000000000 +0000
+@@ -119,9 +119,9 @@
  
     <button>
       <type>STREAM</type>
--     <text>Play Online Streams</text>
-+     <text>Online Streams</text>
+-     <text>Play online streams</text>
++     <text>Oonline streams</text>
       <text lang="HE">נגן מדיה מכוונת</text>
 -     <action>PLUGIN mythstream</action>
--     <depends>mythstream</depends>
 +     <action>MENU is.xml</action>
+      <depends>mythstream</depends>
     </button>
  
-    <button>