From 8344c7b3a9c223385fb26f349619eb9e4884aac9 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Mon, 30 Jun 2008 15:30:16 +0000 Subject: fontconfig: updated to 2.6.0 git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4753 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- .../fontconfig-2.4.2/configure_fix.patch | 16 ----- .../fontconfig-2.6.0/fix-pkgconfig.patch | 15 +++++ .../packages/fontconfig/fontconfig-native_2.4.2.bb | 15 ----- .../packages/fontconfig/fontconfig-native_2.6.0.bb | 15 +++++ meta/packages/fontconfig/fontconfig_2.4.2.bb | 76 ---------------------- meta/packages/fontconfig/fontconfig_2.6.0.bb | 74 +++++++++++++++++++++ 6 files changed, 104 insertions(+), 107 deletions(-) delete mode 100644 meta/packages/fontconfig/fontconfig-2.4.2/configure_fix.patch create mode 100644 meta/packages/fontconfig/fontconfig-2.6.0/fix-pkgconfig.patch delete mode 100644 meta/packages/fontconfig/fontconfig-native_2.4.2.bb create mode 100644 meta/packages/fontconfig/fontconfig-native_2.6.0.bb delete mode 100644 meta/packages/fontconfig/fontconfig_2.4.2.bb create mode 100644 meta/packages/fontconfig/fontconfig_2.6.0.bb diff --git a/meta/packages/fontconfig/fontconfig-2.4.2/configure_fix.patch b/meta/packages/fontconfig/fontconfig-2.4.2/configure_fix.patch deleted file mode 100644 index feea1b36a8..0000000000 --- a/meta/packages/fontconfig/fontconfig-2.4.2/configure_fix.patch +++ /dev/null @@ -1,16 +0,0 @@ -Libtool 2.2.2 requires this is used with AC_SUBST - -RP - 14/4/08 - -Index: fontconfig-2.4.2/configure.in -=================================================================== ---- fontconfig-2.4.2.orig/configure.in 2008-04-15 00:20:54.000000000 +0100 -+++ fontconfig-2.4.2/configure.in 2008-04-14 14:37:40.000000000 +0100 -@@ -46,6 +46,7 @@ - AC_SUBST(LT_CURRENT) - AC_SUBST(LT_REVISION) - LT_AGE=2 -+AC_SUBST(LT_AGE) - - LT_VERSION_INFO="$LT_CURRENT:$LT_REVISION:$LT_AGE" - AC_SUBST(LT_VERSION_INFO) diff --git a/meta/packages/fontconfig/fontconfig-2.6.0/fix-pkgconfig.patch b/meta/packages/fontconfig/fontconfig-2.6.0/fix-pkgconfig.patch new file mode 100644 index 0000000000..17b85f758d --- /dev/null +++ b/meta/packages/fontconfig/fontconfig-2.6.0/fix-pkgconfig.patch @@ -0,0 +1,15 @@ +--- + fontconfig.pc.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- fontconfig-2.6.0.orig/fontconfig.pc.in ++++ fontconfig-2.6.0/fontconfig.pc.in +@@ -5,7 +5,7 @@ includedir=@includedir@ + + Name: Fontconfig + Description: Font configuration and customization library + Version: @VERSION@ + Libs: -L${libdir} -lfontconfig +-Libs.private: @EXPAT_LIBS@ @FREETYPE_LIBS@ ++Libs.private: @EXPAT_LIBS@ -L${libdir} -lfreetype + Cflags: -I${includedir} diff --git a/meta/packages/fontconfig/fontconfig-native_2.4.2.bb b/meta/packages/fontconfig/fontconfig-native_2.4.2.bb deleted file mode 100644 index 541b74634c..0000000000 --- a/meta/packages/fontconfig/fontconfig-native_2.4.2.bb +++ /dev/null @@ -1,15 +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}" - -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-native_2.6.0.bb b/meta/packages/fontconfig/fontconfig-native_2.6.0.bb new file mode 100644 index 0000000000..541b74634c --- /dev/null +++ b/meta/packages/fontconfig/fontconfig-native_2.6.0.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.4.2.bb b/meta/packages/fontconfig/fontconfig_2.4.2.bb deleted file mode 100644 index b974e99c76..0000000000 --- a/meta/packages/fontconfig/fontconfig_2.4.2.bb +++ /dev/null @@ -1,76 +0,0 @@ -SECTION = "libs" -LICENSE = "BSD" -DESCRIPTION = "A library for configuring and customizing font access." -DEPENDS = "expat freetype zlib" - -SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \ - file://configure_fix.patch;patch=1" - -PR = "r10" - -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_INCDIR}/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 -} - diff --git a/meta/packages/fontconfig/fontconfig_2.6.0.bb b/meta/packages/fontconfig/fontconfig_2.6.0.bb new file mode 100644 index 0000000000..b7f1f5aaa7 --- /dev/null +++ b/meta/packages/fontconfig/fontconfig_2.6.0.bb @@ -0,0 +1,74 @@ +SECTION = "libs" +LICENSE = "BSD" +DESCRIPTION = "A library for configuring and customizing font access." +DEPENDS = "expat freetype zlib" + +SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \ + file://fix-pkgconfig.patch;patch=1" + +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_INCDIR}/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