Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv

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

@@ -1,3 +1,7 @@
+2.1.5
+- update to oscam-7038
+- start userspace DVB drivers before oscam
+
 2.1.4
 - update to oscam-6626
   * added bulcrypt cas support

packages/addons/service/softcam/oscam/meta

@@ -20,8 +20,8 @@
 ################################################################################
 
 PKG_NAME="oscam"
-PKG_VERSION="6626"
-PKG_REV="4"
+PKG_VERSION="7038"
+PKG_REV="5"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://streamboard.gmc.to/wiki/index.php/OSCam/en"

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

@@ -79,6 +79,13 @@ if [ ! "$(pidof oscam)" ]; then
     if [ -f "$LOCKDIR/$LOCKFILE" ] ; then
       break
     fi
+    # start userspace DVB driver/addon
+    for driver_dvb in $(find /storage/.xbmc/addons/driver.dvb.*/bin/userspace-driver.sh -type f 2>/dev/null); do
+      driver_dvb_name=$(echo $driver_dvb | awk 'BEGIN {FS="/"} {printf("%s", $5)}')
+      logger -t OSCAM "### Loading userspace DVB driver: $driver_dvb_name ###"
+      # use ". " because of variable export
+      . $driver_dvb
+    done
     LD_LIBRARY_PATH="$ADDON_DIR/lib:$LD_LIBRARY_PATH" oscam $OSCAM_ARG > /dev/null 2>&1
     sleep 1
   done &