diff -Naur ccextractor-0.89.old/linux/Makefile.am ccextractor-0.89/linux/Makefile.am --- ccextractor-0.89.old/linux/Makefile.am 2021-06-20 14:04:42.569388396 +0200 +++ ccextractor-0.89/linux/Makefile.am 2021-06-20 14:05:14.733984021 +0200 @@ -87,28 +87,6 @@ ../src/thirdparty/gpacmp4/gpac/internal/odf_dev.h \ ../src/thirdparty/gpacmp4/gpac/internal/odf_parse_common.h \ ../src/thirdparty/gpacmp4/gpac/internal/ogg.h \ - ../src/thirdparty/libpng/pngstruct.h \ - ../src/thirdparty/libpng/pngpriv.h \ - ../src/thirdparty/libpng/pnginfo.h \ - ../src/thirdparty/libpng/pnglibconf.h \ - ../src/thirdparty/libpng/pngconf.h \ - ../src/thirdparty/libpng/pngdebug.h \ - ../src/thirdparty/libpng/png.h \ - ../src/thirdparty/libpng/png.c \ - ../src/thirdparty/libpng/pngerror.c \ - ../src/thirdparty/libpng/pngget.c \ - ../src/thirdparty/libpng/pngmem.c \ - ../src/thirdparty/libpng/pngpread.c \ - ../src/thirdparty/libpng/pngread.c \ - ../src/thirdparty/libpng/pngrio.c \ - ../src/thirdparty/libpng/pngrtran.c \ - ../src/thirdparty/libpng/pngrutil.c \ - ../src/thirdparty/libpng/pngset.c \ - ../src/thirdparty/libpng/pngtrans.c \ - ../src/thirdparty/libpng/pngwio.c \ - ../src/thirdparty/libpng/pngwrite.c \ - ../src/thirdparty/libpng/pngwtran.c \ - ../src/thirdparty/libpng/pngwutil.c \ ../src/lib_ccx/ccx_common_common.h \ ../src/lib_ccx/ccx_common_option.h \ ../src/lib_ccx/utility.h \ @@ -230,34 +208,6 @@ ../src/lib_ccx/ts_tables_epg.c \ ../src/lib_ccx/wtv_constants.h \ ../src/lib_ccx/wtv_functions.c \ - ../src/thirdparty/zlib/adler32.c \ - ../src/thirdparty/zlib/compress.c \ - ../src/thirdparty/zlib/crc32.c \ - ../src/thirdparty/zlib/crc32.h \ - ../src/thirdparty/zlib/deflate.c \ - ../src/thirdparty/zlib/deflate.h \ - ../src/thirdparty/zlib/gzclose.c \ - ../src/thirdparty/zlib/gzguts.h \ - ../src/thirdparty/zlib/gzlib.c \ - ../src/thirdparty/zlib/gzread.c \ - ../src/thirdparty/zlib/gzwrite.c \ - ../src/thirdparty/zlib/infback.c \ - ../src/thirdparty/zlib/inffast.c \ - ../src/thirdparty/zlib/inffast.h \ - ../src/thirdparty/zlib/inffixed.h \ - ../src/thirdparty/zlib/inflate.c \ - ../src/thirdparty/zlib/inflate.h \ - ../src/thirdparty/zlib/inftrees.c \ - ../src/thirdparty/zlib/inftrees.h \ - ../src/thirdparty/zlib/trees.c \ - ../src/thirdparty/zlib/trees.h \ - ../src/thirdparty/zlib/uncompr.c \ - ../src/thirdparty/zlib/zconf.h \ - ../src/thirdparty/zlib/zlib.h \ - ../src/thirdparty/zlib/zutil.c \ - ../src/thirdparty/zlib/zutil.h \ - ../src/thirdparty/utf8proc/utf8proc.c \ - ../src/thirdparty/utf8proc/utf8proc.h \ ../src/thirdparty/lib_hash/sha2.c \ ../src/thirdparty/lib_hash/sha2.h \ ../src/thirdparty/protobuf-c/protobuf-c.c \ @@ -273,65 +223,22 @@ ../src/lib_ccx/zvbi/sampling_par.c \ ../src/lib_ccx/zvbi/sampling_par.h \ ../src/lib_ccx/zvbi/sliced.h \ - ../src/lib_ccx/zvbi/zvbi_decoder.h \ - ../src/freetype/* \ - ../src/thirdparty/freetype/autofit/autofit.c \ - ../src/thirdparty/freetype/base/ftbase.c \ - ../src/thirdparty/freetype/base/ftbbox.c \ - ../src/thirdparty/freetype/base/ftbdf.c \ - ../src/thirdparty/freetype/base/ftbitmap.c \ - ../src/thirdparty/freetype/base/ftcid.c \ - ../src/thirdparty/freetype/base/ftfntfmt.c \ - ../src/thirdparty/freetype/base/ftfstype.c \ - ../src/thirdparty/freetype/base/ftgasp.c \ - ../src/thirdparty/freetype/base/ftglyph.c \ - ../src/thirdparty/freetype/base/ftgxval.c \ - ../src/thirdparty/freetype/base/ftinit.c \ - ../src/thirdparty/freetype/base/ftlcdfil.c \ - ../src/thirdparty/freetype/base/ftmm.c \ - ../src/thirdparty/freetype/base/ftotval.c \ - ../src/thirdparty/freetype/base/ftpatent.c \ - ../src/thirdparty/freetype/base/ftpfr.c \ - ../src/thirdparty/freetype/base/ftstroke.c \ - ../src/thirdparty/freetype/base/ftsynth.c \ - ../src/thirdparty/freetype/base/ftsystem.c \ - ../src/thirdparty/freetype/base/fttype1.c \ - ../src/thirdparty/freetype/base/ftwinfnt.c \ - ../src/thirdparty/freetype/bdf/bdf.c \ - ../src/thirdparty/freetype/bzip2/ftbzip2.c \ - ../src/thirdparty/freetype/cache/ftcache.c \ - ../src/thirdparty/freetype/cff/cff.c \ - ../src/thirdparty/freetype/cid/type1cid.c \ - ../src/thirdparty/freetype/gzip/ftgzip.c \ - ../src/thirdparty/freetype/include/ft2build.h \ - ../src/thirdparty/freetype/lzw/ftlzw.c \ - ../src/thirdparty/freetype/pcf/pcf.c \ - ../src/thirdparty/freetype/pfr/pfr.c \ - ../src/thirdparty/freetype/psaux/psaux.c \ - ../src/thirdparty/freetype/pshinter/pshinter.c \ - ../src/thirdparty/freetype/psnames/psnames.c \ - ../src/thirdparty/freetype/raster/raster.c \ - ../src/thirdparty/freetype/sfnt/sfnt.c \ - ../src/thirdparty/freetype/smooth/smooth.c \ - ../src/thirdparty/freetype/truetype/truetype.c \ - ../src/thirdparty/freetype/type1/type1.c \ - ../src/thirdparty/freetype/type42/type42.c \ - ../src/thirdparty/freetype/winfonts/winfnt.c + ../src/lib_ccx/zvbi/zvbi_decoder.h -ccextractor_CFLAGS = -std=gnu99 -Wno-write-strings -Wno-pointer-sign -D_FILE_OFFSET_BITS=64 -DVERSION_FILE_PRESENT -DFT2_BUILD_LIBRARY -DGPAC_DISABLE_VTT -DGPAC_DISABLE_OD_DUMP -DGPAC_DISABLE_REMOTERY -DNO_GZIP -DGPAC_HAVE_CONFIG_H +ccextractor_CFLAGS = -std=gnu99 -Wno-write-strings -Wno-pointer-sign -D_FILE_OFFSET_BITS=64 -DVERSION_FILE_PRESENT -DGPAC_DISABLE_VTT -DGPAC_DISABLE_OD_DUMP -DGPAC_DISABLE_REMOTERY -DNO_GZIP -DGPAC_HAVE_CONFIG_H -ccextractor_CPPFLAGS =-I../src/lib_ccx/ -I../src/thirdparty/gpacmp4/ -I../src/thirdparty/libpng/ -I../src/thirdparty/zlib/ -I../src/thirdparty/zvbi/ -I../src/thirdparty/lib_hash/ -I../src/thirdparty/protobuf-c/ -I../src/thirdparty -I../src/ -I../src/thirdparty/freetype/include/ +ccextractor_CPPFLAGS =-I../src/lib_ccx/ -I../src/thirdparty/gpacmp4/ -I../src/thirdparty/zlib/ -I../src/thirdparty/zvbi/ -I../src/thirdparty/lib_hash/ -I../src/thirdparty/protobuf-c/ -I../src/thirdparty -I../src/ -I/usr/include/freetype2/ -ccextractor_LDADD=-lm -lpthread -ldl +ccextractor_LDADD=-lm -lpthread -ldl -lcrypto -lpng -lz -lutf8proc -lfreetype -lprotobuf-c if SYS_IS_LINUX -ccextractor_CFLAGS += -O3 -s -DGPAC_CONFIG_LINUX +ccextractor_CFLAGS += -DGPAC_CONFIG_LINUX endif if SYS_IS_MAC ccextractor_CFLAGS += -DPAC_CONFIG_DARWIN -Dfopen64=fopen -Dopen64=open -Dlseek64=lseek -ccextractor_LDADD += -liconv -lz +ccextractor_LDADD += -liconv -lz endif if SYS_IS_64_BIT @@ -358,7 +265,7 @@ if TESSERACT_PRESENT TESS_LIB = ${tesseract_LIBS} -TESS_CPPFLAG = ${tesseract_CFLAGS} +TESS_CPPFLAG = ${tesseract_CFLAGS} -I/usr/include/tesseract else #fix for raspberry pi not having a pkgconfig file for tesseract @@ -375,7 +282,7 @@ ccextractor_LDADD += $(LEPT_LIB) endif -EXTRA_DIST = ../src/thirdparty/gpacmp4/gpac/sync_layer.h ../src/lib_ccx/ccfont2.xbm ../src/thirdparty/utf8proc/utf8proc_data.c fonts/ icon/ +EXTRA_DIST = ../src/thirdparty/gpacmp4/gpac/sync_layer.h ../src/lib_ccx/ccfont2.xbm fonts/ icon/ #For GUI if BUILD_WITH_GUI @@ -412,14 +319,14 @@ if SYS_IS_LINUX -ccextractorGUI_CFLAGS += -s -O3 -DUNIX +ccextractorGUI_CFLAGS += -DUNIX ccextractorGUI_CFLAGS += ${glew_CFLAGS} ccextractorGUI_LDADD += ${glew_LIBS} ccextractorGUI_LDADD += -lX11 -lXinerama -lXcursor -lXi -lXrandr -lXxf86vm -lm -ldl -lpthread endif if SYS_IS_MAC -ccextractorGUI_CFLAGS += -O3 -DUNIX +ccextractorGUI_CFLAGS += -DUNIX ccextractorGUI_CFLAGS += ${glew_CFLAGS} ccextractorGUI_LDADD += ${glew_LIBS} ccextractorGUI_LDFLAGS = -framework OpenGL -framework Cocoa -framework IOKit -framework CoreVideo diff -Naur ccextractor-0.89.old/src/lib_ccx/params.c ccextractor-0.89/src/lib_ccx/params.c --- ccextractor-0.89.old/src/lib_ccx/params.c 2021-06-20 14:04:42.583388655 +0200 +++ ccextractor-0.89/src/lib_ccx/params.c 2021-06-20 14:04:50.704539043 +0200 @@ -13,7 +13,7 @@ #include "../lib_hash/sha2.h" #include #include -#include +#include #ifdef ENABLE_OCR #include