From cc523e5c7e101db7f055bd8e8b2682128ff5000a Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@x200t.openelec.tv>
Date: Mon, 5 Apr 2010 14:42:58 +0200
Subject: [PATCH] lirc: - dont build lirc driver anymore (builded with kernel)
 - dont install lirc driver anymore (installed with kernel) - disable looking
 of alsa, portausio, svgalib - logging to syslog - cosmetics & cleanups

---
 packages/sysutils/lirc/build       | 12 +++++++-----
 packages/sysutils/lirc/install     | 16 ----------------
 packages/sysutils/lirc/need_unpack | 14 --------------
 3 files changed, 7 insertions(+), 35 deletions(-)
 delete mode 100755 packages/sysutils/lirc/need_unpack

diff --git a/packages/sysutils/lirc/build b/packages/sysutils/lirc/build
index 9da5b011e6..058ece2228 100755
--- a/packages/sysutils/lirc/build
+++ b/packages/sysutils/lirc/build
@@ -3,7 +3,6 @@
 . config/options
 
 $SCRIPTS/build toolchain
-$SCRIPTS/build linux
 
 if [ "$DEBUG" = yes ]; then
   DEBUG_CONFIG="--enable-debug"
@@ -17,6 +16,11 @@ export ac_cv_lib_util_forkpty=no
 export MAKEFLAGS=-j1
 
 cd $PKG_BUILD
+
+sed -i -e 's/asoundlib.h/ALSA_DISABLED/g' configure*
+sed -i -e 's/portaudio.h/PORTAUDIO_DISABLED/g' configure*
+sed -i -e 's/vga.h/SVGALIB_DISABLED/g' configure*
+
 ./configure --host=$TARGET_NAME \
             --build=$HOST_NAME \
             --prefix=/usr \
@@ -24,10 +28,8 @@ cd $PKG_BUILD
             --disable-shared \
             --enable-sandboxed \
             --without-x \
-            --with-driver=$RECEIVER \
-            --with-port=0x3f8 \
-            --with-irq=4 \
-            --with-kerneldir=$(kernel_path) \
+            --with-driver=userspace \
+            --with-syslog=LOG_DAEMON \
             $DEBUG_CONFIG
 
 make
diff --git a/packages/sysutils/lirc/install b/packages/sysutils/lirc/install
index caf1b9868a..b59ba5f497 100755
--- a/packages/sysutils/lirc/install
+++ b/packages/sysutils/lirc/install
@@ -2,10 +2,7 @@
 
 . config/options
 
-$SCRIPTS/install linux
-
 PKG_DIR=`find $PACKAGES -type d -name $1`
-VER=`ls $BUILD/linux*/modules/lib/modules`
 
 mkdir -p $INSTALL/usr/sbin
   cp $PKG_BUILD/daemons/lircd $INSTALL/usr/sbin
@@ -16,19 +13,6 @@ mkdir -p $INSTALL/usr/bin
 
 mkdir -p $INSTALL/etc
   cp $PKG_DIR/config/lircd_$REMOTE.conf $INSTALL/etc/lircd.conf
-  cp $PKG_DIR/config/config_$RECEIVER $INSTALL/etc/lirc.conf
-
-mkdir -p $INSTALL/lib/modules/$VER/lirc
-  cp $PKG_BUILD/drivers/*/*.ko $INSTALL/lib/modules/$VER/lirc
-
-for MOD in `find $INSTALL/lib/modules/$VER/lirc -name *.ko`; do
-  $STRIP --strip-debug $MOD
-done
-
-$ROOT/$TOOLCHAIN/bin/depmod -b $INSTALL -v $VER > /dev/null
-for i in `ls $INSTALL/lib/modules/*/modules.* | grep -v modules.dep | grep -v modules.alias | grep -v modules.symbols`; do
-  rm -f $i
-done
 
 if [ "$DEVTOOLS" = yes ]; then
   mkdir -p $INSTALL/usr/bin
diff --git a/packages/sysutils/lirc/need_unpack b/packages/sysutils/lirc/need_unpack
deleted file mode 100755
index 8be9db1963..0000000000
--- a/packages/sysutils/lirc/need_unpack
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-. config/options
-
-PKG_DIR=`find $PACKAGES -type d -name $1`
-STAMP=$STAMPS/$1/unpack
-
-test $PKG_DIR/config/linux.$TARGET_ARCH.conf -nt $STAMP -o \
-     $PKG_DIR/config/linux.$TARGET_PLATFORM.conf -nt $STAMP -o \
-     $PROJECT_DIR/$PROJECT/linux/linux.$TARGET_ARCH.conf -nt $STAMP -o \
-     $PROJECT_DIR/$PROJECT/linux/linux.$TARGET_PLATFORM.conf -nt $STAMP -o \
-     $PKG_DIR/url -nt $STAMP && rm -f $STAMP
-
-exit 0