summaryrefslogtreecommitdiffstats
path: root/meta/packages/fontconfig
diff options
context:
space:
mode:
authorRoss Burton <ross@openedhand.com>2007-05-27 21:21:56 +0000
committerRoss Burton <ross@openedhand.com>2007-05-27 21:21:56 +0000
commitc2d22f0f36980eecc7cf2ad818a5033476614bfc (patch)
treef8757313ecb270561d4db708a77822060bf5c0b1 /meta/packages/fontconfig
parentccbf0edf458fe87c204a27a3085c2e89ca82deb1 (diff)
downloadpoky-c2d22f0f36980eecc7cf2ad818a5033476614bfc.tar.gz
Upgrade fontconfig to 2.4.2
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1790 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/fontconfig')
-rw-r--r--meta/packages/fontconfig/files/local.conf12
-rw-r--r--meta/packages/fontconfig/files/stop-fc-cache.patch8
-rw-r--r--meta/packages/fontconfig/fontconfig-2.2.95/fc-glyphname.patch19
-rw-r--r--meta/packages/fontconfig/fontconfig-2.2.95/fc-lang.patch18
-rw-r--r--meta/packages/fontconfig/fontconfig-native_2.4.2.bb (renamed from meta/packages/fontconfig/fontconfig-native_2.2.95.bb)3
-rw-r--r--meta/packages/fontconfig/fontconfig_2.2.95.bb36
-rw-r--r--meta/packages/fontconfig/fontconfig_2.4.2.bb75
7 files changed, 76 insertions, 95 deletions
diff --git a/meta/packages/fontconfig/files/local.conf b/meta/packages/fontconfig/files/local.conf
deleted file mode 100644
index ddd7cf9d03..0000000000
--- a/meta/packages/fontconfig/files/local.conf
+++ /dev/null
@@ -1,12 +0,0 @@
1<?xml version="1.0"?>
2<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
3<!-- /etc/fonts/local.conf file for local customizations -->
4<fontconfig>
5<!-- Enable sub-pixel rendering -->
6 <match target="font">
7 <test qual="all" name="rgba">
8 <const>unknown</const>
9 </test>
10 <edit name="rgba" mode="assign"><const>rgb</const></edit>
11 </match>
12</fontconfig>
diff --git a/meta/packages/fontconfig/files/stop-fc-cache.patch b/meta/packages/fontconfig/files/stop-fc-cache.patch
deleted file mode 100644
index 7b549118f9..0000000000
--- a/meta/packages/fontconfig/files/stop-fc-cache.patch
+++ /dev/null
@@ -1,8 +0,0 @@
1--- fontconfig-2.2.95/Makefile.am.old 2006-02-07 01:01:01.000000000 +0000
2+++ fontconfig-2.2.95/Makefile.am 2006-02-07 01:01:15.000000000 +0000
3@@ -50,4 +50,4 @@
4 echo " $(INSTALL_DATA) local.conf $(DESTDIR)$(configdir)/local.conf"; \
5 $(INSTALL_DATA) local.conf $(DESTDIR)$(configdir)/local.conf; \
6 fi; fi; fi
7- if [ x$(DESTDIR) = x ]; then fc-cache/fc-cache -f -v; fi
8+# if [ x$(DESTDIR) = x ]; then fc-cache/fc-cache -f -v; fi
diff --git a/meta/packages/fontconfig/fontconfig-2.2.95/fc-glyphname.patch b/meta/packages/fontconfig/fontconfig-2.2.95/fc-glyphname.patch
deleted file mode 100644
index 1afd9324ff..0000000000
--- a/meta/packages/fontconfig/fontconfig-2.2.95/fc-glyphname.patch
+++ /dev/null
@@ -1,19 +0,0 @@
1--- fontconfig/fc-glyphname/Makefile.am~ 2004-04-14 17:06:35.000000000 +0100
2+++ fontconfig/fc-glyphname/Makefile.am 2004-05-15 11:41:35.000000000 +0100
3@@ -27,6 +27,7 @@
4 TMPL=fcglyphname.tmpl.h
5 STMPL=${top_srcdir}/fc-glyphname/${TMPL}
6 TARG=fcglyphname.h
7+FC_GLYPHNAME=./fc-glyphname
8
9 noinst_PROGRAMS=fc-glyphname
10
11@@ -41,7 +42,7 @@
12
13 $(TARG): $(STMPL) fc-glyphname $(SGLYPHNAME)
14 rm -f $(TARG)
15- ./fc-glyphname $(SGLYPHNAME) < $(STMPL) > $(TARG)
16+ $(FC_GLYPHNAME) $(SGLYPHNAME) < $(STMPL) > $(TARG)
17
18 CLEANFILES=$(TARG)
19
diff --git a/meta/packages/fontconfig/fontconfig-2.2.95/fc-lang.patch b/meta/packages/fontconfig/fontconfig-2.2.95/fc-lang.patch
deleted file mode 100644
index d08242a377..0000000000
--- a/meta/packages/fontconfig/fontconfig-2.2.95/fc-lang.patch
+++ /dev/null
@@ -1,18 +0,0 @@
1--- fontconfig/fc-lang/Makefile.am~ 2004-04-14 17:06:36.000000000 +0100
2+++ fontconfig/fc-lang/Makefile.am 2004-05-15 11:22:44.000000000 +0100
3@@ -27,6 +27,7 @@
4 TMPL=fclang.tmpl.h
5 STMPL=${top_srcdir}/fc-lang/fclang.tmpl.h
6 TARG=fclang.h
7+FC_LANG=./fc-lang
8
9 noinst_PROGRAMS=fc-lang
10
11@@ -40,6 +41,6 @@
12
13 $(TARG):$(ORTH) fc-lang $(STMPL)
14 rm -f $(TARG)
15- ./fc-lang -d ${srcdir} $(ORTH) < $(STMPL) > $(TARG)
16+ $(FC_LANG) -d ${srcdir} $(ORTH) < $(STMPL) > $(TARG)
17
18 CLEANFILES=$(TARG)
diff --git a/meta/packages/fontconfig/fontconfig-native_2.2.95.bb b/meta/packages/fontconfig/fontconfig-native_2.4.2.bb
index 69caf6cf73..541b74634c 100644
--- a/meta/packages/fontconfig/fontconfig-native_2.2.95.bb
+++ b/meta/packages/fontconfig/fontconfig-native_2.4.2.bb
@@ -4,10 +4,9 @@ require fontconfig_${PV}.bb
4inherit native 4inherit native
5DEPENDS = "freetype-native expat-native zlib-native" 5DEPENDS = "freetype-native expat-native zlib-native"
6FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/fontconfig-${PV}" 6FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/fontconfig-${PV}"
7SRC_URI += " file://stop-fc-cache.patch;patch=1"
8 7
9EXTRA_OEMAKE = "" 8EXTRA_OEMAKE = ""
10EXTRA_OECONF += "--with-freetype-config=${STAGING_BINDIR}/freetype-config" 9EXTRA_OECONF = "${@[' --disable-docs',' --disable-docs --with-freetype-config=%s/freetype-config' % bb.data.getVar('STAGING_BINDIR', d, 1)][os.path.isfile('%s/freetype-config' % bb.data.getVar('STAGING_BINDIR', d, 1))]}"
11 10
12do_stage () { 11do_stage () {
13 oe_runmake install 12 oe_runmake install
diff --git a/meta/packages/fontconfig/fontconfig_2.2.95.bb b/meta/packages/fontconfig/fontconfig_2.2.95.bb
deleted file mode 100644
index b3a61e727c..0000000000
--- a/meta/packages/fontconfig/fontconfig_2.2.95.bb
+++ /dev/null
@@ -1,36 +0,0 @@
1SECTION = "libs"
2LICENSE = "BSD"
3DESCRIPTION = "A library for configuring and customizing font access."
4DEPENDS = "expat freetype freetype-native zlib fontconfig-native"
5
6SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \
7 file://fc-glyphname.patch;patch=1 \
8 file://fc-lang.patch;patch=1 \
9 file://local.conf"
10PR = "r2"
11
12PACKAGES =+ "fontconfig-utils "
13FILES_fontconfig-utils = "${bindir}/*"
14
15PKG_fontconfig-utils=fontconfig-utils
16
17S = "${WORKDIR}/fontconfig-${PV}"
18
19inherit autotools pkgconfig
20
21export HASDOCBOOK="no"
22
23EXTRA_OECONF = " --disable-docs "
24EXTRA_OEMAKE = "FC_LANG=fc-lang FC_GLYPHNAME=fc-glyphname"
25
26do_stage () {
27 oe_libinstall -so -a -C src libfontconfig ${STAGING_LIBDIR}
28 install -d ${STAGING_INCDIR}/fontconfig
29 for i in ${S}/fontconfig/*.h; do install -m 0644 $i ${STAGING_INCDIR}/fontconfig/; done
30}
31
32do_install () {
33 autotools_do_install
34 install -m 0644 ${WORKDIR}/local.conf ${D}${sysconfdir}/fonts/local.conf
35}
36
diff --git a/meta/packages/fontconfig/fontconfig_2.4.2.bb b/meta/packages/fontconfig/fontconfig_2.4.2.bb
new file mode 100644
index 0000000000..098939324a
--- /dev/null
+++ b/meta/packages/fontconfig/fontconfig_2.4.2.bb
@@ -0,0 +1,75 @@
1SECTION = "libs"
2LICENSE = "BSD"
3DESCRIPTION = "A library for configuring and customizing font access."
4DEPENDS = "expat freetype freetype-native zlib"
5
6SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz"
7
8PR = "r0"
9
10PACKAGES =+ "fontconfig-utils-dbg fontconfig-utils "
11FILES_fontconfig-utils-dbg = "${bindir}/*.dbg"
12FILES_fontconfig-utils = "${bindir}/*"
13
14# Work around past breakage in debian.bbclass
15RPROVIDES_fontconfig-utils = "libfontconfig-utils"
16RREPLACES_fontconfig-utils = "libfontconfig-utils"
17RCONFLICTS_fontconfig-utils = "libfontconfig-utils"
18DEBIAN_NOAUTONAME_fontconfig-utils = "1"
19
20S = "${WORKDIR}/fontconfig-${PV}"
21
22inherit autotools pkgconfig
23
24export HASDOCBOOK="no"
25
26EXTRA_OECONF = " --disable-docs --with-arch=${HOST_ARCH}"
27EXTRA_OEMAKE = "FC_LANG=fc-lang FC_GLYPHNAME=fc-glyphname"
28
29# The tarball has some of the patched files as read only, which
30# patch doesn't like at all
31
32fontconfig_do_unpack() {
33 chmod -R u+rw ${S}
34}
35
36python do_unpack () {
37 bb.build.exec_func('base_do_unpack', d)
38 bb.build.exec_func('fontconfig_do_unpack', d)
39}
40
41do_stage () {
42 oe_libinstall -so -a -C src libfontconfig ${STAGING_LIBDIR}
43 install -d ${STAGING_INCDIR}/fontconfig
44 for i in ${S}/fontconfig/*.h; do install -m 0644 $i ${STAGING_INCDIR}/fontconfig/; done
45}
46
47BUILD_CFLAGS += " -I${STAGING_DIR}/${BUILD_SYS}/include/freetype2"
48
49do_configure_append () {
50 sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-case/Makefile
51 sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-glyphname/Makefile
52 sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-lang/Makefile
53 sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-arch/Makefile
54
55 sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-case/Makefile
56 sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-glyphname/Makefile
57 sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-lang/Makefile
58 sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-arch/Makefile
59
60 sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-case/Makefile
61 sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-glyphname/Makefile
62 sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-lang/Makefile
63 sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-arch/Makefile
64
65 sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-case/Makefile
66 sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-glyphname/Makefile
67 sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-lang/Makefile
68 sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-arch/Makefile
69
70}
71
72do_install () {
73 autotools_do_install
74}
75