summaryrefslogtreecommitdiffstats
path: root/meta-oe
diff options
context:
space:
mode:
authorAndreas Oberritter <obi@opendreambox.org>2016-11-30 13:06:37 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2016-12-09 12:02:14 +0100
commit6e0c24e9b3f9d430dec57f61f8c12c74bca5375d (patch)
tree519fe65074982565906fbfa6ca58d58dc07e6019 /meta-oe
parentcfde74c9dbe8eed65f430334b071aeba6620882d (diff)
downloadmeta-openembedded-6e0c24e9b3f9d430dec57f61f8c12c74bca5375d.tar.gz
imagemagick: use correct major version in program suffix
Signed-off-by: Andreas Oberritter <obi@opendreambox.org> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe')
-rw-r--r--meta-oe/recipes-support/imagemagick/imagemagick_7.0.2.bb46
1 files changed, 23 insertions, 23 deletions
diff --git a/meta-oe/recipes-support/imagemagick/imagemagick_7.0.2.bb b/meta-oe/recipes-support/imagemagick/imagemagick_7.0.2.bb
index 74fe369e9..cfaa7c3c6 100644
--- a/meta-oe/recipes-support/imagemagick/imagemagick_7.0.2.bb
+++ b/meta-oe/recipes-support/imagemagick/imagemagick_7.0.2.bb
@@ -20,7 +20,7 @@ inherit autotools pkgconfig update-alternatives
20 20
21# xml disabled because it's using xml2-config --prefix to determine prefix which returns just /usr with our libxml2 21# xml disabled because it's using xml2-config --prefix to determine prefix which returns just /usr with our libxml2
22# if someone needs xml support then fix it first 22# if someone needs xml support then fix it first
23EXTRA_OECONF = "--program-prefix= --program-suffix=.im6 --without-perl --disable-openmp --without-xml --disable-opencl" 23EXTRA_OECONF = "--program-prefix= --program-suffix=.im7 --without-perl --disable-openmp --without-xml --disable-opencl"
24 24
25CACHED_CONFIGUREVARS = "ac_cv_sys_file_offset_bits=yes" 25CACHED_CONFIGUREVARS = "ac_cv_sys_file_offset_bits=yes"
26PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" 26PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
@@ -51,40 +51,40 @@ ALTERNATIVE_PRIORITY = "100"
51ALTERNATIVE_${PN} = "animate compare composite conjure convert display \ 51ALTERNATIVE_${PN} = "animate compare composite conjure convert display \
52 identify import mogrify montage stream" 52 identify import mogrify montage stream"
53 53
54ALTERNATIVE_TARGET[animate] = "${bindir}/animate.im6" 54ALTERNATIVE_TARGET[animate] = "${bindir}/animate.im7"
55ALTERNATIVE_TARGET[compare] = "${bindir}/compare.im6" 55ALTERNATIVE_TARGET[compare] = "${bindir}/compare.im7"
56ALTERNATIVE_TARGET[composite] = "${bindir}/composite.im6" 56ALTERNATIVE_TARGET[composite] = "${bindir}/composite.im7"
57ALTERNATIVE_TARGET[conjure] = "${bindir}/conjure.im6" 57ALTERNATIVE_TARGET[conjure] = "${bindir}/conjure.im7"
58ALTERNATIVE_TARGET[convert] = "${bindir}/convert.im6" 58ALTERNATIVE_TARGET[convert] = "${bindir}/convert.im7"
59ALTERNATIVE_TARGET[display] = "${bindir}/display.im6" 59ALTERNATIVE_TARGET[display] = "${bindir}/display.im7"
60ALTERNATIVE_TARGET[identify] = "${bindir}/identify.im6" 60ALTERNATIVE_TARGET[identify] = "${bindir}/identify.im7"
61ALTERNATIVE_TARGET[import] = "${bindir}/import.im6" 61ALTERNATIVE_TARGET[import] = "${bindir}/import.im7"
62ALTERNATIVE_TARGET[mogrify] = "${bindir}/mogrify.im6" 62ALTERNATIVE_TARGET[mogrify] = "${bindir}/mogrify.im7"
63ALTERNATIVE_TARGET[montage] = "${bindir}/montage.im6" 63ALTERNATIVE_TARGET[montage] = "${bindir}/montage.im7"
64ALTERNATIVE_TARGET[stream] = "${bindir}/stream.im6" 64ALTERNATIVE_TARGET[stream] = "${bindir}/stream.im7"
65 65
66ALTERNATIVE_${PN}-doc = "animate.1 compare.1 composite.1 conjure.1 \ 66ALTERNATIVE_${PN}-doc = "animate.1 compare.1 composite.1 conjure.1 \
67 convert.1 display.1 identify.1 import.1 mogrify.1 montage.1 stream.1" 67 convert.1 display.1 identify.1 import.1 mogrify.1 montage.1 stream.1"
68 68
69ALTERNATIVE_LINK_NAME[animate.1] = "${mandir}/man1/animate.1" 69ALTERNATIVE_LINK_NAME[animate.1] = "${mandir}/man1/animate.1"
70ALTERNATIVE_TARGET[animate.1] = "${mandir}/man1/animate.im6.1" 70ALTERNATIVE_TARGET[animate.1] = "${mandir}/man1/animate.im7.1"
71ALTERNATIVE_LINK_NAME[compare.1] = "${mandir}/man1/compare.1" 71ALTERNATIVE_LINK_NAME[compare.1] = "${mandir}/man1/compare.1"
72ALTERNATIVE_TARGET[compare.1] = "${mandir}/man1/compare.im6.1" 72ALTERNATIVE_TARGET[compare.1] = "${mandir}/man1/compare.im7.1"
73ALTERNATIVE_LINK_NAME[composite.1] = "${mandir}/man1/composite.1" 73ALTERNATIVE_LINK_NAME[composite.1] = "${mandir}/man1/composite.1"
74ALTERNATIVE_TARGET[composite.1] = "${mandir}/man1/composite.im6.1" 74ALTERNATIVE_TARGET[composite.1] = "${mandir}/man1/composite.im7.1"
75ALTERNATIVE_LINK_NAME[conjure.1] = "${mandir}/man1/conjure.1" 75ALTERNATIVE_LINK_NAME[conjure.1] = "${mandir}/man1/conjure.1"
76ALTERNATIVE_TARGET[conjure.1] = "${mandir}/man1/conjure.im6.1" 76ALTERNATIVE_TARGET[conjure.1] = "${mandir}/man1/conjure.im7.1"
77ALTERNATIVE_LINK_NAME[convert.1] = "${mandir}/man1/convert.1" 77ALTERNATIVE_LINK_NAME[convert.1] = "${mandir}/man1/convert.1"
78ALTERNATIVE_TARGET[convert.1] = "${mandir}/man1/convert.im6.1" 78ALTERNATIVE_TARGET[convert.1] = "${mandir}/man1/convert.im7.1"
79ALTERNATIVE_LINK_NAME[display.1] = "${mandir}/man1/display.1" 79ALTERNATIVE_LINK_NAME[display.1] = "${mandir}/man1/display.1"
80ALTERNATIVE_TARGET[display.1] = "${mandir}/man1/display.im6.1" 80ALTERNATIVE_TARGET[display.1] = "${mandir}/man1/display.im7.1"
81ALTERNATIVE_LINK_NAME[identify.1] = "${mandir}/man1/identify.1" 81ALTERNATIVE_LINK_NAME[identify.1] = "${mandir}/man1/identify.1"
82ALTERNATIVE_TARGET[identify.1] = "${mandir}/man1/identify.im6.1" 82ALTERNATIVE_TARGET[identify.1] = "${mandir}/man1/identify.im7.1"
83ALTERNATIVE_LINK_NAME[import.1] = "${mandir}/man1/import.1" 83ALTERNATIVE_LINK_NAME[import.1] = "${mandir}/man1/import.1"
84ALTERNATIVE_TARGET[import.1] = "${mandir}/man1/import.im6.1" 84ALTERNATIVE_TARGET[import.1] = "${mandir}/man1/import.im7.1"
85ALTERNATIVE_LINK_NAME[mogrify.1] = "${mandir}/man1/mogrify.1" 85ALTERNATIVE_LINK_NAME[mogrify.1] = "${mandir}/man1/mogrify.1"
86ALTERNATIVE_TARGET[mogrify.1] = "${mandir}/man1/mogrify.im6.1" 86ALTERNATIVE_TARGET[mogrify.1] = "${mandir}/man1/mogrify.im7.1"
87ALTERNATIVE_LINK_NAME[montage.1] = "${mandir}/man1/montage.1" 87ALTERNATIVE_LINK_NAME[montage.1] = "${mandir}/man1/montage.1"
88ALTERNATIVE_TARGET[montage.1] = "${mandir}/man1/montage.im6.1" 88ALTERNATIVE_TARGET[montage.1] = "${mandir}/man1/montage.im7.1"
89ALTERNATIVE_LINK_NAME[stream.1] = "${mandir}/man1/stream.1" 89ALTERNATIVE_LINK_NAME[stream.1] = "${mandir}/man1/stream.1"
90ALTERNATIVE_TARGET[stream.1] = "${mandir}/man1/stream.im6.1" 90ALTERNATIVE_TARGET[stream.1] = "${mandir}/man1/stream.im7.1"