[IMPROVEMENT] Update Rust and fix windows build (#1480)

* fix: bump leptonica-sys to 0.4.3 and update Cargo.lock

* fix: bump rust version to 1.57.0 and build vcpkg for window hardsubx builds

* fix: add Bcrypt dependency

* fix: switch to rust stable

* chore: bump package versions

* fix: try to remove i686 to fix error

* fix: install tesseract and lint fixes

* fix: try using ffmpeg the third

* fix: include headers

* fix: add rsmpeg

* fix: switch default triplet to static md

* fix: import errors

* fix: directory path

* fix: pre build commands

* fix: update vcxproj

* fix: linux ci

* fix: ci fixes

* chore: lint fixes

* fix: error

* fix: copy include files

* fix: ci error

* fix: link swresample lib

* fix: some errors

* fix: include directory path and include all libraries

* fix: try to add library directories

* fix: fixes in libraries

* fix: formatting ci

* fix: mflat errors

* fix: libcurl

* fix: preprocessor definitions

* fix: add libcrypto

* fix: remove lib_hash to fix conflicts (we have libcrypto already)

* fix: add avcodec and avformat dependencies on windows

* fix: add remaining deps that may fix the build

* fix: add crypt depdency

* fix: rename conflicting names

* Revert "fix: remove lib_hash to fix conflicts (we have libcrypto already)"

This reverts commit f57ff71.

* fix: prefix with CC_

* fix: post build actions

* fix: ocr error

* Revert "fix: ocr error"

This reverts commit 9259945.

* fix: xcopy error

* fix: generated file name for x64

* fix: ocr error

* fix: add item group at top to see if it works

* fix: remove unwanted headers, removed \\ from VCPKG_ROOT, remove unwanted includes in vcxproj

* fix: add libpng for non hardsubx, comment the broken ocr code again

* fix: libpng path

* feat: add lib png headers in ClCompile

* fix: png.h not found

* fix: last try for ocr fix

* fix: libpng not found

* fix: cl compile headers

* fix: libpng and ocr

* fix: libpng error

* fix: redefinition error

* fix: zlib for non hardsubx

* fix: lib names

* fix: zlib.h not found

Author: prateekmedia

.github/workflows/build_linux.yml

@@ -1,6 +1,7 @@
 name: Build CCExtractor on Linux
 
 on:
+  workflow_dispatch:
   push:
     paths:
     - '.github/workflows/build_linux.yml'
@@ -73,11 +74,16 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: dependencies
-      run: sudo apt update && sudo apt install libtesseract-dev libavformat-dev libswscale-dev yasm
+      run: sudo apt update && sudo apt install libtesseract-dev libavformat-dev libavdevice-dev libswscale-dev yasm
     - name: cmake
-      run: mkdir build && cd build && cmake -DWITH_OCR=ON -DWITH_HARDSUBX=ON ../src
+      run: |
+        mkdir build && cd build
+        cmake -DWITH_OCR=ON -DWITH_HARDSUBX=ON ../src
     - name: build
-      run: make -j$(nproc)
+      run: |
+        FFMPEG_INCLUDE_DIR=/usr/include/x86_64-linux-gnu \
+        FFMPEG_PKG_CONFIG_PATH=/usr/x86_64-linux-gnu/lib/pkgconfig \
+        make -j$(nproc)
       working-directory: build
     - name: Display version information
       run: ./build/ccextractor --version
@@ -96,7 +102,7 @@ jobs:
           restore-keys: ${{ runner.os }}-cargo-
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.56.0
+          toolchain: stable
           override: true
       - name: build
         run: cargo build 

.github/workflows/build_windows.yml

@@ -1,6 +1,7 @@
 name: Build CCExtractor on Windows
 
 on:
+  workflow_dispatch:
   push:
     paths:
       - ".github/workflows/build_windows.yml"
@@ -27,16 +28,27 @@ jobs:
         run: choco install llvm
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.56.0
+          toolchain: stable
           override: true
       - name: Install Win 10 SDK
         uses: ilammy/msvc-dev-cmd@v1
+      - name: Setup Vcpkg
+        id: vcpkg
+        uses: friendlyanon/setup-vcpkg@v1
+        with:
+          committish: "2023.02.24"
+          cache-version: "1"
+          ignore-reserve-cache-error: true
+      - name: Install dependencies
+        run: cd vcpkg && vcpkg integrate install && vcpkg install libpng --triplet x64-windows-static-md
       - name: build Release
         env:
           LIBCLANG_PATH: "C:\\Program Files\\LLVM\\lib"
           LLVM_CONFIG_PATH: "C:\\Program Files\\LLVM\\bin\\llvm-config"
           CARGO_TARGET_DIR: "..\\..\\windows"
           BINDGEN_EXTRA_CLANG_ARGS: -fmsc-version=0
+          VCPKG_DEFAULT_TRIPLET: x64-windows-static-md
+          VCPKG_ROOT: ${{ github.workspace }}\vcpkg
         run: msbuild ccextractor.sln /p:Configuration=Release /p:Platform=x64
         working-directory: ./windows
       - name: Display version information
@@ -59,16 +71,27 @@ jobs:
         run: choco install llvm
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.56.0
+          toolchain: stable
           override: true
       - name: Install Win 10 SDK
         uses: ilammy/msvc-dev-cmd@v1
+      - name: Setup Vcpkg
+        id: vcpkg
+        uses: friendlyanon/setup-vcpkg@v1
+        with:
+          committish: "2023.02.24"
+          cache-version: "1"
+          ignore-reserve-cache-error: true
+      - name: Install dependencies
+        run: cd vcpkg && vcpkg integrate install && vcpkg install libpng --triplet x64-windows-static-md
       - name: build Debug
         env:
           LIBCLANG_PATH: "C:\\Program Files\\LLVM\\lib"
           LLVM_CONFIG_PATH: "C:\\Program Files\\LLVM\\bin\\llvm-config"
           CARGO_TARGET_DIR: "..\\..\\windows"
           BINDGEN_EXTRA_CLANG_ARGS: -fmsc-version=0
+          VCPKG_DEFAULT_TRIPLET: x64-windows-static-md
+          VCPKG_ROOT: ${{ github.workspace }}\vcpkg
         run: msbuild ccextractor.sln /p:Configuration=Debug /p:Platform=x64
         working-directory: ./windows
       - name: Display version information
@@ -89,34 +112,41 @@ jobs:
       - name: Setup MSBuild.exe
         uses: microsoft/setup-msbuild@v1.3.1
       - name: Install llvm and clang
-        uses: egor-tensin/setup-clang@v1
-        with:
-          version: latest
-          platform: x86
+        run: choco install llvm
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.56.0
+          toolchain: stable
           override: true
-          target: i686-pc-windows-msvc
       - name: Install Win 10 SDK
         uses: ilammy/msvc-dev-cmd@v1
+      - name: Setup Vcpkg
+        id: vcpkg
+        uses: friendlyanon/setup-vcpkg@v1
+        with:
+          committish: "2023.02.24"
+          cache-version: "1"
+          ignore-reserve-cache-error: true
+      - name: Install dependencies
+        run: cd vcpkg && vcpkg integrate install && vcpkg install leptonica tesseract ffmpeg --triplet x64-windows-static-md
       - name: build Release-Full
         env:
           LIBCLANG_PATH: "C:\\Program Files\\LLVM\\lib"
           LLVM_CONFIG_PATH: "C:\\Program Files\\LLVM\\bin\\llvm-config"
           CARGO_TARGET_DIR: "..\\..\\windows"
           BINDGEN_EXTRA_CLANG_ARGS: -fmsc-version=0
-        run: msbuild ccextractor.sln /p:Configuration=Release-Full /p:Platform=Win32
+          VCPKG_DEFAULT_TRIPLET: x64-windows-static-md
+          VCPKG_ROOT: ${{ github.workspace }}\vcpkg
+        run: msbuild ccextractor.sln /p:Configuration=Release-Full /p:Platform=x64
         working-directory: ./windows
       - name: Display version information
         run: ./ccextractorwinfull.exe --version
-        working-directory: ./windows/Release-Full
+        working-directory: ./windows/x64/Release-Full
       - uses: actions/upload-artifact@v3
         with:
           name: CCExtractor Windows OCR and HardSubX Release build
           path: |
-            ./windows/Release-Full/ccextractorwinfull.exe
-            ./windows/Release-Full/*.dll
+            ./windows/x64/Release-Full/ccextractorwinfull.exe
+            ./windows/x64/Release-Full/*.dll
   build_ocr_hardsubx_debug:
     runs-on: windows-2019
     steps:
@@ -125,15 +155,20 @@ jobs:
       - name: Setup MSBuild.exe
         uses: microsoft/setup-msbuild@v1.3.1
       - name: Install llvm and clang
-        uses: egor-tensin/setup-clang@v1
+        run: choco install llvm
+      - name: Setup Vcpkg
+        id: vcpkg
+        uses: friendlyanon/setup-vcpkg@v1
         with:
-          version: latest
-          platform: x86
+          committish: "2023.02.24"
+          cache-version: "1"
+          ignore-reserve-cache-error: true
+      - name: Install dependencies
+        run: cd vcpkg && vcpkg integrate install && vcpkg install leptonica tesseract ffmpeg --triplet x64-windows-static-md
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.56.0
+          toolchain: stable
           override: true
-          target: i686-pc-windows-msvc
       - name: Install Win 10 SDK
         uses: ilammy/msvc-dev-cmd@v1
       - name: build Debug-Full
@@ -142,15 +177,17 @@ jobs:
           LLVM_CONFIG_PATH: "C:\\Program Files\\LLVM\\bin\\llvm-config"
           CARGO_TARGET_DIR: "..\\..\\windows"
           BINDGEN_EXTRA_CLANG_ARGS: -fmsc-version=0
-        run: msbuild ccextractor.sln /p:Configuration=Debug-Full /p:Platform=Win32
+          VCPKG_DEFAULT_TRIPLET: x64-windows-static-md
+          VCPKG_ROOT: ${{ github.workspace }}\vcpkg
+        run: msbuild ccextractor.sln /p:Configuration=Debug-Full /p:Platform=x64
         working-directory: ./windows
       - name: Display version information
         run: ./ccextractorwinfull.exe --version
-        working-directory: ./windows/Debug-Full
+        working-directory: ./windows/x64/Debug-Full
       - uses: actions/upload-artifact@v3
         with:
           name: CCExtractor Windows OCR and HardSubX Debug build
           path: |
-            ./windows/Debug-Full/ccextractorwinfull.exe
-            ./windows/Debug-Full/ccextractorwinfull.pdb
-            ./windows/Debug-Full/*.dll
+            ./windows/x64/Debug-Full/ccextractorwinfull.exe
+            ./windows/x64/Debug-Full/ccextractorwinfull.pdb
+            ./windows/x64/Debug-Full/*.dll

.github/workflows/format.yml

@@ -42,12 +42,15 @@ jobs:
           restore-keys: ${{ runner.os }}-cargo-
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.56.0
+          toolchain: stable
           override: true
           components: rustfmt, clippy
       - name: dependencies
-        run: sudo apt update && sudo apt install libtesseract-dev libavformat-dev libswscale-dev yasm
+        run: sudo apt update && sudo apt install libtesseract-dev  libavformat-dev libavdevice-dev libswscale-dev yasm
       - name: rustfmt
         run: cargo fmt --all -- --check
       - name: clippy
-        run: cargo clippy --all-features -- -D warnings
+        run: |
+          FFMPEG_INCLUDE_DIR=/usr/include/x86_64-linux-gnu \
+          FFMPEG_PKG_CONFIG_PATH=/usr/x86_64-linux-gnu/lib/pkgconfig \
+          cargo clippy --all-features -- -D warnings

.github/workflows/release.yml

@@ -21,12 +21,11 @@ jobs:
       uses: egor-tensin/setup-clang@v1
       with:
         version: latest
-        platform: x86
+        platform: x64
     - uses: actions-rs/toolchain@v1
       with:
-        toolchain: 1.56.0
+        toolchain: stable
         override: true
-        target: i686-pc-windows-msvc
     - name: Install Win 10 SDK
       uses: ilammy/msvc-dev-cmd@v1
     - name: build Release-Full

.gitignore

@@ -150,3 +150,7 @@ src/rust/CMakeCache.txt
 src/rust/Makefile
 src/rust/cmake_install.cmake
 src/rust/target/
+windows/ccx_rust.lib
+windows/*/debug/*
+windows/*/CACHEDIR.TAG
+windows/.rustc_info.json

src/CMakeLists.txt

@@ -128,7 +128,7 @@ if(WIN32)
     include_directories ("${PROJECT_SOURCE_DIR}/thirdparty/win_spec_incld/")
     include_directories ("${PROJECT_SOURCE_DIR}/thirdparty/win_iconv/")
     aux_source_directory ("${PROJECT_SOURCE_DIR}/thirdparty/win_iconv/" SOURCEFILE)
-    set (EXTRA_LIBS ${EXTRA_LIBS} ws2_32 winmm)
+    set (EXTRA_LIBS ${EXTRA_LIBS} ws2_32 winmm Bcrypt)
 else (WIN32)
     # Adding some platform specific library path
     link_directories (/opt/local/lib)

src/lib_ccx/ccx_encoders_helpers.h

@@ -6,7 +6,7 @@
 #include "ccx_decoders_structs.h"
 #include "ccx_decoders_608.h"
 #include "ccx_encoders_common.h"
-#include "png.h"
+#include <png.h>
 
 extern struct word_list capitalization_list;
 extern struct word_list profane;
@@ -15,7 +15,8 @@ extern const char *profane_builtin[];
 
 extern unsigned char usercolor_rgb[8];
 
-struct ccx_encoders_helpers_settings_t {
+struct ccx_encoders_helpers_settings_t
+{
 	int trim_subs;
 	int no_font_color;
 	int no_type_setting;
@@ -36,9 +37,9 @@ int add_word(struct word_list *list, const char *word);
 int add_builtin_words(const char *builtin[], struct word_list *list);
 void correct_spelling_and_censor_words(struct encoder_ctx *context, unsigned char *line, unsigned int length);
 
-unsigned encode_line (struct encoder_ctx *ctx, unsigned char *buffer, unsigned char *text);
+unsigned encode_line(struct encoder_ctx *ctx, unsigned char *buffer, unsigned char *text);
 
-void shell_sort(void *base, int nb, size_t size, int(*compar)(const void*p1, const void *p2, void*arg), void *arg);
+void shell_sort(void *base, int nb, size_t size, int (*compar)(const void *p1, const void *p2, void *arg), void *arg);
 
 void ccx_encoders_helpers_perform_shellsort_words(void);
 void ccx_encoders_helpers_setup(enum ccx_encoding_type encoding, int no_font_color, int no_type_setting, int trim_subs);

src/lib_ccx/ccx_encoders_sami.c

@@ -1,7 +1,7 @@
 #include "lib_ccx.h"
 #include "ccx_common_option.h"
 #include "ccx_encoders_common.h"
-#include "png.h"
+#include <png.h>
 #include "ocr.h"
 #include "utility.h"
 #include "ccx_encoders_helpers.h"

src/lib_ccx/ccx_encoders_smptett.c

@@ -24,7 +24,7 @@
 #include "lib_ccx.h"
 #include "ccx_common_option.h"
 #include "ccx_encoders_common.h"
-#include "png.h"
+#include <png.h>
 #include "ocr.h"
 #include "utility.h"
 #include "ccx_encoders_helpers.h"

src/lib_ccx/ccx_encoders_spupng.c

@@ -1,7 +1,7 @@
 #include "ccfont2.xbm" // CC font from libzvbi
 #include "ccx_common_common.h"
 #include "ccx_encoders_common.h"
-#include "png.h"
+#include <png.h>
 #include <ft2build.h>
 #include <math.h>
 #include FT_FREETYPE_H