external/lcms2/UnpackedTarball_lcms2.mk | 1
external/lcms2/lcms2-windows_aarch64_outdir.patch.1 | 26 ++++++++++++++++++++
2 files changed, 27 insertions(+)
New commits:
commit 5388adf92e5e4e60c84747c73bdfeddaa533663a
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
AuthorDate: Fri Dec 8 18:59:49 2023 +0100
Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Tue Dec 12 11:32:24 2023 +0100
fix lcms2 build on Windows AARCH64 - missig output path option
broke with e1473bc935b68147cb019572928e19a03f188f18 - the shipped config
doesn't set the outdir for arm64 build, so the dll doesn't end up in the
expected location.
Note this only patches the 2019 config that is currently also hardcoded
in the makefile
Change-Id: I21e90cd15922bbe37b534b04362450e1f87662ef
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160497
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>
(cherry picked from commit ebb2dff479556b0a8a855443c7bb9ff62b3f89f0)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160478
diff --git a/external/lcms2/UnpackedTarball_lcms2.mk
b/external/lcms2/UnpackedTarball_lcms2.mk
index 1aae4c3db254..28b30ef3acee 100644
--- a/external/lcms2/UnpackedTarball_lcms2.mk
+++ b/external/lcms2/UnpackedTarball_lcms2.mk
@@ -17,6 +17,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,lcms2,3))
$(eval $(call gb_UnpackedTarball_add_patches,lcms2,\
external/lcms2/lcms2-2.4-windows.patch \
+ external/lcms2/lcms2-windows_aarch64_outdir.patch.1 \
external/lcms2/c++17.patch.1 \
))
diff --git a/external/lcms2/lcms2-windows_aarch64_outdir.patch.1
b/external/lcms2/lcms2-windows_aarch64_outdir.patch.1
new file mode 100644
index 000000000000..aa27b1b77923
--- /dev/null
+++ b/external/lcms2/lcms2-windows_aarch64_outdir.patch.1
@@ -0,0 +1,26 @@
+diff -ur lcms2.org/Projects/VC2019/lcms2_DLL/lcms2_DLL.vcxproj
lcms2/Projects/VC2019/lcms2_DLL/lcms2_DLL.vcxproj
+--- lcms2.org/Projects/VC2019/lcms2_DLL/lcms2_DLL.vcxproj 2023-12-08
18:49:59.819483000 +0100
++++ lcms2/Projects/VC2019/lcms2_DLL/lcms2_DLL.vcxproj 2023-12-08
18:50:59.460115500 +0100
+@@ -92,6 +92,7 @@
+ <_ProjectFileVersion>10.0.21006.1</_ProjectFileVersion>
+ <OutDir
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\bin\</OutDir>
+ <OutDir
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\bin\</OutDir>
++ <OutDir
Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">..\..\..\bin\</OutDir>
+ <IntDir
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)_$(Platform)\</IntDir>
+ <IntDir
Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(Configuration)_$(Platform)\</IntDir>
+ <IntDir
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Configuration)_$(Platform)\</IntDir>
+@@ -100,6 +101,7 @@
+ <LinkIncremental
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+ <OutDir
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\bin\</OutDir>
+ <OutDir
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\bin\</OutDir>
++ <OutDir
Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">..\..\..\bin\</OutDir>
+ <IntDir
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)_$(Platform)\</IntDir>
+ <IntDir
Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">$(Configuration)_$(Platform)\</IntDir>
+ <IntDir
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Configuration)_$(Platform)\</IntDir>
+@@ -340,4 +342,4 @@
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+-</Project>
+\ No newline at end of file
++</Project>
