oscam: update to oscam-5386, various cleanups and changes

Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2011-06-19 20:51:36 +02:00
parent 4ee1cdfccb
commit 966297681f
5 changed files with 23 additions and 14 deletions

View File

@ -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

View File

@ -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

View File

@ -1,2 +1,5 @@
0.99.2
- update to oscam-5386
0.99.1
- initial version oscam-5377

View File

@ -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."

View File

@ -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