Mercurial > mxe-octave

annotate src/graphicsmagick-2-dynamicpath.patch @ 4773:7c3e3151bf58

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
graphicsmagic: enable modules, allow dynaic paths in windows * src/graphicsmagick-2-dynamicpath.patch: new file * dist-files.mk: ref graphicsmagick-2-dynamicpath.patch * src/graphicsmagick.mk; enable modules
author John Donoghue
date Tue, 17 Jul 2018 11:41:39 -0400
parents
children 7ac858194666
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4773
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
1 diff -ur GraphicsMagick-1.3.30.orig/magick/blob.c GraphicsMagick-1.3.30/magick/blob.c
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
2 --- GraphicsMagick-1.3.30.orig/magick/blob.c 2018-07-16 08:55:01.552444311 -0400
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
3 +++ GraphicsMagick-1.3.30/magick/blob.c 2018-07-17 09:27:05.584144673 -0400
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
4 @@ -1955,6 +1955,29 @@
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
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
34 Only in GraphicsMagick-1.3.30/magick: .blob.c.swp
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
35 diff -ur GraphicsMagick-1.3.30.orig/magick/module.c GraphicsMagick-1.3.30/magick/module.c
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
36 --- GraphicsMagick-1.3.30.orig/magick/module.c 2018-07-16 08:55:01.539443999 -0400
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
37 +++ GraphicsMagick-1.3.30/magick/module.c 2018-07-17 08:22:22.161123799 -0400
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
38 @@ -1021,6 +1021,33 @@
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
39 start += length+1;
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
40 }
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
41 }
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
42 +#if defined(MSWINDOWS)
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
43 + {
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
44 + char buf[FILENAME_MAX+100];
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
45 + if (GetModuleFileName(NULL, buf, FILENAME_MAX + 1))
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
46 + {
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
47 + char *ptr = strrchr(buf, '\\');
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
48 + if(ptr)
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
49 + {
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
50 + *(ptr+1) = 0;
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
51 + strcat(buf, "..\\lib\\");
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
52 + switch (module_type)
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
53 + {
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
54 + case MagickCoderModule:
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
55 + default:
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
56 + strcat(buf, MagickCoderModulesSubdir);
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
57 + break;
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
58 + case MagickFilterModule:
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
59 + strcat(buf, MagickFilterModulesSubdir);
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
60 + break;
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
61 + }
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
62 + strcat(buf, "\\");
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
63 + AddModulePath(path_map,&path_index,buf,exception);
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 + }
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
67 +#endif
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
68 +
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
69
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
70 #if defined(UseInstalledMagick)
7c3e3151bf58 graphicsmagic: enable modules, allow dynaic paths in windows
John Donoghue
parents:
diff changeset
71 # if defined(MagickCoderModulesPath)