https://bugs.kde.org/show_bug.cgi?id=443471
caulier.gil...@gmail.com changed:
What |Removed |Added
----------------------------------------------------------------------------
Latest Commit| |https://invent.kde.org/grap
| |hics/digikam/commit/081966f
| |3b2f1c236bc994c19a4cd9e7e82
| |018271
--- Comment #24 from caulier.gil...@gmail.com ---
Git commit 081966f3b2f1c236bc994c19a4cd9e7e82018271 by Gilles Caulier.
Committed on 06/01/2022 at 17:38.
Pushed by cgilles into branch 'master'.
Update DrMingw to last stable 0.9.4
M +22 -42 project/bundles/3rdparty/ext_drmingw/CMakeLists.txt
M +29 -15 project/bundles/3rdparty/ext_drmingw/drmingw-coreonly.patch
M +4 -3 project/bundles/mxe/01-build-mxe.sh
M +4 -1 project/bundles/mxe/04-build-installer.sh
M +2 -1 project/bundles/mxe/rll.py
https://invent.kde.org/graphics/digikam/commit/081966f3b2f1c236bc994c19a4cd9e7e82018271
diff --git a/project/bundles/3rdparty/ext_drmingw/CMakeLists.txt
b/project/bundles/3rdparty/ext_drmingw/CMakeLists.txt
index ae74fbb15b..6ffe0cd1bd 100644
--- a/project/bundles/3rdparty/ext_drmingw/CMakeLists.txt
+++ b/project/bundles/3rdparty/ext_drmingw/CMakeLists.txt
@@ -11,20 +11,24 @@ set(PREFIX_ext_drmingw "${EXTPREFIX}")
# Compile DrMingw source code
ExternalProject_Add(ext_drmingw
+
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
- URL https://github.com/jrfonseca/drmingw/archive/0.9.2.tar.gz
- URL_MD5 08f6ab4587deeea2406a69a115d7a8c7
+
+ GIT_REPOSITORY https://github.com/jrfonseca/drmingw.git
+ GIT_TAG 0.9.4
INSTALL_DIR ${EXTPREFIX_drmingw}
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i
${CMAKE_CURRENT_SOURCE_DIR}/drmingw-coreonly.patch
- CONFIGURE_COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/../../../../bootstrap.mxe
<SOURCE_DIR>/. &&
- <SOURCE_DIR>/bootstrap.mxe ${MXE_BUILDROOT}
RelWithDebInfo -DBUILD_TESTING=OFF
+ CONFIGURE_COMMAND git submodule update --init &&
+ cp ${CMAKE_CURRENT_SOURCE_DIR}/../../../../bootstrap.mxe
<SOURCE_DIR>/. &&
+ <SOURCE_DIR>/bootstrap.mxe ${MXE_BUILDROOT}
RelWithDebInfo -DBUILD_TESTING=OFF -DCMAKE_DISABLE_FIND_PACKAGE_PythonInterp=1
-DCMAKE_DISABLE_FIND_PACKAGE_WinDbg=1
BUILD_COMMAND cd <SOURCE_DIR>/build.mxe && $(MAKE)
- INSTALL_COMMAND cd <SOURCE_DIR>/build.mxe && make install/fast
+ INSTALL_COMMAND cd <SOURCE_DIR>/build.mxe && make install/fast &&
+ ${CMAKE_COMMAND} -E copy
<SOURCE_DIR>/build.mxe/thirdparty/libz.dll ${PREFIX_ext_drmingw}/bin/
UPDATE_COMMAND ""
BUILD_IN_SOURCE 1
@@ -33,44 +37,20 @@ ExternalProject_Add(ext_drmingw
# Deploying DrMingw run-time dependencies
-if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
-
- # 64 bits
-
- ExternalProject_Add(ext_drmingw_deps
- DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
- URL
https://github.com/jrfonseca/drmingw/releases/download/0.9.2/drmingw-0.9.2-win64.7z
- URL_HASH MD5=687f29c0c6dc961890e7b4277a87c8a2
-
- INSTALL_DIR ${PREFIX_ext_drmingw}
- CONFIGURE_COMMAND ""
- BUILD_COMMAND ""
- INSTALL_COMMAND ${CMAKE_COMMAND} -E copy <SOURCE_DIR>/bin/dbghelp.dll
${PREFIX_ext_drmingw}/bin/
- COMMAND ${CMAKE_COMMAND} -E copy <SOURCE_DIR>/bin/symsrv.dll
${PREFIX_ext_drmingw}/bin/
- COMMAND ${CMAKE_COMMAND} -E copy <SOURCE_DIR>/bin/symsrv.yes
${PREFIX_ext_drmingw}/bin/
-
- UPDATE_COMMAND ""
- )
-
-else()
-
- # 32 bits
-
- ExternalProject_Add(ext_drmingw_deps
- DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
- URL
https://github.com/jrfonseca/drmingw/releases/download/0.9.2/drmingw-0.9.2-win32.7z
- URL_HASH MD5=78783e43b3509041b86597add2b8c028
-
- INSTALL_DIR ${PREFIX_ext_drmingw}
- CONFIGURE_COMMAND ""
- BUILD_COMMAND ""
- INSTALL_COMMAND ${CMAKE_COMMAND} -E copy <SOURCE_DIR>/bin/dbghelp.dll
${PREFIX_ext_drmingw}/bin/
- COMMAND ${CMAKE_COMMAND} -E copy <SOURCE_DIR>/bin/symsrv.dll
${PREFIX_ext_drmingw}/bin/
- COMMAND ${CMAKE_COMMAND} -E copy <SOURCE_DIR>/bin/symsrv.yes
${PREFIX_ext_drmingw}/bin/
+ExternalProject_Add(ext_drmingw_deps
+ DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
+ URL
https://github.com/jrfonseca/drmingw/releases/download/0.9.3/drmingw-0.9.3-win64.7z
+ URL_HASH MD5=f2a2e62a0214fe43525cf380d639b927
- UPDATE_COMMAND ""
- )
+ INSTALL_DIR ${PREFIX_ext_drmingw}
+ CONFIGURE_COMMAND ""
+ BUILD_COMMAND ""
+ INSTALL_COMMAND ${CMAKE_COMMAND} -E copy <SOURCE_DIR>/bin/dbghelp.dll
${PREFIX_ext_drmingw}/bin/
+ COMMAND ${CMAKE_COMMAND} -E copy <SOURCE_DIR>/bin/dbgcore.dll
${PREFIX_ext_drmingw}/bin/
+ COMMAND ${CMAKE_COMMAND} -E copy <SOURCE_DIR>/bin/symsrv.dll
${PREFIX_ext_drmingw}/bin/
+ COMMAND ${CMAKE_COMMAND} -E copy <SOURCE_DIR>/bin/symsrv.yes
${PREFIX_ext_drmingw}/bin/
-endif()
+ UPDATE_COMMAND ""
+)
add_dependencies(ext_drmingw ext_drmingw_deps)
diff --git a/project/bundles/3rdparty/ext_drmingw/drmingw-coreonly.patch
b/project/bundles/3rdparty/ext_drmingw/drmingw-coreonly.patch
index c6f4d7055d..1169d1ed7c 100644
--- a/project/bundles/3rdparty/ext_drmingw/drmingw-coreonly.patch
+++ b/project/bundles/3rdparty/ext_drmingw/drmingw-coreonly.patch
@@ -1,8 +1,35 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b2bdb35..733bc95 100644
+index 9dad199..77b72f8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -157,8 +157,8 @@ set (MGWHELP_IMPLIB
${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/libmgwhelp.a)
+@@ -64,16 +64,16 @@ add_compiler_flags (-fno-strict-aliasing)
+ include (StaticCRT)
+
+ # Avoid Posix threads
+-execute_process (
+- COMMAND "${CMAKE_COMMAND}" -E echo "#include <thread>\n#ifdef
_GLIBCXX_HAS_GTHREADS\n#error _GLIBCXX_HAS_GTHREADS\n#endif"
+- COMMAND "${CMAKE_CXX_COMPILER}" -x c++ -E -
+- RESULT_VARIABLE STATUS_CXX11_THREADS
+- OUTPUT_QUIET
+- ERROR_QUIET
+-)
+-if (NOT STATUS_CXX11_THREADS EQUAL 0)
+- message (SEND_ERROR "Win32 threads recommended.")
+-endif ()
++#execute_process (
++# COMMAND "${CMAKE_COMMAND}" -E echo "#include <thread>\n#ifdef
_GLIBCXX_HAS_GTHREADS\n#error _GLIBCXX_HAS_GTHREADS\n#endif"
++# COMMAND "${CMAKE_CXX_COMPILER}" -x c++ -E -
++# RESULT_VARIABLE STATUS_CXX11_THREADS
++# OUTPUT_QUIET
++# ERROR_QUIET
++#)
++#if (NOT STATUS_CXX11_THREADS EQUAL 0)
++# message (SEND_ERROR "Win32 threads recommended.")
++#endif ()
+
+ # Enable stack protection
+ # XXX: Broken on https://gcc.gnu.org/bugzilla/show_bug.cgi?id=86832
+@@ -145,8 +145,8 @@ set (MGWHELP_IMPLIB
${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/libmgwhelp.a)
set (EXCHNDL_IMPLIB ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/libexchndl.a)
add_subdirectory (src)
@@ -13,16 +40,3 @@ index b2bdb35..733bc95 100644
##############################################################################
-diff --git a/thirdparty/zlib/CMakeLists.txt b/thirdparty/zlib/CMakeLists.txt
-index bf66809..c2f3ccf 100644
---- a/thirdparty/zlib/CMakeLists.txt
-+++ b/thirdparty/zlib/CMakeLists.txt
-@@ -5,7 +5,7 @@ else ()
- add_definitions (-DHAVE_UNISTD_H)
- endif ()
-
--add_library (z EXCLUDE_FROM_ALL
-+add_library (z STATIC
- adler32.c
- compress.c
- crc32.c
diff --git a/project/bundles/mxe/01-build-mxe.sh
b/project/bundles/mxe/01-build-mxe.sh
index 7791ff44a0..a9f9b30360 100755
--- a/project/bundles/mxe/01-build-mxe.sh
+++ b/project/bundles/mxe/01-build-mxe.sh
@@ -40,7 +40,7 @@ ORIG_PATH="$PATH"
ORIG_WD="`pwd`"
export PATH=$MXE_BUILDROOT/usr/bin:$MXE_INSTALL_PREFIX/qt5/bin:$PATH
-
+if [ ] ; then
###############################################################################################
# Check if a previous bundle already exist
@@ -144,7 +144,7 @@ make MXE_TARGETS=$MXE_BUILD_TARGETS \
echo -e "\n"
# gdb \
-
+fi
#################################################################################################
echo -e "\n"
@@ -182,8 +182,9 @@ ${MXE_BUILD_TARGETS}-cmake $ORIG_WD/../3rdparty \
# Low level libraries
# NOTE: The order to compile each component here is very important.
-${MXE_BUILD_TARGETS}-cmake --build . --config RelWithDebInfo --target
ext_opencv -- -j$CPU_CORES
+#${MXE_BUILD_TARGETS}-cmake --build . --config RelWithDebInfo --target
ext_opencv -- -j$CPU_CORES
#${MXE_BUILD_TARGETS}-cmake --build . --config RelWithDebInfo --target
ext_libgphoto2 -- -j$CPU_CORES
+
${MXE_BUILD_TARGETS}-cmake --build . --config RelWithDebInfo --target
ext_drmingw -- -j$CPU_CORES
#################################################################################################
diff --git a/project/bundles/mxe/04-build-installer.sh
b/project/bundles/mxe/04-build-installer.sh
index cff78c7176..fd37007fd6 100755
--- a/project/bundles/mxe/04-build-installer.sh
+++ b/project/bundles/mxe/04-build-installer.sh
@@ -148,10 +148,13 @@ cp -r $MXE_INSTALL_PREFIX/bin/OpenAL32.dll
$BUNDLED
echo -e "\n---------- DrMinGw run-time"
cp -r $MXE_INSTALL_PREFIX/bin/exchndl.dll
$BUNDLEDIR/ 2>/dev/null
cp -r $MXE_INSTALL_PREFIX/bin/mgwhelp.dll
$BUNDLEDIR/ 2>/dev/null
-cp -r $MXE_INSTALL_PREFIX/bin/dbghelp.dll
$BUNDLEDIR/ 2>/dev/null
+cp -r $MXE_INSTALL_PREFIX/bin/dbgcore.dll
$BUNDLEDIR/ 2>/dev/null
cp -r $MXE_INSTALL_PREFIX/bin/symsrv.dll
$BUNDLEDIR/ 2>/dev/null
cp -r $MXE_INSTALL_PREFIX/bin/symsrv.yes
$BUNDLEDIR/ 2>/dev/null
+# Do not include this file from DrMinGW as it require extra devel dll from
Microsoft at run-time.
+#cp -r $MXE_INSTALL_PREFIX/bin/dbghelp.dll
$BUNDLEDIR/ 2>/dev/null
+
echo -e "\n---------- Copy executables with recursive dependencies in bundle
directory\n"
# Executables and plugins shared libraries dependencies scan
---------------------------------
diff --git a/project/bundles/mxe/rll.py b/project/bundles/mxe/rll.py
index 30d2895d30..1766fd02cb 100755
--- a/project/bundles/mxe/rll.py
+++ b/project/bundles/mxe/rll.py
@@ -90,7 +90,8 @@ blacklist = [
"dxgi.dll",
"dwrite.dll",
"ncrypt.dll",
- "dbghelp.dll", # blacklisted dll from DrMinGW as it use MSVC dll to
show debg dialog.
+ "dbghelp.dll", # blacklisted dll from DrMinGW as it use MSVC dll to
show debug dialog.
+ "dbgcore.dll", # blacklisted dll from DrMinGW.
]
# -----------------------------------------------
--
You are receiving this mail because:
You are watching all bug changes.
