Skip to content

Commit 2a04682

Browse files
author
Lukas Rusak
committed
Merge pull request #136 from CvH/patch-2
oscam: fixes cm-online and updates
2 parents a3c8a0f + 351e7a6 commit 2a04682

11 files changed

Lines changed: 51 additions & 39 deletions

File tree

‎addons/service/softcam/oscam/changelog.txt‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,17 @@
1+
7.0.1
2+
- update to oscam-11211
3+
- removed wait for network option (OE system wait-for-online preference is now respected)
4+
- add option to delay OSCam start (this is a workaround for random problems with hardware)
5+
16
7.0.0
27
- rebuild for OpenELEC-7.0
8+
39
6.0.1
410
- preserve timestamps on daemon start
511

612
6.0.0
713
- rebuild for OpenELEC-6.0
14+
815
4.3.6
916
- update to oscam-10607
1017

‎addons/service/softcam/oscam/package.mk‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,29 @@
11
################################################################################
22
# This file is part of OpenELEC - http://www.openelec.tv
3-
# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
3+
# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
44
# Copyright (C) 2011-2011 Gregor Fuis (gujs@openelec.tv)
55
#
6-
# This Program is free software; you can redistribute it and/or modify
6+
# OpenELEC is free software: you can redistribute it and/or modify
77
# it under the terms of the GNU General Public License as published by
8-
# the Free Software Foundation; either version 2, or (at your option)
9-
# any later version.
8+
# the Free Software Foundation, either version 2 of the License, or
9+
# (at your option) any later version.
1010
#
11-
# This Program is distributed in the hope that it will be useful,
11+
# OpenELEC is distributed in the hope that it will be useful,
1212
# but WITHOUT ANY WARRANTY; without even the implied warranty of
13-
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1414
# GNU General Public License for more details.
1515
#
1616
# You should have received a copy of the GNU General Public License
17-
# along with OpenELEC.tv; see the file COPYING. If not, write to
18-
# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
19-
# http://www.gnu.org/copyleft/gpl.html
17+
# along with OpenELEC. If not, see <http://www.gnu.org/licenses/>.
2018
################################################################################
2119

2220
PKG_NAME="oscam"
23-
PKG_VERSION="10607"
24-
PKG_REV="0"
21+
PKG_VERSION="11211"
22+
PKG_REV="1"
2523
PKG_ARCH="any"
2624
PKG_LICENSE="GPL"
2725
PKG_SITE="http://www.streamboard.tv/oscam/wiki"
28-
PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
26+
PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
2927
PKG_DEPENDS_TARGET="toolchain pcsc-lite"
3028
PKG_PRIORITY="optional"
3129
PKG_SECTION="service/softcam"
@@ -34,13 +32,13 @@ PKG_LONGDESC="OSCam is Open Source Conditional Access Modul."
3432
PKG_DISCLAIMER="using oscam may be illegal in your country. if in doubt, do not install"
3533

3634
PKG_IS_ADDON="yes"
35+
PKG_ADDON_NAME="OSCam"
3736
PKG_ADDON_TYPE="xbmc.service"
38-
PKG_ADDON_PROVIDES=""
3937
PKG_ADDON_REPOVERSION="7.0"
4038

4139
PKG_AUTORECONF="no"
4240

43-
PKG_MAINTAINER="Stefan Saraev (seo at irc.freenode.net)"
41+
PKG_MAINTAINER="unofficial.addon.pro"
4442

4543
configure_target() {
4644
cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \

‎addons/service/softcam/oscam/patches/oscam-01-revision.patch‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/config.sh b/config.sh
2+
index 7653731..a6b2ea8 100755
3+
--- a/config.sh
4+
+++ b/config.sh
5+
@@ -687,7 +687,7 @@ do
6+
break
7+
;;
8+
'-r'|'--oscam-revision')
9+
- (svnversion -n . 2>/dev/null || printf 0) | sed 's/.*://; s/[^0-9]*$//; s/^$/0/'
10+
+ svn info | grep Revision: | sed -e 's/.*\: //'
11+
break
12+
;;
13+
'-O'|'--detect-osx-sdk-version')

addons/service/softcam/oscam/patches/oscam-link-with-ludev.patch renamed to addons/service/softcam/oscam/patches/oscam-02-link-with-ludev.patch

File renamed without changes.

addons/service/softcam/oscam/patches/oscam-pcsc-pthread.patch renamed to addons/service/softcam/oscam/patches/oscam-03-pcsc-pthread.patch

File renamed without changes.

‎addons/service/softcam/oscam/source/bin/oscam.start‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ fi
4141

4242
find $ADDON_DIR/bin -maxdepth 1 -type f ! -perm 0755 -exec chmod 0755 \{\} \;
4343

44-
if [ "$WAIT_FOR_NET" == "true" ] ; then
45-
cm-online $WAIT_FOR_NET_TIME
44+
if [ "$WORKAROUND_SLEEP" == "true" ] ; then
45+
sleep $WORKAROUND_SLEEP_TIME
4646
fi
4747

4848
# start userspace DVB driver/addon

‎addons/service/softcam/oscam/source/resources/language/English/strings.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<strings>
33
<string id="1000">General</string>
44
<string id="1011">Restart on suspend / resume</string>
5-
<string id="1012">Wait for network</string>
6-
<string id="1013">time (s)</string>
75
<string id="1001">DVBAPI</string>
6+
<string id="1012">Delay the start of OSCam</string>
7+
<string id="1013">time (s)</string>
88
<string id="1022">Wait for frontend initialization</string>
99
<string id="1023">Number of adapters to wait for</string>
1010
</strings>

‎addons/service/softcam/oscam/source/resources/settings.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<category label="1000">
44
<setting type="sep" />
55
<setting id="RESTART_ON_RESUME" type="bool" label="1011" default="false" />
6-
<setting id="WAIT_FOR_NET" type="bool" label="1012" default="false" />
7-
<setting id="WAIT_FOR_NET_TIME" type="slider" range="1,30" option="int" label="1013" default="1" enable="eq(-1,true)" />
6+
<setting id="WORKAROUND_SLEEP" type="bool" label="1012" default="false" />
7+
<setting id="WORKAROUND_SLEEP_TIME" type="slider" range="1,30" option="int" label="1013" default="1" enable="eq(-1,true)" />
88
</category>
99
<category label="1001">
1010
<setting type="sep" />

‎addons/service/softcam/oscam/source/settings-default.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
<settings>
22
<setting id="RESTART_ON_RESUME" value="false" />
3-
<setting id="WAIT_FOR_NET" value="false" />
4-
<setting id="WAIT_FOR_NET_TIME" value="1" />
53
<setting id="WAIT_FOR_FEINIT" value="false" />
4+
<setting id="$WORKAROUND_SLEEP" value="false" />
5+
<setting id="$WORKAROUND_SLEEP_TIME" value="1" />
66
<setting id="NUM_ADAPTERS" value="1" />
77
</settings>
8-

‎addons/service/softcam/oscam/source/system.d/service.softcam.oscam.service‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
[Unit]
22
Description=OScam
3-
After=graphical.target
3+
After=network-online.service
4+
Requires=network-online.service
45

56
[Service]
67
ExecStart=/bin/sh -c "exec sh /storage/.kodi/addons/service.softcam.oscam/bin/oscam.start"

0 commit comments

Comments
 (0)