From 966297681f2ff6c9180f68e7360f1b8e707669ce Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Sun, 19 Jun 2011 20:51:36 +0200
Subject: [PATCH] oscam: update to oscam-5386, various cleanups and changes

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/addons/service/softcam/oscam/addon       |  2 +-
 packages/addons/service/softcam/oscam/build       |  8 +++++++-
 .../addons/service/softcam/oscam/changelog.txt    |  3 +++
 packages/addons/service/softcam/oscam/meta        |  9 ++++-----
 .../softcam/oscam/source/bin/oscam.service        | 15 ++++++++-------
 5 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/packages/addons/service/softcam/oscam/addon b/packages/addons/service/softcam/oscam/addon
index 23e6843c7b..9b81749b4f 100755
--- a/packages/addons/service/softcam/oscam/addon
+++ b/packages/addons/service/softcam/oscam/addon
@@ -24,7 +24,7 @@
 . config/options $1
 
 mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
-  cp -P $PKG_BUILD/oscam $ADDON_BUILD/$PKG_ADDON_ID/bin
+  cp -P $PKG_BUILD/build/oscam $ADDON_BUILD/$PKG_ADDON_ID/bin
   cp -PR $PKG_DIR/config/oscam.conf $ADDON_BUILD/$PKG_ADDON_ID/oscam-default.conf
 
 
diff --git a/packages/addons/service/softcam/oscam/build b/packages/addons/service/softcam/oscam/build
index f7b25c375c..e4cc4fb8cd 100755
--- a/packages/addons/service/softcam/oscam/build
+++ b/packages/addons/service/softcam/oscam/build
@@ -24,5 +24,11 @@
 . config/options $1
 
 cd $PKG_BUILD
-cmake -DWEBIF=1
+mkdir -p build && cd build
+
+cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \
+      -DCMAKE_INSTALL_PREFIX=/usr \
+      -DWEBIF=1 \
+      ..
+
 make
diff --git a/packages/addons/service/softcam/oscam/changelog.txt b/packages/addons/service/softcam/oscam/changelog.txt
index 5c9a1ea79d..2f6f7ce593 100644
--- a/packages/addons/service/softcam/oscam/changelog.txt
+++ b/packages/addons/service/softcam/oscam/changelog.txt
@@ -1,2 +1,5 @@
+0.99.2
+- update to oscam-5386
+
 0.99.1
 - initial version oscam-5377
diff --git a/packages/addons/service/softcam/oscam/meta b/packages/addons/service/softcam/oscam/meta
index d21bde4621..962a7cd1f3 100644
--- a/packages/addons/service/softcam/oscam/meta
+++ b/packages/addons/service/softcam/oscam/meta
@@ -20,15 +20,14 @@
 ################################################################################
 
 PKG_NAME="oscam"
-PKG_VERSION="5377"
+PKG_VERSION="5386"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://streamboard.gmc.to/wiki/index.php/OSCam/en"
-#PKG_URL="$OPENELEC_SRC/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
-PKG_URL="http://gujs.openelec.tv/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
-PKG_DEPENDS="libiconv avahi openssl"
-PKG_BUILD_DEPENDS="toolchain libiconv avahi openssl"
+PKG_URL="$OPENELEC_SRC/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
+PKG_DEPENDS="openssl"
+PKG_BUILD_DEPENDS="toolchain openssl"
 PKG_PRIORITY="optional"
 PKG_SECTION="service/softcam"
 PKG_SHORTDESC="oscam: OSCam is Open Source Conditional Access Modul."
diff --git a/packages/addons/service/softcam/oscam/source/bin/oscam.service b/packages/addons/service/softcam/oscam/source/bin/oscam.service
index a3aac8992e..cd5a2466cb 100755
--- a/packages/addons/service/softcam/oscam/source/bin/oscam.service
+++ b/packages/addons/service/softcam/oscam/source/bin/oscam.service
@@ -21,7 +21,7 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
 
-#Check if process is already running
+# Check if process is already running
 if [ ! $(pidof oscam) ]; then
 
   ADDON_DIR="$HOME/.xbmc/addons/service.softcam.oscam"
@@ -64,10 +64,11 @@ if [ ! $(pidof oscam) ]; then
   touch $ADDON_CONF_TIERS
   touch $ADDON_CONF_USER
 
-#Restart process if it terminates.
-  (while true; do
-    oscam $OSCAM_ARG  > /dev/null 2>&1
-    sleep 1
-  done)&
+# Restart process if it terminates.
+  (
+    while true; do
+      oscam $OSCAM_ARG > /dev/null 2>&1
+      usleep 250000
+    done
+  )&
 fi
-