oscam: update to 11881

packages/addons/service/oscam/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="oscam"
-PKG_VERSION="11799"
-PKG_SHA256="10e7ffb153c66b4f29c21dd5a239d1186f988e918e8ff2673a4ea5fb9073a209"
+PKG_VERSION="11881"
+PKG_SHA256="0e9393a443510ea06faf418aa3c6431bbd12617a40f5de1c023218c4419e9006"
 PKG_REV="0"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
@@ -58,7 +58,6 @@ PKG_CMAKE_OPTS_TARGET="\
   -DHAVE_DVBAPI=1 \
   -DHAVE_LIBCRYPTO=1 \
   -DSTATIC_LIBUSB=1 \
-  -DTOUCH=ON \
   -DWEBIF=1 \
   -DWEBIF_LIVELOG=1 \
   -DWEBIF_JQUERY=1 \
@@ -71,7 +70,10 @@ makeinstall_target() {
 }
 
 addon() {
-  mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
+  mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/{bin,lib.private}
     cp -P ${PKG_BUILD}/.${TARGET_NAME}/oscam ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
     cp -P ${PKG_BUILD}/.${TARGET_NAME}/utils/list_smargo ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
+    cp -L $(get_install_dir pcsc-lite)/usr/lib/libpcsclite.so.1 ${ADDON_BUILD}/${PKG_ADDON_ID}/lib.private
+
+  patchelf --add-rpath '${ORIGIN}/../lib.private' ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/oscam
 }

packages/addons/service/oscam/patches/oscam-02-link-with-ludev.patch

@@ -1,14 +1,14 @@
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -498,7 +498,7 @@ add_library (${csoscam} STATIC ${csoscam
- 
- set (exe_name "oscam")
+@@ -621,7 +621,7 @@
+ 	set (exe_name "oscam-upx")
+ endif (NOT USE_COMPRESS EQUAL 1)
  add_executable (${exe_name} ${exe_srcs} ${exe_hdrs})
 -target_link_libraries (${exe_name} ${csoscam} ${csmodules} ${csreaders} csctapi cscrypt minilzo)
 +target_link_libraries (${exe_name} ${csoscam} ${csmodules} ${csreaders} csctapi cscrypt minilzo udev)
- if(HAVE_LIBRT AND HAVE_LIBUSB)
- 	if (LIBUSBDIR)
- 		set (libusb_link "imp_libusb")
+ if (WITH_SIGNING EQUAL 1)
+ 	SIGN_COMMAND_OSCAM()
+ endif (WITH_SIGNING EQUAL 1)
 --- a/utils/CMakeLists.txt
 +++ b/utils/CMakeLists.txt
 @@ -12,7 +12,7 @@ file (GLOB all_srcs ${exe_srcs})