1 |
commit: f14e7958e3403bb6c5785ad7e69bccc466c1c7e0 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Dec 27 00:19:17 2020 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Dec 27 00:19:22 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f14e7958 |
7 |
|
8 |
media-gfx/graphicsmagick: bump to 1.3.36 |
9 |
|
10 |
Package-Manager: Portage-3.0.12-prefix, Repoman-3.0.2 |
11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
12 |
|
13 |
media-gfx/graphicsmagick/Manifest | 1 + |
14 |
.../files/graphicsmagick-1.3.36-flags.patch | 59 ++++++++++++++++++++++ |
15 |
...ck-9999.ebuild => graphicsmagick-1.3.36.ebuild} | 13 +++-- |
16 |
.../graphicsmagick/graphicsmagick-9999.ebuild | 11 ++-- |
17 |
4 files changed, 71 insertions(+), 13 deletions(-) |
18 |
|
19 |
diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest |
20 |
index 5c6174e3fae..f43ed697a40 100644 |
21 |
--- a/media-gfx/graphicsmagick/Manifest |
22 |
+++ b/media-gfx/graphicsmagick/Manifest |
23 |
@@ -1 +1,2 @@ |
24 |
DIST GraphicsMagick-1.3.35.tar.xz 5543224 BLAKE2B 8a284d85341c10939fdece5c565d5b881276afb9b4c5dfb2221b780a01b99f78ee62761722c372baf9155c63f7ef176b67310aeedcab0368f4f26f5b0150bcce SHA512 baae92089d52147ef961f93495abc8a9d8b1a963af61d87a650c1ab105d46816aa38c83f654edcb5a0e1b7f07ccc06eaeaa443b9bde3a63a0b9bfb45f3ae144c |
25 |
+DIST GraphicsMagick-1.3.36.tar.xz 5600712 BLAKE2B 069ab4f9bb5beea3321860bf8e43c8a1b51ab102054e92486375209a86fd3c1c1fb44d4b2c43a65c78f36e9f37e09316fe77b4f261bfb0af3b2c2a86ff8b5aa5 SHA512 27ed5fcbfb0303436bdcb0f11d18257a967d471251b51e633e2c655b0a7e5ed01f61a61f9702cc7d4c02714e005ac18ca9ba0f690c0580e41d07947a03c5cbb4 |
26 |
|
27 |
diff --git a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.36-flags.patch b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.36-flags.patch |
28 |
new file mode 100644 |
29 |
index 00000000000..311cd782925 |
30 |
--- /dev/null |
31 |
+++ b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.36-flags.patch |
32 |
@@ -0,0 +1,59 @@ |
33 |
+diff --git a/Magick++/bin/GraphicsMagick++-config.in b/Magick++/bin/GraphicsMagick++-config.in |
34 |
+index 9733be2..4c49362 100755 |
35 |
+--- a/Magick++/bin/GraphicsMagick++-config.in |
36 |
++++ b/Magick++/bin/GraphicsMagick++-config.in |
37 |
+@@ -33,7 +33,7 @@ while test $# -gt 0; do |
38 |
+ echo '@MAGICK_API_CPPFLAGS@' |
39 |
+ ;; |
40 |
+ --cxxflags) |
41 |
+- echo '@CXXFLAGS@' |
42 |
++ echo '@MAGICK_API_CXXFLAGS@' |
43 |
+ ;; |
44 |
+ --ldflags) |
45 |
+ echo '@MAGICK_API_LDFLAGS@' |
46 |
+diff --git a/configure.ac b/configure.ac |
47 |
+index d6a30f6..2f5ff6c 100644 |
48 |
+--- a/configure.ac |
49 |
++++ b/configure.ac |
50 |
+@@ -335,6 +335,7 @@ fi |
51 |
+ |
52 |
+ AC_OPENMP([C]) |
53 |
+ CFLAGS="$OPENMP_CFLAGS $CFLAGS" |
54 |
++MAGICK_API_CFLAGS="$MAGICK_API_CFLAGS $OPENMP_CFLAGS" |
55 |
+ #CXXFLAGS="$OPENMP_CXXFLAGS $CXXFLAGS" |
56 |
+ #LDFLAGS="$LDFLAGS $OPENMP_CFLAGS" |
57 |
+ AC_SUBST([OPENMP_CFLAGS]) |
58 |
+@@ -3689,9 +3690,10 @@ MAGICK_DEP_LIBS=`echo $MAGICK_DEP_LIBS | sed -e 's/ */ /g'` |
59 |
+ MAGICK_EXTRA_DEP_LIBS=`echo $MAGICK_EXTRA_DEP_LIBS | sed -e 's/ */ /g'` |
60 |
+ #LIBS=`echo $LIBS | sed -e 's/ */ /g'` |
61 |
+ |
62 |
+-MAGICK_API_CFLAGS=$CFLAGS |
63 |
++MAGICK_API_CFLAGS=`echo $MAGICK_API_CFLAGS | sed -e 's/ */ /g'` |
64 |
+ MAGICK_API_CPPFLAGS=`echo $MAGICK_API_CPPFLAGS | sed -e 's/ */ /g'` |
65 |
+-MAGICK_API_LDFLAGS="-L$LIB_DIR $LDFLAGS" |
66 |
++MAGICK_API_CXXFLAGS="" |
67 |
++MAGICK_API_LDFLAGS="-L$LIB_DIR" |
68 |
+ MAGICK_API_DEP_LIBS="$MAGICK_DEP_LIBS" |
69 |
+ MAGICK_API_LIBS="-lGraphicsMagick $MAGICK_API_DEP_LIBS $MAGICK_EXTRA_DEP_LIBS" |
70 |
+ |
71 |
+@@ -3721,6 +3723,7 @@ AC_SUBST([X_CFLAGS]) |
72 |
+ |
73 |
+ AC_SUBST([MAGICK_API_CFLAGS]) |
74 |
+ AC_SUBST([MAGICK_API_CPPFLAGS]) |
75 |
++AC_SUBST(MAGICK_API_CXXFLAGS) |
76 |
+ AC_SUBST([MAGICK_API_PC_CPPFLAGS]) |
77 |
+ AC_SUBST([MAGICK_API_LDFLAGS]) |
78 |
+ AC_SUBST([MAGICK_API_LIBS]) |
79 |
+diff --git a/magick/GraphicsMagick-config.in b/magick/GraphicsMagick-config.in |
80 |
+index 8b2f016..3f66ae3 100644 |
81 |
+--- a/magick/GraphicsMagick-config.in |
82 |
++++ b/magick/GraphicsMagick-config.in |
83 |
+@@ -30,7 +30,7 @@ while test $# -gt 0; do |
84 |
+ echo @PACKAGE_VERSION@ |
85 |
+ ;; |
86 |
+ --cflags) |
87 |
+- echo '@CFLAGS@' |
88 |
++ echo '@MAGICK_API_CFLAGS@' |
89 |
+ ;; |
90 |
+ --cppflags) |
91 |
+ echo '@MAGICK_API_CPPFLAGS@' |
92 |
|
93 |
diff --git a/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.36.ebuild |
94 |
similarity index 94% |
95 |
copy from media-gfx/graphicsmagick/graphicsmagick-9999.ebuild |
96 |
copy to media-gfx/graphicsmagick/graphicsmagick-1.3.36.ebuild |
97 |
index 5cde9ca8939..84918ccd05d 100644 |
98 |
--- a/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild |
99 |
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.36.ebuild |
100 |
@@ -2,10 +2,10 @@ |
101 |
# Distributed under the terms of the GNU General Public License v2 |
102 |
|
103 |
EAPI=7 |
104 |
+ |
105 |
inherit autotools toolchain-funcs |
106 |
|
107 |
MY_P=${P/graphicsm/GraphicsM} |
108 |
- |
109 |
DESCRIPTION="Collection of tools and libraries for many image formats" |
110 |
HOMEPAGE="http://www.graphicsmagick.org/" |
111 |
LICENSE="MIT" |
112 |
@@ -16,7 +16,8 @@ if [[ ${PV} == "9999" ]] ; then |
113 |
EHG_REPO_URI="http://hg.code.sf.net/p/${PN}/code" |
114 |
else |
115 |
SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz" |
116 |
- KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" |
117 |
+ S="${WORKDIR}/${MY_P}" |
118 |
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" |
119 |
fi |
120 |
|
121 |
IUSE="bzip2 +cxx debug dynamic-loading fpx imagemagick jbig jpeg lcms lzma |
122 |
@@ -39,20 +40,18 @@ RDEPEND="dev-libs/libltdl:0 |
123 |
truetype? ( |
124 |
media-fonts/urw-fonts |
125 |
>=media-libs/freetype-2 |
126 |
- ) |
127 |
+ ) |
128 |
webp? ( media-libs/libwebp:= ) |
129 |
wmf? ( media-libs/libwmf ) |
130 |
X? ( |
131 |
x11-libs/libSM |
132 |
x11-libs/libXext |
133 |
- ) |
134 |
+ ) |
135 |
zlib? ( sys-libs/zlib )" |
136 |
DEPEND="${RDEPEND}" |
137 |
|
138 |
-S=${WORKDIR}/${MY_P} |
139 |
- |
140 |
PATCHES=( |
141 |
- "${FILESDIR}"/${PN}-1.3.19-flags.patch |
142 |
+ "${FILESDIR}"/${PN}-1.3.36-flags.patch |
143 |
"${FILESDIR}"/${PN}-1.3.19-perl.patch |
144 |
) |
145 |
|
146 |
|
147 |
diff --git a/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild b/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild |
148 |
index 5cde9ca8939..bef7b3a9feb 100644 |
149 |
--- a/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild |
150 |
+++ b/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild |
151 |
@@ -2,10 +2,10 @@ |
152 |
# Distributed under the terms of the GNU General Public License v2 |
153 |
|
154 |
EAPI=7 |
155 |
+ |
156 |
inherit autotools toolchain-funcs |
157 |
|
158 |
MY_P=${P/graphicsm/GraphicsM} |
159 |
- |
160 |
DESCRIPTION="Collection of tools and libraries for many image formats" |
161 |
HOMEPAGE="http://www.graphicsmagick.org/" |
162 |
LICENSE="MIT" |
163 |
@@ -16,6 +16,7 @@ if [[ ${PV} == "9999" ]] ; then |
164 |
EHG_REPO_URI="http://hg.code.sf.net/p/${PN}/code" |
165 |
else |
166 |
SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz" |
167 |
+ S="${WORKDIR}/${MY_P}" |
168 |
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" |
169 |
fi |
170 |
|
171 |
@@ -39,20 +40,18 @@ RDEPEND="dev-libs/libltdl:0 |
172 |
truetype? ( |
173 |
media-fonts/urw-fonts |
174 |
>=media-libs/freetype-2 |
175 |
- ) |
176 |
+ ) |
177 |
webp? ( media-libs/libwebp:= ) |
178 |
wmf? ( media-libs/libwmf ) |
179 |
X? ( |
180 |
x11-libs/libSM |
181 |
x11-libs/libXext |
182 |
- ) |
183 |
+ ) |
184 |
zlib? ( sys-libs/zlib )" |
185 |
DEPEND="${RDEPEND}" |
186 |
|
187 |
-S=${WORKDIR}/${MY_P} |
188 |
- |
189 |
PATCHES=( |
190 |
- "${FILESDIR}"/${PN}-1.3.19-flags.patch |
191 |
+ "${FILESDIR}"/${PN}-1.3.36-flags.patch |
192 |
"${FILESDIR}"/${PN}-1.3.19-perl.patch |
193 |
) |