Mercurial > mxe-octave

annotate src/graphicsmagick-2-dynamicpath.patch @ 6234:97c5f8da5036 release

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* src/librsb.mk: update to 1.2.0.11
author Markus Mützel <markus.muetzel@gmx.de>
date Fri, 27 May 2022 12:24:32 +0200
parents 7ac858194666
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
6014
7ac858194666 graphicsmagick: update to v1.3.37
John Donoghue <john.donoghue@ieee.org>
parents: 4773
diff changeset
1 diff -ur GraphicsMagick-1.3.37.orig/magick/blob.c GraphicsMagick-1.3.37/magick/blob.c
7ac858194666 graphicsmagick: update to v1.3.37
John Donoghue <john.donoghue@ieee.org>
parents: 4773
diff changeset
2 --- GraphicsMagick-1.3.37.orig/magick/blob.c 2021-12-14 12:59:54.946462559 -0500
7ac858194666 graphicsmagick: update to v1.3.37
John Donoghue <john.donoghue@ieee.org>
parents: 4773
diff changeset
3 +++ GraphicsMagick-1.3.37/magick/blob.c 2021-12-14 13:05:57.022604525 -0500
7ac858194666 graphicsmagick: update to v1.3.37
John Donoghue <john.donoghue@ieee.org>
parents: 4773
diff changeset
4 @@ -1975,6 +1975,29 @@
4773
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
5 AddConfigurePath(path_map,&path_index,MagickLibConfigPath,exception);
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
6 # endif /* defined(MagickLibConfigPath) */
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
7
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
8 +#if defined(MSWINDOWS)
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
9 + {
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
10 + char buf[FILENAME_MAX+100];
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
11 + if (GetModuleFileName(NULL, buf, FILENAME_MAX + 1))
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
12 + {
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
13 + char *ptr = strrchr(buf, '\\');
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
14 + if(ptr) {
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
15 + *(ptr+1) = 0;
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
16 + strcat(buf, "..\\lib\\");
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
17 + strcat(buf, MagickShareConfigSubDir);
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
18 + strcat(buf, "\\");
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
19 + AddConfigurePath(path_map,&path_index,buf,exception);
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
20 +
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
21 + *(ptr+1) = 0;
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
22 + strcat(buf, "..\\share\\");
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
23 + strcat(buf, MagickLibConfigSubDir);
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
24 + strcat(buf, "\\");
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
25 + AddConfigurePath(path_map,&path_index,buf,exception);
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
26 + }
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
27 + }
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
28 + }
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
29 +#endif
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
30 +
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
31 # if defined(MSWINDOWS) && !(defined(MagickLibConfigPath) || defined(MagickShareConfigPath))
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
32 {
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
33 char
6014
7ac858194666 graphicsmagick: update to v1.3.37
John Donoghue <john.donoghue@ieee.org>
parents: 4773
diff changeset
34 diff -ur GraphicsMagick-1.3.37.orig/magick/module.c GraphicsMagick-1.3.37/magick/module.c
7ac858194666 graphicsmagick: update to v1.3.37
John Donoghue <john.donoghue@ieee.org>
parents: 4773
diff changeset
35 --- GraphicsMagick-1.3.37.orig/magick/module.c 2021-12-14 12:59:54.935462099 -0500
7ac858194666 graphicsmagick: update to v1.3.37
John Donoghue <john.donoghue@ieee.org>
parents: 4773
diff changeset
36 +++ GraphicsMagick-1.3.37/magick/module.c 2021-12-14 13:08:20.667611735 -0500
7ac858194666 graphicsmagick: update to v1.3.37
John Donoghue <john.donoghue@ieee.org>
parents: 4773
diff changeset
37 @@ -1036,6 +1036,33 @@
4773
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
38 }
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
39 }
6014
7ac858194666 graphicsmagick: update to v1.3.37
John Donoghue <john.donoghue@ieee.org>
parents: 4773
diff changeset
40
4773
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
41 +#if defined(MSWINDOWS)
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
42 + {
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
43 + char buf[FILENAME_MAX+100];
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
44 + if (GetModuleFileName(NULL, buf, FILENAME_MAX + 1))
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
45 + {
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
46 + char *ptr = strrchr(buf, '\\');
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
47 + if(ptr)
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
48 + {
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
49 + *(ptr+1) = 0;
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
50 + strcat(buf, "..\\lib\\");
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
51 + switch (module_type)
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
52 + {
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
53 + case MagickCoderModule:
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
54 + default:
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
55 + strcat(buf, MagickCoderModulesSubdir);
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
56 + break;
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
57 + case MagickFilterModule:
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
58 + strcat(buf, MagickFilterModulesSubdir);
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
59 + break;
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
60 + }
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
61 + strcat(buf, "\\");
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
62 + AddModulePath(path_map,&path_index,buf,exception);
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
63 + }
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
64 + }
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
65 + }
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
66 +#endif
6014
7ac858194666 graphicsmagick: update to v1.3.37
John Donoghue <john.donoghue@ieee.org>
parents: 4773
diff changeset
67 +
4773
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
68 #if defined(UseInstalledMagick)
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
69 # if defined(MagickCoderModulesPath)
6014
7ac858194666 graphicsmagick: update to v1.3.37
John Donoghue <john.donoghue@ieee.org>
parents: 4773
diff changeset
70 {