From 808d04cff5e71afff489572f2d7a0823ef7cc8a1 Mon Sep 17 00:00:00 2001 From: Prateek Sunal Date: Fri, 16 Jun 2023 01:26:39 +0530 Subject: [PATCH 1/3] fix: rename bitstream --- linux/Makefile.am | 2 +- mac/Makefile.am | 2 +- src/lib_ccx/{bitstream.h => cc_bitstream.h} | 0 src/lib_ccx/lib_ccx.h | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename src/lib_ccx/{bitstream.h => cc_bitstream.h} (100%) diff --git a/linux/Makefile.am b/linux/Makefile.am index 473f9c85a..6f9bea014 100644 --- a/linux/Makefile.am +++ b/linux/Makefile.am @@ -115,7 +115,7 @@ ccextractor_SOURCES = \ ../src/lib_ccx/activity.h \ ../src/lib_ccx/asf_constants.h \ ../src/lib_ccx/avc_functions.h \ - ../src/lib_ccx/bitstream.h \ + ../src/lib_ccx/cc_bitstream.h \ ../src/lib_ccx/ccx_common_option.c \ ../src/lib_ccx/ccx_common_common.c \ ../src/lib_ccx/compile_info_real.h \ diff --git a/mac/Makefile.am b/mac/Makefile.am index fddc26a58..be725403b 100644 --- a/mac/Makefile.am +++ b/mac/Makefile.am @@ -115,7 +115,7 @@ ccextractor_SOURCES = \ ../src/lib_ccx/activity.h \ ../src/lib_ccx/asf_constants.h \ ../src/lib_ccx/avc_functions.h \ - ../src/lib_ccx/bitstream.h \ + ../src/lib_ccx/cc_bitstream.h \ ../src/lib_ccx/ccx_common_option.c \ ../src/lib_ccx/ccx_common_common.c \ ../src/lib_ccx/utility.c \ diff --git a/src/lib_ccx/bitstream.h b/src/lib_ccx/cc_bitstream.h similarity index 100% rename from src/lib_ccx/bitstream.h rename to src/lib_ccx/cc_bitstream.h diff --git a/src/lib_ccx/lib_ccx.h b/src/lib_ccx/lib_ccx.h index 04f719d6a..92d72e488 100644 --- a/src/lib_ccx/lib_ccx.h +++ b/src/lib_ccx/lib_ccx.h @@ -15,7 +15,7 @@ #include "ccx_demuxer.h" #include "ccx_encoders_common.h" #include "ccx_decoders_common.h" -#include "bitstream.h" +#include "cc_bitstream.h" #include "networking.h" #include "avc_functions.h" From 6cf15e4f4d1d6a2d85713ea16aae580c9f075205 Mon Sep 17 00:00:00 2001 From: Prateek Sunal Date: Sat, 17 Jun 2023 21:47:32 +0530 Subject: [PATCH 2/3] fix: update vcpkg commit hash --- .github/workflows/build_windows.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml index 7f086bbb0..3e6c6c75d 100644 --- a/.github/workflows/build_windows.yml +++ b/.github/workflows/build_windows.yml @@ -40,8 +40,8 @@ jobs: id: vcpkg uses: friendlyanon/setup-vcpkg@v1 with: - committish: "217194cea7e3491c14779c763beec50b6a4575d6" - cache-version: "1" + committish: "2023.06.20" + cache-version: "2" ignore-reserve-cache-error: true - name: Install dependencies run: cd vcpkg && vcpkg integrate install && vcpkg install leptonica tesseract ffmpeg --triplet x64-windows-static @@ -76,8 +76,8 @@ jobs: id: vcpkg uses: friendlyanon/setup-vcpkg@v1 with: - committish: "217194cea7e3491c14779c763beec50b6a4575d6" - cache-version: "1" + committish: "2023.06.20" + cache-version: "2" ignore-reserve-cache-error: true - name: Install dependencies run: cd vcpkg && vcpkg integrate install && vcpkg install leptonica tesseract ffmpeg --triplet x64-windows-static From b83c72e9f015669890a0ab1f577d51fd5b6bc762 Mon Sep 17 00:00:00 2001 From: Prateek Sunal Date: Sat, 1 Jul 2023 17:17:37 +0530 Subject: [PATCH 3/3] fix: try to fix the linker error --- windows/ccextractor.vcxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/windows/ccextractor.vcxproj b/windows/ccextractor.vcxproj index e1e32f18e..be7436375 100644 --- a/windows/ccextractor.vcxproj +++ b/windows/ccextractor.vcxproj @@ -336,7 +336,7 @@ - ccx_rust.lib;UserEnv.lib;Crypt32.lib;WS2_32.Lib;Bcrypt.lib;Mfplat.lib;Mfuuid.lib;Secur32.lib;Strmiids.lib;Ole32.lib;User32.lib;libcrypto.lib;libcurl.lib;avcodec.lib;avformat.lib;avutil.lib;avfilter.lib;swscale.lib;swresample.lib;leptonica-1.83.1.lib;tesseract53.lib;gif.lib;archive.lib;avdevice.lib;bz2.lib;charset.lib;iconv.lib;jpeg.lib;libpng16.lib;libsharpyuv.lib;libssl.lib;libwebp.lib;libwebpdecoder.lib;libwebpdemux.lib;libwebpmux.lib;libxml2.lib;lz4.lib;lzma.lib;openjp2.lib;tiff.lib;turbojpeg.lib;zlib.lib;zstd.lib;%(AdditionalDependencies) + ccx_rust.lib;UserEnv.lib;Crypt32.lib;WS2_32.Lib;ntdll.lib;Bcrypt.lib;Mfplat.lib;Mfuuid.lib;Secur32.lib;Strmiids.lib;Ole32.lib;User32.lib;libcrypto.lib;libcurl.lib;avcodec.lib;avformat.lib;avutil.lib;avfilter.lib;swscale.lib;swresample.lib;leptonica-1.83.1.lib;tesseract53.lib;gif.lib;archive.lib;avdevice.lib;bz2.lib;charset.lib;iconv.lib;jpeg.lib;libpng16.lib;libsharpyuv.lib;libssl.lib;libwebp.lib;libwebpdecoder.lib;libwebpdemux.lib;libwebpmux.lib;libxml2.lib;lz4.lib;lzma.lib;openjp2.lib;tiff.lib;turbojpeg.lib;zlib.lib;zstd.lib;%(AdditionalDependencies) NotSet true Console @@ -367,7 +367,7 @@ - ccx_rust.lib;UserEnv.lib;Crypt32.lib;WS2_32.Lib;Bcrypt.lib;Mfplat.lib;Mfuuid.lib;Secur32.lib;Strmiids.lib;Ole32.lib;User32.lib;libcrypto.lib;libcurl.lib;avcodec.lib;avformat.lib;avutil.lib;avfilter.lib;swscale.lib;swresample.lib;leptonica-1.83.1.lib;tesseract53.lib;gif.lib;archive.lib;avdevice.lib;bz2.lib;charset.lib;iconv.lib;jpeg.lib;libpng16.lib;libsharpyuv.lib;libssl.lib;libwebp.lib;libwebpdecoder.lib;libwebpdemux.lib;libwebpmux.lib;libxml2.lib;lz4.lib;lzma.lib;openjp2.lib;tiff.lib;turbojpeg.lib;zlib.lib;zstd.lib;%(AdditionalDependencies) + ccx_rust.lib;UserEnv.lib;Crypt32.lib;WS2_32.Lib;ntdll.lib;Bcrypt.lib;Mfplat.lib;Mfuuid.lib;Secur32.lib;Strmiids.lib;Ole32.lib;User32.lib;libcrypto.lib;libcurl.lib;avcodec.lib;avformat.lib;avutil.lib;avfilter.lib;swscale.lib;swresample.lib;leptonica-1.83.1.lib;tesseract53.lib;gif.lib;archive.lib;avdevice.lib;bz2.lib;charset.lib;iconv.lib;jpeg.lib;libpng16.lib;libsharpyuv.lib;libssl.lib;libwebp.lib;libwebpdecoder.lib;libwebpdemux.lib;libwebpmux.lib;libxml2.lib;lz4.lib;lzma.lib;openjp2.lib;tiff.lib;turbojpeg.lib;zlib.lib;zstd.lib;%(AdditionalDependencies) true Console true