Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/freetype/
Date: Tue, 29 May 2018 11:19:25
Message-Id: 1527592757.00760fd35aef6ceaa1fc710fea1a432b53d4386d.polynomial-c@gentoo
1 commit: 00760fd35aef6ceaa1fc710fea1a432b53d4386d
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Tue May 29 11:19:02 2018 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Tue May 29 11:19:17 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00760fd3
7
8 Revert "media-libs/freetype: Removed old."
9
10 This reverts commit e58039c3bfc00d54a68d8fb671e1d4775617be0c.
11
12 media-libs/freetype/Manifest | 6 ++
13 media-libs/freetype/freetype-2.8.ebuild | 179 ++++++++++++++++++++++++++++++++
14 media-libs/freetype/freetype-2.9.ebuild | 178 +++++++++++++++++++++++++++++++
15 3 files changed, 363 insertions(+)
16
17 diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest
18 index a60cc3d73ec..b34fe2ceb5b 100644
19 --- a/media-libs/freetype/Manifest
20 +++ b/media-libs/freetype/Manifest
21 @@ -1,3 +1,9 @@
22 +DIST freetype-2.8.tar.bz2 1873526 BLAKE2B c2336a3774cee0334bd342f4323524063a982c8a46dc5623a420be1a0ccb76ed5adc710673ea2401b0013f80a5c22bbc07e2adb4e842a0763ee1b0afc3cedb82 SHA512 3842c34bf6100a8c9b78258146b2ff35e9bb4c993937d3ef09982c1e2552dfd15f8849ddd8a1e84edf08b5a5fb918b68cf7b1584545c5900e22a00bfa1c89ff5
23 DIST freetype-2.9.1.tar.bz2 1926385 BLAKE2B f165d638e0f49749a2640aabba96aca20441c76028cc18bb2482fd620a29dd368bc55ea020c1e74fa6effe9fed3c59a53c7fdf2dd6021f445032b7007201948e SHA512 856766e1f3f4c7dc8afb2b5ee991138c8b642c6a6e5e007cd2bc04ae58bde827f082557cf41bf541d97e8485f7fd064d10390d1ee597f19d1daed6c152e27708
24 +DIST freetype-2.9.tar.bz2 1915013 BLAKE2B 6474230507a0bcf9408846cf45d8e0c69314783e38ed71de6ce69031da9b418fe513056068768e4b350a93dd13dadfe8363d72b1d20d5347d5ce1d30d9d9fe08 SHA512 28465f3453baf9a187529432118389de8f1b85273c9fb787d2c8f0feee8ab64b387ddd936b4e67ec58dcf71e33884e7e25f01169b737824221ab143839a9161a
25 +DIST freetype-doc-2.8.tar.bz2 2127740 BLAKE2B 891b43a7a6b0eae4a0f91110367b47c1c0ebd05a2d1a309669415f98fa08736738504b243d315a100a385074888382c6767f0741dd79814f5783cd215a716ca5 SHA512 3a970a7dd6f0ba580c9f8084b271c11e6e87111ab9a5b6a3148eb1087e45ee18e998aa7e36a4311067a3b674cb784b1e827cf8c3a853e380078219be3eccce06
26 DIST freetype-doc-2.9.1.tar.bz2 2130292 BLAKE2B 667032fa447fbc28c0f753df3ade7a07a4f8d4d26cdd00fed2fa0e8098e9d6a083572608b7d06446ea91baa932e3c6d18beb1f86f6b549a8cd2c07a2df567da0 SHA512 1668f02f67e6e047df04e5e2fccb564cd9af780ec9b3c4878109868302a83eaec7b627390ff82c3e875122400e6f20fc690936a1e4964dfa65143e5309fa22d4
27 +DIST freetype-doc-2.9.tar.bz2 2128135 BLAKE2B a192237e9f2cd0b14cf081ba09d58d6e42793d7c8034815d9d8a11a7abf5775bc9181f960405c7f2b12c6994329f8caee3c3ae62cc8b08fbbc3fd285f76922b8 SHA512 0ffd38541f8fd0ae6efb97025bb585209580b964d632e15c66944bc2549e2b0e6c375a141df5061621e8c32eeaed017834530169addc4daa2e83399f88efde2f
28 +DIST ft2demos-2.8.tar.bz2 225274 BLAKE2B b8b02b8b03b84709b7d274d1c8dff323051051ceb3f77762f2fad51ec7a21d34cdbc35a6e828d1755b374d05801d11b0f9968361a34efbb6a6239769b8cd730a SHA512 dffdf6a493e8145c6513be34b57734a9a99c61f758a0e1ea691ef4284cee4c274ad7c3a8120a8ec425d86e33a70cd879d9db258e9c67b6a4db79c3243d4c9fb3
29 DIST ft2demos-2.9.1.tar.bz2 233462 BLAKE2B c689942b222b2c600b5ec3963791621ae87acefb9b01caa5dc35af52525d03e3a1094e48c0789d5eaabbce787bddd7c3055e12454e54ea3c7fae92bca47614de SHA512 38bee59184b20c2eb983deaa5c1f241e31c1b4793e47dc06b1b419601489cfece3b11fde4cf4fb6c5af12254ad0c1ce9a1547885c208e8e715655e9c48f22a46
30 +DIST ft2demos-2.9.tar.bz2 230926 BLAKE2B 8c8e02101243468d52953aeeee7ad985a5aa3fabc82c19a3404ce301348fd32e5f89aa56798613658d5d29a8c3a6c7d4a70eae038ef6095005f8c10354b3f288 SHA512 3dfaf97619d585d6e4db20002c69f9c46cb8991c4faf86d9d92884a80001235ef01010148156cb4879d7869e6121fc27ef03c13288af011df26fe85c3fb7e6a1
31
32 diff --git a/media-libs/freetype/freetype-2.8.ebuild b/media-libs/freetype/freetype-2.8.ebuild
33 new file mode 100644
34 index 00000000000..4dfd2a7b496
35 --- /dev/null
36 +++ b/media-libs/freetype/freetype-2.8.ebuild
37 @@ -0,0 +1,179 @@
38 +# Copyright 1999-2018 Gentoo Foundation
39 +# Distributed under the terms of the GNU General Public License v2
40 +
41 +EAPI=6
42 +
43 +inherit flag-o-matic libtool multilib multilib-build multilib-minimal toolchain-funcs
44 +
45 +INFINALITY_PATCH="03-infinality-2.6.3-2016.03.26.patch"
46 +
47 +DESCRIPTION="A high-quality and portable font engine"
48 +HOMEPAGE="https://www.freetype.org/"
49 +SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.bz2
50 + mirror://nongnu/freetype/${P/_/}.tar.bz2
51 + utils? ( mirror://sourceforge/freetype/ft2demos-${PV}.tar.bz2
52 + mirror://nongnu/freetype/ft2demos-${PV}.tar.bz2 )
53 + doc? ( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.bz2
54 + mirror://nongnu/freetype/${PN}-doc-${PV}.tar.bz2 )"
55 +
56 +LICENSE="|| ( FTL GPL-2+ )"
57 +SLOT="2"
58 +KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
59 +IUSE="X +adobe-cff bindist bzip2 +cleartype_hinting debug doc fontforge harfbuzz
60 + infinality png static-libs utils"
61 +RESTRICT="!bindist? ( bindist )" # bug 541408
62 +
63 +RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
64 + bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
65 + harfbuzz? ( >=media-libs/harfbuzz-0.9.19[truetype,${MULTILIB_USEDEP}] )
66 + png? ( >=media-libs/libpng-1.2.51:=[${MULTILIB_USEDEP}] )
67 + utils? (
68 + X? (
69 + >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
70 + >=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}]
71 + >=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}]
72 + )
73 + )"
74 +DEPEND="${RDEPEND}
75 + virtual/pkgconfig"
76 +PDEPEND="infinality? ( media-libs/fontconfig-infinality )"
77 +
78 +PATCHES=(
79 + # This is the same as the 01 patch from infinality
80 + "${FILESDIR}"/${PN}-2.7-enable-valid.patch
81 +
82 + "${FILESDIR}"/${PN}-2.4.11-sizeof-types.patch # 459966
83 +
84 + # patches from upstream (can be removed with the next version bump)
85 +)
86 +
87 +src_prepare() {
88 + enable_option() {
89 + sed -i -e "/#define $1/ { s:/\* ::; s: \*/:: }" \
90 + include/${PN}/config/ftoption.h \
91 + || die "unable to enable option $1"
92 + }
93 +
94 + disable_option() {
95 + sed -i -e "/#define $1/ { s:^:/* :; s:$: */: }" \
96 + include/${PN}/config/ftoption.h \
97 + || die "unable to disable option $1"
98 + }
99 +
100 + default
101 +
102 + # Will be the new default for >=freetype-2.7.0
103 + disable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING 2"
104 +
105 + if use infinality && use cleartype_hinting; then
106 + enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING ( 1 | 2 )"
107 + elif use infinality; then
108 + enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING 1"
109 + elif use cleartype_hinting; then
110 + enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING 2"
111 + fi
112 +
113 + # Can be disabled with FREETYPE_PROPERTIES="pcf:no-long-family-names=1"
114 + # via environment (new since v2.8)
115 + enable_option PCF_CONFIG_OPTION_LONG_FAMILY_NAMES
116 +
117 + if ! use bindist; then
118 + # See http://freetype.org/patents.html
119 + # ClearType is covered by several Microsoft patents in the US
120 + enable_option FT_CONFIG_OPTION_SUBPIXEL_RENDERING
121 + fi
122 +
123 + if ! use adobe-cff; then
124 + enable_option CFF_CONFIG_OPTION_OLD_ENGINE
125 + fi
126 +
127 + if use debug; then
128 + enable_option FT_DEBUG_LEVEL_TRACE
129 + enable_option FT_DEBUG_MEMORY
130 + fi
131 +
132 + if use utils; then
133 + cd "${WORKDIR}/ft2demos-${PV}" || die
134 + # Disable tests needing X11 when USE="-X". (bug #177597)
135 + if ! use X; then
136 + sed -i -e "/EXES\ +=\ ftdiff/ s:^:#:" Makefile || die
137 + fi
138 + cd "${S}" || die
139 + fi
140 +
141 + # we need non-/bin/sh to run configure
142 + if [[ -n ${CONFIG_SHELL} ]] ; then
143 + sed -i -e "1s:^#![[:space:]]*/bin/sh:#!$CONFIG_SHELL:" \
144 + "${S}"/builds/unix/configure || die
145 + fi
146 +
147 + elibtoolize --patch-only
148 +}
149 +
150 +multilib_src_configure() {
151 + append-flags -fno-strict-aliasing
152 + type -P gmake &> /dev/null && export GNUMAKE=gmake
153 +
154 + local myeconfargs=(
155 + --enable-biarch-config
156 + --enable-shared
157 + $(use_with bzip2)
158 + $(use_with harfbuzz)
159 + $(use_with png)
160 + $(use_enable static-libs static)
161 +
162 + # avoid using libpng-config
163 + LIBPNG_CFLAGS="$($(tc-getPKG_CONFIG) --cflags libpng)"
164 + LIBPNG_LDFLAGS="$($(tc-getPKG_CONFIG) --libs libpng)"
165 + )
166 +
167 + ECONF_SOURCE="${S}" \
168 + econf "${myeconfargs[@]}"
169 +}
170 +
171 +multilib_src_compile() {
172 + default
173 +
174 + if multilib_is_native_abi && use utils; then
175 + einfo "Building utils"
176 + # fix for Prefix, bug #339334
177 + emake \
178 + X11_PATH="${EPREFIX}/usr/$(get_libdir)" \
179 + FT2DEMOS=1 TOP_DIR_2="${WORKDIR}/ft2demos-${PV}"
180 + fi
181 +}
182 +
183 +multilib_src_install() {
184 + default
185 +
186 + if multilib_is_native_abi && use utils; then
187 + einfo "Installing utils"
188 + rm "${WORKDIR}"/ft2demos-${PV}/bin/README || die
189 + local ft2demo
190 + for ft2demo in ../ft2demos-${PV}/bin/*; do
191 + ./libtool --mode=install $(type -P install) -m 755 "$ft2demo" \
192 + "${ED}"/usr/bin || die
193 + done
194 + fi
195 +}
196 +
197 +multilib_src_install_all() {
198 + if use fontforge; then
199 + # Probably fontforge needs less but this way makes things simplier...
200 + einfo "Installing internal headers required for fontforge"
201 + local header
202 + find src/truetype include/freetype/internal -name '*.h' | \
203 + while read header; do
204 + mkdir -p "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die
205 + cp ${header} "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die
206 + done
207 + fi
208 +
209 + dodoc docs/{CHANGES,CUSTOMIZE,DEBUG,INSTALL.UNIX,*.txt,PROBLEMS,TODO}
210 + if use doc ; then
211 + docinto html
212 + dodoc -r docs/*
213 + fi
214 +
215 + prune_libtool_files --all
216 +}
217
218 diff --git a/media-libs/freetype/freetype-2.9.ebuild b/media-libs/freetype/freetype-2.9.ebuild
219 new file mode 100644
220 index 00000000000..4d9867d2f4f
221 --- /dev/null
222 +++ b/media-libs/freetype/freetype-2.9.ebuild
223 @@ -0,0 +1,178 @@
224 +# Copyright 1999-2018 Gentoo Foundation
225 +# Distributed under the terms of the GNU General Public License v2
226 +
227 +EAPI=6
228 +
229 +inherit flag-o-matic libtool multilib multilib-build multilib-minimal toolchain-funcs
230 +
231 +INFINALITY_PATCH="03-infinality-2.6.3-2016.03.26.patch"
232 +
233 +DESCRIPTION="A high-quality and portable font engine"
234 +HOMEPAGE="https://www.freetype.org/"
235 +SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.bz2
236 + mirror://nongnu/freetype/${P/_/}.tar.bz2
237 + utils? ( mirror://sourceforge/freetype/ft2demos-${PV}.tar.bz2
238 + mirror://nongnu/freetype/ft2demos-${PV}.tar.bz2 )
239 + doc? ( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.bz2
240 + mirror://nongnu/freetype/${PN}-doc-${PV}.tar.bz2 )"
241 +
242 +LICENSE="|| ( FTL GPL-2+ )"
243 +SLOT="2"
244 +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
245 +IUSE="X +adobe-cff bindist bzip2 +cleartype_hinting debug doc fontforge harfbuzz
246 + infinality png static-libs utils"
247 +RESTRICT="!bindist? ( bindist )" # bug 541408
248 +
249 +RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
250 + bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
251 + harfbuzz? ( >=media-libs/harfbuzz-0.9.19[truetype,${MULTILIB_USEDEP}] )
252 + png? ( >=media-libs/libpng-1.2.51:=[${MULTILIB_USEDEP}] )
253 + utils? (
254 + X? (
255 + >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
256 + >=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}]
257 + >=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}]
258 + )
259 + )"
260 +DEPEND="${RDEPEND}
261 + virtual/pkgconfig"
262 +PDEPEND="infinality? ( media-libs/fontconfig-infinality )"
263 +
264 +PATCHES=(
265 + # This is the same as the 01 patch from infinality
266 + "${FILESDIR}"/${PN}-2.7-enable-valid.patch
267 +
268 + "${FILESDIR}"/${PN}-2.4.11-sizeof-types.patch # 459966
269 +
270 + # patches from upstream (can be removed with the next version bump)
271 +)
272 +
273 +src_prepare() {
274 + enable_option() {
275 + sed -i -e "/#define $1/ { s:/\* ::; s: \*/:: }" \
276 + include/${PN}/config/ftoption.h \
277 + || die "unable to enable option $1"
278 + }
279 +
280 + disable_option() {
281 + sed -i -e "/#define $1/ { s:^:/* :; s:$: */: }" \
282 + include/${PN}/config/ftoption.h \
283 + || die "unable to disable option $1"
284 + }
285 +
286 + default
287 +
288 + # Will be the new default for >=freetype-2.7.0
289 + disable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING 2"
290 +
291 + if use infinality && use cleartype_hinting; then
292 + enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING ( 1 | 2 )"
293 + elif use infinality; then
294 + enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING 1"
295 + elif use cleartype_hinting; then
296 + enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING 2"
297 + fi
298 +
299 + # Can be disabled with FREETYPE_PROPERTIES="pcf:no-long-family-names=1"
300 + # via environment (new since v2.8)
301 + enable_option PCF_CONFIG_OPTION_LONG_FAMILY_NAMES
302 +
303 + if ! use bindist; then
304 + # See http://freetype.org/patents.html
305 + # ClearType is covered by several Microsoft patents in the US
306 + enable_option FT_CONFIG_OPTION_SUBPIXEL_RENDERING
307 + fi
308 +
309 + if ! use adobe-cff; then
310 + enable_option CFF_CONFIG_OPTION_OLD_ENGINE
311 + fi
312 +
313 + if use debug; then
314 + enable_option FT_DEBUG_LEVEL_TRACE
315 + enable_option FT_DEBUG_MEMORY
316 + fi
317 +
318 + if use utils; then
319 + cd "${WORKDIR}/ft2demos-${PV}" || die
320 + # Disable tests needing X11 when USE="-X". (bug #177597)
321 + if ! use X; then
322 + sed -i -e "/EXES\ +=\ ftdiff/ s:^:#:" Makefile || die
323 + fi
324 + cd "${S}" || die
325 + fi
326 +
327 + # we need non-/bin/sh to run configure
328 + if [[ -n ${CONFIG_SHELL} ]] ; then
329 + sed -i -e "1s:^#![[:space:]]*/bin/sh:#!$CONFIG_SHELL:" \
330 + "${S}"/builds/unix/configure || die
331 + fi
332 +
333 + elibtoolize --patch-only
334 +}
335 +
336 +multilib_src_configure() {
337 + append-flags -fno-strict-aliasing
338 + type -P gmake &> /dev/null && export GNUMAKE=gmake
339 +
340 + local myeconfargs=(
341 + --enable-biarch-config
342 + --enable-shared
343 + $(use_with bzip2)
344 + $(use_with harfbuzz)
345 + $(use_with png)
346 + $(use_enable static-libs static)
347 +
348 + # avoid using libpng-config
349 + LIBPNG_CFLAGS="$($(tc-getPKG_CONFIG) --cflags libpng)"
350 + LIBPNG_LDFLAGS="$($(tc-getPKG_CONFIG) --libs libpng)"
351 + )
352 +
353 + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
354 +}
355 +
356 +multilib_src_compile() {
357 + default
358 +
359 + if multilib_is_native_abi && use utils; then
360 + einfo "Building utils"
361 + # fix for Prefix, bug #339334
362 + emake \
363 + X11_PATH="${EPREFIX}/usr/$(get_libdir)" \
364 + FT2DEMOS=1 TOP_DIR_2="${WORKDIR}/ft2demos-${PV}"
365 + fi
366 +}
367 +
368 +multilib_src_install() {
369 + default
370 +
371 + if multilib_is_native_abi && use utils; then
372 + einfo "Installing utils"
373 + rm "${WORKDIR}"/ft2demos-${PV}/bin/README || die
374 + local ft2demo
375 + for ft2demo in ../ft2demos-${PV}/bin/*; do
376 + ./libtool --mode=install $(type -P install) -m 755 "$ft2demo" \
377 + "${ED%/}"/usr/bin || die
378 + done
379 + fi
380 +}
381 +
382 +multilib_src_install_all() {
383 + if use fontforge; then
384 + # Probably fontforge needs less but this way makes things simplier...
385 + einfo "Installing internal headers required for fontforge"
386 + local header
387 + find src/truetype include/freetype/internal -name '*.h' | \
388 + while read header; do
389 + mkdir -p "${ED%/}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die
390 + cp ${header} "${ED%/}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die
391 + done
392 + fi
393 +
394 + dodoc docs/{CHANGES,CUSTOMIZE,DEBUG,INSTALL.UNIX,*.txt,PROBLEMS,TODO}
395 + if use doc ; then
396 + docinto html
397 + dodoc -r docs/*
398 + fi
399 +
400 + prune_libtool_files --all
401 +}