From d01f6b8d45a5c380912921ed666962f864ca35b6 Mon Sep 17 00:00:00 2001
From: Jason Scurtu <xarbit@MBP-von-Jason.fritz.box>
Date: Sat, 28 Nov 2020 15:23:38 +0100
Subject: [PATCH 1/4] add -DDISABLE_DEPENDENCY_TRACKING to libpng. - fixes
"PNG_ARM_NEON_FILE undefined" error
---
deps/PNG/PNG.cmake | 1 +
1 file changed, 1 insertion(+)
diff --git a/deps/PNG/PNG.cmake b/deps/PNG/PNG.cmake
index 3e55991fb..9619518a5 100644
--- a/deps/PNG/PNG.cmake
+++ b/deps/PNG/PNG.cmake
@@ -8,6 +8,7 @@ prusaslicer_add_cmake_project(PNG
-DPNG_STATIC=ON
-DPNG_PREFIX=prusaslicer_
-DPNG_TESTS=OFF
+ -DDISABLE_DEPENDENCY_TRACKING
)
if (MSVC)
From d780b33a160f7417c59042535982d134d6d552f6 Mon Sep 17 00:00:00 2001
From: Jason Scurtu <xarbit@MBP-von-Jason.fritz.box>
Date: Sat, 28 Nov 2020 19:47:46 +0100
Subject: [PATCH 2/4] apple silicon target - move rpi4 detection to Linux -
set(_gmp_build_tgt aarch64) for Apple Silicon
---
deps/GMP/GMP.cmake | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/deps/GMP/GMP.cmake b/deps/GMP/GMP.cmake
index 08b286891..45c6b1f14 100644
--- a/deps/GMP/GMP.cmake
+++ b/deps/GMP/GMP.cmake
@@ -19,15 +19,18 @@ if (MSVC)
else ()
set(_gmp_ccflags "-O2 -DNDEBUG -fPIC -DPIC -Wall -Wmissing-prototypes -Wpointer-arith -pedantic -fomit-frame-pointer -fno-common")
set(_gmp_build_tgt "${CMAKE_SYSTEM_PROCESSOR}")
- if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm")
- set(_gmp_ccflags "${_gmp_ccflags} -march=armv7-a") # Works on RPi-4
- set(_gmp_build_tgt armv7)
- endif()
if (APPLE)
+ if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm")
+ set(_gmp_build_tgt aarch64)
+ endif()
set(_gmp_ccflags "${_gmp_ccflags} -mmacosx-version-min=${DEP_OSX_TARGET}")
set(_gmp_build_tgt "--build=${_gmp_build_tgt}-apple-darwin")
elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+ if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm")
+ set(_gmp_ccflags "${_gmp_ccflags} -march=armv7-a") # Works on RPi-4
+ set(_gmp_build_tgt armv7)
+ endif()
set(_gmp_build_tgt "--build=${_gmp_build_tgt}-pc-linux-gnu")
else ()
set(_gmp_build_tgt "") # let it guess
From 1719a9b3d11ded4b944293a2d2fa9f88028f63c8 Mon Sep 17 00:00:00 2001
From: Jason Scurtu <xarbit@MBP-von-Jason.fritz.box>
Date: Sat, 28 Nov 2020 19:48:09 +0100
Subject: [PATCH 3/4] fix typo and disable ARM_NEON check
---
deps/PNG/PNG.cmake | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/deps/PNG/PNG.cmake b/deps/PNG/PNG.cmake
index 9619518a5..412f1c0ee 100644
--- a/deps/PNG/PNG.cmake
+++ b/deps/PNG/PNG.cmake
@@ -8,7 +8,8 @@ prusaslicer_add_cmake_project(PNG
-DPNG_STATIC=ON
-DPNG_PREFIX=prusaslicer_
-DPNG_TESTS=OFF
- -DDISABLE_DEPENDENCY_TRACKING
+ -DDISABLE_DEPENDENCY_TRACKING=OFF
+ -DPNG_ARM_NEON=off
)
if (MSVC)
From d5a6602f1c0e434c100144ea100dc2eb8428a02a Mon Sep 17 00:00:00 2001
From: Jason Scurtu <xarbit@MBP-von-Jason.fritz.box>
Date: Sat, 28 Nov 2020 19:55:09 +0100
Subject: [PATCH 4/4] bump gmp version
---
deps/GMP/GMP.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/deps/GMP/GMP.cmake b/deps/GMP/GMP.cmake
index 45c6b1f14..a7fe19355 100644
--- a/deps/GMP/GMP.cmake
+++ b/deps/GMP/GMP.cmake
@@ -38,7 +38,7 @@ else ()
ExternalProject_Add(dep_GMP
# URL https://gmplib.org/download/gmp/gmp-6.1.2.tar.bz2
- URL https://gmplib.org/download/gmp/gmp-6.2.0.tar.lz
+ URL https://gmplib.org/download/gmp/gmp-6.2.1.tar.bz2
BUILD_IN_SOURCE ON
CONFIGURE_COMMAND env "CFLAGS=${_gmp_ccflags}" "CXXFLAGS=${_gmp_ccflags}" ./configure --enable-shared=no --enable-cxx=yes --enable-static=yes "--prefix=${DESTDIR}/usr/local" ${_gmp_build_tgt}
BUILD_COMMAND make -j