simon987/sist2-build
1
0
Fork 0
mirror of https://github.com/simon987/sist2-build.git synced 2025-10-31 09:26:59 +00:00
Code Issues Projects Releases Wiki Activity

3.0.4 fixes

Browse Source
This commit is contained in:
simon987 2023-04-23 13:52:03 -04:00
parent 5c7a3bd647
commit d560962375
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -18,7 +18,7 @@ RUN git clone --depth 1 https://github.com/simon987/vcpkg.git && cd vcpkg
RUN cd /vcpkg/ && ./bootstrap-vcpkg.sh
RUN ./vcpkg/vcpkg install \
curl[core,openssl] sqlite3 cpp-jwt pcre cjson brotli libarchive[core,bzip2,libxml2,lz4,lzma,lzo] pthread tesseract libxml2 libmupdf gtest mongoose libmagic libraw gumbo ffmpeg[core,avcodec,avformat,swscale,swresample] \
curl[core,openssl] sqlite3 cpp-jwt pcre cjson brotli libarchive[core,bzip2,libxml2,lz4,lzma,lzo] pthread tesseract libxml2 libmupdf gtest mongoose libraw gumbo ffmpeg[core,avcodec,avformat,swscale,swresample] \
&& rm -rf /root/.cache/vcpkg /vcpkg/downloads /vcpkg/buildtrees /vcpkg/downloads
COPY patches/* ./

19
patches/fix-libraw.patch Normal file
View File

@ -0,0 +1,19 @@
--- b/installed/x64-linux/share/libraw/librawTargets.cmake
+++ a/installed/x64-linux/share/libraw/librawTargets.cmake
@@ -60,7 +60,7 @@
set_target_properties(libraw::raw PROPERTIES
INTERFACE_COMPILE_DEFINITIONS "LIBRAW_NODLL"
+ INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include/libraw"
- INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/libraw"
INTERFACE_LINK_LIBRARIES "m;lcms2::lcms2;ZLIB::ZLIB;\$<\$<NOT:\$<CONFIG:DEBUG>>:${VCPKG_IMPORT_PREFIX}/lib/libjasper.a>;\$<\$<CONFIG:DEBUG>:${VCPKG_IMPORT_PREFIX}/debug/lib/libjasperd.a>;\$<\$<NOT:\$<CONFIG:DEBUG>>:${VCPKG_IMPORT_PREFIX}/lib/libjpeg.a>;\$<\$<CONFIG:DEBUG>:${VCPKG_IMPORT_PREFIX}/debug/lib/libjpeg.a>"
)
@@ -69,7 +69,7 @@
set_target_properties(libraw::raw_r PROPERTIES
INTERFACE_COMPILE_DEFINITIONS "LIBRAW_NODLL"
+ INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include/libraw"
- INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/libraw"
INTERFACE_LINK_LIBRARIES "m;lcms2::lcms2;ZLIB::ZLIB;\$<\$<NOT:\$<CONFIG:DEBUG>>:${VCPKG_IMPORT_PREFIX}/lib/libjasper.a>;\$<\$<CONFIG:DEBUG>:${VCPKG_IMPORT_PREFIX}/debug/lib/libjasperd.a>;\$<\$<NOT:\$<CONFIG:DEBUG>>:${VCPKG_IMPORT_PREFIX}/lib/libjpeg.a>;\$<\$<CONFIG:DEBUG>:${VCPKG_IMPORT_PREFIX}/debug/lib/libjpeg.a>"
)