Need to patch some files again..
diff --git a/project/bundles/3rdparty/ext_kf5_frameworks/CMakeLists.txt b/project/bundles/3rdparty/ext_kf5_frameworks/CMakeLists.txt
index a13b70e3b9..33943d13f8 100755
--- a/project/bundles/3rdparty/ext_kf5_frameworks/CMakeLists.txt
+++ b/project/bundles/3rdparty/ext_kf5_frameworks/CMakeLists.txt
@@ -108,7 +108,7 @@ function(InstallKF5Component
CONFIGURE_COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/../../../../bootstrap.macports <SOURCE_DIR>/. &&
sed -i '' -e "s/DBUILD_TESTING=ON/DBUILD_TESTING=OFF/g" <SOURCE_DIR>/bootstrap.macports &&
- <SOURCE_DIR>/bootstrap.macports ${EXTPREFIX_frameworks} debug x86_64 "${argoptions}"
+ <SOURCE_DIR>/bootstrap.macports ${EXTPREFIX_frameworks} debug arm64 "${argoptions}"
BUILD_COMMAND cd <SOURCE_DIR>/build && $(MAKE)
diff --git a/project/bundles/macports/01-build-macports.sh b/project/bundles/macports/01-build-macports.sh
index c9593b8f6f..5b93322878 100755
--- a/project/bundles/macports/01-build-macports.sh
+++ b/project/bundles/macports/01-build-macports.sh
@@ -210,7 +210,7 @@ EOF
# No need to build with both architectures embeded (x86 and ARM) for Apple Silicon target
cat << EOF >> "$INSTALL_PREFIX/etc/macports/variants.conf"
-+universal
++arm64
EOF
fi
diff --git a/project/bundles/macports/config.sh b/project/bundles/macports/config.sh
index 830ac93ed5..d84dc30231 100644
--- a/project/bundles/macports/config.sh
+++ b/project/bundles/macports/config.sh
@@ -16,7 +16,7 @@ BUILDING_DIR="`pwd`/temp.build"
########################################################################
# Target macOS architecture: "x86_64" for Intel 64 bits, or "arm64" for Apple Silicon 64 bits.
-ARCH_TARGET="x86_64"
+ARCH_TARGET="arm64"
if [[ $ARCH_TARGET = "x86_64" ]] ; then
@@ -50,7 +50,7 @@ if [[ $ARCH_TARGET = "x86_64" ]] ; then
elif [[ $ARCH_TARGET = "arm64" ]] ; then
# Apple Silicon is supported since macOS BigSur
- OSX_MIN_TARGET="11.0"
+ OSX_MIN_TARGET="11.3"
else
laurent@mini-de-laurent digikam % git diff
diff --git a/project/bundles/3rdparty/ext_breeze/CMakeLists.txt b/project/bundles/3rdparty/ext_breeze/CMakeLists.txt
index 3b4209c73c..7249f5d006 100755
--- a/project/bundles/3rdparty/ext_breeze/CMakeLists.txt
+++ b/project/bundles/3rdparty/ext_breeze/CMakeLists.txt
@@ -60,7 +60,7 @@ elseif(APPLE)
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/breeze-common-rules.patch
CONFIGURE_COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/../../../../bootstrap.macports <SOURCE_DIR>/. &&
- <SOURCE_DIR>/bootstrap.macports ${EXTPREFIX_breeze} debug x86_64 "-DWITH_WALLPAPERS=OFF -DWITH_DECORATIONS=OFF -DBUILD_TESTING=OFF -Wno-dev"
+ <SOURCE_DIR>/bootstrap.macports ${EXTPREFIX_breeze} debug arm64 "-DWITH_WALLPAPERS=OFF -DWITH_DECORATIONS=OFF -DBUILD_TESTING=OFF -Wno-dev"
BUILD_COMMAND cd <SOURCE_DIR>/build && $(MAKE)
diff --git a/project/bundles/3rdparty/ext_exiv2/CMakeLists.txt b/project/bundles/3rdparty/ext_exiv2/CMakeLists.txt
index 1455a8f88c..ce37bf36b4 100755
--- a/project/bundles/3rdparty/ext_exiv2/CMakeLists.txt
+++ b/project/bundles/3rdparty/ext_exiv2/CMakeLists.txt
@@ -93,7 +93,7 @@ elseif(APPLE)
cd <SOURCE_DIR> &&
<SOURCE_DIR>/create_manifest.sh ${EXTERNALS_DOWNLOAD_DIR} exiv2 &&
cp -f ${CMAKE_CURRENT_SOURCE_DIR}/../../../../bootstrap.macports <SOURCE_DIR>/. &&
- <SOURCE_DIR>/bootstrap.macports ${PREFIX_ext_exiv2} RelWithDebInfo x86_64 ${BASH_OPTIONS}
+ <SOURCE_DIR>/bootstrap.macports ${PREFIX_ext_exiv2} RelWithDebInfo arm64 ${BASH_OPTIONS}
BUILD_COMMAND cd <SOURCE_DIR>/build && $(MAKE)
diff --git a/project/bundles/3rdparty/ext_ffmpeg/CMakeLists.txt b/project/bundles/3rdparty/ext_ffmpeg/CMakeLists.txt
index f7f972b9bc..d10274178d 100644
--- a/project/bundles/3rdparty/ext_ffmpeg/CMakeLists.txt
+++ b/project/bundles/3rdparty/ext_ffmpeg/CMakeLists.txt
@@ -52,7 +52,7 @@ if(MINGW)
set(FFmpeg_Conf ${FFmpeg_Conf}
--cross-prefix=${MXE_BUILD_TARGETS}-
--enable-cross-compile
- --arch=x86_64
+ --arch=arm64
--target-os=mingw32
--disable-static
--enable-shared
diff --git a/project/bundles/3rdparty/ext_heif/CMakeLists.txt b/project/bundles/3rdparty/ext_heif/CMakeLists.txt
index f0dbcb9f92..91e612679e 100755
--- a/project/bundles/3rdparty/ext_heif/CMakeLists.txt
+++ b/project/bundles/3rdparty/ext_heif/CMakeLists.txt
@@ -64,7 +64,7 @@ elseif(APPLE)
cd <SOURCE_DIR> &&
<SOURCE_DIR>/create_manifest.sh ${EXTERNALS_DOWNLOAD_DIR} heif &&
cp -f ${CMAKE_CURRENT_SOURCE_DIR}/../../../../bootstrap.macports <SOURCE_DIR>/. &&
- <SOURCE_DIR>/bootstrap.macports ${PREFIX_ext_heif} RelWithDebInfo x86_64 ${Heif_conf}
+ <SOURCE_DIR>/bootstrap.macports ${PREFIX_ext_heif} RelWithDebInfo arm64 ${Heif_conf}
BUILD_COMMAND cd <SOURCE_DIR>/build && $(MAKE)
diff --git a/project/bundles/3rdparty/ext_hugin/CMakeLists.txt b/project/bundles/3rdparty/ext_hugin/CMakeLists.txt
index f1d6ab06ea..df6638ff1d 100755
--- a/project/bundles/3rdparty/ext_hugin/CMakeLists.txt
+++ b/project/bundles/3rdparty/ext_hugin/CMakeLists.txt
@@ -58,7 +58,7 @@ elseif(APPLE)
SVN_REPOSITORY svn://dev.exiv2.org/svn/trunk
CONFIGURE_COMMAND cp -f ${CMAKE_CURRENT_SOURCE_DIR}/../../../../bootstrap.macports <SOURCE_DIR>/. &&
- <SOURCE_DIR>/bootstrap.macports ${PREFIX_ext_exiv2} RelWithDebInfo x86_64 ${BASH_OPTIONS}
+ <SOURCE_DIR>/bootstrap.macports ${PREFIX_ext_exiv2} RelWithDebInfo arm64 ${BASH_OPTIONS}
BUILD_COMMAND cd <SOURCE_DIR>/build && $(MAKE)
diff --git a/project/bundles/3rdparty/ext_imagemagick/CMakeLists.txt b/project/bundles/3rdparty/ext_imagemagick/CMakeLists.txt
index 7da597e7db..7f473ee54c 100755
--- a/project/bundles/3rdparty/ext_imagemagick/CMakeLists.txt
+++ b/project/bundles/3rdparty/ext_imagemagick/CMakeLists.txt
@@ -44,7 +44,7 @@ if(MINGW)
set(Magick_Conf ${Magick_Conf}
--host=${MXE_BUILD_TARGETS}
- --build=x86_64-pc-linux-gnu
+ --build=arm64-pc-linux-gnu
)
set(Magick_Patch ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/magick-plusplus-mxe.patch)
diff --git a/project/bundles/3rdparty/ext_kf5_frameworks/CMakeLists.txt b/project/bundles/3rdparty/ext_kf5_frameworks/CMakeLists.txt
index a13b70e3b9..33943d13f8 100755
--- a/project/bundles/3rdparty/ext_kf5_frameworks/CMakeLists.txt
+++ b/project/bundles/3rdparty/ext_kf5_frameworks/CMakeLists.txt
@@ -108,7 +108,7 @@ function(InstallKF5Component
CONFIGURE_COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/../../../../bootstrap.macports <SOURCE_DIR>/. &&
sed -i '' -e "s/DBUILD_TESTING=ON/DBUILD_TESTING=OFF/g" <SOURCE_DIR>/bootstrap.macports &&
- <SOURCE_DIR>/bootstrap.macports ${EXTPREFIX_frameworks} debug x86_64 "${argoptions}"
+ <SOURCE_DIR>/bootstrap.macports ${EXTPREFIX_frameworks} debug arm64 "${argoptions}"
BUILD_COMMAND cd <SOURCE_DIR>/build && $(MAKE)
diff --git a/project/bundles/3rdparty/ext_lensfun/CMakeLists.txt b/project/bundles/3rdparty/ext_lensfun/CMakeLists.txt
index d44494484f..ba5bcffe49 100644
--- a/project/bundles/3rdparty/ext_lensfun/CMakeLists.txt
+++ b/project/bundles/3rdparty/ext_lensfun/CMakeLists.txt
@@ -61,7 +61,7 @@ elseif (APPLE)
cd <SOURCE_DIR> &&
<SOURCE_DIR>/create_manifest.sh ${EXTERNALS_DOWNLOAD_DIR} lensfun &&
cp -f ${CMAKE_CURRENT_SOURCE_DIR}/../../../../bootstrap.macports <SOURCE_DIR>/. &&
- <SOURCE_DIR>/bootstrap.macports ${EXTPREFIX_lensfun} RelWithDebInfo x86_64 ${BASH_OPTIONS}
+ <SOURCE_DIR>/bootstrap.macports ${EXTPREFIX_lensfun} RelWithDebInfo arm64 ${BASH_OPTIONS}
BUILD_COMMAND cd <SOURCE_DIR>/build && $(MAKE)
diff --git a/project/bundles/3rdparty/ext_libavif/CMakeLists.txt b/project/bundles/3rdparty/ext_libavif/CMakeLists.txt
index efdfca9934..d6382d1ce6 100755
--- a/project/bundles/3rdparty/ext_libavif/CMakeLists.txt
+++ b/project/bundles/3rdparty/ext_libavif/CMakeLists.txt
@@ -66,7 +66,7 @@ elseif(APPLE)
GIT_TAG v0.9.3
CONFIGURE_COMMAND cp -f ${CMAKE_CURRENT_SOURCE_DIR}/../../../../bootstrap.macports <SOURCE_DIR>/. &&
- <SOURCE_DIR>/bootstrap.macports ${PREFIX_libavif} RelWithDebInfo x86_64 ${BASH_OPTIONS_AVIF}
+ <SOURCE_DIR>/bootstrap.macports ${PREFIX_libavif} RelWithDebInfo arm64 ${BASH_OPTIONS_AVIF}
BUILD_COMMAND cd <SOURCE_DIR>/build && $(MAKE)
diff --git a/project/bundles/3rdparty/ext_libde265/CMakeLists.txt b/project/bundles/3rdparty/ext_libde265/CMakeLists.txt
index 7723038d0f..94eb290e67 100755
--- a/project/bundles/3rdparty/ext_libde265/CMakeLists.txt
+++ b/project/bundles/3rdparty/ext_libde265/CMakeLists.txt
@@ -43,7 +43,7 @@ elseif(APPLE)
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/libde265-lib-only.patch
CONFIGURE_COMMAND cp -f ${CMAKE_CURRENT_SOURCE_DIR}/../../../../bootstrap.macports <SOURCE_DIR>/. &&
- <SOURCE_DIR>/bootstrap.macports ${PREFIX_libde265} RelWithDebInfo x86_64
+ <SOURCE_DIR>/bootstrap.macports ${PREFIX_libde265} RelWithDebInfo arm64
BUILD_COMMAND cd <SOURCE_DIR>/build && $(MAKE)
diff --git a/project/bundles/3rdparty/ext_libjxl/CMakeLists.txt b/project/bundles/3rdparty/ext_libjxl/CMakeLists.txt
index 6d71636abf..fefb63e852 100644
--- a/project/bundles/3rdparty/ext_libjxl/CMakeLists.txt
+++ b/project/bundles/3rdparty/ext_libjxl/CMakeLists.txt
@@ -67,7 +67,7 @@ elseif(APPLE)
CONFIGURE_COMMAND git submodule update --init --recursive --depth 1 --recommend-shallow &&
cp -f ${CMAKE_CURRENT_SOURCE_DIR}/../../../../bootstrap.macports <SOURCE_DIR>/. &&
- <SOURCE_DIR>/bootstrap.macports ${PREFIX_ext_libjxl} RelWithDebInfo x86_64 ${BASH_OPTIONS}
+ <SOURCE_DIR>/bootstrap.macports ${PREFIX_ext_libjxl} RelWithDebInfo arm64 ${BASH_OPTIONS}
BUILD_COMMAND cd <SOURCE_DIR>/build && $(MAKE)
diff --git a/project/bundles/3rdparty/ext_libksane/CMakeLists.txt b/project/bundles/3rdparty/ext_libksane/CMakeLists.txt
index 5f55a73af0..4273a53f20 100755
--- a/project/bundles/3rdparty/ext_libksane/CMakeLists.txt
+++ b/project/bundles/3rdparty/ext_libksane/CMakeLists.txt
@@ -81,7 +81,7 @@ elseif(APPLE)
URL_MD5 ${KF5_APPLICATION_MD5SUM}
CONFIGURE_COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/../../../../bootstrap.macports <SOURCE_DIR>/. &&
- <SOURCE_DIR>/bootstrap.macports ${EXTPREFIX_libksane} debug x86_64 "-DBUILD_TESTING=OFF -Wno-dev"
+ <SOURCE_DIR>/bootstrap.macports ${EXTPREFIX_libksane} debug arm64 "-DBUILD_TESTING=OFF -Wno-dev"
BUILD_COMMAND cd <SOURCE_DIR>/build && $(MAKE)
@@ -105,7 +105,7 @@ elseif(APPLE)
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/libksane-common-rules.patch
CONFIGURE_COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/../../../../bootstrap.macports <SOURCE_DIR>/. &&
- <SOURCE_DIR>/bootstrap.macports ${EXTPREFIX_libksane} debug x86_64 "-DWITH_DESIGNER_PLUGIN=OFF -DBUILD_TESTING=OFF -Wno-dev"
+ <SOURCE_DIR>/bootstrap.macports ${EXTPREFIX_libksane} debug arm64 "-DWITH_DESIGNER_PLUGIN=OFF -DBUILD_TESTING=OFF -Wno-dev"
BUILD_COMMAND cd <SOURCE_DIR>/build && $(MAKE)
diff --git a/project/bundles/3rdparty/ext_marble/CMakeLists.txt b/project/bundles/3rdparty/ext_marble/CMakeLists.txt
index 6d18838aa1..0758572313 100755
--- a/project/bundles/3rdparty/ext_marble/CMakeLists.txt
+++ b/project/bundles/3rdparty/ext_marble/CMakeLists.txt
@@ -60,7 +60,7 @@ elseif(APPLE)
<SOURCE_DIR>/fixbundledatapath.sh
CONFIGURE_COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/../../../../bootstrap.macports <SOURCE_DIR>/. &&
- <SOURCE_DIR>/bootstrap.macports ${EXTPREFIX_marble} debug x86_64 "-DWITH_DESIGNER_PLUGIN=OFF -DBUILD_MARBLE_TESTS=OFF -DBUILD_MARBLE_TOOLS=OFF -DBUILD_MARBLE_EXAMPLES=OFF -DBUILD_MARBLE_APPS=OFF -DBUILD_WITH_DBUS=OFF -DQTONLY=ON -DBUILD_TESTING=OFF -Wno-dev"
+ <SOURCE_DIR>/bootstrap.macports ${EXTPREFIX_marble} debug arm64 "-DWITH_DESIGNER_PLUGIN=OFF -DBUILD_MARBLE_TESTS=OFF -DBUILD_MARBLE_TOOLS=OFF -DBUILD_MARBLE_EXAMPLES=OFF -DBUILD_MARBLE_APPS=OFF -DBUILD_WITH_DBUS=OFF -DQTONLY=ON -DBUILD_TESTING=OFF -Wno-dev"
BUILD_COMMAND cd <SOURCE_DIR>/build && $(MAKE)
diff --git a/project/bundles/3rdparty/ext_opencv/CMakeLists.txt b/project/bundles/3rdparty/ext_opencv/CMakeLists.txt
index 11f4c30616..13a0b1a548 100644
--- a/project/bundles/3rdparty/ext_opencv/CMakeLists.txt
+++ b/project/bundles/3rdparty/ext_opencv/CMakeLists.txt
@@ -136,7 +136,7 @@ elseif(APPLE)
GIT_TAG 4.6.0
CONFIGURE_COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/../../../../bootstrap.macports <SOURCE_DIR>/. &&
- <SOURCE_DIR>/bootstrap.macports ${EXTPREFIX_opencv} RelWithDebInfo x86_64 "${BASH_OPTIONS}"
+ <SOURCE_DIR>/bootstrap.macports ${EXTPREFIX_opencv} RelWithDebInfo arm64 "${BASH_OPTIONS}"
BUILD_COMMAND cd <SOURCE_DIR>/build && $(MAKE)
diff --git a/project/bundles/3rdparty/ext_qt/5.15-LTS/config_help-5.15.txt b/project/bundles/3rdparty/ext_qt/5.15-LTS/config_help-5.15.txt
index d9ff8e598e..5011afe7d6 100644
--- a/project/bundles/3rdparty/ext_qt/5.15-LTS/config_help-5.15.txt
+++ b/project/bundles/3rdparty/ext_qt/5.15-LTS/config_help-5.15.txt
@@ -203,10 +203,10 @@ Build environment:
-android-sdk path .... Set Android SDK root path [$ANDROID_SDK_ROOT]
-android-ndk path .... Set Android NDK root path [$ANDROID_NDK_ROOT]
-android-ndk-platform Set Android platform
- -android-ndk-host .... Set Android NDK host (linux-x86, linux-x86_64, etc.)
+ -android-ndk-host .... Set Android NDK host (linux-x86, linux-arm64, etc.)
[$ANDROID_NDK_HOST]
-android-abis ....... Comma separated Android abis, default is:
- armeabi-v7a,arm64-v8a,x86,x86_64
+ armeabi-v7a,arm64-v8a,x86,arm64
-android-style-assets Automatically extract style assets from the device at
run time. This option makes the Android style behave
correctly, but also makes the Android platform plugin
diff --git a/project/bundles/3rdparty/ext_qt/5.15/config_help-5.15.txt b/project/bundles/3rdparty/ext_qt/5.15/config_help-5.15.txt
index d9ff8e598e..5011afe7d6 100644
--- a/project/bundles/3rdparty/ext_qt/5.15/config_help-5.15.txt
+++ b/project/bundles/3rdparty/ext_qt/5.15/config_help-5.15.txt
@@ -203,10 +203,10 @@ Build environment:
-android-sdk path .... Set Android SDK root path [$ANDROID_SDK_ROOT]
-android-ndk path .... Set Android NDK root path [$ANDROID_NDK_ROOT]
-android-ndk-platform Set Android platform
- -android-ndk-host .... Set Android NDK host (linux-x86, linux-x86_64, etc.)
+ -android-ndk-host .... Set Android NDK host (linux-x86, linux-arm64, etc.)
[$ANDROID_NDK_HOST]
-android-abis ....... Comma separated Android abis, default is:
- armeabi-v7a,arm64-v8a,x86,x86_64
+ armeabi-v7a,arm64-v8a,x86,arm64
-android-style-assets Automatically extract style assets from the device at
run time. This option makes the Android style behave
correctly, but also makes the Android platform plugin
diff --git a/project/bundles/3rdparty/ext_qtwebkit/CMakeLists.txt b/project/bundles/3rdparty/ext_qtwebkit/CMakeLists.txt
index 4873ff9b22..ec0a931a6b 100644
--- a/project/bundles/3rdparty/ext_qtwebkit/CMakeLists.txt
+++ b/project/bundles/3rdparty/ext_qtwebkit/CMakeLists.txt
@@ -43,7 +43,7 @@ if(APPLE)
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/qtwebkit-fixrpath-macports.patch
CONFIGURE_COMMAND cp -f ${CMAKE_CURRENT_SOURCE_DIR}/../../../../bootstrap.macports <SOURCE_DIR>/. &&
- <SOURCE_DIR>/bootstrap.macports ${EXTPREFIX_qtwebkit} MinSizeRel x86_64 ${BASH_OPTIONS}
+ <SOURCE_DIR>/bootstrap.macports ${EXTPREFIX_qtwebkit} MinSizeRel arm64 ${BASH_OPTIONS}
BUILD_COMMAND cd <SOURCE_DIR>/build && $(MAKE)
diff --git a/project/bundles/macports/01-build-macports.sh b/project/bundles/macports/01-build-macports.sh
index c9593b8f6f..5b93322878 100755
--- a/project/bundles/macports/01-build-macports.sh
+++ b/project/bundles/macports/01-build-macports.sh
@@ -210,7 +210,7 @@ EOF
# No need to build with both architectures embeded (x86 and ARM) for Apple Silicon target
cat << EOF >> "$INSTALL_PREFIX/etc/macports/variants.conf"
-+universal
++arm64
EOF
fi
diff --git a/project/bundles/macports/config.sh b/project/bundles/macports/config.sh
index 830ac93ed5..d84dc30231 100644
--- a/project/bundles/macports/config.sh
+++ b/project/bundles/macports/config.sh
@@ -16,7 +16,7 @@ BUILDING_DIR="`pwd`/temp.build"
########################################################################
# Target macOS architecture: "x86_64" for Intel 64 bits, or "arm64" for Apple Silicon 64 bits.
-ARCH_TARGET="x86_64"
+ARCH_TARGET="arm64"
if [[ $ARCH_TARGET = "x86_64" ]] ; then
@@ -50,7 +50,7 @@ if [[ $ARCH_TARGET = "x86_64" ]] ; then
elif [[ $ARCH_TARGET = "arm64" ]] ; then
# Apple Silicon is supported since macOS BigSur
- OSX_MIN_TARGET="11.0"
+ OSX_MIN_TARGET="11.3"
else
Capture d’écran 2023-06-02 à 15.52.04.jpeg
build-macports.full.log.zip