patch version: 2.26.05-11961-802 (5b6fa7ad) patch date: 2026-05-20 02:55:36 UTC (+00:00) --- diff --git a/CMakeLists.txt b/CMakeLists.txt index f31b956b..5285de7c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -637,6 +637,22 @@ endif (CONFIG_STREAMRELAY MATCHES "Y" AND NOT MODULE_STREAMRELAY EQUAL 1) # Manage config.h based on command line parameters # Manipulate config file based on given parameters and read unset parameters +execute_process (COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/config.sh --enabled WITH_EMU OUTPUT_VARIABLE CONFIG_WITH_EMU OUTPUT_STRIP_TRAILING_WHITESPACE) +if (CONFIG_WITH_EMU MATCHES "Y" AND NOT WITH_EMU EQUAL 1) + add_definitions ("-DWITH_EMU") + set (WITH_EMU "1") + message (STATUS " EMU is added by config compiling with EMU") +endif (CONFIG_WITH_EMU MATCHES "Y" AND NOT WITH_EMU EQUAL 1) + +if (WITH_EMU) + execute_process (COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/config.sh --enabled WITH_SOFTCAM OUTPUT_VARIABLE CONFIG_WITH_SOFTCAM OUTPUT_STRIP_TRAILING_WHITESPACE) + if (CONFIG_WITH_SOFTCAM MATCHES "Y" AND NOT WITH_SOFTCAM EQUAL 1) + add_definitions ("-DWITH_SOFTCAM") + set (WITH_SOFTCAM "1") + message (STATUS " SOFTCAM is added by config linking SoftCam.Key") + endif (CONFIG_WITH_SOFTCAM MATCHES "Y" AND NOT WITH_SOFTCAM EQUAL 1) +endif (WITH_EMU) + execute_process (COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/config.sh --show-valid OUTPUT_VARIABLE config_vars_string OUTPUT_STRIP_TRAILING_WHITESPACE) string(REGEX MATCHALL "[A-Z0-9_]+" config_vars ${config_vars_string}) @@ -1006,6 +1022,24 @@ endif( HAVE_LIBRT OR HAVE_LIBRT_STATIC) #-------------------------------------------------------------------------------- +if (NOT OSCamOperatingSystem MATCHES "Mac OS X") +if (NOT DEFINED ENV{ANDROID_NDK}) +if (NOT DEFINED ENV{ANDROID_STANDALONE_TOOLCHAIN}) + if (WITH_SOFTCAM) + if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/SoftCam.Key) + execute_process (COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/SoftCam.Key ${CMAKE_CURRENT_BINARY_DIR}/SoftCam.Key) + else (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/SoftCam.Key) + execute_process (COMMAND touch ${CMAKE_CURRENT_BINARY_DIR}/SoftCam.Key) + endif (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/SoftCam.Key) + set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--format=binary -Wl,SoftCam.Key -Wl,--format=default") + if (NOT OSCamOperatingSystem MATCHES "Windows/Cygwin") + set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,noexecstack") + endif (NOT OSCamOperatingSystem MATCHES "Windows/Cygwin") + endif (WITH_SOFTCAM) +endif (NOT DEFINED ENV{ANDROID_STANDALONE_TOOLCHAIN}) +endif (NOT DEFINED ENV{ANDROID_NDK}) +endif (NOT OSCamOperatingSystem MATCHES "Mac OS X") + #----------------------- installation ----------------------------- file (GLOB config_files "${CMAKE_CURRENT_SOURCE_DIR}/Distribution/oscam.*") @@ -1127,4 +1161,11 @@ if (HAVE_LIBDVBCSA) endif (LIBDVBCSADIR) endif (HAVE_LIBDVBCSA) +if (WITH_EMU) + message (STATUS " Compile with EMU support") + if (WITH_SOFTCAM) + message (STATUS " SoftCam.Key will be linked as well") + endif (WITH_SOFTCAM) +endif (WITH_EMU) + message (STATUS "") diff --git a/Distribution/doc/html/oscam.server.5.html b/Distribution/doc/html/oscam.server.5.html index 4a4f7abb..ad00113e 100644 --- a/Distribution/doc/html/oscam.server.5.html +++ b/Distribution/doc/html/oscam.server.5.html @@ -840,6 +840,13 @@ set reader's CCcam reshare hop, default:0
+cccwantemu = 0|1 +
+ ccckeepalive = 0|1
| Process EMM from stream (emu): | ++ + | +
| ECM fix delay (emu): | |
| Maxhop: | |
| Mindown: | |
| Reshare: | Global CCCam Reshare:##RESHARE## |
| Want Emu: | |
| Keep alive: | |
| AU providers: | |
| [BISS] Enable date-coded keys: |