-
Notifications
You must be signed in to change notification settings - Fork 343
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix windows pacman repo build. (#968)
Msys2 updated gcc in the last few days which has caused the package repo build to fail. Here are some minor fixes to make the build work again. - Add fmt to openimageio's dependency list since the version included with the openimageio source now appears to cause an internal compiler error. - Added an include for math.h to in a libsox test file to make the compiler stop generating an error about fabs() not being defined. - Fix type mismatch and missing declaration errors in ImageMagick. - Updated mingw-w64-dump_syms gitcommit to point to a version that fixes a missing header build error.
- Loading branch information
Showing
7 changed files
with
63 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
39 changes: 39 additions & 0 deletions
39
tools/MINGW-packages/mingw-w64-imagemagick/fix-compiler-errors.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
diff -ru a/magick/utility-private.h b/magick/utility-private.h | ||
--- a/magick/utility-private.h 2024-05-16 16:18:24.863994300 -0700 | ||
+++ b/magick/utility-private.h 2024-05-16 16:18:57.352206600 -0700 | ||
@@ -273,7 +273,7 @@ | ||
path_wide=create_wchar_path(path); | ||
if (path_wide == (WCHAR *) NULL) | ||
return(-1); | ||
- status=wstat(path_wide,attributes); | ||
+ status=_wstati64(path_wide,attributes); | ||
path_wide=(WCHAR *) RelinquishMagickMemory(path_wide); | ||
return(status); | ||
#endif | ||
|
||
diff -ru a/magick/utility.c b/magick/utility.c | ||
--- a/magick/utility.c 2020-05-31 09:04:03.000000000 -0700 | ||
+++ b/magick/utility.c 2024-05-17 08:05:06.523764900 -0700 | ||
@@ -67,6 +67,9 @@ | ||
#if defined(MAGICKCORE_HAVE_PROCESS_H) | ||
#include <process.h> | ||
#endif | ||
+#if defined(MAGICKCORE_HAVE_GETPAGESIZE) | ||
+int getpagesize(); | ||
+#endif | ||
#if defined(MAGICKCORE_HAVE_MACH_O_DYLD_H) | ||
#include <mach-o/dyld.h> | ||
#end | ||
|
||
diff -ru a/wand/mogrify.c b/wand/mogrify.c | ||
--- a/wand/mogrify.c 2020-05-31 09:04:03.000000000 -0700 | ||
+++ b/wand/mogrify.c 2024-05-17 08:33:23.368934800 -0700 | ||
@@ -3983,7 +3983,7 @@ | ||
"preserve-timestamp")); | ||
if (preserve_timestamp != MagickFalse) | ||
{ | ||
- struct utimbuf | ||
+ struct _utimbuf | ||
timestamp; | ||
|
||
timestamp.actime=properties.st_atime; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
11 changes: 11 additions & 0 deletions
11
tools/MINGW-packages/mingw-w64-sox/include-math-header.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
diff -ur a/src/sox_sample_test.h b/src/sox_sample_test.h | ||
--- a/src/sox_sample_test.h 2012-01-23 14:27:33.000000000 -0800 | ||
+++ b/src/sox_sample_test.h 2024-05-16 14:11:33.908971100 -0700 | ||
@@ -19,6 +19,7 @@ | ||
#undef NDEBUG /* Must undef above assert.h or other that might include it. */ | ||
#endif | ||
#include <assert.h> | ||
+#include <math.h> | ||
#include "sox.h" | ||
|
||
#define TEST_UINT(bits) \ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
20240201-1 | ||
20240516-1 |