From 0e062525fc7e0f49074c1c074cc7c0f2cd0f8ce1 Mon Sep 17 00:00:00 2001
From: simon987 <me@simon987.net>
Date: Sun, 23 Apr 2023 13:52:23 -0400
Subject: [PATCH] 3.0.4 fixes
---
Dockerfile | 2 +-
patches/fix-libraw.patch | 19 +++++++++++++++++++
2 files changed, 20 insertions(+), 1 deletion(-)
create mode 100644 patches/fix-libraw.patch
diff --git a/Dockerfile b/Dockerfile
index 07c4910..cd844ca 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,7 +23,7 @@ RUN git clone --depth 1 https://github.com/simon987/vcpkg.git && cd vcpkg
RUN cd /vcpkg/ && ./bootstrap-vcpkg.sh
RUN VCPKG_FORCE_SYSTEM_BINARIES=true ./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/* ./
diff --git a/patches/fix-libraw.patch b/patches/fix-libraw.patch
new file mode 100644
index 0000000..d23d5ab
--- /dev/null
+++ b/patches/fix-libraw.patch
@@ -0,0 +1,19 @@
+--- b/installed/arm64-linux/share/libraw/librawTargets.cmake
++++ a/installed/arm64-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>"
+ )