-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Last week (as it last week?) there were some debates on the freetype2
bytecode interpreter.
It was proposed that plf.zarb.org carry a copy of freetype2 with the
bytecode interpreter enabled. However, maintaining RPMs and spec files
for two different releases could become an issue.
So, attached is a new (proposed) spec file for freetype that should
solve this issue (if it is accepted).
It uses the same method other RPMs use to enable options,
(kde,samba,openoffice,kernel) so that anyone can enable the bytecode
interpreter at rpm build time by doing:
$ rpm -ba --with plf SPECS/freetype2.spec
At the moment it requires the attached patch (which would have to be in
CVS I guess), but that could be put into the spec file (but that would
be in cvs).
Would this be acceptable? Or are the plfs going to have to maintain a
seperate rpm and spec file ) not that freetype2.spec is that complex.
Regards,
Buchan
- --
|----------------Registered Linux User #182071-----------------|
Buchan Milne Mechanical Engineer, Network Manager
Cellphone * Work +27 82 472 2231 * +27 21 8828820x202
Stellenbosch Automotive Engineering http://www.cae.co.za
GPG Key http://ranger.dnsalias.com/bgmilne.asc
1024D/60D204A7 2919 E232 5610 A038 87B1 72D6 AC92 BA50 60D2 04A7
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iD8DBQE84UxQrJK6UGDSBKcRAhfMAJ44loXKfcGC8Kw77KLflm1R7yGQeACfS8mh
Y2xOLAOk1jvEvBLdVytNB3c=
=rN/2
-----END PGP SIGNATURE-----
%define build_plf 0
%{?_with_plf: %{expand: %%define build_plf 1}}
%define rel 3
Name: freetype2
Summary: A free and portable TrueType font rendering engine
Version: 2.0.9
%if %build_plf
Release: %{rel}plf
%else
Release: %{rel}mdk
%endif
License: FreeType License/GPL
URL: http://www.freetype.org/
Source0: freetype-%{version}.tar.bz2
Source1: ftdocs-%{version}.tar.bz2
Patch0: freetype2-enable-bytecode-interpreter.patch.bz2
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
Group: System/Libraries
%description
The FreeType2 engine is a free and portable TrueType font rendering engine.
It has been developed to provide TT support to a great variety of
platforms and environments. Note that FreeType2 is a library, not a
stand-alone application, though some utility applications are included
%package devel
Summary: Header files and static library for development with FreeType2
Group: Development/C
Requires: %{name} = %{version}-%{release}
%description devel
This package is only needed if you intend to develop or compile applications
which rely on the FreeType2 library. If you simply want to run existing
applications, you won't need this package.
%prep
%setup -q -n freetype-%version -a 1
cp -ar freetype-%{version}/docs/* docs
%if %build_plf
%patch0 -p1
%endif
%build
CFLAGS="%optflags" \
./configure --prefix=%_prefix \
--build=%_target_platform \
--host=%_target_platform \
--enable-shared \
--disable-static \
--with-gnu-ld \
--with-pic
%make
%install
rm -fr %buildroot
%makeinstall
%clean
rm -fr %buildroot
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%defattr(-, root, root)
%{_libdir}/*.so.*
%files devel
%defattr(-, root, root)
%doc docs/*
%{_bindir}/freetype-config
%{_libdir}/*.so
%{_libdir}/*.la
%{_includedir}/*
%changelog
* Tue May 14 2002 Buchan Milne <[EMAIL PROTECTED]> 2.0.9-3{mdk,plf}
- Add a patch to enable the bytecode interpreter when
built with --with plf
* Mon May 06 2002 Gwenole Beauchesne <[EMAIL PROTECTED]> 2.0.9-2mdk
- Automated rebuild in gcc3.1 environment
* Wed Mar 20 2002 David BAUDENS <[EMAIL PROTECTED]> 2.0.9-1mdk
- 2.0.9
- devel: Requires: %%version-%%release and not only %%version
- Use ./configure
- Don't build static libraries
- Move documentation in devel package
- Spec clean up
* Tue Jan 25 2002 Christian Belisle <[EMAIL PROTECTED]> 2.0.6-1mdk
- Release 2.0.6.
- Added URL.
* Sun Oct 28 2001 Giuseppe Ghib� <[EMAIL PROTECTED]> 2.0.5-1mdk
- Release 2.0.5.
- fixed executable permission on docs files.
- s/Copyright/License/.
* Thu Jun 28 2001 Frederic Crozat <[EMAIL PROTECTED]> 2.0.4-1mdk
- Release 2.0.4
* Wed May 30 2001 Frederic Crozat <[EMAIL PROTECTED]> 2.0.3-1mdk
- Release 2.0.3
- Remove patch0 (Type1 fonts are corrected)
* Wed Apr 25 2001 Geoffrey Lee <[EMAIL PROTECTED]> 2.0.2-4mdk
- Spec patch from Abel Cheung to fix build on certain machines
(personally I have no idea why it happens).
* Mon Apr 09 2001 Giuseppe Ghib� <[EMAIL PROTECTED]> 2.0.2-3mdk
- patched t1load patch (Arnd Bergmann).
* Mon Apr 09 2001 Giuseppe Ghib� <[EMAIL PROTECTED]> 2.0.2-2mdk
- added Tom Kacvinsky patch to fix problem with ancient URW fonts,
libXft segfaults, etc. (thanks to Arnd Bergmann).
* Sat Mar 31 2001 Giuseppe Ghib� <[EMAIL PROTECTED]> 2.0.2-1mdk
- 2.0.2 final.
- removedft2build patch.
* Mon Dec 11 2000 Frederic Crozat <[EMAIL PROTECTED]> 2.0.2-0.20001211.1mdk
- Snapshot version from CVS (needed for xrender)
- Patch ft2build.h to use correct path (Fred Lepied)
- Remove patch1 (not longer needed)
- Remove patch2 (merged upstream)
* Sat Dec 02 2000 Geoffrey Lee <[EMAIL PROTECTED]> 2.0.1-1mdk
- new and shiny source bumped into cooker.
- obsolete patch as the bug is fixed.
- use RPM_OPT_FLAGS.
* Tue Nov 21 2000 Frederic Crozat <[EMAIL PROTECTED]> 2.0-3mdk
- Include all modules in lib (no longer apply patch1)
* Tue Nov 21 2000 Frederic Crozat <[EMAIL PROTECTED]> 2.0-2mdk
- Add config script to devel package
- correctly configure package
* Fri Nov 10 2000 Geoffrey Lee <[EMAIL PROTECTED]> 2.0-1mdk
- really 2.0 release.
* Wed Nov 8 2000 Frederic Crozat <[EMAIL PROTECTED]> 2.0-0.8.1mdk
- First mandrake release
* Thu Oct 5 2000 Ramiro Estrugo <[EMAIL PROTECTED]>
- Created this thing
--- freetype-2.0.9/include/freetype/config/ftoption.h Mon Jan 7 12:05:34 2002
+++ freetype-2.0.9-plf/include/freetype/config/ftoption.h Tue May 14 19:22:49
+2002
@@ -375,7 +375,7 @@
/* By undefining this, you will only compile the code necessary to load */
/* TrueType glyphs without hinting. */
/* */
-#undef TT_CONFIG_OPTION_BYTECODE_INTERPRETER
+#define TT_CONFIG_OPTION_BYTECODE_INTERPRETER
/*************************************************************************/
