Merge pull request #9 from prateekmedia/patch-1

FFMPEG 5 compatibility

Author: PunitLodha

.github/workflows/build_linux.yml

@@ -1,6 +1,7 @@
 name: Build CCExtractor on Linux
 
 on:
+  workflow_dispatch:
   push:
     paths:
     - '.github/workflows/build_linux.yml'
@@ -96,7 +97,7 @@ jobs:
           restore-keys: ${{ runner.os }}-cargo-
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.56.0
+          toolchain: 1.57.0
           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,7 +28,7 @@ jobs:
         run: choco install llvm
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.56.0
+          toolchain: 1.57.0
           override: true
       - name: Install Win 10 SDK
         uses: ilammy/msvc-dev-cmd@v1
@@ -59,7 +60,7 @@ jobs:
         run: choco install llvm
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.56.0
+          toolchain: 1.57.0
           override: true
       - name: Install Win 10 SDK
         uses: ilammy/msvc-dev-cmd@v1
@@ -95,11 +96,17 @@ jobs:
           platform: x86
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.56.0
+          toolchain: 1.57.0
           override: true
           target: i686-pc-windows-msvc
       - name: Install Win 10 SDK
         uses: ilammy/msvc-dev-cmd@v1
+      - name: Clone vcpkg
+        run: git clone --depth 1 --single-branch --recursive https://github.com/microsoft/vcpkg.git
+      - name: Setup vcpkg
+        run: cd vcpkg && bootstrap-vcpkg.bat && vcpkg integrate install
+      - name: Install dependencies
+        run: cd vcpkg && vcpkg install leptonica:x86-windows-static-md
       - name: build Release-Full
         env:
           LIBCLANG_PATH: "C:\\Program Files\\LLVM\\lib"
@@ -129,9 +136,15 @@ jobs:
         with:
           version: latest
           platform: x86
+      - name: Clone vcpkg
+        run: git clone --depth 1 --single-branch --recursive https://github.com/microsoft/vcpkg.git
+      - name: Setup vcpkg
+        run: cd vcpkg && bootstrap-vcpkg.bat && vcpkg integrate install
+      - name: Install dependencies
+        run: cd vcpkg && vcpkg install leptonica:x86-windows-static-md
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.56.0
+          toolchain: 1.57.0
           override: true
           target: i686-pc-windows-msvc
       - name: Install Win 10 SDK

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/rust/Cargo.lock

@@ -16,8 +16,8 @@ env_logger = "0.8.4"
 iconv = "0.1.1"
 palette = "0.6.0"
 ffmpeg-sys-next = { version = "5.0.1", optional = true, default-features = false, features = ["avcodec", "avformat", "swscale", "build"]}
-tesseract-sys = { version = "0.5.12", optional = true, default-features = false}
-leptonica-sys = { version = "0.4.1", optional = true, default-features = false}
+tesseract-sys = { version = "0.5.14", optional = true, default-features = false}
+leptonica-sys = { version = "0.4.3", optional = true, default-features = false}
 
 [build-dependencies]
 bindgen = "0.58.1"