From 1c5ddc22e0b0c32976d5ae757eaaad24b02cb6b0 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Mon, 4 Aug 2008 12:10:54 +0000 Subject: fontconfig: added 2.6.0 from Poky - should close #2951 --- .../fontconfig/fontconfig-2.6.0/.mtn2git_empty | 0 .../fontconfig-2.6.0/fix-pkgconfig.patch | 15 +++++ packages/fontconfig/fontconfig-native_2.6.0.bb | 15 +++++ packages/fontconfig/fontconfig_2.6.0.bb | 76 ++++++++++++++++++++++ 4 files changed, 106 insertions(+) create mode 100644 packages/fontconfig/fontconfig-2.6.0/.mtn2git_empty create mode 100644 packages/fontconfig/fontconfig-2.6.0/fix-pkgconfig.patch create mode 100644 packages/fontconfig/fontconfig-native_2.6.0.bb create mode 100644 packages/fontconfig/fontconfig_2.6.0.bb diff --git a/packages/fontconfig/fontconfig-2.6.0/.mtn2git_empty b/packages/fontconfig/fontconfig-2.6.0/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/fontconfig/fontconfig-2.6.0/fix-pkgconfig.patch b/packages/fontconfig/fontconfig-2.6.0/fix-pkgconfig.patch new file mode 100644 index 0000000000..17b85f758d --- /dev/null +++ b/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/packages/fontconfig/fontconfig-native_2.6.0.bb b/packages/fontconfig/fontconfig-native_2.6.0.bb new file mode 100644 index 0000000000..541b74634c --- /dev/null +++ b/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/packages/fontconfig/fontconfig_2.6.0.bb b/packages/fontconfig/fontconfig_2.6.0.bb new file mode 100644 index 0000000000..3f7eca4b4e --- /dev/null +++ b/packages/fontconfig/fontconfig_2.6.0.bb @@ -0,0 +1,76 @@ +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}" + +PARALLEL_MAKE = "" + +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