From d31100aec095c07befc6fc9d91b50f802d2e306d Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 28 Apr 2010 18:38:50 +0200 Subject: [PATCH 01/16] glib: - cosmetics --- packages/devel/glib/install | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/devel/glib/install b/packages/devel/glib/install index 2a4172be3f..36e99db878 100755 --- a/packages/devel/glib/install +++ b/packages/devel/glib/install @@ -7,4 +7,5 @@ $SCRIPTS/install zlib mkdir -p $INSTALL/usr/lib cp -P `find $PKG_BUILD/.build-target/g{lib,module,object,thread,io} -name *.so*` $INSTALL/usr/lib rm -rf $INSTALL/usr/lib/libg{lib,module,object,thread,io}*.so*T - cp $PKG_BUILD/.build-target/glib/libcharset/charset.alias $INSTALL/usr/lib \ No newline at end of file + + cp $PKG_BUILD/.build-target/glib/libcharset/charset.alias $INSTALL/usr/lib From e5cc12d62fc1ae57a856e3729a243037e0410afa Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 28 Apr 2010 18:39:33 +0200 Subject: [PATCH 02/16] new package: - add package xbmc-theme-PM3-HD (disabled) --- packages/mediacenter/install | 1 + packages/mediacenter/xbmc-theme-PM3-HD/install | 6 ++++++ packages/mediacenter/xbmc-theme-PM3-HD/url | 1 + 3 files changed, 8 insertions(+) create mode 100644 packages/mediacenter/xbmc-theme-PM3-HD/install create mode 100644 packages/mediacenter/xbmc-theme-PM3-HD/url diff --git a/packages/mediacenter/install b/packages/mediacenter/install index 3dbd24daf4..18e85b7297 100755 --- a/packages/mediacenter/install +++ b/packages/mediacenter/install @@ -5,6 +5,7 @@ # Base $SCRIPTS/install $MEDIACENTER $SCRIPTS/install $MEDIACENTER-theme-Confluence +# $SCRIPTS/install $MEDIACENTER-theme-PM3-HD # Plugins $SCRIPTS/install plugins \ No newline at end of file diff --git a/packages/mediacenter/xbmc-theme-PM3-HD/install b/packages/mediacenter/xbmc-theme-PM3-HD/install new file mode 100644 index 0000000000..b9b7f8903c --- /dev/null +++ b/packages/mediacenter/xbmc-theme-PM3-HD/install @@ -0,0 +1,6 @@ +#!/bin/sh + +. config/options + +mkdir -p $INSTALL/usr/share/xbmc/addons/skin.pm3-hd + cp -R $PKG_BUILD/* $INSTALL/usr/share/xbmc/addons/skin.pm3-hd diff --git a/packages/mediacenter/xbmc-theme-PM3-HD/url b/packages/mediacenter/xbmc-theme-PM3-HD/url new file mode 100644 index 0000000000..1c5183dbb3 --- /dev/null +++ b/packages/mediacenter/xbmc-theme-PM3-HD/url @@ -0,0 +1 @@ +http://sources.openelec.tv/svn/xbmc-theme-PM3-HD-29605.tar.bz2 From 4f7859a5fc6ded08c5968581b97da00d94b64111 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 28 Apr 2010 18:39:57 +0200 Subject: [PATCH 03/16] xbmc: - update to xbmc-29605 --- packages/mediacenter/xbmc/install | 2 -- packages/mediacenter/xbmc/url | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/mediacenter/xbmc/install b/packages/mediacenter/xbmc/install index 4ef6e081fd..4ea16a6758 100755 --- a/packages/mediacenter/xbmc/install +++ b/packages/mediacenter/xbmc/install @@ -85,8 +85,6 @@ mkdir -p $INSTALL/usr/share/xbmc/media cp -P $PKG_BUILD/media/icon.png $INSTALL/usr/share/xbmc/media/ cp -P $PKG_DIR/splash/Splash.png $INSTALL/usr/share/xbmc/media/ -mkdir -p $INSTALL/usr/share/xbmc/skin - mkdir -p $INSTALL/usr/share/xbmc/sounds cp -PR $PKG_BUILD/sounds/* $INSTALL/usr/share/xbmc/sounds diff --git a/packages/mediacenter/xbmc/url b/packages/mediacenter/xbmc/url index f995ab9a88..a97051b150 100644 --- a/packages/mediacenter/xbmc/url +++ b/packages/mediacenter/xbmc/url @@ -1 +1 @@ -http://sources.openelec.tv/svn/xbmc-29490.tar.bz2 +http://sources.openelec.tv/svn/xbmc-29605.tar.bz2 From 1022adca8424861ca7b240c0e61de98f03d1f6c0 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 28 Apr 2010 18:40:26 +0200 Subject: [PATCH 04/16] xbmc-theme-Confluence: - update to xbmc-theme-Confluence-29605 --- packages/mediacenter/xbmc-theme-Confluence/install | 4 ++-- packages/mediacenter/xbmc-theme-Confluence/url | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/mediacenter/xbmc-theme-Confluence/install b/packages/mediacenter/xbmc-theme-Confluence/install index ff3f06ff8c..e9d1d6b44c 100755 --- a/packages/mediacenter/xbmc-theme-Confluence/install +++ b/packages/mediacenter/xbmc-theme-Confluence/install @@ -2,5 +2,5 @@ . config/options -mkdir -p $INSTALL/usr/share/xbmc/skin/Confluence - cp -R $PKG_BUILD/* $INSTALL/usr/share/xbmc/skin/Confluence +mkdir -p $INSTALL/usr/share/xbmc/addons/skin.confluence + cp -R $PKG_BUILD/* $INSTALL/usr/share/xbmc/addons/skin.confluence diff --git a/packages/mediacenter/xbmc-theme-Confluence/url b/packages/mediacenter/xbmc-theme-Confluence/url index 537ae45965..6cbaee5ac4 100644 --- a/packages/mediacenter/xbmc-theme-Confluence/url +++ b/packages/mediacenter/xbmc-theme-Confluence/url @@ -1 +1 @@ -http://sources.openelec.tv/svn/xbmc-theme-Confluence-29490.tar.bz2 +http://sources.openelec.tv/svn/xbmc-theme-Confluence-29605.tar.bz2 From 3201d39adaa79ca184efc163e142fd0bb60c8ba5 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 28 Apr 2010 18:40:53 +0200 Subject: [PATCH 05/16] projects/generic/options: - build with vaapi support --- projects/generic/options | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/generic/options b/projects/generic/options index 5c1d29f96d..9445078e59 100644 --- a/projects/generic/options +++ b/projects/generic/options @@ -86,7 +86,7 @@ VDPAU="yes" # Use VAAPI video acceleration (needs intel i965 driver and a supported card) - VAAPI="no" + VAAPI="yes" # Use Broadcom CrystalHD Decoder Card for video acceleration # (needs Kernelsupport for Broadcom Decoder Card and a supported card) From d54bb9109e0192c5bfcc5a74f9f0b3ed8ff09cfc Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 28 Apr 2010 18:41:20 +0200 Subject: [PATCH 06/16] tools/mkpkg/mkpkg_xbmc: - update to the latest svn changes --- tools/mkpkg/mkpkg_xbmc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tools/mkpkg/mkpkg_xbmc b/tools/mkpkg/mkpkg_xbmc index 51f7959a2e..e22781a15e 100755 --- a/tools/mkpkg/mkpkg_xbmc +++ b/tools/mkpkg/mkpkg_xbmc @@ -18,13 +18,13 @@ echo "cleaning sources..." echo "seperating theme..." rm -rf xbmc-theme-Confluence-$SVN_REV - mv xbmc-$SVN_REV/skin/Confluence xbmc-theme-Confluence-$SVN_REV + mv xbmc-$SVN_REV/addons/skin.confluence xbmc-theme-Confluence-$SVN_REV + mv xbmc-$SVN_REV/addons/skin.pm3-hd xbmc-theme-PM3-HD-$SVN_REV echo "cleaning sources..." - rm -rf xbmc-$SVN_REV/visualizations/XBMCProjectM/win32 + rm -rf xbmc-$SVN_REV/visualisations rm -rf xbmc-$SVN_REV/lib/libSDL-* rm -rf xbmc-$SVN_REV/lib/libcurl-* - rm -rf xbmc-$SVN_REV/skin rm -rf xbmc-$SVN_REV/project for i in "Changelog" "Fake\ Episode\ Maker" "MingwBuildEnvironment" \ @@ -40,7 +40,9 @@ echo "cleaning sources..." echo "packing sources..." tar cvjf xbmc-$SVN_REV.tar.bz2 xbmc-$SVN_REV tar cvjf xbmc-theme-Confluence-$SVN_REV.tar.bz2 xbmc-theme-Confluence-$SVN_REV + tar cvjf xbmc-theme-PM3-HD-$SVN_REV.tar.bz2 xbmc-theme-PM3-HD-$SVN_REV echo "remove temporary sourcedir..." rm -rf xbmc-$SVN_REV rm -rf xbmc-theme-Confluence-$SVN_REV + rm -rf xbmc-theme-PM3-HD-$SVN_REV From b842ef757168aefdc5459c860185cdc68e7d71cb Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 28 Apr 2010 20:41:21 +0200 Subject: [PATCH 07/16] irserver: - move to sysutils/remote --- packages/sysutils/irserver/init.d/30_irserver | 19 -------------- packages/sysutils/{ => remote}/irserver/build | 0 .../irserver/config/81-irtrans.rules | 0 .../remote/irserver/init.d/30_irserver | 25 +++++++++++++++++++ .../sysutils/{ => remote}/irserver/install | 0 ...rver-add_support_for_dev_irtransX-0.1.diff | 0 .../irserver/remotes/philips-rc197.rem | 0 packages/sysutils/{ => remote}/irserver/url | 0 8 files changed, 25 insertions(+), 19 deletions(-) delete mode 100755 packages/sysutils/irserver/init.d/30_irserver rename packages/sysutils/{ => remote}/irserver/build (100%) rename packages/sysutils/{ => remote}/irserver/config/81-irtrans.rules (100%) create mode 100755 packages/sysutils/remote/irserver/init.d/30_irserver rename packages/sysutils/{ => remote}/irserver/install (100%) rename packages/sysutils/{ => remote}/irserver/patches/01-irserver-add_support_for_dev_irtransX-0.1.diff (100%) rename packages/sysutils/{ => remote}/irserver/remotes/philips-rc197.rem (100%) rename packages/sysutils/{ => remote}/irserver/url (100%) diff --git a/packages/sysutils/irserver/init.d/30_irserver b/packages/sysutils/irserver/init.d/30_irserver deleted file mode 100755 index 16e8c106c5..0000000000 --- a/packages/sysutils/irserver/init.d/30_irserver +++ /dev/null @@ -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 -)& diff --git a/packages/sysutils/irserver/build b/packages/sysutils/remote/irserver/build similarity index 100% rename from packages/sysutils/irserver/build rename to packages/sysutils/remote/irserver/build diff --git a/packages/sysutils/irserver/config/81-irtrans.rules b/packages/sysutils/remote/irserver/config/81-irtrans.rules similarity index 100% rename from packages/sysutils/irserver/config/81-irtrans.rules rename to packages/sysutils/remote/irserver/config/81-irtrans.rules diff --git a/packages/sysutils/remote/irserver/init.d/30_irserver b/packages/sysutils/remote/irserver/init.d/30_irserver new file mode 100755 index 0000000000..cc77fcf556 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/packages/sysutils/irserver/install b/packages/sysutils/remote/irserver/install similarity index 100% rename from packages/sysutils/irserver/install rename to packages/sysutils/remote/irserver/install diff --git a/packages/sysutils/irserver/patches/01-irserver-add_support_for_dev_irtransX-0.1.diff b/packages/sysutils/remote/irserver/patches/01-irserver-add_support_for_dev_irtransX-0.1.diff similarity index 100% rename from packages/sysutils/irserver/patches/01-irserver-add_support_for_dev_irtransX-0.1.diff rename to packages/sysutils/remote/irserver/patches/01-irserver-add_support_for_dev_irtransX-0.1.diff diff --git a/packages/sysutils/irserver/remotes/philips-rc197.rem b/packages/sysutils/remote/irserver/remotes/philips-rc197.rem similarity index 100% rename from packages/sysutils/irserver/remotes/philips-rc197.rem rename to packages/sysutils/remote/irserver/remotes/philips-rc197.rem diff --git a/packages/sysutils/irserver/url b/packages/sysutils/remote/irserver/url similarity index 100% rename from packages/sysutils/irserver/url rename to packages/sysutils/remote/irserver/url From 71ccc96ca747aa7fb63a82228deeedf2a5cfd368 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 28 Apr 2010 20:41:48 +0200 Subject: [PATCH 08/16] lirc: - move to sysutils/remote --- packages/sysutils/lirc/init.d/32_lirc | 18 - packages/sysutils/{ => remote}/lirc/build | 0 .../lirc/config/lircd_mceusb.conf | 0 packages/sysutils/remote/lirc/init.d/32_lirc | 18 + packages/sysutils/{ => remote}/lirc/install | 0 .../lirc/lirc-use_lirc.h_from_kernel-0.1.diff | 504 ++++++++++++++++++ packages/sysutils/{ => remote}/lirc/url | 0 7 files changed, 522 insertions(+), 18 deletions(-) delete mode 100755 packages/sysutils/lirc/init.d/32_lirc rename packages/sysutils/{ => remote}/lirc/build (100%) rename packages/sysutils/{ => remote}/lirc/config/lircd_mceusb.conf (100%) create mode 100755 packages/sysutils/remote/lirc/init.d/32_lirc rename packages/sysutils/{ => remote}/lirc/install (100%) create mode 100644 packages/sysutils/remote/lirc/lirc-use_lirc.h_from_kernel-0.1.diff rename packages/sysutils/{ => remote}/lirc/url (100%) diff --git a/packages/sysutils/lirc/init.d/32_lirc b/packages/sysutils/lirc/init.d/32_lirc deleted file mode 100755 index 3501a9d8f2..0000000000 --- a/packages/sysutils/lirc/init.d/32_lirc +++ /dev/null @@ -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 -)& diff --git a/packages/sysutils/lirc/build b/packages/sysutils/remote/lirc/build similarity index 100% rename from packages/sysutils/lirc/build rename to packages/sysutils/remote/lirc/build diff --git a/packages/sysutils/lirc/config/lircd_mceusb.conf b/packages/sysutils/remote/lirc/config/lircd_mceusb.conf similarity index 100% rename from packages/sysutils/lirc/config/lircd_mceusb.conf rename to packages/sysutils/remote/lirc/config/lircd_mceusb.conf diff --git a/packages/sysutils/remote/lirc/init.d/32_lirc b/packages/sysutils/remote/lirc/init.d/32_lirc new file mode 100755 index 0000000000..a1dd209292 --- /dev/null +++ b/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 diff --git a/packages/sysutils/lirc/install b/packages/sysutils/remote/lirc/install similarity index 100% rename from packages/sysutils/lirc/install rename to packages/sysutils/remote/lirc/install diff --git a/packages/sysutils/remote/lirc/lirc-use_lirc.h_from_kernel-0.1.diff b/packages/sysutils/remote/lirc/lirc-use_lirc.h_from_kernel-0.1.diff new file mode 100644 index 0000000000..f70d415552 --- /dev/null +++ b/packages/sysutils/remote/lirc/lirc-use_lirc.h_from_kernel-0.1.diff @@ -0,0 +1,504 @@ +diff -Naur lirc-20100408/daemons/hardware.h lirc-20100408.patch/daemons/hardware.h +--- lirc-20100408/daemons/hardware.h 2009-01-04 23:17:39.000000000 +0100 ++++ lirc-20100408.patch/daemons/hardware.h 2010-04-09 16:05:14.406356679 +0200 +@@ -13,7 +13,7 @@ + #ifndef _HARDWARE_H + #define _HARDWARE_H + +-#include "drivers/lirc.h" ++#include + #include "ir_remote_types.h" + + struct hardware +diff -Naur lirc-20100408/daemons/hw_accent.h lirc-20100408.patch/daemons/hw_accent.h +--- lirc-20100408/daemons/hw_accent.h 2007-07-29 20:20:06.000000000 +0200 ++++ lirc-20100408.patch/daemons/hw_accent.h 2010-04-09 16:05:14.356327542 +0200 +@@ -27,7 +27,7 @@ + #ifndef _HW_ACCENT_H + #define _HW_ACCENT_H + +-#include "drivers/lirc.h" ++#include + + int accent_decode (struct ir_remote *remote, + ir_code *prep, +diff -Naur lirc-20100408/daemons/hw_bte.h lirc-20100408.patch/daemons/hw_bte.h +--- lirc-20100408/daemons/hw_bte.h 2007-07-29 20:20:06.000000000 +0200 ++++ lirc-20100408.patch/daemons/hw_bte.h 2010-04-09 16:05:14.362326501 +0200 +@@ -26,7 +26,7 @@ + #ifndef HW_BTE_H + #define HW_BTE_H + +-#include "drivers/lirc.h" ++#include + + int bte_decode(struct ir_remote *remote, + ir_code *prep,ir_code *codep,ir_code *postp, +diff -Naur lirc-20100408/daemons/hw_caraca.h lirc-20100408.patch/daemons/hw_caraca.h +--- lirc-20100408/daemons/hw_caraca.h 2007-07-29 20:20:06.000000000 +0200 ++++ lirc-20100408.patch/daemons/hw_caraca.h 2010-04-09 16:05:14.400327269 +0200 +@@ -13,7 +13,7 @@ + #ifndef HW_CARACA_H + #define HW_CARACA_H + +-#include "drivers/lirc.h" ++#include + + int caraca_decode(struct ir_remote *remote, + ir_code *prep,ir_code *codep,ir_code *postp, +diff -Naur lirc-20100408/daemons/hw_creative.h lirc-20100408.patch/daemons/hw_creative.h +--- lirc-20100408/daemons/hw_creative.h 2007-07-29 20:20:07.000000000 +0200 ++++ lirc-20100408.patch/daemons/hw_creative.h 2010-04-09 16:05:14.393357176 +0200 +@@ -13,7 +13,7 @@ + #ifndef _HW_CREATIVE_H + #define _HW_CREATIVE_H + +-#include "drivers/lirc.h" ++#include + + int creative_decode(struct ir_remote *remote, + ir_code *prep,ir_code *codep,ir_code *postp, +diff -Naur lirc-20100408/daemons/hw_ea65.h lirc-20100408.patch/daemons/hw_ea65.h +--- lirc-20100408/daemons/hw_ea65.h 2007-07-29 20:20:07.000000000 +0200 ++++ lirc-20100408.patch/daemons/hw_ea65.h 2010-04-09 16:05:14.346327762 +0200 +@@ -24,7 +24,7 @@ + #ifndef HW_EA65_H + #define HW_EA65_H + +-#include "drivers/lirc.h" ++#include + + int ea65_decode(struct ir_remote *remote, + ir_code *prep,ir_code *codep,ir_code *postp, +diff -Naur lirc-20100408/daemons/hw_irlink.h lirc-20100408.patch/daemons/hw_irlink.h +--- lirc-20100408/daemons/hw_irlink.h 2008-01-13 21:50:43.000000000 +0100 ++++ lirc-20100408.patch/daemons/hw_irlink.h 2010-04-09 16:05:14.350327534 +0200 +@@ -23,7 +23,7 @@ + #ifndef HW_IRLINK_H + #define HW_IRLINK_H + +-#include "drivers/lirc.h" ++#include + + int irlink_decode (struct ir_remote *remote, + ir_code *prep, +diff -Naur lirc-20100408/daemons/hw_irman.h lirc-20100408.patch/daemons/hw_irman.h +--- lirc-20100408/daemons/hw_irman.h 2007-07-29 20:20:08.000000000 +0200 ++++ lirc-20100408.patch/daemons/hw_irman.h 2010-04-09 16:05:14.368352769 +0200 +@@ -13,7 +13,7 @@ + #ifndef _HW_IRMAN_H + #define _HW_IRMAN_H + +-#include "drivers/lirc.h" ++#include + + int irman_decode(struct ir_remote *remote, + ir_code *prep,ir_code *codep,ir_code *postp, +diff -Naur lirc-20100408/daemons/hw_logitech.h lirc-20100408.patch/daemons/hw_logitech.h +--- lirc-20100408/daemons/hw_logitech.h 2007-07-29 20:20:08.000000000 +0200 ++++ lirc-20100408.patch/daemons/hw_logitech.h 2010-04-09 16:05:14.348327369 +0200 +@@ -13,7 +13,7 @@ + #ifndef _HW_LOGITECH_H + #define _HW_LOGITECH_H + +-#include "drivers/lirc.h" ++#include + + int logitech_decode(struct ir_remote *remote, + ir_code *prep,ir_code *codep,ir_code *postp, +diff -Naur lirc-20100408/daemons/hw_mouseremote.h lirc-20100408.patch/daemons/hw_mouseremote.h +--- lirc-20100408/daemons/hw_mouseremote.h 2007-07-29 20:20:08.000000000 +0200 ++++ lirc-20100408.patch/daemons/hw_mouseremote.h 2010-04-09 16:05:14.395328008 +0200 +@@ -16,7 +16,7 @@ + #ifndef HW_MOUSEREMOTE_H + #define HW_MOUSEREMOTE_H + +-#include "drivers/lirc.h" ++#include + + int mouseremote_decode(struct ir_remote *remote, + ir_code *prep,ir_code *codep,ir_code *postp, +diff -Naur lirc-20100408/daemons/hw_mp3anywhere.h lirc-20100408.patch/daemons/hw_mp3anywhere.h +--- lirc-20100408/daemons/hw_mp3anywhere.h 2007-07-29 20:20:08.000000000 +0200 ++++ lirc-20100408.patch/daemons/hw_mp3anywhere.h 2010-04-09 16:05:14.364357606 +0200 +@@ -15,7 +15,7 @@ + #ifndef HW_MP3ANYWHERE_H + #define HW_MP3ANYWHERE_H + +-#include "drivers/lirc.h" ++#include + + int mp3anywhere_decode(struct ir_remote *remote, + ir_code *prep,ir_code *codep,ir_code *postp, +diff -Naur lirc-20100408/daemons/hw_mplay.h lirc-20100408.patch/daemons/hw_mplay.h +--- lirc-20100408/daemons/hw_mplay.h 2007-12-22 13:33:16.000000000 +0100 ++++ lirc-20100408.patch/daemons/hw_mplay.h 2010-04-09 16:05:14.389357823 +0200 +@@ -25,7 +25,7 @@ + #ifndef HW_MPLAY_H + #define HW_MPLAY_H + +-#include "drivers/lirc.h" ++#include + + extern int mplay_decode(struct ir_remote *remote, + ir_code *prep, +diff -Naur lirc-20100408/daemons/hw_pcmak.h lirc-20100408.patch/daemons/hw_pcmak.h +--- lirc-20100408/daemons/hw_pcmak.h 2007-07-29 20:20:08.000000000 +0200 ++++ lirc-20100408.patch/daemons/hw_pcmak.h 2010-04-09 16:05:14.402362075 +0200 +@@ -14,7 +14,7 @@ + #ifndef HW_PCMAK_H + #define HW_PCMAK_H + +-#include "drivers/lirc.h" ++#include + + int pcmak_decode(struct ir_remote *remote, + ir_code *prep,ir_code *codep,ir_code *postp, +diff -Naur lirc-20100408/daemons/hw_pinsys.h lirc-20100408.patch/daemons/hw_pinsys.h +--- lirc-20100408/daemons/hw_pinsys.h 2007-07-29 20:20:09.000000000 +0200 ++++ lirc-20100408.patch/daemons/hw_pinsys.h 2010-04-09 16:05:14.352327630 +0200 +@@ -14,7 +14,7 @@ + #ifndef _HW_PINSYS_H + #define _HW_PINSYS_H + +-#include "drivers/lirc.h" ++#include + + int is_it_is_it_huh(int port); + int autodetect(void); +diff -Naur lirc-20100408/daemons/hw_pixelview.h lirc-20100408.patch/daemons/hw_pixelview.h +--- lirc-20100408/daemons/hw_pixelview.h 2007-07-29 20:20:09.000000000 +0200 ++++ lirc-20100408.patch/daemons/hw_pixelview.h 2010-04-09 16:05:14.366327740 +0200 +@@ -13,7 +13,7 @@ + #ifndef _HW_PIXELVIEW_H + #define _HW_PIXELVIEW_H + +-#include "drivers/lirc.h" ++#include + + int pixelview_decode(struct ir_remote *remote, + ir_code *prep,ir_code *codep,ir_code *postp, +diff -Naur lirc-20100408/daemons/hw_silitek.h lirc-20100408.patch/daemons/hw_silitek.h +--- lirc-20100408/daemons/hw_silitek.h 2007-07-29 20:20:09.000000000 +0200 ++++ lirc-20100408.patch/daemons/hw_silitek.h 2010-04-09 16:05:14.358327986 +0200 +@@ -12,7 +12,7 @@ + #ifndef _HW_SILITEK_H + #define _HW_SILITEK_H + +-#include "drivers/lirc.h" ++#include + + int silitek_decode(struct ir_remote *remote, + ir_code *prep,ir_code *codep,ir_code *postp, +diff -Naur lirc-20100408/daemons/hw_slinke.h lirc-20100408.patch/daemons/hw_slinke.h +--- lirc-20100408/daemons/hw_slinke.h 2007-07-29 20:20:09.000000000 +0200 ++++ lirc-20100408.patch/daemons/hw_slinke.h 2010-04-09 16:05:14.360356926 +0200 +@@ -14,7 +14,7 @@ + #ifndef _HW_SLINKE_H + #define _HW_SLINKE_H + +-#include "drivers/lirc.h" ++#include + + int slinke_decode(struct ir_remote *remote, + ir_code *prep, +diff -Naur lirc-20100408/daemons/hw_tira.h lirc-20100408.patch/daemons/hw_tira.h +--- lirc-20100408/daemons/hw_tira.h 2010-03-20 17:18:30.000000000 +0100 ++++ lirc-20100408.patch/daemons/hw_tira.h 2010-04-09 16:05:14.391327119 +0200 +@@ -28,7 +28,7 @@ + #ifndef HW_TIRA_H + #define HW_TIRA_H + +-#include "drivers/lirc.h" ++#include + + int tira_decode (struct ir_remote *remote, + ir_code *prep, +diff -Naur lirc-20100408/daemons/hw_usbx.h lirc-20100408.patch/daemons/hw_usbx.h +--- lirc-20100408/daemons/hw_usbx.h 2007-07-29 20:20:12.000000000 +0200 ++++ lirc-20100408.patch/daemons/hw_usbx.h 2010-04-09 16:05:14.354327656 +0200 +@@ -23,7 +23,7 @@ + #ifndef HW_USBX_H + #define HW_USBX_H + +-#include "drivers/lirc.h" ++#include + + int usbx_decode (struct ir_remote *remote, + ir_code *prep, +diff -Naur lirc-20100408/daemons/irrecord.c lirc-20100408.patch/daemons/irrecord.c +--- lirc-20100408/daemons/irrecord.c 2010-03-20 17:18:30.000000000 +0100 ++++ lirc-20100408.patch/daemons/irrecord.c 2010-04-09 16:05:14.387327137 +0200 +@@ -44,7 +44,7 @@ + #include + #include + +-#include "drivers/lirc.h" ++#include + + #include "hardware.h" + #include "hw-types.h" +diff -Naur lirc-20100408/daemons/ir_remote.c lirc-20100408.patch/daemons/ir_remote.c +--- lirc-20100408/daemons/ir_remote.c 2010-04-02 12:26:57.000000000 +0200 ++++ lirc-20100408.patch/daemons/ir_remote.c 2010-04-09 16:05:14.413327192 +0200 +@@ -22,7 +22,7 @@ + + #include + +-#include "drivers/lirc.h" ++#include + + #include "lircd.h" + #include "ir_remote.h" +diff -Naur lirc-20100408/daemons/ir_remote.h lirc-20100408.patch/daemons/ir_remote.h +--- lirc-20100408/daemons/ir_remote.h 2009-05-24 12:46:52.000000000 +0200 ++++ lirc-20100408.patch/daemons/ir_remote.h 2010-04-09 16:05:14.398356646 +0200 +@@ -21,7 +21,7 @@ + #include + #include + +-#include "drivers/lirc.h" ++#include + #include "hardware.h" + + #include "ir_remote_types.h" +diff -Naur lirc-20100408/daemons/ir_remote_types.h lirc-20100408.patch/daemons/ir_remote_types.h +--- lirc-20100408/daemons/ir_remote_types.h 2010-04-02 12:26:57.000000000 +0200 ++++ lirc-20100408.patch/daemons/ir_remote_types.h 2010-04-09 16:05:14.404327809 +0200 +@@ -21,7 +21,7 @@ + #include + #include + +-#include "drivers/lirc.h" ++#include + + #ifdef LONG_IR_CODE + typedef unsigned long long ir_code; +diff -Naur lirc-20100408/drivers/lirc_atiusb/lirc_atiusb.c lirc-20100408.patch/drivers/lirc_atiusb/lirc_atiusb.c +--- lirc-20100408/drivers/lirc_atiusb/lirc_atiusb.c 2010-03-17 15:16:15.000000000 +0100 ++++ lirc-20100408.patch/drivers/lirc_atiusb/lirc_atiusb.c 2010-04-09 16:05:14.459351320 +0200 +@@ -65,7 +65,7 @@ + #include + #include + +-#include "drivers/lirc.h" ++#include + #include "drivers/kcompat.h" + #include "drivers/lirc_dev/lirc_dev.h" + +diff -Naur lirc-20100408/drivers/lirc_dev/lirc_dev.c lirc-20100408.patch/drivers/lirc_dev/lirc_dev.c +--- lirc-20100408/drivers/lirc_dev/lirc_dev.c 2010-03-17 15:16:15.000000000 +0100 ++++ lirc-20100408.patch/drivers/lirc_dev/lirc_dev.c 2010-04-09 16:05:14.516356068 +0200 +@@ -70,7 +70,7 @@ + #include + #endif + +-#include "drivers/lirc.h" ++#include + #include "lirc_dev.h" + + static int debug; +diff -Naur lirc-20100408/drivers/lirc_dev/lirc_dev.h lirc-20100408.patch/drivers/lirc_dev/lirc_dev.h +--- lirc-20100408/drivers/lirc_dev/lirc_dev.h 2010-01-30 16:01:29.000000000 +0100 ++++ lirc-20100408.patch/drivers/lirc_dev/lirc_dev.h 2010-04-09 16:05:14.520327275 +0200 +@@ -28,7 +28,7 @@ + #include + #endif + +-#include "drivers/lirc.h" ++#include + + struct lirc_buffer { + wait_queue_head_t wait_poll; +diff -Naur lirc-20100408/drivers/lirc_ene0100/lirc_ene0100.h lirc-20100408.patch/drivers/lirc_ene0100/lirc_ene0100.h +--- lirc-20100408/drivers/lirc_ene0100/lirc_ene0100.h 2009-08-25 14:27:53.000000000 +0200 ++++ lirc-20100408.patch/drivers/lirc_ene0100/lirc_ene0100.h 2010-04-09 16:05:14.447327629 +0200 +@@ -20,7 +20,7 @@ + */ + + #include "drivers/kcompat.h" +-#include "drivers/lirc.h" ++#include + #include "drivers/lirc_dev/lirc_dev.h" + + /* hardware address */ +diff -Naur lirc-20100408/drivers/lirc_igorplugusb/lirc_igorplugusb.c lirc-20100408.patch/drivers/lirc_igorplugusb/lirc_igorplugusb.c +--- lirc-20100408/drivers/lirc_igorplugusb/lirc_igorplugusb.c 2010-03-17 15:16:15.000000000 +0100 ++++ lirc-20100408.patch/drivers/lirc_igorplugusb/lirc_igorplugusb.c 2010-04-09 16:05:14.525356846 +0200 +@@ -63,7 +63,7 @@ + #include + + #include "drivers/kcompat.h" +-#include "drivers/lirc.h" ++#include + #include "drivers/lirc_dev/lirc_dev.h" + + #if !defined(KERNEL_2_5) +diff -Naur lirc-20100408/drivers/lirc_imon/lirc_imon.c lirc-20100408.patch/drivers/lirc_imon/lirc_imon.c +--- lirc-20100408/drivers/lirc_imon/lirc_imon.c 2010-03-17 15:27:19.000000000 +0100 ++++ lirc-20100408.patch/drivers/lirc_imon/lirc_imon.c 2010-04-09 16:05:14.500327646 +0200 +@@ -54,7 +54,7 @@ + #include + + #include "drivers/kcompat.h" +-#include "drivers/lirc.h" ++#include + #include "drivers/lirc_dev/lirc_dev.h" + + +diff -Naur lirc-20100408/drivers/lirc_it87/lirc_it87.c lirc-20100408.patch/drivers/lirc_it87/lirc_it87.c +--- lirc-20100408/drivers/lirc_it87/lirc_it87.c 2010-03-17 15:16:15.000000000 +0100 ++++ lirc-20100408.patch/drivers/lirc_it87/lirc_it87.c 2010-04-09 16:05:14.467327188 +0200 +@@ -71,7 +71,7 @@ + #include + #include + +-#include "drivers/lirc.h" ++#include + #include "drivers/lirc_dev/lirc_dev.h" + #include "drivers/kcompat.h" + +diff -Naur lirc-20100408/drivers/lirc_ite8709/lirc_ite8709.c lirc-20100408.patch/drivers/lirc_ite8709/lirc_ite8709.c +--- lirc-20100408/drivers/lirc_ite8709/lirc_ite8709.c 2010-01-13 20:56:13.000000000 +0100 ++++ lirc-20100408.patch/drivers/lirc_ite8709/lirc_ite8709.c 2010-04-09 16:05:14.479327272 +0200 +@@ -31,7 +31,7 @@ + #include + #endif + +-#include "drivers/lirc.h" ++#include + #include "drivers/lirc_dev/lirc_dev.h" + #include "drivers/kcompat.h" + +diff -Naur lirc-20100408/drivers/lirc_mceusb/lirc_mceusb.c lirc-20100408.patch/drivers/lirc_mceusb/lirc_mceusb.c +--- lirc-20100408/drivers/lirc_mceusb/lirc_mceusb.c 2010-03-31 06:51:02.000000000 +0200 ++++ lirc-20100408.patch/drivers/lirc_mceusb/lirc_mceusb.c 2010-04-09 16:05:14.439352599 +0200 +@@ -67,7 +67,7 @@ + #include + #include + +-#include "drivers/lirc.h" ++#include + #include "drivers/kcompat.h" + #include "drivers/lirc_dev/lirc_dev.h" + +diff -Naur lirc-20100408/drivers/lirc_parallel/lirc_parallel.c lirc-20100408.patch/drivers/lirc_parallel/lirc_parallel.c +--- lirc-20100408/drivers/lirc_parallel/lirc_parallel.c 2010-03-17 15:16:16.000000000 +0100 ++++ lirc-20100408.patch/drivers/lirc_parallel/lirc_parallel.c 2010-04-09 16:05:14.420351761 +0200 +@@ -70,7 +70,7 @@ + #include + #include + +-#include "drivers/lirc.h" ++#include + #include "drivers/kcompat.h" + #include "drivers/lirc_dev/lirc_dev.h" + +diff -Naur lirc-20100408/drivers/lirc_sasem/lirc_sasem.c lirc-20100408.patch/drivers/lirc_sasem/lirc_sasem.c +--- lirc-20100408/drivers/lirc_sasem/lirc_sasem.c 2010-03-17 15:16:16.000000000 +0100 ++++ lirc-20100408.patch/drivers/lirc_sasem/lirc_sasem.c 2010-04-09 16:05:14.534327175 +0200 +@@ -58,7 +58,7 @@ + #include + + #include "drivers/kcompat.h" +-#include "drivers/lirc.h" ++#include + #include "drivers/lirc_dev/lirc_dev.h" + + +diff -Naur lirc-20100408/drivers/lirc_serial/lirc_serial.c lirc-20100408.patch/drivers/lirc_serial/lirc_serial.c +--- lirc-20100408/drivers/lirc_serial/lirc_serial.c 2010-03-17 15:16:16.000000000 +0100 ++++ lirc-20100408.patch/drivers/lirc_serial/lirc_serial.c 2010-04-09 16:05:14.509327239 +0200 +@@ -120,7 +120,7 @@ + #endif + #endif + +-#include "drivers/lirc.h" ++#include + #include "drivers/kcompat.h" + #include "drivers/lirc_dev/lirc_dev.h" + +diff -Naur lirc-20100408/drivers/lirc_sir/lirc_sir.c lirc-20100408.patch/drivers/lirc_sir/lirc_sir.c +--- lirc-20100408/drivers/lirc_sir/lirc_sir.c 2010-03-17 15:16:16.000000000 +0100 ++++ lirc-20100408.patch/drivers/lirc_sir/lirc_sir.c 2010-04-09 16:05:14.429327188 +0200 +@@ -95,7 +95,7 @@ + + #include + +-#include "drivers/lirc.h" ++#include + #include "drivers/lirc_dev/lirc_dev.h" + #include "drivers/kcompat.h" + +diff -Naur lirc-20100408/drivers/lirc_streamzap/lirc_streamzap.c lirc-20100408.patch/drivers/lirc_streamzap/lirc_streamzap.c +--- lirc-20100408/drivers/lirc_streamzap/lirc_streamzap.c 2010-03-17 15:16:16.000000000 +0100 ++++ lirc-20100408.patch/drivers/lirc_streamzap/lirc_streamzap.c 2010-04-09 16:05:14.486358057 +0200 +@@ -52,7 +52,7 @@ + #endif + #include + +-#include "drivers/lirc.h" ++#include + #include "drivers/kcompat.h" + #include "drivers/lirc_dev/lirc_dev.h" + +diff -Naur lirc-20100408/drivers/lirc_ttusbir/lirc_ttusbir.c lirc-20100408.patch/drivers/lirc_ttusbir/lirc_ttusbir.c +--- lirc-20100408/drivers/lirc_ttusbir/lirc_ttusbir.c 2009-03-15 10:34:01.000000000 +0100 ++++ lirc-20100408.patch/drivers/lirc_ttusbir/lirc_ttusbir.c 2010-04-09 16:05:14.444327695 +0200 +@@ -38,7 +38,7 @@ + #include + #include + +-#include "drivers/lirc.h" ++#include + #include "drivers/kcompat.h" + #include "drivers/lirc_dev/lirc_dev.h" + +diff -Naur lirc-20100408/drivers/lirc_wpc8769l/lirc_wpc8769l.c lirc-20100408.patch/drivers/lirc_wpc8769l/lirc_wpc8769l.c +--- lirc-20100408/drivers/lirc_wpc8769l/lirc_wpc8769l.c 2010-03-17 15:16:16.000000000 +0100 ++++ lirc-20100408.patch/drivers/lirc_wpc8769l/lirc_wpc8769l.c 2010-04-09 16:05:14.475356554 +0200 +@@ -66,7 +66,7 @@ + #include + #endif + +-#include "drivers/lirc.h" ++#include + #include "drivers/kcompat.h" + #include "drivers/lirc_dev/lirc_dev.h" + +diff -Naur lirc-20100408/tools/mode2.c lirc-20100408.patch/tools/mode2.c +--- lirc-20100408/tools/mode2.c 2009-12-28 14:05:30.000000000 +0100 ++++ lirc-20100408.patch/tools/mode2.c 2010-04-09 16:05:14.543327535 +0200 +@@ -33,7 +33,7 @@ + #include + #include + +-#include "drivers/lirc.h" ++#include + #include "daemons/ir_remote.h" + #include "daemons/hardware.h" + #include "daemons/hw-types.h" +diff -Naur lirc-20100408/tools/smode2.c lirc-20100408.patch/tools/smode2.c +--- lirc-20100408/tools/smode2.c 2003-03-30 14:26:44.000000000 +0200 ++++ lirc-20100408.patch/tools/smode2.c 2010-04-09 16:05:14.546353310 +0200 +@@ -37,7 +37,7 @@ + #include + #include + +-#include "drivers/lirc.h" ++#include + + GraphicsContext *screen; + GraphicsContext *physicalscreen; +diff -Naur lirc-20100408/tools/xmode2.c lirc-20100408.patch/tools/xmode2.c +--- lirc-20100408/tools/xmode2.c 2009-12-27 20:04:10.000000000 +0100 ++++ lirc-20100408.patch/tools/xmode2.c 2010-04-09 16:05:14.539352347 +0200 +@@ -60,7 +60,7 @@ + #include + #include + +-#include "drivers/lirc.h" ++#include + #include "daemons/ir_remote.h" + #include "daemons/hardware.h" + #include "daemons/hw-types.h" diff --git a/packages/sysutils/lirc/url b/packages/sysutils/remote/lirc/url similarity index 100% rename from packages/sysutils/lirc/url rename to packages/sysutils/remote/lirc/url From 8f505e4e0af760c8219964890b27c3c1646a6a3e Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 28 Apr 2010 20:42:40 +0200 Subject: [PATCH 09/16] lcdproc: - add user config file - rework the init script --- packages/sysutils/lcdproc/init.d/33_lcdproc | 9 ++++++--- packages/sysutils/lcdproc/install | 3 +++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/packages/sysutils/lcdproc/init.d/33_lcdproc b/packages/sysutils/lcdproc/init.d/33_lcdproc index 119dbef8bc..a64dcfcb81 100755 --- a/packages/sysutils/lcdproc/init.d/33_lcdproc +++ b/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 \ No newline at end of file diff --git a/packages/sysutils/lcdproc/install b/packages/sysutils/lcdproc/install index 969d25da3c..d395d781a0 100755 --- a/packages/sysutils/lcdproc/install +++ b/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 From ad59ede1560bcac2241d5fd458192efd479204e4 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 28 Apr 2010 20:43:04 +0200 Subject: [PATCH 10/16] xbmc: - install remote package --- packages/mediacenter/xbmc/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mediacenter/xbmc/install b/packages/mediacenter/xbmc/install index 4ea16a6758..22bbae5fe0 100755 --- a/packages/mediacenter/xbmc/install +++ b/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 From 6fd9bde9a1494f663c4049ee05c10dcee3bbd3cb Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 28 Apr 2010 20:43:37 +0200 Subject: [PATCH 11/16] xbmc: - add philips-rc197 remote controller support --- ...461-xbmc-add_remote_philips-rc197-0.1.diff | 55 +++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 packages/mediacenter/xbmc/patches/461-xbmc-add_remote_philips-rc197-0.1.diff diff --git a/packages/mediacenter/xbmc/patches/461-xbmc-add_remote_philips-rc197-0.1.diff b/packages/mediacenter/xbmc/patches/461-xbmc-add_remote_philips-rc197-0.1.diff new file mode 100644 index 0000000000..677aa8859e --- /dev/null +++ b/packages/mediacenter/xbmc/patches/461-xbmc-add_remote_philips-rc197-0.1.diff @@ -0,0 +1,55 @@ +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 14:18:01.951408228 +0200 +@@ -362,4 +362,51 @@ + recordlist + teletext + ++ ++ ++ play ++ Pause ++ Stop ++ Fwd ++ Rew ++ left ++ right ++ up ++ down ++ ++ Ch+ ++ Ch- ++ Back ++ DVDMenu ++ EPG ++ Info ++ Next ++ Prev ++ eHome ++ Rec ++ Vol+ ++ Vol- ++ Mute ++ power ++ TV ++ 1 ++ 2 ++ 3 ++ 4 ++ 5 ++ 6 ++ 7 ++ 8 ++ 9 ++ 0 ++ Star ++ Hash ++ Clear ++ Enter ++ Red ++ Green ++ Yellow ++ Blue ++ Teletext ++ + From fef78f1c3f7c42e4d3f9b093f64fdd317f47bcf1 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 28 Apr 2010 23:39:14 +0200 Subject: [PATCH 12/16] lcdproc: - add lcd user config file --- packages/sysutils/lcdproc/config/lcd.conf | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 packages/sysutils/lcdproc/config/lcd.conf diff --git a/packages/sysutils/lcdproc/config/lcd.conf b/packages/sysutils/lcdproc/config/lcd.conf new file mode 100644 index 0000000000..6259b17772 --- /dev/null +++ b/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" From 92e9ff992a678ab11fd8569ccde9d13ecde04dfd Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 28 Apr 2010 23:39:50 +0200 Subject: [PATCH 13/16] remote: - add remote user config file --- packages/sysutils/remote/config/remote.conf | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 packages/sysutils/remote/config/remote.conf diff --git a/packages/sysutils/remote/config/remote.conf b/packages/sysutils/remote/config/remote.conf new file mode 100644 index 0000000000..aafd0b010e --- /dev/null +++ b/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" From a593b42718cf35ffcaf33aa464d78c1cd45b15b6 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 28 Apr 2010 23:40:46 +0200 Subject: [PATCH 14/16] xbmc: - remove patch for adding philips remote - add patch to support irtrans mediacenter remote --- ...461-xbmc-add_remote_philips-rc197-0.1.diff | 55 ------------------- ...mc-add_remote_irtrans_mediacenter-0.1.diff | 52 ++++++++++++++++++ 2 files changed, 52 insertions(+), 55 deletions(-) delete mode 100644 packages/mediacenter/xbmc/patches/461-xbmc-add_remote_philips-rc197-0.1.diff create mode 100644 packages/mediacenter/xbmc/patches/462-xbmc-add_remote_irtrans_mediacenter-0.1.diff diff --git a/packages/mediacenter/xbmc/patches/461-xbmc-add_remote_philips-rc197-0.1.diff b/packages/mediacenter/xbmc/patches/461-xbmc-add_remote_philips-rc197-0.1.diff deleted file mode 100644 index 677aa8859e..0000000000 --- a/packages/mediacenter/xbmc/patches/461-xbmc-add_remote_philips-rc197-0.1.diff +++ /dev/null @@ -1,55 +0,0 @@ -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 14:18:01.951408228 +0200 -@@ -362,4 +362,51 @@ - recordlist - teletext - -+ -+ -+ play -+ Pause -+ Stop -+ Fwd -+ Rew -+ left -+ right -+ up -+ down -+ -+ Ch+ -+ Ch- -+ Back -+ DVDMenu -+ EPG -+ Info -+ Next -+ Prev -+ eHome -+ Rec -+ Vol+ -+ Vol- -+ Mute -+ power -+ TV -+ 1 -+ 2 -+ 3 -+ 4 -+ 5 -+ 6 -+ 7 -+ 8 -+ 9 -+ 0 -+ Star -+ Hash -+ Clear -+ Enter -+ Red -+ Green -+ Yellow -+ Blue -+ Teletext -+ - diff --git a/packages/mediacenter/xbmc/patches/462-xbmc-add_remote_irtrans_mediacenter-0.1.diff b/packages/mediacenter/xbmc/patches/462-xbmc-add_remote_irtrans_mediacenter-0.1.diff new file mode 100644 index 0000000000..2b969b601e --- /dev/null +++ b/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 @@ + recordlist + teletext + ++ ++ pause ++ stop ++ fwd ++ rew ++ left ++ right ++ up ++ down ++ ++ ch+ ++ ch- ++ back ++ clear ++ play ++ info ++ next ++ prev ++ teletext ++ ehome ++ rec ++ vol+ ++ vol- ++ mute ++ power ++ video ++ music ++ pictures ++ tv ++ 1 ++ 2 ++ 3 ++ 4 ++ 5 ++ 6 ++ 7 ++ 8 ++ 9 ++ 0 ++ red ++ green ++ yellow ++ blue ++ + From 8c0006edf7e8e49c1fdd1252c0298f32b806e9f7 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 28 Apr 2010 23:41:25 +0200 Subject: [PATCH 15/16] remote: - add install script --- packages/sysutils/remote/install | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100755 packages/sysutils/remote/install diff --git a/packages/sysutils/remote/install b/packages/sysutils/remote/install new file mode 100755 index 0000000000..5f8129d2c2 --- /dev/null +++ b/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 \ No newline at end of file From ce6296fae0f653880601f0d11c92a4b62f1bb8b7 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 28 Apr 2010 23:42:53 +0200 Subject: [PATCH 16/16] irserver: - remove philips-rc197 config file --- packages/sysutils/remote/irserver/install | 2 - .../remote/irserver/remotes/philips-rc197.rem | 53 ------------------- 2 files changed, 55 deletions(-) delete mode 100644 packages/sysutils/remote/irserver/remotes/philips-rc197.rem diff --git a/packages/sysutils/remote/irserver/install b/packages/sysutils/remote/irserver/install index 8c196ca804..4f33270239 100755 --- a/packages/sysutils/remote/irserver/install +++ b/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 diff --git a/packages/sysutils/remote/irserver/remotes/philips-rc197.rem b/packages/sysutils/remote/irserver/remotes/philips-rc197.rem deleted file mode 100644 index f3ca22a38f..0000000000 --- a/packages/sysutils/remote/irserver/remotes/philips-rc197.rem +++ /dev/null @@ -1,53 +0,0 @@ -[REMOTE] - [NAME]philips-rc197 - -[TIMING] - [0][N]0[RC]2[RP]87[FREQ]36[SB][RS][RC6] - -[COMMANDS] - [1][T]0[D]S11101010000000000011110000010000000001 - [2][T]0[D]S11101010000000000011110000010000000010 - [3][T]0[D]S11101010000000000011110000010000000011 - [4][T]0[D]S11101010000000000011110000010000000100 - [5][T]0[D]S11101010000000000011110000010000000101 - [6][T]0[D]S11101010000000000011110000010000000110 - [7][T]0[D]S11101010000000000011110000010000000111 - [8][T]0[D]S11101010000000000011110000010000001000 - [9][T]0[D]S11101010000000000011110000010000001001 - [0][T]0[D]S11101010000000000011110000010000000000 - [Star][T]0[D]S11101010000000000011110000010000011101 - [Hash][T]0[D]S11101010000000000011110000010000011100 - [ok][T]0[D]S11101010000000000011110000010000100010 - [left][T]0[D]S11101010000000000011110000010000100000 - [right][T]0[D]S11101010000000000011110000010000100001 - [down][T]0[D]S11101010000000000011110000010000011111 - [up][T]0[D]S11101010000000000011110000010000011110 - [play][T]0[D]S11101010000000000011110000010000010110 - [power][T]0[D]S11101010000000000011110000010000001100 - [Stop][T]0[D]S11101010000000000011110000010000011001 - [Rec][T]0[D]S11101010000000000011110000010000010111 - [Rew][T]0[D]S11101010000000000011110000010000010101 - [Fwd][T]0[D]S11101010000000000011110000010000010100 - [Pause][T]0[D]S11101010000000000011110000010000011000 - [Next][T]0[D]S11101010000000000011110000010000011010 - [Prev][T]0[D]S11101010000000000011110000010000011011 - [eHome][T]0[D]S11101010000000000011110000010000001101 - [Back][T]0[D]S11101010000000000011110000010000100011 - [EPG][T]0[D]S11101010000000000011110000010000100110 - [Info][T]0[D]S11101010000000000011110000010000001111 - [LiveTV][T]0[D]S11101010000000000011110000010000100101 - [TV][T]0[D]S11101010000000000011110000010001000110 - [Vol+][T]0[D]S11101010000000000011110000010000010000 - [Vol-][T]0[D]S11101010000000000011110000010000010001 - [Mute][T]0[D]S11101010000000000011110000010000001110 - [Ch+][T]0[D]S11101010000000000011110000010000010010 - [Ch-][T]0[D]S11101010000000000011110000010000010011 - [Enter][T]0[D]S11101010000000000011110000010000001011 - [Clear][T]0[D]S11101010000000000011110000010000001010 - [DVDMenu][T]0[D]S11101010000000000011110000010000100100 - [Rectv][T]0[D]S11101010000000000011110000010001001000 - [Teletext][T][0][D]S11101010000000000011110000010001011010 - [Red][T][0][D]S11101010000000000011110000010001011011 - [Green][T][0][D]S11101010000000000011110000010001011100 - [Yellow][T][0][D]S11101010000000000011110000010001011101 - [Blue][T][0][D]S11101010000000000011110000010001011110