Merge pull request #3491 from CvH/10.0/pscam2

oscam: update to 11518
LibreELEC · May 7, 2019 · 52d7931 · 52d7931
2 parents 4df8ad4 + 3e46a0b
commit 52d7931
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 15 deletions.
diff --git a/packages/addons/service/oscam/changelog.txt b/packages/addons/service/oscam/changelog.txt
@@ -1,3 +1,7 @@
+109
+- Update to version 11518
+- fixed missing Modules
+
 108
 - Update to version 11517
 

diff --git a/packages/addons/service/oscam/package.mk b/packages/addons/service/oscam/package.mk
@@ -2,10 +2,10 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="oscam"
-PKG_VERSION="a2ee0528f1de527748aaf7a79982ed112ffa3183"
-PKG_SHA256="24315471faea612a25b39fc14050f4fad4365715fde48dcb0032ebdce770282d"
-PKG_VERSION_NUMBER="11517"
-PKG_REV="108"
+PKG_VERSION="e8ce7359fa920ca8d63aca9dde4f0eeb1f1f72f1"
+PKG_SHA256="93610d3d61479cae87340a0a3d7dc8c04b326b662f58f4181ac08c87897bd80b"
+PKG_VERSION_NUMBER="11518"
+PKG_REV="109"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.streamboard.tv/oscam/wiki"
@@ -19,17 +19,53 @@ PKG_IS_ADDON="yes"
 PKG_ADDON_NAME="OSCam"
 PKG_ADDON_TYPE="xbmc.service"
 
-PKG_CMAKE_OPTS_TARGET="-DLIBUSBDIR=$SYSROOT_PREFIX/usr \
-                       -DWITH_SSL=1 \
-                       -DHAVE_LIBCRYPTO=1 \
-                       -DHAVE_DVBAPI=1 \
-                       -DWITH_STAPI=0 \
-                       -DWEBIF=1 \
-                       -DWITH_DEBUG=0 \
-                       -DOPTIONAL_INCLUDE_DIR=$SYSROOT_PREFIX/usr/include \
-                       -DSTATIC_LIBUSB=1 \
-                       -DCLOCKFIX=0 \
-                       -DCARDREADER_DB2COM=OFF"
+PKG_CMAKE_OPTS_TARGET="\
+  `#Building` \
+  -DLIBUSBDIR=$SYSROOT_PREFIX/usr \
+  -DOPTIONAL_INCLUDE_DIR=$SYSROOT_PREFIX/usr/include \
+  \
+  `#Readers` \
+  -DCARDREADER_DB2COM=OFF \
+  -DCARDREADER_DRECAS=ON \
+  -DCARDREADER_INTERNAL=OFF \
+  -DCARDREADER_MP35=ON \
+  -DCARDREADER_PHOENIX=ON \
+  -DCARDREADER_SC8IN1=ON \
+  -DCARDREADER_SMARGO=ON \
+  -DCARDREADER_STAPI5=OFF \
+  -DCARDREADER_STAPI=OFF \
+  -DCARDREADER_STINGER=ON \
+  \
+  `#Protocol` \
+  -DMODULE_CAMD33=OFF \
+  -DMODULE_CAMD35=ON \
+  -DMODULE_CAMD35_TCP=ON \
+  -DMODULE_CCCAM=ON \
+  -DMODULE_CCCSHARE=ON \
+  -DMODULE_CONSTCW=ON \
+  -DMODULE_GBOX=ON \
+  -DMODULE_GHTTP=ON \
+  -DMODULE_NEWCAMD=ON \
+  -DMODULE_PANDORA=ON \
+  -DMODULE_RADEGAST=ON \
+  -DMODULE_SCAM=ON \
+  -DMODULE_SERIAL=ON \
+  \
+  `#Features` \
+  -DCLOCKFIX=0 \
+  -DCS_ANTICASC=ON \
+  -DCS_CACHEEX=ON \
+  -DCW_CYCLE_CHECK=ON \
+  -DHAVE_DVBAPI=1 \
+  -DHAVE_LIBCRYPTO=1 \
+  -DSTATIC_LIBUSB=1 \
+  -DTOUCH=ON \
+  -DWEBIF=1 \
+  -DWEBIF_LIVELOG=1 \
+  -DWEBIF_JQUERY=1 \
+  -DWITH_DEBUG=0 \
+  -DWITH_SSL=1 \
+  -DWITH_STAPI=0"
 
 pre_configure_target() {
   export OSCAM_ADDON_VERSION="$PKG_VERSION_NUMBER"