From b576772d4c1b624d5c18f122aed99095f589c1b9 Mon Sep 17 00:00:00 2001 From: simon987 Date: Thu, 23 Dec 2021 15:58:52 -0500 Subject: [PATCH] LibRaw hack --- Dockerfile | 5 +++-- patches/libraw.patch | 31 +++++++++++++++++++++++++++++++ patches/mongoose-master.patch | 4 ++-- patches/mupdf-curl-dep.patch | 4 ++-- 4 files changed, 38 insertions(+), 6 deletions(-) create mode 100644 patches/libraw.patch diff --git a/Dockerfile b/Dockerfile index fafdd4c..7dfd206 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,8 +22,9 @@ RUN wget https://github.com/Kitware/CMake/releases/download/v3.20.2/cmake-3.20.2 RUN git clone https://github.com/microsoft/vcpkg.git && cd vcpkg && git checkout 897ff93 ADD patches/* / -RUN patch -p0 < mupdf-curl-dep.patch -RUN patch -p0 < mongoose-master.patch +RUN cd /vcpkg/; patch -p1 < ../mupdf-curl-dep.patch +RUN cd /vcpkg/; patch -p1 < ../mongoose-master.patch +RUN cd /vcpkg/; patch -p1 < ../libraw.patch RUN cd /vcpkg/ && ./bootstrap-vcpkg.sh diff --git a/patches/libraw.patch b/patches/libraw.patch new file mode 100644 index 0000000..8291e51 --- /dev/null +++ b/patches/libraw.patch @@ -0,0 +1,31 @@ +--- a/ports/libraw/portfile.cmake ++++ b/ports/libraw/portfile.cmake +@@ -1,23 +1,23 @@ + vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO LibRaw/LibRaw +- REF d4f05dd1b9b2d44c8f7e82043cbad3c724db2416 +- SHA512 5794521f535163afd7815ad005295301c5e0e2f8b2f34ef0a911d9dd1572c1f456b292777548203f9767957a55782b5bc9041c033190d25d1e9b4240d7df32b9 ++ REF 52b2fc52e93a566e7e05eaa44cada58e3360b6ad ++ SHA512 f30ed1bd99df6d0759d9d820c586cd019a78cd7817a1a547565aeb6c53607c32ca19820e0aaf2f3270d4916abbaa892a70a27e6a6f71175fb226bb7d5bd22bf7 + HEAD_REF master + ) + + vcpkg_from_github( + OUT_SOURCE_PATH LIBRAW_CMAKE_SOURCE_PATH + REPO LibRaw/LibRaw-cmake +- REF a71f3b83ee3dccd7be32f9a2f410df4d9bdbde0a +- SHA512 607e6f76bcb57534da4f0c864b7a421f1ed49244468b1b52abe77f65aa599cae80715520b3a951294321b812deffd4f163757c9949f337571aa54f414ccc58a5 ++ REF b82a1b0101b1e7264eb3113f1e6c1ba2372ebb7f ++ SHA512 b3f9807a902937db101c6e42b4275817420deed8774a05a68bca5a985cda688f27da3f473f55f2460af58bf1a2bf02578499e5401c8b7b677f46ca9f8f5faf9f + HEAD_REF master + PATCHES +- findlibraw_debug_fix.patch ++ #findlibraw_debug_fix.patch + lcms2_debug_fix.patch + # Move the non-thread-safe library to manual-link. This is unfortunately needed + # because otherwise libraries that build on top of libraw have to choose. +- fix-install.patch ++ # fix-install.patch + ) + diff --git a/patches/mongoose-master.patch b/patches/mongoose-master.patch index e28572c..0872777 100644 --- a/patches/mongoose-master.patch +++ b/patches/mongoose-master.patch @@ -1,5 +1,5 @@ ---- /vcpkg/ports/mongoose/portfile.cmake -+++ /vcpkg/ports/mongoose/portfile.cmake +--- a/ports/mongoose/portfile.cmake ++++ b/ports/mongoose/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/patches/mupdf-curl-dep.patch b/patches/mupdf-curl-dep.patch index 8ff9114..147f000 100644 --- a/patches/mupdf-curl-dep.patch +++ b/patches/mupdf-curl-dep.patch @@ -1,5 +1,5 @@ ---- /vcpkg/ports/libmupdf/vcpkg.json 2021-09-22 09:11:22.598136284 -0400 -+++ /vcpkg/ports/libmupdf/vcpkg.json_ 2021-11-07 10:14:38.039574071 -0500 +--- a/ports/libmupdf/vcpkg.json 2021-09-22 09:11:22.598136284 -0400 ++++ b/ports/libmupdf/vcpkg.json 2021-11-07 10:14:38.039574071 -0500 @@ -5,7 +5,13 @@ "homepage": "https://github.com/ArtifexSoftware/mupdf", "supports": "!osx",