Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Lars Wendler (polynomial-c)" <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-libs/freetype: ChangeLog freetype-2.5.1.ebuild freetype-2.5.0.1.ebuild
Date: Fri, 06 Dec 2013 14:12:09
Message-Id: 20131206141205.92EA22004B@flycatcher.gentoo.org
1 polynomial-c 13/12/06 14:12:05
2
3 Modified: ChangeLog freetype-2.5.0.1.ebuild
4 Added: freetype-2.5.1.ebuild
5 Log:
6 Version bump. Cleaned up FILESDIR. Fixed inifinality patchfile source URI
7
8 (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)
9
10 Revision Changes Path
11 1.382 media-libs/freetype/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/freetype/ChangeLog?rev=1.382&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/freetype/ChangeLog?rev=1.382&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/freetype/ChangeLog?r1=1.381&r2=1.382
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v
20 retrieving revision 1.381
21 retrieving revision 1.382
22 diff -u -r1.381 -r1.382
23 --- ChangeLog 24 Oct 2013 22:40:21 -0000 1.381
24 +++ ChangeLog 6 Dec 2013 14:12:05 -0000 1.382
25 @@ -1,6 +1,23 @@
26 # ChangeLog for media-libs/freetype
27 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.381 2013/10/24 22:40:21 gienah Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.382 2013/12/06 14:12:05 polynomial-c Exp $
30 +
31 +*freetype-2.5.1 (06 Dec 2013)
32 +
33 + 06 Dec 2013; Lars Wendler <polynomial-c@g.o> freetype-2.5.0.1.ebuild,
34 + +freetype-2.5.1.ebuild, -files/freetype-1.4-glibc-2.10.patch,
35 + -files/freetype-1.4_pre-contrib-destdir.patch,
36 + -files/freetype-1.4_pre-malloc.patch,
37 + -files/freetype-1.4_pre-silence-strict-aliasing.patch,
38 + -files/freetype-1.4_pre-ttf2pk-tetex-3.patch,
39 + -files/freetype-1.4_pre-ttf2tfm-segfault.patch,
40 + -files/freetype-1.4_pre20080316-CVE-2006-1861.patch,
41 + -files/freetype-1.4_pre20080316-CVE-2007-2754.patch,
42 + -files/freetype-1.4_pre20080316-CVE-2008-1808.patch,
43 + -files/freetype-1.4_pre20080316-LDLFAGS.patch,
44 + -files/freetype-1.4_pre20080316-kpathsea_version.patch,
45 + +files/freetype-2.5.1-TT_Load_Simple_Glyph_fix.patch:
46 + Version bump. Cleaned up FILESDIR. Fixed inifinality patchfile source URI.
47
48 24 Oct 2013; Mark Wright <gienah@g.o> freetype-2.5.0.1.ebuild:
49 if use png, then sed freetype2.pc to add the png lib, to fix bug 487646.
50
51
52
53 1.4 media-libs/freetype/freetype-2.5.0.1.ebuild
54
55 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/freetype/freetype-2.5.0.1.ebuild?rev=1.4&view=markup
56 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/freetype/freetype-2.5.0.1.ebuild?rev=1.4&content-type=text/plain
57 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/freetype/freetype-2.5.0.1.ebuild?r1=1.3&r2=1.4
58
59 Index: freetype-2.5.0.1.ebuild
60 ===================================================================
61 RCS file: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.5.0.1.ebuild,v
62 retrieving revision 1.3
63 retrieving revision 1.4
64 diff -u -r1.3 -r1.4
65 --- freetype-2.5.0.1.ebuild 24 Oct 2013 22:40:21 -0000 1.3
66 +++ freetype-2.5.0.1.ebuild 6 Dec 2013 14:12:05 -0000 1.4
67 @@ -1,6 +1,6 @@
68 # Copyright 1999-2013 Gentoo Foundation
69 # Distributed under the terms of the GNU General Public License v2
70 -# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.5.0.1.ebuild,v 1.3 2013/10/24 22:40:21 gienah Exp $
71 +# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.5.0.1.ebuild,v 1.4 2013/12/06 14:12:05 polynomial-c Exp $
72
73 EAPI=5
74
75 @@ -13,7 +13,7 @@
76 SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.bz2
77 utils? ( mirror://sourceforge/freetype/ft2demos-${MY_PV}.tar.bz2 )
78 doc? ( mirror://sourceforge/freetype/${PN}-doc-${MY_PV}.tar.bz2 )
79 - infinality? ( http://ibn.net63.net/infinality-bundle/src/${PN}2-infinality-ultimate-${PV}-5.src.tar.gz )"
80 + infinality? ( https://raw.github.com/bohoomil/fontconfig-ultimate/c12482bd16b69cba5798dc7581b926b55682904d/01_freetype2-iu-2.5.0.1-7/infinality-2.5.patch -> ${P}-infinality.patch )"
81
82 LICENSE="|| ( FTL GPL-2+ )"
83 SLOT="2"
84 @@ -49,7 +49,7 @@
85 }
86
87 if use infinality; then
88 - epatch "${WORKDIR}/${PN}2-infinality-ultimate/infinality-2.5.patch"
89 + epatch "${DISTDIR}/${P}-infinality.patch"
90
91 # FT_CONFIG_OPTION_SUBPIXEL_RENDERING is already enabled in
92 # freetype-2.4.11
93
94
95
96 1.1 media-libs/freetype/freetype-2.5.1.ebuild
97
98 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/freetype/freetype-2.5.1.ebuild?rev=1.1&view=markup
99 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/freetype/freetype-2.5.1.ebuild?rev=1.1&content-type=text/plain
100
101 Index: freetype-2.5.1.ebuild
102 ===================================================================
103 # Copyright 1999-2013 Gentoo Foundation
104 # Distributed under the terms of the GNU General Public License v2
105 # $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.5.1.ebuild,v 1.1 2013/12/06 14:12:05 polynomial-c Exp $
106
107 EAPI=5
108
109 inherit autotools-multilib flag-o-matic multilib
110
111 DESCRIPTION="A high-quality and portable font engine"
112 HOMEPAGE="http://www.freetype.org/"
113 SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.bz2
114 utils? ( mirror://sourceforge/freetype/ft2demos-${PV}.tar.bz2 )
115 doc? ( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.bz2 )
116 infinality? ( https://raw.github.com/bohoomil/fontconfig-ultimate/ddda669247330d1a1b8c9473cfe5052d42e1b313/01_lib32-freetype2-iu-2.5.1-2/infinality-2.5.1.patch -> ${P}-infinality.patch )"
117
118 LICENSE="|| ( FTL GPL-2+ )"
119 SLOT="2"
120 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
121 IUSE="X +adobe-cff auto-hinter bindist bzip2 debug doc fontforge infinality png
122 static-libs utils"
123
124 DEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]
125 bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
126 png? ( media-libs/libpng[${MULTILIB_USEDEP}] )
127 X? ( x11-libs/libX11[${MULTILIB_USEDEP}]
128 x11-libs/libXau[${MULTILIB_USEDEP}]
129 x11-libs/libXdmcp[${MULTILIB_USEDEP}] )"
130 RDEPEND="${DEPEND}
131 infinality? ( media-libs/fontconfig-infinality )
132 abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )"
133
134 src_prepare() {
135 enable_option() {
136 sed -i -e "/#define $1/a #define $1" \
137 include/config/ftoption.h \
138 || die "unable to enable option $1"
139 }
140
141 disable_option() {
142 sed -i -e "/#define $1/ { s:^:/*:; s:$:*/: }" \
143 include/config/ftoption.h \
144 || die "unable to disable option $1"
145 }
146
147 if use infinality; then
148 epatch "${DISTDIR}/${P}-infinality.patch"
149
150 # FT_CONFIG_OPTION_SUBPIXEL_RENDERING is already enabled in
151 # freetype-2.4.11
152 enable_option TT_CONFIG_OPTION_SUBPIXEL_HINTING
153 fi
154
155 if ! use bindist; then
156 # See http://freetype.org/patents.html
157 # ClearType is covered by several Microsoft patents in the US
158 enable_option FT_CONFIG_OPTION_SUBPIXEL_RENDERING
159 fi
160
161 if use auto-hinter; then
162 disable_option TT_CONFIG_OPTION_BYTECODE_INTERPRETER
163 enable_option TT_CONFIG_OPTION_UNPATENTED_HINTING
164 fi
165
166 if ! use adobe-cff; then
167 enable_option CFF_CONFIG_OPTION_OLD_ENGINE
168 fi
169
170 if use debug; then
171 enable_option FT_DEBUG_LEVEL_TRACE
172 enable_option FT_DEBUG_MEMORY
173 fi
174
175 epatch "${FILESDIR}"/${PN}-2.3.2-enable-valid.patch
176
177 epatch "${FILESDIR}"/${PN}-2.4.11-sizeof-types.patch # 459966
178
179 epatch "${FILESDIR}"/${P}-TT_Load_Simple_Glyph_fix.patch
180
181 #if use png; then
182 # local pnglibs=$(pkg-config libpng --libs) # 488222 487646
183 # sed -e "s@××××.private: %LIBZ% %LIBBZ2% %FT2_EXTRA_LIBS%@××××.private: %LIBZ% %LIBBZ2% %FT2_EXTRA_LIBS% ${pnglibs}@" \
184 # -e 's@Requires:@Requires.private: zlib libpng\nRequires:@' \
185 # -i "${S}/builds/unix/freetype2.in" \
186 # || die "Could not sed pkg-config libpng --libs in builds/unix/freetype2.in"
187 #fi
188
189 if use utils; then
190 cd "${WORKDIR}/ft2demos-${MY_PV}" || die
191 # Disable tests needing X11 when USE="-X". (bug #177597)
192 if ! use X; then
193 sed -i -e "/EXES\ +=\ ftdiff/ s:^:#:" Makefile || die
194 fi
195 fi
196
197 # we need non-/bin/sh to run configure
198 if [[ -n ${CONFIG_SHELL} ]] ; then
199 sed -i -e "1s:^#![[:space:]]*/bin/sh:#!$CONFIG_SHELL:" \
200 "${S}"/builds/unix/configure || die
201 fi
202
203 autotools-utils_src_prepare
204 }
205
206 src_configure() {
207 append-flags -fno-strict-aliasing
208 type -P gmake &> /dev/null && export GNUMAKE=gmake
209
210 local myeconfargs=(
211 --enable-biarch-config
212 $(use_with bzip2) \
213 $(use_with png)
214 )
215
216 autotools-multilib_src_configure
217 }
218
219 src_compile() {
220 autotools-multilib_src_compile
221
222 if use utils; then
223 einfo "Building utils"
224 # fix for Prefix, bug #339334
225 multilib_for_best_abi autotools-utils_src_compile \
226 X11_PATH="${EPREFIX}/usr/$(get_libdir)" \
227 FT2DEMOS=1 TOP_DIR_2="${WORKDIR}/ft2demos-${MY_PV}"
228 fi
229 }
230
231 src_install() {
232 autotools-multilib_src_install
233
234 if use utils; then
235 install_utils() {
236 einfo "Installing utils"
237 rm "${WORKDIR}"/ft2demos-${MY_PV}/bin/README || die
238 local ft2demo
239 for ft2demo in ../ft2demos-${MY_PV}/bin/*; do
240 "${BUILD_DIR}"/libtool --mode=install $(type -P install) -m 755 "$ft2demo" \
241 "${ED}"/usr/bin || die
242 done
243 }
244 multilib_for_best_abi install_utils
245 fi
246
247 if use fontforge; then
248 # Probably fontforge needs less but this way makes things simplier...
249 einfo "Installing internal headers required for fontforge"
250 local header
251 find src/truetype include/freetype/internal -name '*.h' | \
252 while read header; do
253 mkdir -p "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die
254 cp ${header} "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die
255 done
256 fi
257
258 dodoc docs/{CHANGES,CUSTOMIZE,DEBUG,*.txt,PROBLEMS,TODO}
259 use doc && dohtml -r docs/*
260 }
Report Message
Find on MARC Find on Google Groups