Merge branch 'oscam-svn' of [email protected]:oscam-emu/oscam-…

…patched.git

Drop emu's stream relay in favour of oscam's relay.
Drop ffdecsa in favour of libdvbcsa.

Thanks to WXbet for the necessary adjustments.

Co-authored-by: WXbet <[email protected]>

CMakeLists.txt

@@ -101,7 +101,6 @@ if (OSCamOperatingSystem MATCHES "Windows/Cygwin")
 		${CMAKE_CURRENT_SOURCE_DIR}/csctapi
 		${CMAKE_CURRENT_SOURCE_DIR}/cscrypt
 		${CMAKE_CURRENT_SOURCE_DIR}/minilzo
-		${CMAKE_CURRENT_SOURCE_DIR}/ffdecsa
 		${CMAKE_CURRENT_SOURCE_DIR}/extapi/cygwin
 		/usr/include/w32api
 		${OPTIONAL_INCLUDE_DIR}
@@ -111,7 +110,6 @@ else (OSCamOperatingSystem MATCHES "Windows/Cygwin")
 		${CMAKE_CURRENT_SOURCE_DIR}/csctapi
 		${CMAKE_CURRENT_SOURCE_DIR}/cscrypt
 		${CMAKE_CURRENT_SOURCE_DIR}/minilzo
-		${CMAKE_CURRENT_SOURCE_DIR}/ffdecsa
 		${OPTIONAL_INCLUDE_DIR}
 		)
 endif (OSCamOperatingSystem MATCHES "Windows/Cygwin")
@@ -419,6 +417,39 @@ else (HAVE_PCSC)
 	endif (OSCamOperatingSystem MATCHES "Windows/Cygwin")
 endif (HAVE_PCSC)
 
+execute_process (COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/config.sh --enabled MODULE_STREAMRELAY OUTPUT_VARIABLE CONFIG_STREAMRELAY OUTPUT_STRIP_TRAILING_WHITESPACE)
+if (CONFIG_STREAMRELAY MATCHES "Y" AND NOT MODULE_STREAMRELAY EQUAL 1)
+	if (LIBDVBCSADIR)
+		check_include_file ("${LIBDVBCSADIR}/include/dvbcsa/dvbcsa.h" FOUND_LIBDVBCSA)
+		set (LIBADVBCSA_LIBRARY "${LIBDVBCSADIR}/libdvbcsa.a")
+		set (LIBDVBCSA_LIBRARY "${LIBDVBCSADIR}/libdvbcsa.so")
+	else (LIBDVBCSADIR)
+		check_include_file ("dvbcsa/dvbcsa.h" FOUND_LIBDVBCSA)
+		find_library (LIBADVBCSA_LIBRARY NAMES libdvbcsa.a)
+		find_library (LIBDVBCSA_LIBRARY NAMES dvbcsa)
+	endif (LIBDVBCSADIR)
+
+	if (HAVE_LIBDVBCSA)
+		if (STATIC_LIBDVBCSA AND FOUND_LIBDVBCSA AND EXISTS ${LIBADVBCSA_LIBRARY})
+			message(STATUS "  static libdvbcsa found (libdvbcsa.a).")
+			add_library(imp_libdvbcsa STATIC IMPORTED)
+			set_property(TARGET imp_libdvbcsa PROPERTY IMPORTED_LOCATION ${LIBADVBCSA_LIBRARY})
+			set (dvbcsa_link "imp_libdvbcsa")
+			set (STATICLIBDVBCSA True)
+		elseif ((NOT STATIC_LIBDVBCSA OR STATIC_LIBDVBCSA EQUAL 0) AND FOUND_LIBDVBCSA AND EXISTS ${LIBDVBCSA_LIBRARY})
+			message(STATUS "  libdvbcsa found (libdvbcsa.so).")
+			add_library(imp_libdvbcsa SHARED IMPORTED)
+			set_property(TARGET imp_libdvbcsa PROPERTY IMPORTED_LOCATION ${LIBDVBCSA_LIBRARY} )
+			set(dvbcsa_link dvbcsa)
+			set (STATICLIBDVBCSA False)
+		else (STATIC_LIBDVBCSA AND FOUND_LIBDVBCSA AND EXISTS ${LIBADVBCSA_LIBRARY})
+			message(FATAL_ERROR "  no libdvbcsa found!")
+		endif (STATIC_LIBDVBCSA AND FOUND_LIBDVBCSA AND EXISTS ${LIBADVBCSA_LIBRARY})
+	else (HAVE_LIBDVBCSA)
+		message(FATAL_ERROR "  HAVE_LIBDVBCSA disabled!")
+	endif (HAVE_LIBDVBCSA)
+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
 
@@ -467,7 +498,6 @@ execute_process (COMMAND make --no-print-directory --quiet -C ${CMAKE_CURRENT_SO
 add_subdirectory (csctapi)
 add_subdirectory (minilzo)
 add_subdirectory (cscrypt)
-add_subdirectory (ffdecsa)
 
 #----------------------- file groups ------------------------------
 execute_process (COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/config.sh --enabled MODULE_CAMD33 OUTPUT_VARIABLE CAMD33 OUTPUT_STRIP_TRAILING_WHITESPACE)
@@ -517,7 +547,7 @@ add_library (${csoscam} STATIC ${csoscam_srcs} ${csoscam_hdrs})
 
 set (exe_name "oscam")
 add_executable (${exe_name} ${exe_srcs} ${exe_hdrs})
-target_link_libraries (${exe_name} ${csoscam} ${csmodules} ${csreaders} csctapi cscrypt minilzo ffdecsa)
+target_link_libraries (${exe_name} ${csoscam} ${csmodules} ${csreaders} csctapi cscrypt minilzo)
 if(HAVE_LIBRT AND HAVE_LIBUSB)
 	if (LIBUSBDIR)
 		set (libusb_link "imp_libusb")
@@ -645,7 +675,7 @@ elseif (OSCamOperatingSystem MATCHES "SU980")
 	target_link_libraries (${exe_name} rt entropic)
 endif (OSCamOperatingSystem MATCHES "Linux")
 
-target_link_libraries (${exe_name} ${libusb_link} ${rt_link} ${setupapi_link} ${ole32_link} ${shell32_link} ${pthread_link} ${dl_link} ${xcas_link})
+target_link_libraries (${exe_name} ${libusb_link} ${rt_link} ${setupapi_link} ${ole32_link} ${shell32_link} ${pthread_link} ${dl_link} ${xcas_link} ${dvbcsa_link})
 
 #----------------------- put svnversion in the build ------------------------------
 # at every target rebuild, we re-build the oscam.c compilation...
@@ -671,10 +701,26 @@ add_definitions ("-D'CS_SVN_VERSION=\"${CS_SVN_VERSION}\"'")
 
 execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpmachine COMMAND tr -d '\n' OUTPUT_VARIABLE CS_TARGET)
 add_definitions ("-D'CS_TARGET=\"${CS_TARGET}\"'")
+
+execute_process (COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/config.sh --enabled WITH_ARM_NEON OUTPUT_VARIABLE CONFIG_WITH_ARM_NEON OUTPUT_STRIP_TRAILING_WHITESPACE)
+if (CONFIG_WITH_ARM_NEON MATCHES "Y" AND NOT WITH_ARM_NEON EQUAL 0)
+	add_definitions ("-DWITH_ARM_NEON")
+	set (WITH_ARM_NEON "1")
+elseif (CONFIG_WITH_ARM_NEON MATCHES "Y" AND NOT WITH_ARM_NEON EQUAL 0)
+	message (status  " The config file has WITH_ARM_NEON enabled, but You disabled it by you cmake command COMPILING WHITOUT arm neon optimization")
+endif (CONFIG_WITH_ARM_NEON MATCHES "Y" AND NOT WITH_ARM_NEON EQUAL 0)
 #----------------------- global compile and link options ------------------------------
-#enable sse2 on x86
+#enable sse2 on x86, neon on arm
 if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86)|(X86)|(amd64)|(AMD64)")
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse -msse2 -msse3")
+elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "(arm)|(ARM)")
+	if (WITH_ARM_NEON EQUAL 1)
+		message(status "  ARM NEON is enabled, compiling with neon optimization")
+		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mfpu=neon")
+		set (CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -mfpu=neon")
+	else (WITH_ARM_NEON EQUAL 1)
+		message(status "  ARM NEON is disabled, compiling without neon optimization")
+	endif (WITH_ARM_NEON EQUAL 1)
 endif (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86)|(X86)|(amd64)|(AMD64)")
 
 # disable warning about unused but set variables in gcc 4.6+
@@ -684,7 +730,7 @@ if (CMAKE_COMPILER_IS_GNUCC)
 	list(GET GCC_VERSION_COMPONENTS 0 GCC_MAJOR)
 	list(GET GCC_VERSION_COMPONENTS 0 GCC_MINOR)
 	add_definitions ("-W -Wall ")
-	set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -O2")
+	set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -O2 -pipe -ffunction-sections -fdata-sections -fomit-frame-pointer -fno-schedule-insns")
 	set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -O2")
 	set (CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -ggdb")
 	set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -ggdb")
@@ -846,9 +892,9 @@ if (HAVE_PTHREAD)
 	message (STATUS "  use system pthread functions")
 endif (HAVE_PTHREAD)
 if (HAVE_LIBUSB)
-if(STATIC_LIBUSB EQUAL 1)
-	message (STATUS "  You selected to enable static libusb")
-endif(STATIC_LIBUSB EQUAL 1)
+	if(STATIC_LIBUSB EQUAL 1)
+		message (STATUS "  You selected to enable static libusb")
+	endif(STATIC_LIBUSB EQUAL 1)
 	if(STATICLIBUSB AND NOT LIBUSBDIR)
 		message (STATUS "  use static libusb functions")
 	else(STATICLIBUSB AND NOT LIBUSBDIR)
@@ -863,6 +909,24 @@ endif(STATIC_LIBUSB EQUAL 1)
 		endif(LIBUSBDIR AND STATIC_LIBUSB EQUAL 0)
 	endif(STATICLIBUSB AND NOT LIBUSBDIR)
 endif (HAVE_LIBUSB)
+if (HAVE_LIBDVBCSA)
+	if(STATIC_LIBDVBCSA EQUAL 1)
+		message (STATUS "  You selected to enable static libdvbcsa")
+	endif(STATIC_LIBDVBCSA EQUAL 1)
+	if(STATICLIBDVBCSA AND NOT LIBDVBCSADIR)
+		message (STATUS "  use static libdvbcsa functions")
+	else(STATICLIBDVBCSA AND NOT LIBDVBCSADIR)
+		if (LIBDVBCSADIR AND STATIC_LIBDVBCSA EQUAL 0)
+			message(STATUS "  use system libdvbcsa from selected LIBDVBCSADIR functions")
+		elseif (LIBDVBCSADIR AND STATIC_LIBDVBCSA EQUAL 1)
+			message(STATUS "  use static libdvbcsa from selected LIBDVBCSADIR functions")
+		elseif(LIBDVBCSADIR)
+			message(STATUS " use system libdvbcsa from selected LIBDVBCSADIR functions")
+		elseif(NOT LIBDVBCSADIR AND NOT STATIC_LIBDVBCSA)
+			message (STATUS "  use system libdvbcsa functions")
+		endif(LIBDVBCSADIR AND STATIC_LIBDVBCSA EQUAL 0)
+	endif(STATICLIBDVBCSA AND NOT LIBDVBCSADIR)
+endif (HAVE_LIBDVBCSA)
 
 if (WITH_EMU)
 	message (STATUS "  Compile with EMU support")

Distribution/doc/html/oscam.conf.5.html

@@ -1634,6 +1634,16 @@ <H3>The [dvbapi] section</H3>
 
 <P>
 
+<B>demuxer_fix</B> = <B>0</B>|<B>1</B>
+<DL COMPACT><DT><DD>
+try fixing audio/video sync errors:
+<P>
+<BR>&nbsp;<B>0</B>&nbsp;=&nbsp;disabled&nbsp;(default)
+<BR>&nbsp;<B>1</B>&nbsp;=&nbsp;enabled
+</DL>
+
+<P>
+
 <B>cw_delay</B> = <B>milli-seconds</B>
 <DL COMPACT><DT><DD>
 delay of CW writing, default:none

Distribution/doc/man/oscam.conf.5

@@ -1234,6 +1234,14 @@ mode writing provider name into \fBoscam.srvid2\fR file:
  \fB1\fP = enabled
 .RE
 .PP
+\fBdemuxer_fix\fP = \fB0\fP|\fB1\fP
+.RS 3n
+try fixing audio/video sync errors:
+
+ \fB0\fP = disabled (default)
+ \fB1\fP = enabled
+.RE
+.PP
 \fBcw_delay\fP = \fBmilli-seconds\fP
 .RS 3n
 delay of CW writing, default:none

Distribution/doc/txt/oscam.conf.txt

@@ -864,6 +864,12 @@ DESCRIPTIONS
 	   0 = disabled (default)
 	   1 = enabled
 
+       demuxer_fix = 0|1
+	  try fixing audio/video sync errors:
+
+	   0 = disabled (default)
+	   1 = enabled
+
        cw_delay = milli-seconds
 	  delay of CW writing, default:none
 

Makefile

@@ -50,6 +50,10 @@ ifeq ($(uname_S),FreeBSD)
 	LIB_DL :=
 endif
 
+ifeq "$(shell ./config.sh --enabled MODULE_STREAMRELAY)" "Y"
+	override USE_LIBDVBCSA=1
+endif
+
 override STD_LIBS := -lm $(LIB_PTHREAD) $(LIB_DL) $(LIB_RT)
 override STD_DEFS := -D'CS_SVN_VERSION="$(SVN_REV)"'
 override STD_DEFS += -D'CS_CONFDIR="$(CONF_DIR)"'
@@ -58,18 +62,25 @@ override STD_DEFS += -D'CS_CONFDIR="$(CONF_DIR)"'
 CC_WARN = -W -Wall -Wshadow -Wredundant-decls -Wstrict-prototypes -Wold-style-definition
 
 # Compiler optimizations
-CC_OPTS = -O2 -ggdb -pipe -ffunction-sections -fdata-sections
+ifeq ($(HOSTCC),clang)
+	CC_OPTS = -O2 -ggdb -pipe -ffunction-sections -fdata-sections -fomit-frame-pointer
+else
+	CC_OPTS = -O2 -ggdb -pipe -ffunction-sections -fdata-sections -fomit-frame-pointer -fno-schedule-insns
+endif
 
 CC = $(CROSS_DIR)$(CROSS)gcc
 STRIP = $(CROSS_DIR)$(CROSS)strip
 
 LDFLAGS = -Wl,--gc-sections
 
+#enable sse2 on x86, neon on arm
 TARGETHELP := $(shell $(CC) --target-help 2>&1)
 ifneq (,$(findstring sse2,$(TARGETHELP)))
-override CFLAGS += -fexpensive-optimizations -mmmx -msse -msse2 -msse3
-else
-override CFLAGS += -fexpensive-optimizations
+override CFLAGS += -mmmx -msse -msse2 -msse3
+else ifneq (,$(findstring neon,$(TARGETHELP)))
+	ifeq "$(shell ./config.sh --enabled WITH_ARM_NEON)" "Y"
+		override CFLAGS += -mfpu=neon
+	endif
 endif
 
 # The linker for powerpc have bug that prevents --gc-sections from working
@@ -106,6 +117,7 @@ DEFAULT_SU980_LIB = -lentropic -lrt
 DEFAULT_AZBOX_LIB = -Lextapi/openxcas -lOpenXCASAPI
 DEFAULT_LIBCRYPTO_LIB = -lcrypto
 DEFAULT_SSL_LIB = -lssl
+DEFAULT_LIBDVBCSA_LIB = -ldvbcsa
 ifeq ($(uname_S),Linux)
 	DEFAULT_LIBUSB_LIB = -lusb-1.0 -lrt
 else
@@ -117,15 +129,13 @@ ifeq ($(uname_S),FreeBSD)
 	DEFAULT_LIBUSB_LIB = -lusb
 endif
 ifeq ($(uname_S),Darwin)
-	FIX_OPENSSL_FLAGS_DIR := $(shell ln -sf /usr/local/opt/[email protected]/include/openssl /usr/local/include)
-	FIX_OPENSSL_LIB_DIR := $(shell ln -sf /usr/local/opt/[email protected]/lib/libssl.1.1.dylib /usr/local/lib)
-	FIX_OPENSSL_LIBCRYPTO_DIR := $(shell ln -sf /usr/local/opt/[email protected]/lib/libcrypto.1.1.dylib /usr/local/lib)
-	DEFAULT_LIBCRYPTO_LIB = -L/usr/local/opt/[email protected]/lib -lcrypto
-	DEFAULT_SSL_LIB = -L/usr/local/opt/[email protected]/lib -lssl
+	DEFAULT_SSL_LIB = -L/usr/local/opt/openssl/lib -lssl
+	DEFAULT_LIBCRYPTO_LIB = -L/usr/local/opt/openssl/lib -lcrypto
+	DEFAULT_LIBDVBCSA_LIB = -L/usr/local/opt/libdvbcsa/lib -ldvbcsa
 	DEFAULT_LIBUSB_FLAGS = -I/usr/local/opt/libusb/include
-	DEFAULT_LIBUSB_LIB = -L/usr/local/opt/libusb/lib -lusb-1.0 -framework IOKit -framework CoreFoundation -framework Security
+	DEFAULT_LIBUSB_LIB = -L/usr/local/opt/libusb/lib -lusb-1.0 -lobjc -framework IOKit -framework CoreFoundation -framework Security
 	DEFAULT_PCSC_FLAGS = -I/usr/local/opt/pcsc-lite/include/PCSC
-	DEFAULT_PCSC_LIB = -L/usr/local/opt/pcsc-lite/lib -framework IOKit -framework CoreFoundation -framework PCSC
+	DEFAULT_PCSC_LIB = -L/usr/local/opt/pcsc-lite/lib -lpcsclite -lobjc -framework IOKit -framework CoreFoundation -framework PCSC
 else
 	# Get the compiler's last include PATHs. Basicaly it is /usr/include
 	# but in case of cross compilation it might be something else.
@@ -180,6 +190,7 @@ $(eval $(call prepare_use_flags,SSL,ssl))
 $(eval $(call prepare_use_flags,LIBCRYPTO,))
 $(eval $(call prepare_use_flags,LIBUSB,libusb))
 $(eval $(call prepare_use_flags,PCSC,pcsc))
+$(eval $(call prepare_use_flags,LIBDVBCSA,libdvbcsa))
 $(eval $(call prepare_use_flags,UTF8))
 
 # Add PLUS_TARGET and EXTRA_TARGET to TARGET
@@ -285,15 +296,13 @@ SRC-$(CONFIG_MODULE_CCCSHARE) += module-cccshare.c
 SRC-$(CONFIG_MODULE_CONSTCW) += module-constcw.c
 SRC-$(CONFIG_WITH_EMU) += module-emulator.c
 SRC-$(CONFIG_WITH_EMU) += module-emulator-osemu.c
-SRC-$(CONFIG_WITH_EMU) += module-emulator-streamserver.c
 SRC-$(CONFIG_WITH_EMU) += module-emulator-biss.c
 SRC-$(CONFIG_WITH_EMU) += module-emulator-cryptoworks.c
 SRC-$(CONFIG_WITH_EMU) += module-emulator-director.c
 SRC-$(CONFIG_WITH_EMU) += module-emulator-irdeto.c
 SRC-$(CONFIG_WITH_EMU) += module-emulator-nagravision.c
 SRC-$(CONFIG_WITH_EMU) += module-emulator-powervu.c
 SRC-$(CONFIG_WITH_EMU) += module-emulator-viaccess.c
-SRC-$(CONFIG_WITH_EMU) += ffdecsa/ffdecsa.c
 ifeq "$(CONFIG_WITH_EMU)" "y"
 ifeq "$(CONFIG_WITH_SOFTCAM)" "y"
 UNAME := $(shell uname -s)
@@ -325,7 +334,6 @@ SRC-$(CONFIG_MODULE_GBOX) += module-gbox-sms.c
 SRC-$(CONFIG_MODULE_GBOX) += module-gbox-remm.c
 SRC-$(CONFIG_MODULE_GBOX) += module-gbox-cards.c
 SRC-$(CONFIG_MODULE_GBOX) += module-gbox.c
-SRC-$(CONFIG_IRDETO_GUESSING) += module-ird-guess.c
 SRC-$(CONFIG_LCDSUPPORT) += module-lcd.c
 SRC-$(CONFIG_LEDSUPPORT) += module-led.c
 SRC-$(CONFIG_MODULE_MONITOR) += module-monitor.c
@@ -336,6 +344,7 @@ SRC-$(CONFIG_MODULE_GHTTP) += module-ghttp.c
 SRC-$(CONFIG_MODULE_RADEGAST) += module-radegast.c
 SRC-$(CONFIG_MODULE_SCAM) += module-scam.c
 SRC-$(CONFIG_MODULE_SERIAL) += module-serial.c
+SRC-$(CONFIG_MODULE_STREAMRELAY) += module-streamrelay.c
 SRC-$(CONFIG_WITH_LB) += module-stat.c
 SRC-$(CONFIG_WEBIF) += module-webif-lib.c
 SRC-$(CONFIG_WEBIF) += module-webif-tpl.c
@@ -407,7 +416,7 @@ SRC := $(subst config.c,$(OBJDIR)/config.c,$(SRC))
 # starts the compilation.
 all:
 	@./config.sh --use-flags "$(USE_FLAGS)" --objdir "$(OBJDIR)" --make-config.mak
-	@-mkdir -p $(OBJDIR)/cscrypt $(OBJDIR)/csctapi $(OBJDIR)/minilzo $(OBJDIR)/ffdecsa $(OBJDIR)/webif
+	@-mkdir -p $(OBJDIR)/cscrypt $(OBJDIR)/csctapi $(OBJDIR)/minilzo $(OBJDIR)/webif
 	@-printf "\
 +-------------------------------------------------------------------------------\n\
 | OSCam ver: $(VER) rev: $(SVN_REV) target: $(TARGET)\n\
@@ -454,7 +463,7 @@ $(OBJDIR)/config.o: $(OBJDIR)/config.c
 	$(Q)$(CC) $(STD_DEFS) $(CC_OPTS) $(CC_WARN) $(CFLAGS) -c $< -o $@
 
 $(OBJDIR)/%.o: %.c Makefile
-	@$(CC) -MP -MM -MT $@ -o $(subst .o,.d,$@) $<
+	@$(CC) $(CFLAGS) -MP -MM -MT $@ -o $(subst .o,.d,$@) $<
 	$(SAY) "CC	$<"
 	$(Q)$(CC) $(STD_DEFS) $(CC_OPTS) $(CC_WARN) $(CFLAGS) -c $< -o $@
 
@@ -697,6 +706,13 @@ OSCam build system documentation\n\
                          SSL_LDFLAGS='$(DEFAULT_SSL_FLAGS)'\n\
                          SSL_LIB='$(DEFAULT_SSL_LIB)'\n\
                      Using USE_SSL=1 adds to '-ssl' to PLUS_TARGET.\n\
+\n\
+   USE_LIBDVBCSA=1 - Request linking with libdvbcsa. USE_LIBDVBCSA is automatically\n\
+                     The variables that control USE_LIBDVBCSA=1 build are:\n\
+                         LIBDVBCSA_FLAGS='$(DEFAULT_LIBDVBCSA_FLAGS)'\n\
+                         LIBDVBCSA_CFLAGS='$(DEFAULT_LIBDVBCSA_FLAGS)'\n\
+                         LIBDVBCSA_LDFLAGS='$(DEFAULT_LIBDVBCSA_FLAGS)'\n\
+                         LIBDVBCSA_LIB='$(DEFAULT_LIBDVBCSA_LIB)'\n\
 \n\
    USE_UTF8=1       - Request UTF-8 enabled webif by default.\n\
 \n\
@@ -815,6 +831,8 @@ OSCam build system documentation\n\
      make USE_LIBCRYPTO=1 LIBCRYPTO_LIB=\"/usr/lib/libcrypto.a\"\n\n\
    Build OSCam with static libssl and libcrypto:\n\
      make USE_SSL=1 SSL_LIB=\"/usr/lib/libssl.a\" LIBCRYPTO_LIB=\"/usr/lib/libcrypto.a\"\n\n\
+   Build OSCam with static libdvbcsa:\n\
+     make USE_LIBDVBCSA=1 LIBDVBCSA_LIB=\"/usr/lib/libdvbcsa.a\"\n\n\
    Build with verbose messages and size optimizations:\n\
      make V=1 CC_OPTS=-Os\n\n\
    Build and set oscam file name:\n\

README

@@ -6,7 +6,7 @@ License
 =======
 
 OSCam: Open Source CAM
-Copyright (C) 2009-2020 OSCam developers
+Copyright (C) 2009-2024 OSCam developers
 
 OSCam is based on the Streamboard mp-cardserver 0.9d by dukat and
 has been extended and worked on by many more since then.