From c2d22f0f36980eecc7cf2ad818a5033476614bfc Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Sun, 27 May 2007 21:21:56 +0000 Subject: Upgrade fontconfig to 2.4.2 git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1790 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- meta/packages/fontconfig/files/local.conf | 12 ---- meta/packages/fontconfig/files/stop-fc-cache.patch | 8 --- .../fontconfig-2.2.95/fc-glyphname.patch | 19 ------ .../fontconfig/fontconfig-2.2.95/fc-lang.patch | 18 ------ .../fontconfig/fontconfig-native_2.2.95.bb | 16 ----- .../packages/fontconfig/fontconfig-native_2.4.2.bb | 15 +++++ meta/packages/fontconfig/fontconfig_2.2.95.bb | 36 ----------- meta/packages/fontconfig/fontconfig_2.4.2.bb | 75 ++++++++++++++++++++++ 8 files changed, 90 insertions(+), 109 deletions(-) delete mode 100644 meta/packages/fontconfig/files/local.conf delete mode 100644 meta/packages/fontconfig/files/stop-fc-cache.patch delete mode 100644 meta/packages/fontconfig/fontconfig-2.2.95/fc-glyphname.patch delete mode 100644 meta/packages/fontconfig/fontconfig-2.2.95/fc-lang.patch delete mode 100644 meta/packages/fontconfig/fontconfig-native_2.2.95.bb create mode 100644 meta/packages/fontconfig/fontconfig-native_2.4.2.bb delete mode 100644 meta/packages/fontconfig/fontconfig_2.2.95.bb create mode 100644 meta/packages/fontconfig/fontconfig_2.4.2.bb 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 @@ - - - - - - - - unknown - - rgb - - 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 @@ ---- fontconfig-2.2.95/Makefile.am.old 2006-02-07 01:01:01.000000000 +0000 -+++ fontconfig-2.2.95/Makefile.am 2006-02-07 01:01:15.000000000 +0000 -@@ -50,4 +50,4 @@ - echo " $(INSTALL_DATA) local.conf $(DESTDIR)$(configdir)/local.conf"; \ - $(INSTALL_DATA) local.conf $(DESTDIR)$(configdir)/local.conf; \ - fi; fi; fi -- if [ x$(DESTDIR) = x ]; then fc-cache/fc-cache -f -v; fi -+# 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 @@ ---- fontconfig/fc-glyphname/Makefile.am~ 2004-04-14 17:06:35.000000000 +0100 -+++ fontconfig/fc-glyphname/Makefile.am 2004-05-15 11:41:35.000000000 +0100 -@@ -27,6 +27,7 @@ - TMPL=fcglyphname.tmpl.h - STMPL=${top_srcdir}/fc-glyphname/${TMPL} - TARG=fcglyphname.h -+FC_GLYPHNAME=./fc-glyphname - - noinst_PROGRAMS=fc-glyphname - -@@ -41,7 +42,7 @@ - - $(TARG): $(STMPL) fc-glyphname $(SGLYPHNAME) - rm -f $(TARG) -- ./fc-glyphname $(SGLYPHNAME) < $(STMPL) > $(TARG) -+ $(FC_GLYPHNAME) $(SGLYPHNAME) < $(STMPL) > $(TARG) - - CLEANFILES=$(TARG) - 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 @@ ---- fontconfig/fc-lang/Makefile.am~ 2004-04-14 17:06:36.000000000 +0100 -+++ fontconfig/fc-lang/Makefile.am 2004-05-15 11:22:44.000000000 +0100 -@@ -27,6 +27,7 @@ - TMPL=fclang.tmpl.h - STMPL=${top_srcdir}/fc-lang/fclang.tmpl.h - TARG=fclang.h -+FC_LANG=./fc-lang - - noinst_PROGRAMS=fc-lang - -@@ -40,6 +41,6 @@ - - $(TARG):$(ORTH) fc-lang $(STMPL) - rm -f $(TARG) -- ./fc-lang -d ${srcdir} $(ORTH) < $(STMPL) > $(TARG) -+ $(FC_LANG) -d ${srcdir} $(ORTH) < $(STMPL) > $(TARG) - - CLEANFILES=$(TARG) diff --git a/meta/packages/fontconfig/fontconfig-native_2.2.95.bb b/meta/packages/fontconfig/fontconfig-native_2.2.95.bb deleted file mode 100644 index 69caf6cf73..0000000000 --- a/meta/packages/fontconfig/fontconfig-native_2.2.95.bb +++ /dev/null @@ -1,16 +0,0 @@ -SECTION = "base" -LICENSE = "BSD" -require fontconfig_${PV}.bb -inherit native -DEPENDS = "freetype-native expat-native zlib-native" -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/fontconfig-${PV}" -SRC_URI += " file://stop-fc-cache.patch;patch=1" - -EXTRA_OEMAKE = "" -EXTRA_OECONF += "--with-freetype-config=${STAGING_BINDIR}/freetype-config" - -do_stage () { - oe_runmake install - install fc-lang/fc-lang ${STAGING_BINDIR} - install fc-glyphname/fc-glyphname ${STAGING_BINDIR} -} diff --git a/meta/packages/fontconfig/fontconfig-native_2.4.2.bb b/meta/packages/fontconfig/fontconfig-native_2.4.2.bb new file mode 100644 index 0000000000..541b74634c --- /dev/null +++ b/meta/packages/fontconfig/fontconfig-native_2.4.2.bb @@ -0,0 +1,15 @@ +SECTION = "base" +LICENSE = "BSD" +require 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' % bb.data.getVar('STAGING_BINDIR', d, 1)][os.path.isfile('%s/freetype-config' % 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/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 @@ -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 \ - file://local.conf" -PR = "r2" - -PACKAGES =+ "fontconfig-utils " -FILES_fontconfig-utils = "${bindir}/*" - -PKG_fontconfig-utils=fontconfig-utils - -S = "${WORKDIR}/fontconfig-${PV}" - -inherit autotools pkgconfig - -export HASDOCBOOK="no" - -EXTRA_OECONF = " --disable-docs " -EXTRA_OEMAKE = "FC_LANG=fc-lang FC_GLYPHNAME=fc-glyphname" - -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 - install -m 0644 ${WORKDIR}/local.conf ${D}${sysconfdir}/fonts/local.conf -} - 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 @@ +SECTION = "libs" +LICENSE = "BSD" +DESCRIPTION = "A library for configuring and customizing font access." +DEPENDS = "expat freetype freetype-native zlib" + +SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz" + +PR = "r0" + +PACKAGES =+ "fontconfig-utils-dbg fontconfig-utils " +FILES_fontconfig-utils-dbg = "${bindir}/*.dbg" +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 --with-arch=${HOST_ARCH}" +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 +} + +BUILD_CFLAGS += " -I${STAGING_DIR}/${BUILD_SYS}/include/freetype2" + +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 + +} + +do_install () { + autotools_do_install +} + -- cgit v1.2.3-54-g00ecf