merging trunk

packages/mediacenter/xbmc/install

@@ -127,7 +127,7 @@ mkdir -p $INSTALL/usr/share/xbmc/addons
 
 # other programs needed to run
   $SCRIPTS/install alsa
-  $SCRIPTS/install lirc
+  $SCRIPTS/install remote
   [ ! "$LCD_DRIVER" = none ] && $SCRIPTS/install lcdproc
   [ "$SENSOR_SUPPORT" = yes ] && $SCRIPTS/install lm_sensors
   [ "$UPDATE_SUPPORT" = yes ] && $SCRIPTS/install autoupdate

packages/mediacenter/xbmc/patches/462-xbmc-add_remote_irtrans_mediacenter-0.1.diff

@@ -0,0 +1,52 @@
+diff -Naur xbmc-29490/system/Lircmap.xml xbmc-29490.patch/system/Lircmap.xml
+--- xbmc-29490/system/Lircmap.xml	2010-04-24 22:45:26.000000000 +0200
++++ xbmc-29490.patch/system/Lircmap.xml	2010-04-28 22:00:13.734656322 +0200
+@@ -362,4 +362,48 @@
+ 		<recordedtv>recordlist</recordedtv>
+ 		<title>teletext</title>
+ 	</remote>
++	<remote device="mediacenter">
++		<pause>pause</pause>
++		<stop>stop</stop>
++		<forward>fwd</forward>
++		<reverse>rew</reverse>
++		<left>left</left>
++		<right>right</right>
++		<up>up</up>
++		<down>down</down>
++		<select>ok</select>
++		<pageplus>ch+</pageplus>
++		<pageminus>ch-</pageminus>
++		<back>back</back>
++		<menu>clear</menu>
++		<title>play</title>
++		<info>info</info>
++		<skipplus>next</skipplus>
++		<skipminus>prev</skipminus>
++		<display>teletext</display>
++		<start>ehome</start>
++		<record>rec</record>
++		<volumeplus>vol+</volumeplus>
++		<volumeminus>vol-</volumeminus>
++		<mute>mute</mute>
++		<power>power</power>
++		<myvideo>video</myvideo>
++		<mymusic>music</mymusic>
++		<mypictures>pictures</mypictures>
++		<mytv>tv</mytv>
++		<one>1</one>
++		<two>2</two>
++		<three>3</three>
++		<four>4</four>
++		<five>5</five>
++		<six>6</six>
++		<seven>7</seven>
++		<eight>8</eight>
++		<nine>9</nine>
++		<zero>0</zero>
++		<mytv>red</mytv>
++		<mymusic>green</mymusic>
++		<mypictures>yellow</mypictures>
++		<myvideo>blue</myvideo>
++	</remote>
+ </lircmap>

packages/sysutils/irserver/init.d/30_irserver

@@ -1,19 +0,0 @@
-# start the IRtrans daemon
-#
-# runlevels: openelec, textmode
-
-IRTRANS_DEV="/dev/irtrans0"
-IRSERVER_LOG="/var/log/irserver.log"
-IRSERVER_PID="/var/run/irserver.pid"
-
-[ "$DEBUG" = "yes" ] && \
-  IRSERVER_ARG="$IRSERVER_ARG -loglevel 4" # set loglevel in debugmode
-
-(
-  progress "Starting IRtrans daemon"
-
-  irserver -logfile $IRSERVER_LOG \
-           -pidfile $IRSERVER_PID \
-           -daemon $IRTRANS_DEV \
-           $IRSERVER_ARG > /dev/null 2>&1
-)&

packages/sysutils/lcdproc/config/lcd.conf

@@ -0,0 +1,7 @@
+# Setup LCD/VFD driver ( none / irtrans )
+#
+# none:     no LCD/VFD hardware is installed
+#
+# irtrans:  use irtrans as LCD/VFD driver
+
+LCD_DRIVER="none"

packages/sysutils/lcdproc/init.d/33_lcdproc

@@ -2,9 +2,12 @@
 #
 # runlevels: openelec, textmode
 
-(
+[ -f /storage/.config/lcd.conf ] && . /storage/.config/lcd.conf
+
+if [ ! "$LCD_DRIVER" = "none" -a -z "$LCD_DRIVER" ]; then
+
   progress "Starting LCD daemon"
 
-  LCDd -c /etc/LCDd.conf > /dev/null 2>&1
+  LCDd -c /etc/LCDd.conf -d $LCD_DRIVER > /dev/null 2>&1
 
-)&
+fi

packages/sysutils/lcdproc/install

@@ -16,5 +16,8 @@ mkdir -p $INSTALL/usr/sbin
 mkdir -p $INSTALL/usr/lib/lcdproc
   cp $PKG_BUILD/server/drivers/*.so $INSTALL/usr/lib/lcdproc
 
+mkdir -p $INSTALL/usr/config
+  cp $PKG_DIR/config/lcd.conf $INSTALL/usr/config
+
 mkdir -p $INSTALL/etc
   cp $PKG_BUILD/LCDd.conf $INSTALL/etc

packages/sysutils/lirc/init.d/32_lirc

@@ -1,18 +0,0 @@
-# start the LIRC daemon
-#
-# runlevels: openelec, textmode
-
-LIRC_DRIVER="default"
-LIRC_DEVICE="/dev/lirc0"
-LIRC_OUTPUT="/dev/lircd"
-
-(
-  progress "Starting LIRC daemon"
-
-
-  $IONICE mkdir -p /var/run/lirc
-
-    lircd --driver=$LIRC_DRIVER \
-          --device=$LIRC_DEVICE \
-          --output=$LIRC_OUTPUT
-)&

packages/sysutils/remote/config/remote.conf

@@ -0,0 +1,9 @@
+# Setup remote control ( none / lirc / irtrans )
+#
+# none:     no remote control hardware is installed
+#
+# lirc:     use lirc as remotecontrol backend (default)
+#
+# irtrans:  use irtrans as remotecontrol backend
+
+REMOTE_BACKEND="lirc"

packages/sysutils/remote/install

@@ -0,0 +1,11 @@
+#!/bin/sh
+
+. config/options
+
+$SCRIPTS/install lirc
+$SCRIPTS/install irserver
+
+PKG_DIR=`find $PACKAGES -type d -name $1`
+
+mkdir -p $INSTALL/usr/config
+  cp $PKG_DIR/config/*.conf $INSTALL/usr/config

packages/sysutils/remote/irserver/init.d/30_irserver

@@ -0,0 +1,25 @@
+# start the IRtrans daemon
+#
+# runlevels: openelec, textmode
+
+[ -f /storage/.config/remote.conf ] && . /storage/.config/remote.conf
+[ -f /storage/.config/lcd.conf ] && . /storage/.config/lcd.conf
+
+if [ "$REMOTE_BACKEND" = "irtrans" -o "$LCD_DRIVER" = "irtrans" ]; then
+
+  progress "Starting IRtrans daemon"
+
+  IRTRANS_DEV="/dev/irtrans0"
+  IRSERVER_LOG="/var/log/irserver.log"
+  IRSERVER_PID="/var/run/irserver.pid"
+
+  [ ! "$REMOTE_BACKEND" = "irtrans" ] && \
+    IRSERVER_ARG="$IRSERVER_ARG -no_lirc" # dont run in lirc mode
+
+  [ "$DEBUG" = "yes" ] && \
+    IRSERVER_ARG="$IRSERVER_ARG -loglevel 4" # set loglevel in debugmode
+
+  irserver -logfile $IRSERVER_LOG -pidfile $IRSERVER_PID \
+           -daemon $IRTRANS_DEV $IRSERVER_ARG > /dev/null 2>&1
+
+fi

packages/sysutils/remote/irserver/install

@@ -12,8 +12,6 @@ mkdir -p $INSTALL/usr/sbin
 mkdir -p $INSTALL/usr/share/irtrans/remotes
   cp $PKG_BUILD/remotes/irtrans.rem $INSTALL/usr/share/irtrans/remotes
   cp $PKG_BUILD/remotes/mediacenter.rem $INSTALL/usr/share/irtrans/remotes
-  cp $PKG_DIR/remotes/*.rem $INSTALL/usr/share/irtrans/remotes
-
 
 mkdir -p $INSTALL/lib/udev/rules.d
   cp $PKG_DIR/config/*.rules $INSTALL/lib/udev/rules.d

packages/sysutils/remote/lirc/init.d/32_lirc

@@ -0,0 +1,18 @@
+# start the LIRC daemon
+#
+# runlevels: openelec, textmode
+
+[ -f /storage/.config/remote.conf ] && . /storage/.config/remote.conf
+
+if [ "$REMOTE_BACKEND" = "lirc" ]; then
+
+  progress "Starting LIRC daemon"
+
+  LIRC_DRIVER="default"
+  LIRC_DEVICE="/dev/lirc0"
+  LIRC_OUTPUT="/dev/lircd"
+
+  $IONICE mkdir -p /var/run/lirc
+  lircd --driver=$LIRC_DRIVER --device=$LIRC_DEVICE --output=$LIRC_OUTPUT
+
+fi