aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2010-03-27 11:47:11 +0100
committerKoen Kooi <koen@openembedded.org>2010-03-27 11:47:11 +0100
commit2f1504b2038384ef0669bab566a0c9167f978b02 (patch)
tree3b2fffa82609adad19c1c65ee465695ebaebbf02
parent0e58efa364736f695f89ba2ab646f49438e807e3 (diff)
downloadopenembedded-2f1504b2038384ef0669bab566a0c9167f978b02.tar.gz
openembedded-2f1504b2038384ef0669bab566a0c9167f978b02.tar.bz2
openembedded-2f1504b2038384ef0669bab566a0c9167f978b02.zip
fontconfig: add 2.8.0 and make it default for angstrom
* 2.8.0 has he bugfix we need and is better that the 'random' git version 2.6.99 is using
-rw-r--r--conf/distro/include/angstrom-2008-preferred-versions.inc2
-rw-r--r--recipes/fontconfig/fontconfig_2.8.0.bb63
2 files changed, 64 insertions, 1 deletions
diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc
index 9b9e1e4262..93b805263f 100644
--- a/conf/distro/include/angstrom-2008-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2008-preferred-versions.inc
@@ -7,7 +7,7 @@ PREFERRED_VERSION_busybox = "1.13.2"
PREFERRED_VERSION_cairo = "1.8.10"
PREFERRED_VERSION_dbus = "1.2.22"
PREFERRED_VERSION_dropbear = "0.51"
-PREFERRED_VERSION_fontconfig = "2.6.99"
+PREFERRED_VERSION_fontconfig = "2.8.0"
PREFERRED_VERSION_glib-2.0 = "2.23.6"
PREFERRED_VERSION_glib-2.0-native = "2.23.6"
PREFERRED_VERSION_glibmm = "2.22.1"
diff --git a/recipes/fontconfig/fontconfig_2.8.0.bb b/recipes/fontconfig/fontconfig_2.8.0.bb
new file mode 100644
index 0000000000..5c6f8544af
--- /dev/null
+++ b/recipes/fontconfig/fontconfig_2.8.0.bb
@@ -0,0 +1,63 @@
+DESCRIPTION = "A library for configuring and customizing font access."
+SECTION = "libs"
+LICENSE = "BSD"
+DEPENDS = "expat freetype zlib"
+
+# Work around past breakage in debian.bbclass
+RPROVIDES_fontconfig-utils = "libfontconfig-utils"
+RCONFLICTS_fontconfig-utils = "libfontconfig-utils"
+
+SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz;name=fontconfig"
+SRC_URI[fontconfig.md5sum] = "77e15a92006ddc2adbb06f840d591c0e"
+SRC_URI[fontconfig.sha256sum] = "fa2a1c6eea654d9fce7a4b1220f10c99cdec848dccaf1625c01f076b31382335"
+
+S = "${WORKDIR}/fontconfig-${PV}"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = " --disable-docs --with-arch=${HOST_ARCH} --with-cache-dir=/var/lib/fontconfig"
+EXTRA_OEMAKE = "FC_LANG=fc-lang FC_GLYPHNAME=fc-glyphname"
+
+export HASDOCBOOK="no"
+BUILD_CFLAGS += " -I${STAGING_INCDIR}/freetype2"
+PARALLEL_MAKE = ""
+
+do_configure_append () {
+ sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-case/Makefile
+ sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-glyphname/Makefile
+ sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-lang/Makefile
+ sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-arch/Makefile
+ sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-case/Makefile
+ sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-glyphname/Makefile
+ sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-lang/Makefile
+ sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-arch/Makefile
+ sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-case/Makefile
+ sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-glyphname/Makefile
+ sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-lang/Makefile
+ sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-arch/Makefile
+ sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-case/Makefile
+ sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-glyphname/Makefile
+ sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-lang/Makefile
+ sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-arch/Makefile
+}
+
+# The tarball has some of the patched files as read only, which
+# patch doesn't like at all
+
+python do_unpack () {
+ bb.build.exec_func('base_do_unpack', d)
+ bb.build.exec_func('fontconfig_do_unpack', d)
+}
+
+fontconfig_do_unpack() {
+ chmod -R u+rw ${S}
+}
+
+PACKAGES =+ "fontconfig-utils-dbg fontconfig-utils "
+
+FILES_fontconfig-utils-dbg = "${bindir}/*.dbg"
+FILES_fontconfig-utils = "${bindir}/*"
+
+DEBIAN_NOAUTONAME_fontconfig-utils = "1"
+RREPLACES_fontconfig-utils = "libfontconfig-utils"
+