fontconfig: update to 2.3.91 for some much needed speed improvements

5 files changed, 103 insertions, 0 deletions

diff --git a/packages/fontconfig/fontconfig-2.3.91/.mtn2git_empty b/packages/fontconfig/fontconfig-2.3.91/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/fontconfig/fontconfig-2.3.91/.mtn2git_empty
diff --git a/packages/fontconfig/fontconfig-2.3.91/fc-glyphname.patch b/packages/fontconfig/fontconfig-2.3.91/fc-glyphname.patch
new file mode 100644
index 0000000000..b62bdda0ca
--- /dev/null
+++ b/packages/fontconfig/fontconfig-2.3.91/fc-glyphname.patch
@@ -0,0 +1,19 @@
+--- /tmp/Makefile.am	2006-04-25 15:46:09.236249864 +0200
++++ fontconfig-2.3.94/fc-glyphname/Makefile.am	2006-04-25 15:46:39.175698376 +0200
+@@ -31,6 +31,7 @@
+ TMPL=fcglyphname.tmpl.h
+ STMPL=${top_srcdir}/fc-glyphname/${TMPL}
+ TARG=fcglyphname.h
++FC_GLYPHNAME=./fc-glyphname
+ 
+ noinst_PROGRAMS=fc-glyphname
+ 
+@@ -45,7 +46,7 @@
+ 
+ $(TARG): $(STMPL) fc-glyphname$(EXEEXT) $(SGLYPHNAME)
+ 	rm -f $(TARG)
+-	./fc-glyphname$(EXEEXT) $(SGLYPHNAME) < $(STMPL) > $(TARG)
++	$(FC_GLYPHNAME)$(EXEEXT) $(SGLYPHNAME) < $(STMPL) > $(TARG)
+ 
+ CLEANFILES=$(TARG)
+ 
diff --git a/packages/fontconfig/fontconfig-2.3.91/fc-lang.patch b/packages/fontconfig/fontconfig-2.3.91/fc-lang.patch
new file mode 100644
index 0000000000..533f3249a8
--- /dev/null
+++ b/packages/fontconfig/fontconfig-2.3.91/fc-lang.patch
@@ -0,0 +1,18 @@
+--- /tmp/Makefile.am	2006-04-25 15:47:49.313035880 +0200
++++ fontconfig-2.3.94/fc-lang/Makefile.am	2006-04-25 15:48:22.807943880 +0200
+@@ -31,6 +31,7 @@
+ TMPL=fclang.tmpl.h
+ STMPL=${top_srcdir}/fc-lang/fclang.tmpl.h
+ TARG=fclang.h
++FC_LANG=./fc-lang
+ 
+ noinst_PROGRAMS=fc-lang
+ 
+@@ -44,6 +45,6 @@
+ 
+ $(TARG):$(ORTH) fc-lang${EXEEXT} $(STMPL)
+ 	rm -f $(TARG)
+-	./fc-lang${EXEEXT} -d ${srcdir} $(ORTH) < $(STMPL) > $(TARG)
++	$(FC_LANG)${EXEEXT} -d ${srcdir} $(ORTH) < $(STMPL) > $(TARG)
+ 
+ CLEANFILES=$(TARG)
diff --git a/packages/fontconfig/fontconfig-native_2.3.91.bb b/packages/fontconfig/fontconfig-native_2.3.91.bb
new file mode 100644
index 0000000000..b3d267b798
--- /dev/null
+++ b/packages/fontconfig/fontconfig-native_2.3.91.bb
@@ -0,0 +1,15 @@
+SECTION = "base"
+LICENSE = "BSD"
+include fontconfig_${PV}.bb
+inherit native
+DEPENDS = "freetype-native expat-native zlib-native"
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/fontconfig-${PV}"
+
+EXTRA_OEMAKE = ""
+EXTRA_OECONF = "${@[' --disable-docs',' --disable-docs --with-freetype-config=%s/freetype-config-native' % bb.data.getVar('STAGING_BINDIR', d, 1)][os.path.isfile('%s/freetype-config-native' % bb.data.getVar('STAGING_BINDIR', d, 1))]}"
+
+do_stage () {
+	oe_runmake install
+	install fc-lang/fc-lang ${STAGING_BINDIR}
+	install fc-glyphname/fc-glyphname ${STAGING_BINDIR}
+}
diff --git a/packages/fontconfig/fontconfig_2.3.91.bb b/packages/fontconfig/fontconfig_2.3.91.bb
new file mode 100644
index 0000000000..e45d1339fe
--- /dev/null
+++ b/packages/fontconfig/fontconfig_2.3.91.bb
@@ -0,0 +1,51 @@
+SECTION = "libs"
+LICENSE = "BSD"
+DESCRIPTION = "A library for configuring and customizing font access."
+DEPENDS = "expat freetype freetype-native zlib fontconfig-native"
+
+SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \
+           file://fc-glyphname.patch;patch=1 \
+           file://fc-lang.patch;patch=1"
+
+PR = "r0"
+
+PACKAGES =+ "fontconfig-utils "
+FILES_fontconfig-utils = "${bindir}/*"
+
+# Work around past breakage in debian.bbclass
+RPROVIDES_fontconfig-utils = "libfontconfig-utils"
+RREPLACES_fontconfig-utils = "libfontconfig-utils"
+RCONFLICTS_fontconfig-utils = "libfontconfig-utils"
+DEBIAN_NOAUTONAME_fontconfig-utils = "1"
+
+S = "${WORKDIR}/fontconfig-${PV}"
+
+inherit autotools pkgconfig
+
+export HASDOCBOOK="no"
+
+EXTRA_OECONF = " --disable-docs "
+EXTRA_OEMAKE = "FC_LANG=fc-lang FC_GLYPHNAME=fc-glyphname"
+
+# The tarball has some of the patched files as read only, which
+# patch doesn't like at all
+
+fontconfig_do_unpack() {
+       chmod -R u+rw ${S}
+}
+
+python do_unpack () {
+       bb.build.exec_func('base_do_unpack', d)
+       bb.build.exec_func('fontconfig_do_unpack', d)
+}
+
+do_stage () {
+	oe_libinstall -so -a -C src libfontconfig ${STAGING_LIBDIR}
+	install -d ${STAGING_INCDIR}/fontconfig
+	for i in ${S}/fontconfig/*.h; do install -m 0644 $i ${STAGING_INCDIR}/fontconfig/; done
+}
+
+do_install () {
+	autotools_do_install
+}
+