rev |
line source |
al@19713
|
1 Submitted By: Ken Moffat <ken at linuxfromscratch dot org>
|
al@19713
|
2 Date: 2017-01-09
|
al@19713
|
3 Initial Package Version: 6.9.6-3
|
al@19713
|
4 Upstream Status: N/A
|
al@19713
|
5 Origin: Self
|
al@19713
|
6 Description: Allows the libraries of ImageMagick-6 to be installed
|
al@19713
|
7 without the programs or man-pages, and with versioned pkgconfig files
|
al@19713
|
8 so that ImageMagick-7 can be installed alongside this. Do not build
|
al@19713
|
9 perl here if doing this (the version from ImageMagick-7 will use the
|
al@19713
|
10 libraries from 7), and edit anyi cmake programs using this (e.g.
|
al@19713
|
11 inkscape-0.92) so that they look for the -6 pkgconfig files.
|
al@19713
|
12
|
al@19713
|
13 Internally, ImageMagick-7 is a major change, and the names of the
|
al@19713
|
14 libraries and the include directories differ.
|
al@19713
|
15
|
al@19713
|
16 For packages which use a conventional configure script, pass
|
al@19713
|
17 IMAGEMAGICK_CFLAGS=-I/usr/include/ImageMagick-6 and
|
al@19713
|
18 IMAGEMAGICK_LIBS="-lMagickCore-6.Q16HDRI -lMagick++-6.Q16HDRI -lMagickWand-6.Q16HDRI"
|
al@19713
|
19
|
al@19713
|
20 In some places I have had to hardcode -6 because I could not persuade
|
al@19713
|
21 the build system to convert @MAGICK_CORE_VERSION@ in one file or for
|
al@19713
|
22 the names of the files.
|
al@19713
|
23
|
al@19713
|
24 Also, my raw patch deletes wand/Wand.pc.in but gnu patch fails there,
|
al@19713
|
25 believing it is a reversal (not understood, a git patch would be
|
al@19713
|
26 easier if we all had git, mentioned because it will probably happen
|
al@19713
|
27 again if this has to be rediffed for future versions).
|
al@19713
|
28
|
al@19713
|
29 diff -Naur ImageMagick-6.9.6-3.orig/configure ImageMagick-6.9.6-3/configure
|
al@19713
|
30 --- ImageMagick-6.9.6-3.orig/configure 2017-01-07 01:35:18.362869976 +0000
|
al@19713
|
31 +++ ImageMagick-6.9.6-3/configure 2017-01-07 20:50:59.735901975 +0000
|
al@19713
|
32 @@ -37452,7 +37452,7 @@
|
al@19713
|
33 # ==============================================================================
|
al@19713
|
34 # Generate build environment
|
al@19713
|
35 # ==============================================================================
|
al@19713
|
36 -ac_config_files="$ac_config_files common.shi config/configure.xml config/delegates.xml config/ImageMagick.rdf config/MagickCore.dox config/MagickWand.dox config/Magick++.dox config/type-apple.xml config/type-dejavu.xml config/type-ghostscript.xml config/type-windows.xml config/type.xml ImageMagick.spec Magick++/bin/Magick++-config magick/ImageMagick.pc Magick++/lib/ImageMagick++.pc Magick++/lib/Magick++.pc magick/Magick-config magick/MagickCore-config magick/MagickCore.pc magick/version.h Makefile magick.sh PerlMagick/check.sh PerlMagick/default/Magick.pm PerlMagick/Makefile.PL PerlMagick/default/Makefile.PL PerlMagick/quantum/Makefile.PL PerlMagick/quantum/quantum.pm PerlMagick/quantum/quantum.xs PerlMagick/quantum/typemap utilities/animate.1 utilities/compare.1 utilities/composite.1 utilities/conjure.1 utilities/convert.1 utilities/display.1 utilities/identify.1 utilities/ImageMagick.1 utilities/import.1 utilities/mogrify.1 utilities/montage.1 utilities/stream.1 wand/MagickWand-config wand/MagickWand.pc wand/Wand-config wand/Wand.pc"
|
al@19713
|
37 +ac_config_files="$ac_config_files common.shi config/configure.xml config/delegates.xml config/ImageMagick.rdf config/MagickCore.dox config/MagickWand.dox config/Magick++.dox config/type-apple.xml config/type-dejavu.xml config/type-ghostscript.xml config/type-windows.xml config/type.xml ImageMagick.spec Magick++/bin/Magick++-config magick/ImageMagick-6.pc Magick++/lib/ImageMagick++-6.pc Magick++/lib/Magick++-6.pc magick/Magick-config magick/MagickCore-config magick/MagickCore-6.pc magick/version.h Makefile magick.sh PerlMagick/check.sh PerlMagick/default/Magick.pm PerlMagick/Makefile.PL PerlMagick/default/Makefile.PL PerlMagick/quantum/Makefile.PL PerlMagick/quantum/quantum.pm PerlMagick/quantum/quantum.xs PerlMagick/quantum/typemap utilities/animate.1 utilities/compare.1 utilities/composite.1 utilities/conjure.1 utilities/convert.1 utilities/display.1 utilities/identify.1 utilities/ImageMagick.1 utilities/import.1 utilities/mogrify.1 utilities/montage.1 utilities/stream.1 wand/MagickWand-config wand/MagickWand-6.pc wand/Wand-config wand/Wand-6.pc"
|
al@19713
|
38
|
al@19713
|
39 cat >confcache <<\_ACEOF
|
al@19713
|
40 # This file is a shell script that caches the results of configure
|
al@19713
|
41 diff -Naur ImageMagick-6.9.6-3.orig/configure.ac ImageMagick-6.9.6-3/configure.ac
|
al@19713
|
42 --- ImageMagick-6.9.6-3.orig/configure.ac 2017-01-07 01:35:27.053787793 +0000
|
al@19713
|
43 +++ ImageMagick-6.9.6-3/configure.ac 2017-01-07 20:52:26.205101788 +0000
|
al@19713
|
44 @@ -3835,12 +3835,12 @@
|
al@19713
|
45 config/type.xml \
|
al@19713
|
46 ImageMagick.spec \
|
al@19713
|
47 Magick++/bin/Magick++-config \
|
al@19713
|
48 - magick/ImageMagick.pc \
|
al@19713
|
49 - Magick++/lib/ImageMagick++.pc \
|
al@19713
|
50 - Magick++/lib/Magick++.pc \
|
al@19713
|
51 + magick/ImageMagick-6.pc \
|
al@19713
|
52 + Magick++/lib/ImageMagick++-6.pc \
|
al@19713
|
53 + Magick++/lib/Magick++-6.pc \
|
al@19713
|
54 magick/Magick-config \
|
al@19713
|
55 magick/MagickCore-config \
|
al@19713
|
56 - magick/MagickCore.pc \
|
al@19713
|
57 + magick/MagickCore-6.pc \
|
al@19713
|
58 magick/version.h \
|
al@19713
|
59 Makefile \
|
al@19713
|
60 magick.sh \
|
al@19713
|
61 @@ -3865,9 +3865,9 @@
|
al@19713
|
62 utilities/montage.1 \
|
al@19713
|
63 utilities/stream.1 \
|
al@19713
|
64 wand/MagickWand-config \
|
al@19713
|
65 - wand/MagickWand.pc \
|
al@19713
|
66 + wand/MagickWand-6.pc \
|
al@19713
|
67 wand/Wand-config \
|
al@19713
|
68 - wand/Wand.pc ])
|
al@19713
|
69 + wand/Wand-6.pc ])
|
al@19713
|
70 AC_OUTPUT
|
al@19713
|
71
|
al@19713
|
72 # ==============================================================================
|
al@19713
|
73 diff -Naur ImageMagick-6.9.6-3.orig/magick/ImageMagick-6.pc.in ImageMagick-6.9.6-3/magick/ImageMagick-6.pc.in
|
al@19713
|
74 --- ImageMagick-6.9.6-3.orig/magick/ImageMagick-6.pc.in 1970-01-01 01:00:00.000000000 +0100
|
al@19713
|
75 +++ ImageMagick-6.9.6-3/magick/ImageMagick-6.pc.in 2017-01-07 00:55:17.999483324 +0000
|
al@19713
|
76 @@ -0,0 +1,14 @@
|
al@19713
|
77 +prefix=@prefix@
|
al@19713
|
78 +exec_prefix=@exec_prefix@
|
al@19713
|
79 +libdir=@libdir@
|
al@19713
|
80 +includedir=@includedir@/ImageMagick-@MAGICK_MAJOR_VERSION@
|
al@19713
|
81 +includearchdir=@INCLUDEARCH_DIR@/ImageMagick-@MAGICK_MAJOR_VERSION@
|
al@19713
|
82 +libname=MagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@
|
al@19713
|
83 +
|
al@19713
|
84 +Name: ImageMagick-@MAGICK_MAJOR_VERSION@
|
al@19713
|
85 +Description: ImageMagick - convert, edit, and compose images (ABI @MAGICK_ABI_SUFFIX@)
|
al@19713
|
86 +URL: https://www.imagemagick.org
|
al@19713
|
87 +Version: @PACKAGE_VERSION@
|
al@19713
|
88 +Cflags: -I${includearchdir} -I${includedir} @MAGICK_PCFLAGS@
|
al@19713
|
89 +Libs: -L${libdir} -l${libname}
|
al@19713
|
90 +Libs.private: -L${libdir} -l${libname} @MAGICK_LIBS@ @MATH_LIBS@
|
al@19713
|
91 diff -Naur ImageMagick-6.9.6-3.orig/magick/ImageMagick.pc.in ImageMagick-6.9.6-3/magick/ImageMagick.pc.in
|
al@19713
|
92 --- ImageMagick-6.9.6-3.orig/magick/ImageMagick.pc.in 2017-01-07 01:58:35.942633448 +0000
|
al@19713
|
93 +++ ImageMagick-6.9.6-3/magick/ImageMagick.pc.in 1970-01-01 01:00:00.000000000 +0100
|
al@19713
|
94 @@ -1,14 +0,0 @@
|
al@19713
|
95 -prefix=@prefix@
|
al@19713
|
96 -exec_prefix=@exec_prefix@
|
al@19713
|
97 -libdir=@libdir@
|
al@19713
|
98 -includedir=@includedir@/ImageMagick-@MAGICK_MAJOR_VERSION@
|
al@19713
|
99 -includearchdir=@INCLUDEARCH_DIR@/ImageMagick-@MAGICK_MAJOR_VERSION@
|
al@19713
|
100 -libname=MagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@
|
al@19713
|
101 -
|
al@19713
|
102 -Name: ImageMagick
|
al@19713
|
103 -Description: ImageMagick - convert, edit, and compose images (ABI @MAGICK_ABI_SUFFIX@)
|
al@19713
|
104 -URL: https://www.imagemagick.org
|
al@19713
|
105 -Version: @PACKAGE_VERSION@
|
al@19713
|
106 -Cflags: -I${includearchdir} -I${includedir} @MAGICK_PCFLAGS@
|
al@19713
|
107 -Libs: -L${libdir} -l${libname}
|
al@19713
|
108 -Libs.private: -L${libdir} -l${libname} @MAGICK_LIBS@ @MATH_LIBS@
|
al@19713
|
109 diff -Naur ImageMagick-6.9.6-3.orig/magick/MagickCore-6.pc.in ImageMagick-6.9.6-3/magick/MagickCore-6.pc.in
|
al@19713
|
110 --- ImageMagick-6.9.6-3.orig/magick/MagickCore-6.pc.in 1970-01-01 01:00:00.000000000 +0100
|
al@19713
|
111 +++ ImageMagick-6.9.6-3/magick/MagickCore-6.pc.in 2017-01-07 22:13:31.500562039 +0000
|
al@19713
|
112 @@ -0,0 +1,15 @@
|
al@19713
|
113 +prefix=@prefix@
|
al@19713
|
114 +exec_prefix=@exec_prefix@
|
al@19713
|
115 +libdir=@libdir@
|
al@19713
|
116 +includedir=@includedir@/ImageMagick-@MAGICK_MAJOR_VERSION@
|
al@19713
|
117 +includearchdir=@INCLUDEARCH_DIR@/ImageMagick-@MAGICK_MAJOR_VERSION@
|
al@19713
|
118 +libname=MagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@
|
al@19713
|
119 +moduledir=@libdir@/ImageMagick-@MAGICK_MAJOR_VERSION@.@MAGICK_MINOR_VERSION@.@MAGICK_MICRO_VERSION@/modules-@MAGICK_ABI_SUFFIX@
|
al@19713
|
120 +
|
al@19713
|
121 +Name: MagickCore-@MAGICK_MAJOR_VERSION@
|
al@19713
|
122 +Description: MagickCore - C API for ImageMagick (ABI @MAGICK_ABI_SUFFIX@)
|
al@19713
|
123 +URL: https://www.imagemagick.org
|
al@19713
|
124 +Version: @PACKAGE_VERSION@
|
al@19713
|
125 +Cflags: -I${includearchdir} -I${includedir} @MAGICK_PCFLAGS@
|
al@19713
|
126 +Libs: -L${libdir} -l${libname}
|
al@19713
|
127 +Libs.private: -L${libdir} -l${libname} @MAGICK_LIBS@ @MATH_LIBS@
|
al@19713
|
128 diff -Naur ImageMagick-6.9.6-3.orig/magick/MagickCore.pc.in ImageMagick-6.9.6-3/magick/MagickCore.pc.in
|
al@19713
|
129 --- ImageMagick-6.9.6-3.orig/magick/MagickCore.pc.in 2016-10-31 00:34:31.000000000 +0000
|
al@19713
|
130 +++ ImageMagick-6.9.6-3/magick/MagickCore.pc.in 1970-01-01 01:00:00.000000000 +0100
|
al@19713
|
131 @@ -1,15 +0,0 @@
|
al@19713
|
132 -prefix=@prefix@
|
al@19713
|
133 -exec_prefix=@exec_prefix@
|
al@19713
|
134 -libdir=@libdir@
|
al@19713
|
135 -includedir=@includedir@/ImageMagick-@MAGICK_MAJOR_VERSION@
|
al@19713
|
136 -includearchdir=@INCLUDEARCH_DIR@/ImageMagick-@MAGICK_MAJOR_VERSION@
|
al@19713
|
137 -libname=MagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@
|
al@19713
|
138 -moduledir=@libdir@/ImageMagick-@MAGICK_MAJOR_VERSION@.@MAGICK_MINOR_VERSION@.@MAGICK_MICRO_VERSION@/modules-@MAGICK_ABI_SUFFIX@
|
al@19713
|
139 -
|
al@19713
|
140 -Name: MagickCore
|
al@19713
|
141 -Description: MagickCore - C API for ImageMagick (ABI @MAGICK_ABI_SUFFIX@)
|
al@19713
|
142 -URL: https://www.imagemagick.org
|
al@19713
|
143 -Version: @PACKAGE_VERSION@
|
al@19713
|
144 -Cflags: -I${includearchdir} -I${includedir} @MAGICK_PCFLAGS@
|
al@19713
|
145 -Libs: -L${libdir} -l${libname}
|
al@19713
|
146 -Libs.private: -L${libdir} -l${libname} @MAGICK_LIBS@ @MATH_LIBS@
|
al@19713
|
147 diff -Naur ImageMagick-6.9.6-3.orig/Magick++/lib/ImageMagick++-6.pc.in ImageMagick-6.9.6-3/Magick++/lib/ImageMagick++-6.pc.in
|
al@19713
|
148 --- ImageMagick-6.9.6-3.orig/Magick++/lib/ImageMagick++-6.pc.in 1970-01-01 01:00:00.000000000 +0100
|
al@19713
|
149 +++ ImageMagick-6.9.6-3/Magick++/lib/ImageMagick++-6.pc.in 2017-01-07 22:11:59.637428232 +0000
|
al@19713
|
150 @@ -0,0 +1,14 @@
|
al@19713
|
151 +prefix=@prefix@
|
al@19713
|
152 +exec_prefix=@exec_prefix@
|
al@19713
|
153 +libdir=@libdir@
|
al@19713
|
154 +includedir=@includedir@/ImageMagick-@MAGICK_MAJOR_VERSION@
|
al@19713
|
155 +includearchdir=@INCLUDEARCH_DIR@/ImageMagick-@MAGICK_MAJOR_VERSION@
|
al@19713
|
156 +libname=Magick++-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@
|
al@19713
|
157 +
|
al@19713
|
158 +Name: ImageMagick++-@MAGICK_MAJOR_VERSION@
|
al@19713
|
159 +Description: Magick++ - C++ API for ImageMagick (ABI @MAGICK_ABI_SUFFIX@)
|
al@19713
|
160 +Version: @PACKAGE_VERSION@
|
al@19713
|
161 +Requires: MagickWand-@MAGICK_MAJOR_VERSION@
|
al@19713
|
162 +Libs: -L${libdir} -l${libname}
|
al@19713
|
163 +Libs.private: -L${libdir} -l${libname} @MAGICK_LIBS@ @MATH_LIBS@
|
al@19713
|
164 +Cflags: -I${includearchdir} -I${includedir} @MAGICK_PCFLAGS@
|
al@19713
|
165 diff -Naur ImageMagick-6.9.6-3.orig/Magick++/lib/ImageMagick++.pc.in ImageMagick-6.9.6-3/Magick++/lib/ImageMagick++.pc.in
|
al@19713
|
166 --- ImageMagick-6.9.6-3.orig/Magick++/lib/ImageMagick++.pc.in 2016-10-31 00:34:30.000000000 +0000
|
al@19713
|
167 +++ ImageMagick-6.9.6-3/Magick++/lib/ImageMagick++.pc.in 1970-01-01 01:00:00.000000000 +0100
|
al@19713
|
168 @@ -1,14 +0,0 @@
|
al@19713
|
169 -prefix=@prefix@
|
al@19713
|
170 -exec_prefix=@exec_prefix@
|
al@19713
|
171 -libdir=@libdir@
|
al@19713
|
172 -includedir=@includedir@/ImageMagick-@MAGICK_MAJOR_VERSION@
|
al@19713
|
173 -includearchdir=@INCLUDEARCH_DIR@/ImageMagick-@MAGICK_MAJOR_VERSION@
|
al@19713
|
174 -libname=Magick++-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@
|
al@19713
|
175 -
|
al@19713
|
176 -Name: ImageMagick++
|
al@19713
|
177 -Description: Magick++ - C++ API for ImageMagick (ABI @MAGICK_ABI_SUFFIX@)
|
al@19713
|
178 -Version: @PACKAGE_VERSION@
|
al@19713
|
179 -Requires: MagickWand
|
al@19713
|
180 -Libs: -L${libdir} -l${libname}
|
al@19713
|
181 -Libs.private: -L${libdir} -l${libname} @MAGICK_LIBS@ @MATH_LIBS@
|
al@19713
|
182 -Cflags: -I${includearchdir} -I${includedir} @MAGICK_PCFLAGS@
|
al@19713
|
183 diff -Naur ImageMagick-6.9.6-3.orig/Magick++/lib/Magick++-6.pc.in ImageMagick-6.9.6-3/Magick++/lib/Magick++-6.pc.in
|
al@19713
|
184 --- ImageMagick-6.9.6-3.orig/Magick++/lib/Magick++-6.pc.in 1970-01-01 01:00:00.000000000 +0100
|
al@19713
|
185 +++ ImageMagick-6.9.6-3/Magick++/lib/Magick++-6.pc.in 2017-01-07 21:09:41.641487042 +0000
|
al@19713
|
186 @@ -0,0 +1,14 @@
|
al@19713
|
187 +prefix=@prefix@
|
al@19713
|
188 +exec_prefix=@exec_prefix@
|
al@19713
|
189 +libdir=@libdir@
|
al@19713
|
190 +includedir=@includedir@/ImageMagick-@MAGICK_MAJOR_VERSION@
|
al@19713
|
191 +includearchdir=@INCLUDEARCH_DIR@/ImageMagick-@MAGICK_MAJOR_VERSION@
|
al@19713
|
192 +libname=Magick++-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@
|
al@19713
|
193 +
|
al@19713
|
194 +Name: Magick++-@MAGICK_MAJOR_VERSION@
|
al@19713
|
195 +Description: Magick++ - C++ API for ImageMagick (ABI @MAGICK_ABI_SUFFIX@)
|
al@19713
|
196 +Version: @PACKAGE_VERSION@
|
al@19713
|
197 +Requires: MagickWand-@MAGICK_MAJOR_VERSION@
|
al@19713
|
198 +Libs: -L${libdir} -l${libname}
|
al@19713
|
199 +Libs.private: -L${libdir} -l${libname} @MAGICK_LIBS@ @MATH_LIBS@
|
al@19713
|
200 +Cflags: -I${includearchdir} -I${includedir} @MAGICK_PCFLAGS@
|
al@19713
|
201 diff -Naur ImageMagick-6.9.6-3.orig/Magick++/lib/Magick++.pc.in ImageMagick-6.9.6-3/Magick++/lib/Magick++.pc.in
|
al@19713
|
202 --- ImageMagick-6.9.6-3.orig/Magick++/lib/Magick++.pc.in 2016-10-31 00:34:30.000000000 +0000
|
al@19713
|
203 +++ ImageMagick-6.9.6-3/Magick++/lib/Magick++.pc.in 1970-01-01 01:00:00.000000000 +0100
|
al@19713
|
204 @@ -1,14 +0,0 @@
|
al@19713
|
205 -prefix=@prefix@
|
al@19713
|
206 -exec_prefix=@exec_prefix@
|
al@19713
|
207 -libdir=@libdir@
|
al@19713
|
208 -includedir=@includedir@/ImageMagick-@MAGICK_MAJOR_VERSION@
|
al@19713
|
209 -includearchdir=@INCLUDEARCH_DIR@/ImageMagick-@MAGICK_MAJOR_VERSION@
|
al@19713
|
210 -libname=Magick++-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@
|
al@19713
|
211 -
|
al@19713
|
212 -Name: Magick++
|
al@19713
|
213 -Description: Magick++ - C++ API for ImageMagick (ABI @MAGICK_ABI_SUFFIX@)
|
al@19713
|
214 -Version: @PACKAGE_VERSION@
|
al@19713
|
215 -Requires: MagickWand
|
al@19713
|
216 -Libs: -L${libdir} -l${libname}
|
al@19713
|
217 -Libs.private: -L${libdir} -l${libname} @MAGICK_LIBS@ @MATH_LIBS@
|
al@19713
|
218 -Cflags: -I${includearchdir} -I${includedir} @MAGICK_PCFLAGS@
|
al@19713
|
219 diff -Naur ImageMagick-6.9.6-3.orig/Makefile.in ImageMagick-6.9.6-3/Makefile.in
|
al@19713
|
220 --- ImageMagick-6.9.6-3.orig/Makefile.in 2017-01-06 01:07:37.217002803 +0000
|
al@19713
|
221 +++ ImageMagick-6.9.6-3/Makefile.in 2017-01-08 00:24:45.777974561 +0000
|
al@19713
|
222 @@ -302,10 +302,10 @@
|
al@19713
|
223 config/Magick++.dox config/type-apple.xml \
|
al@19713
|
224 config/type-dejavu.xml config/type-ghostscript.xml \
|
al@19713
|
225 config/type-windows.xml config/type.xml ImageMagick.spec \
|
al@19713
|
226 - Magick++/bin/Magick++-config magick/ImageMagick.pc \
|
al@19713
|
227 - Magick++/lib/ImageMagick++.pc Magick++/lib/Magick++.pc \
|
al@19713
|
228 + Magick++/bin/Magick++-config magick/ImageMagick-6.pc \
|
al@19713
|
229 + Magick++/lib/ImageMagick++-6.pc Magick++/lib/Magick++-6.pc \
|
al@19713
|
230 magick/Magick-config magick/MagickCore-config \
|
al@19713
|
231 - magick/MagickCore.pc magick/version.h magick.sh \
|
al@19713
|
232 + magick/MagickCore-6.pc magick/version.h magick.sh \
|
al@19713
|
233 PerlMagick/check.sh PerlMagick/default/Magick.pm \
|
al@19713
|
234 PerlMagick/Makefile.PL PerlMagick/default/Makefile.PL \
|
al@19713
|
235 PerlMagick/quantum/Makefile.PL PerlMagick/quantum/quantum.pm \
|
al@19713
|
236 @@ -314,8 +314,8 @@
|
al@19713
|
237 utilities/conjure.1 utilities/convert.1 utilities/display.1 \
|
al@19713
|
238 utilities/identify.1 utilities/ImageMagick.1 \
|
al@19713
|
239 utilities/import.1 utilities/mogrify.1 utilities/montage.1 \
|
al@19713
|
240 - utilities/stream.1 wand/MagickWand-config wand/MagickWand.pc \
|
al@19713
|
241 - wand/Wand-config wand/Wand.pc
|
al@19713
|
242 + utilities/stream.1 wand/MagickWand-config wand/MagickWand-6.pc \
|
al@19713
|
243 + wand/Wand-config wand/Wand-6.pc
|
al@19713
|
244 CONFIG_CLEAN_VPATH_FILES =
|
al@19713
|
245 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
|
al@19713
|
246 am__vpath_adj = case $$p in \
|
al@19713
|
247 @@ -2471,8 +2471,8 @@
|
al@19713
|
248 $(srcdir)/tests/Makefile.am $(srcdir)/utilities/Makefile.am \
|
al@19713
|
249 $(srcdir)/wand/Makefile.am \
|
al@19713
|
250 $(top_srcdir)/Magick++/bin/Magick++-config.in \
|
al@19713
|
251 - $(top_srcdir)/Magick++/lib/ImageMagick++.pc.in \
|
al@19713
|
252 - $(top_srcdir)/Magick++/lib/Magick++.pc.in \
|
al@19713
|
253 + $(top_srcdir)/Magick++/lib/ImageMagick++-6.pc.in \
|
al@19713
|
254 + $(top_srcdir)/Magick++/lib/Magick++-6.pc.in \
|
al@19713
|
255 $(top_srcdir)/PerlMagick/Makefile.PL.in \
|
al@19713
|
256 $(top_srcdir)/PerlMagick/check.sh.in \
|
al@19713
|
257 $(top_srcdir)/PerlMagick/default/Magick.pm.in \
|
al@19713
|
258 @@ -2501,10 +2501,10 @@
|
al@19713
|
259 $(top_srcdir)/config/type-ghostscript.xml.in \
|
al@19713
|
260 $(top_srcdir)/config/type-windows.xml.in \
|
al@19713
|
261 $(top_srcdir)/config/type.xml.in \
|
al@19713
|
262 - $(top_srcdir)/magick/ImageMagick.pc.in \
|
al@19713
|
263 + $(top_srcdir)/magick/ImageMagick-6.pc.in \
|
al@19713
|
264 $(top_srcdir)/magick/Magick-config.in \
|
al@19713
|
265 $(top_srcdir)/magick/MagickCore-config.in \
|
al@19713
|
266 - $(top_srcdir)/magick/MagickCore.pc.in \
|
al@19713
|
267 + $(top_srcdir)/magick/MagickCore-6.pc.in \
|
al@19713
|
268 $(top_srcdir)/magick/version.h.in \
|
al@19713
|
269 $(top_srcdir)/utilities/ImageMagick.1.in \
|
al@19713
|
270 $(top_srcdir)/utilities/animate.1.in \
|
al@19713
|
271 @@ -2519,9 +2519,9 @@
|
al@19713
|
272 $(top_srcdir)/utilities/montage.1.in \
|
al@19713
|
273 $(top_srcdir)/utilities/stream.1.in \
|
al@19713
|
274 $(top_srcdir)/wand/MagickWand-config.in \
|
al@19713
|
275 - $(top_srcdir)/wand/MagickWand.pc.in \
|
al@19713
|
276 + $(top_srcdir)/wand/MagickWand-6.pc.in \
|
al@19713
|
277 $(top_srcdir)/wand/Wand-config.in \
|
al@19713
|
278 - $(top_srcdir)/wand/Wand.pc.in ChangeLog config/ar-lib \
|
al@19713
|
279 + $(top_srcdir)/wand/Wand.pc-6.in ChangeLog config/ar-lib \
|
al@19713
|
280 config/compile config/config.guess config/config.sub \
|
al@19713
|
281 config/depcomp config/install-sh config/ltmain.sh \
|
al@19713
|
282 config/missing config/mkinstalldirs
|
al@19713
|
283 @@ -4185,8 +4185,8 @@
|
al@19713
|
284 magick/MagickCore-config
|
al@19713
|
285
|
al@19713
|
286 MAGICK_PKGCONFIG = \
|
al@19713
|
287 - magick/ImageMagick.pc \
|
al@19713
|
288 - magick/MagickCore.pc \
|
al@19713
|
289 + magick/ImageMagick-6.pc \
|
al@19713
|
290 + magick/MagickCore-6.pc \
|
al@19713
|
291 magick/ImageMagick-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@.pc \
|
al@19713
|
292 magick/MagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@.pc
|
al@19713
|
293
|
al@19713
|
294 @@ -4605,9 +4605,9 @@
|
al@19713
|
295 magick/Magick-config.in \
|
al@19713
|
296 magick/MagickCore-config.in \
|
al@19713
|
297 $(MAGICK_MANS) \
|
al@19713
|
298 - magick/ImageMagick.pc.in \
|
al@19713
|
299 + magick/ImageMagick-6.pc.in \
|
al@19713
|
300 magick/libMagickCore.map \
|
al@19713
|
301 - magick/MagickCore.pc.in \
|
al@19713
|
302 + magick/MagickCore-6.pc.in \
|
al@19713
|
303 magick/config.h_vms \
|
al@19713
|
304 magick/mac.c \
|
al@19713
|
305 magick/nt-base.c \
|
al@19713
|
306 @@ -4722,8 +4722,8 @@
|
al@19713
|
307 wand/MagickWand-config
|
al@19713
|
308
|
al@19713
|
309 WAND_PKGCONFIG = \
|
al@19713
|
310 - wand/MagickWand.pc \
|
al@19713
|
311 - wand/Wand.pc \
|
al@19713
|
312 + wand/MagickWand-6.pc \
|
al@19713
|
313 + wand/Wand-6.pc \
|
al@19713
|
314 wand/MagickWand-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@.pc \
|
al@19713
|
315 wand/Wand-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@.pc
|
al@19713
|
316
|
al@19713
|
317 @@ -4747,9 +4747,9 @@
|
al@19713
|
318 wand/ChangeLog \
|
al@19713
|
319 wand/libMagickWand.map \
|
al@19713
|
320 wand/MagickWand-config.1 \
|
al@19713
|
321 - wand/MagickWand.pc.in \
|
al@19713
|
322 + wand/MagickWand-6.pc.in \
|
al@19713
|
323 wand/Wand-config.1 \
|
al@19713
|
324 - wand/Wand.pc.in
|
al@19713
|
325 + wand/Wand-6.pc.in
|
al@19713
|
326
|
al@19713
|
327 WAND_CLEANFILES =
|
al@19713
|
328 MAGICKPP_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/Magick++/lib
|
al@19713
|
329 @@ -4778,8 +4778,8 @@
|
al@19713
|
330 Magick++/bin/Magick++-config.1
|
al@19713
|
331
|
al@19713
|
332 MAGICKPP_PKGCONFIG_OPT = \
|
al@19713
|
333 - Magick++/lib/Magick++.pc \
|
al@19713
|
334 - Magick++/lib/ImageMagick++.pc \
|
al@19713
|
335 + Magick++/lib/Magick++-6.pc \
|
al@19713
|
336 + Magick++/lib/ImageMagick++-6.pc \
|
al@19713
|
337 Magick++/lib/Magick++-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@.pc \
|
al@19713
|
338 Magick++/lib/ImageMagick++-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@.pc
|
al@19713
|
339
|
al@19713
|
340 @@ -4796,9 +4796,9 @@
|
al@19713
|
341 Magick++/README \
|
al@19713
|
342 Magick++/bin/Magick++-config.1 \
|
al@19713
|
343 Magick++/bin/Magick++-config.in \
|
al@19713
|
344 - Magick++/lib/ImageMagick++.pc.in \
|
al@19713
|
345 + Magick++/lib/ImageMagick++-6.pc.in \
|
al@19713
|
346 Magick++/lib/libMagick++.map \
|
al@19713
|
347 - Magick++/lib/Magick++.pc.in \
|
al@19713
|
348 + Magick++/lib/Magick++-6.pc.in \
|
al@19713
|
349 Magick++/demo/model.miff \
|
al@19713
|
350 Magick++/demo/smile.miff \
|
al@19713
|
351 Magick++/demo/smile_anim.miff \
|
al@19713
|
352 @@ -5286,17 +5286,17 @@
|
al@19713
|
353 cd $(top_builddir) && $(SHELL) ./config.status $@
|
al@19713
|
354 Magick++/bin/Magick++-config: $(top_builddir)/config.status $(top_srcdir)/Magick++/bin/Magick++-config.in
|
al@19713
|
355 cd $(top_builddir) && $(SHELL) ./config.status $@
|
al@19713
|
356 -magick/ImageMagick.pc: $(top_builddir)/config.status $(top_srcdir)/magick/ImageMagick.pc.in
|
al@19713
|
357 +magick/ImageMagick-6.pc: $(top_builddir)/config.status $(top_srcdir)/magick/ImageMagick-6.pc.in
|
al@19713
|
358 cd $(top_builddir) && $(SHELL) ./config.status $@
|
al@19713
|
359 -Magick++/lib/ImageMagick++.pc: $(top_builddir)/config.status $(top_srcdir)/Magick++/lib/ImageMagick++.pc.in
|
al@19713
|
360 +Magick++/lib/ImageMagick++-6.pc: $(top_builddir)/config.status $(top_srcdir)/Magick++/lib/ImageMagick++-6.pc.in
|
al@19713
|
361 cd $(top_builddir) && $(SHELL) ./config.status $@
|
al@19713
|
362 -Magick++/lib/Magick++.pc: $(top_builddir)/config.status $(top_srcdir)/Magick++/lib/Magick++.pc.in
|
al@19713
|
363 +Magick++/lib/Magick++-6.pc: $(top_builddir)/config.status $(top_srcdir)/Magick++/lib/Magick++-6.pc.in
|
al@19713
|
364 cd $(top_builddir) && $(SHELL) ./config.status $@
|
al@19713
|
365 magick/Magick-config: $(top_builddir)/config.status $(top_srcdir)/magick/Magick-config.in
|
al@19713
|
366 cd $(top_builddir) && $(SHELL) ./config.status $@
|
al@19713
|
367 magick/MagickCore-config: $(top_builddir)/config.status $(top_srcdir)/magick/MagickCore-config.in
|
al@19713
|
368 cd $(top_builddir) && $(SHELL) ./config.status $@
|
al@19713
|
369 -magick/MagickCore.pc: $(top_builddir)/config.status $(top_srcdir)/magick/MagickCore.pc.in
|
al@19713
|
370 +magick/MagickCore-6.pc: $(top_builddir)/config.status $(top_srcdir)/magick/MagickCore-6.pc.in
|
al@19713
|
371 cd $(top_builddir) && $(SHELL) ./config.status $@
|
al@19713
|
372 magick/version.h: $(top_builddir)/config.status $(top_srcdir)/magick/version.h.in
|
al@19713
|
373 cd $(top_builddir) && $(SHELL) ./config.status $@
|
al@19713
|
374 @@ -5344,11 +5344,11 @@
|
al@19713
|
375 cd $(top_builddir) && $(SHELL) ./config.status $@
|
al@19713
|
376 wand/MagickWand-config: $(top_builddir)/config.status $(top_srcdir)/wand/MagickWand-config.in
|
al@19713
|
377 cd $(top_builddir) && $(SHELL) ./config.status $@
|
al@19713
|
378 -wand/MagickWand.pc: $(top_builddir)/config.status $(top_srcdir)/wand/MagickWand.pc.in
|
al@19713
|
379 +wand/MagickWand-6.pc: $(top_builddir)/config.status $(top_srcdir)/wand/MagickWand-6.pc.in
|
al@19713
|
380 cd $(top_builddir) && $(SHELL) ./config.status $@
|
al@19713
|
381 wand/Wand-config: $(top_builddir)/config.status $(top_srcdir)/wand/Wand-config.in
|
al@19713
|
382 cd $(top_builddir) && $(SHELL) ./config.status $@
|
al@19713
|
383 -wand/Wand.pc: $(top_builddir)/config.status $(top_srcdir)/wand/Wand.pc.in
|
al@19713
|
384 +wand/Wand-6.pc: $(top_builddir)/config.status $(top_srcdir)/wand/Wand-6.pc.in
|
al@19713
|
385 cd $(top_builddir) && $(SHELL) ./config.status $@
|
al@19713
|
386
|
al@19713
|
387 install-codersLTLIBRARIES: $(coders_LTLIBRARIES)
|
al@19713
|
388 @@ -11369,7 +11369,7 @@
|
al@19713
|
389 install-data-local install-docDATA install-filtersLTLIBRARIES \
|
al@19713
|
390 install-includeHEADERS install-magickincHEADERS \
|
al@19713
|
391 install-magickincarchHEADERS install-magickppincHEADERS \
|
al@19713
|
392 - install-magickpptopincHEADERS install-man \
|
al@19713
|
393 + install-magickpptopincHEADERS \
|
al@19713
|
394 install-pkgconfigDATA install-wandincHEADERS
|
al@19713
|
395
|
al@19713
|
396 install-dvi: install-dvi-am
|
al@19713
|
397 @@ -11387,6 +11387,8 @@
|
al@19713
|
398
|
al@19713
|
399 install-info-am:
|
al@19713
|
400
|
al@19713
|
401 +install-libs-only: install-libLTLIBRARIES install-data-am
|
al@19713
|
402 +
|
al@19713
|
403 install-man: install-man1
|
al@19713
|
404
|
al@19713
|
405 install-pdf: install-pdf-am
|
al@19713
|
406 @@ -11563,7 +11565,7 @@
|
al@19713
|
407 @WITH_PERL_FALSE@distclean-perl:
|
al@19713
|
408
|
al@19713
|
409 # create a copy for pc file (ideally the non abi should be symlinked)
|
al@19713
|
410 -%-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@.pc: %.pc
|
al@19713
|
411 +%-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@.pc: %-@MAGICK_MAJOR_VERSION@.pc
|
al@19713
|
412 cp -f $^ $@
|
al@19713
|
413
|
al@19713
|
414 all-local: $(MAGICKPP_LOCAL_TARGETS) $(PERLMAGICK_ALL_LOCAL_TARGETS) $(MAINTAINER_TARGETS)
|
al@19713
|
415 diff -Naur ImageMagick-6.9.6-3.orig/wand/MagickWand-6.pc.in ImageMagick-6.9.6-3/wand/MagickWand-6.pc.in
|
al@19713
|
416 --- ImageMagick-6.9.6-3.orig/wand/MagickWand-6.pc.in 1970-01-01 01:00:00.000000000 +0100
|
al@19713
|
417 +++ ImageMagick-6.9.6-3/wand/MagickWand-6.pc.in 2017-01-08 00:37:51.232515933 +0000
|
al@19713
|
418 @@ -0,0 +1,15 @@
|
al@19713
|
419 +prefix=@prefix@
|
al@19713
|
420 +exec_prefix=@exec_prefix@
|
al@19713
|
421 +libdir=@libdir@
|
al@19713
|
422 +includedir=@includedir@/ImageMagick-@MAGICK_MAJOR_VERSION@
|
al@19713
|
423 +includearchdir=@INCLUDEARCH_DIR@/ImageMagick-@MAGICK_MAJOR_VERSION@
|
al@19713
|
424 +libname=MagickWand-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@
|
al@19713
|
425 +
|
al@19713
|
426 +Name: MagickWand-@MAGICK_MAJOR_VERSION@
|
al@19713
|
427 +Description: MagickWand - C API for ImageMagick (ABI @MAGICK_ABI_SUFFIX@)
|
al@19713
|
428 +URL: https://www.imagemagick.org
|
al@19713
|
429 +Version: @PACKAGE_VERSION@
|
al@19713
|
430 +Requires: MagickCore-@MAGICK_MAJOR_VERSION@
|
al@19713
|
431 +Cflags: -I${includearchdir} -I${includedir} @MAGICK_PCFLAGS@
|
al@19713
|
432 +Libs: -L${libdir} -l${libname}
|
al@19713
|
433 +Libs.private: -L${libdir} -l${libname} @MAGICK_LIBS@ @MATH_LIBS@
|
al@19713
|
434 diff -Naur ImageMagick-6.9.6-3.orig/wand/MagickWand.pc.in ImageMagick-6.9.6-3/wand/MagickWand.pc.in
|
al@19713
|
435 --- ImageMagick-6.9.6-3.orig/wand/MagickWand.pc.in 2016-10-31 00:34:31.000000000 +0000
|
al@19713
|
436 +++ ImageMagick-6.9.6-3/wand/MagickWand.pc.in 1970-01-01 01:00:00.000000000 +0100
|
al@19713
|
437 @@ -1,15 +0,0 @@
|
al@19713
|
438 -prefix=@prefix@
|
al@19713
|
439 -exec_prefix=@exec_prefix@
|
al@19713
|
440 -libdir=@libdir@
|
al@19713
|
441 -includedir=@includedir@/ImageMagick-@MAGICK_MAJOR_VERSION@
|
al@19713
|
442 -includearchdir=@INCLUDEARCH_DIR@/ImageMagick-@MAGICK_MAJOR_VERSION@
|
al@19713
|
443 -libname=MagickWand-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@
|
al@19713
|
444 -
|
al@19713
|
445 -Name: MagickWand
|
al@19713
|
446 -Description: MagickWand - C API for ImageMagick (ABI @MAGICK_ABI_SUFFIX@)
|
al@19713
|
447 -URL: https://www.imagemagick.org
|
al@19713
|
448 -Version: @PACKAGE_VERSION@
|
al@19713
|
449 -Requires: MagickCore
|
al@19713
|
450 -Cflags: -I${includearchdir} -I${includedir} @MAGICK_PCFLAGS@
|
al@19713
|
451 -Libs: -L${libdir} -l${libname}
|
al@19713
|
452 -Libs.private: -L${libdir} -l${libname} @MAGICK_LIBS@ @MATH_LIBS@
|
al@19713
|
453 diff -Naur ImageMagick-6.9.6-3.orig/wand/Wand-6.pc.in ImageMagick-6.9.6-3/wand/Wand-6.pc.in
|
al@19713
|
454 --- ImageMagick-6.9.6-3.orig/wand/Wand-6.pc.in 1970-01-01 01:00:00.000000000 +0100
|
al@19713
|
455 +++ ImageMagick-6.9.6-3/wand/Wand-6.pc.in 2017-01-08 00:39:23.169642808 +0000
|
al@19713
|
456 @@ -0,0 +1,15 @@
|
al@19713
|
457 +prefix=@prefix@
|
al@19713
|
458 +exec_prefix=@exec_prefix@
|
al@19713
|
459 +libdir=@libdir@
|
al@19713
|
460 +includedir=@includedir@/ImageMagick-@MAGICK_MAJOR_VERSION@
|
al@19713
|
461 +includearchdir=@INCLUDEARCH_DIR@/ImageMagick-@MAGICK_MAJOR_VERSION@
|
al@19713
|
462 +libname=MagickWand-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@
|
al@19713
|
463 +
|
al@19713
|
464 +Name: MagickWand-6
|
al@19713
|
465 +Description: MagickCore - C API for ImageMagick (ABI @MAGICK_ABI_SUFFIX@)
|
al@19713
|
466 +URL: https://www.imagemagick.org
|
al@19713
|
467 +Version: @PACKAGE_VERSION@
|
al@19713
|
468 +Requires: MagickCore-6
|
al@19713
|
469 +Cflags: -I${includearchdir} -I${includedir} @MAGICK_PCFLAGS@
|
al@19713
|
470 +Libs: -L${libdir} -l${libname}
|
al@19713
|
471 +Libs.private: -L${libdir} -l${libname} @MAGICK_LIBS@ @MATH_LIBS@
|