From efdb82b4b59079933a02e01296ddfb33b2e108c6 Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Fri, 2 Jul 2010 16:01:33 +0800 Subject: fontconfig and fontconfig-native: upgrade to the latest version 2.8.0 fontconfig-native requires fontconfig, so upgraded both recipes; renamed the patch directory from fontconfig-2.6.0 to fontconfig-2.8.0; slightly rebased fix-pkgconfig.patch; added HOMEPAGE, BUGTRACKER, LICENSE and LIC_FILES_CHKSUM; updated LICENSE from "BSD" to "MIT-style & MIT & Public Domain"; reset PR to "r0". Signed-off-by: Dexuan Cui --- .../fontconfig/fontconfig-2.6.0/97_fontconfig | 1 - .../fontconfig-2.6.0/fix-pkgconfig.patch | 15 ---- .../fontconfig/fontconfig-2.8.0/97_fontconfig | 1 + .../fontconfig-2.8.0/fix-pkgconfig.patch | 13 ++++ .../packages/fontconfig/fontconfig-native_2.6.0.bb | 12 --- .../packages/fontconfig/fontconfig-native_2.8.0.bb | 12 +++ meta/packages/fontconfig/fontconfig_2.6.0.bb | 81 -------------------- meta/packages/fontconfig/fontconfig_2.8.0.bb | 89 ++++++++++++++++++++++ 8 files changed, 115 insertions(+), 109 deletions(-) delete mode 100644 meta/packages/fontconfig/fontconfig-2.6.0/97_fontconfig delete mode 100644 meta/packages/fontconfig/fontconfig-2.6.0/fix-pkgconfig.patch create mode 100644 meta/packages/fontconfig/fontconfig-2.8.0/97_fontconfig create mode 100644 meta/packages/fontconfig/fontconfig-2.8.0/fix-pkgconfig.patch delete mode 100644 meta/packages/fontconfig/fontconfig-native_2.6.0.bb create mode 100644 meta/packages/fontconfig/fontconfig-native_2.8.0.bb delete mode 100644 meta/packages/fontconfig/fontconfig_2.6.0.bb create mode 100644 meta/packages/fontconfig/fontconfig_2.8.0.bb (limited to 'meta') diff --git a/meta/packages/fontconfig/fontconfig-2.6.0/97_fontconfig b/meta/packages/fontconfig/fontconfig-2.6.0/97_fontconfig deleted file mode 100644 index 2993959db..000000000 --- a/meta/packages/fontconfig/fontconfig-2.6.0/97_fontconfig +++ /dev/null @@ -1 +0,0 @@ -d root root 0755 /var/cache/fontconfig none diff --git a/meta/packages/fontconfig/fontconfig-2.6.0/fix-pkgconfig.patch b/meta/packages/fontconfig/fontconfig-2.6.0/fix-pkgconfig.patch deleted file mode 100644 index 17b85f758..000000000 --- a/meta/packages/fontconfig/fontconfig-2.6.0/fix-pkgconfig.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- - 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-2.8.0/97_fontconfig b/meta/packages/fontconfig/fontconfig-2.8.0/97_fontconfig new file mode 100644 index 000000000..2993959db --- /dev/null +++ b/meta/packages/fontconfig/fontconfig-2.8.0/97_fontconfig @@ -0,0 +1 @@ +d root root 0755 /var/cache/fontconfig none diff --git a/meta/packages/fontconfig/fontconfig-2.8.0/fix-pkgconfig.patch b/meta/packages/fontconfig/fontconfig-2.8.0/fix-pkgconfig.patch new file mode 100644 index 000000000..7fec1e910 --- /dev/null +++ b/meta/packages/fontconfig/fontconfig-2.8.0/fix-pkgconfig.patch @@ -0,0 +1,13 @@ +--- + fontconfig.pc.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- fontconfig-2.8.0.orig/fontconfig.pc.in ++++ fontconfig-2.8.0/fontconfig.pc.in +@@ -7,5 +7,5 @@ + Description: Font configuration and customization library + Version: @VERSION@ + Libs: -L${libdir} -lfontconfig +-Libs.private: @LIBXML2_LIBS@ @EXPAT_LIBS@ @FREETYPE_LIBS@ @ICONV_LIBS@ ++Libs.private: @LIBXML2_LIBS@ @EXPAT_LIBS@ -L{libdir} -lfreetype @ICONV_LIBS@ + Cflags: -I${includedir} diff --git a/meta/packages/fontconfig/fontconfig-native_2.6.0.bb b/meta/packages/fontconfig/fontconfig-native_2.6.0.bb deleted file mode 100644 index 03a1bc86c..000000000 --- a/meta/packages/fontconfig/fontconfig-native_2.6.0.bb +++ /dev/null @@ -1,12 +0,0 @@ -require fontconfig_${PV}.bb -inherit native -DEPENDS = "freetype-native expat-native zlib-native" - -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_install_append () { - install -d ${D}${bindir}/ - install fc-lang/fc-lang ${D}${bindir}/ - install fc-glyphname/fc-glyphname ${D}${bindir}/ -} diff --git a/meta/packages/fontconfig/fontconfig-native_2.8.0.bb b/meta/packages/fontconfig/fontconfig-native_2.8.0.bb new file mode 100644 index 000000000..03a1bc86c --- /dev/null +++ b/meta/packages/fontconfig/fontconfig-native_2.8.0.bb @@ -0,0 +1,12 @@ +require fontconfig_${PV}.bb +inherit native +DEPENDS = "freetype-native expat-native zlib-native" + +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_install_append () { + install -d ${D}${bindir}/ + install fc-lang/fc-lang ${D}${bindir}/ + install fc-glyphname/fc-glyphname ${D}${bindir}/ +} diff --git a/meta/packages/fontconfig/fontconfig_2.6.0.bb b/meta/packages/fontconfig/fontconfig_2.6.0.bb deleted file mode 100644 index 4c6df307f..000000000 --- a/meta/packages/fontconfig/fontconfig_2.6.0.bb +++ /dev/null @@ -1,81 +0,0 @@ -SECTION = "libs" -LICENSE = "BSD" -DESCRIPTION = "A library for configuring and customizing font access." -DEPENDS = "expat freetype zlib" - -PR = "r1" - -SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \ - file://fix-pkgconfig.patch;patch=1 \ - file://97_fontconfig" - -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" - -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) -} - -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 -} - -do_install_append() { - install -d ${D}${sysconfdir}/default/volatiles - install -m 0644 ${WORKDIR}/97_fontconfig ${D}${sysconfdir}/default/volatiles - rmdir ${D}${localstatedir}/cache/fontconfig - rmdir ${D}${localstatedir}/cache/ -} - -pkg_postinst_hal () { - /etc/init.d/populate-volatile.sh update -} diff --git a/meta/packages/fontconfig/fontconfig_2.8.0.bb b/meta/packages/fontconfig/fontconfig_2.8.0.bb new file mode 100644 index 000000000..f83d72cdd --- /dev/null +++ b/meta/packages/fontconfig/fontconfig_2.8.0.bb @@ -0,0 +1,89 @@ +DESCRIPTION = "A library for configuring and customizing font access." +HOMEPAGE = "http://www.fontconfig.org" +BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=fontconfig" + +LICENSE = "MIT-style & MIT & Public Domain" +LIC_FILES_CHKSUM = "file://COPYING;md5=f3ad4145dea6ca7efa2f1bee8165a7a1 \ + file://src/fcfreetype.c;endline=45;md5=bc3dd139e2f7245a02fde5545b203a6f \ + file://src/fccache.c;beginline=1020;endline=1035;md5=0326cfeb4a7333dd4dd25fbbc4b9f27f" + +SECTION = "libs" + +DEPENDS = "expat freetype zlib" + +PR = "r0" + +SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \ + file://fix-pkgconfig.patch \ + file://97_fontconfig" + +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" + +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) +} + +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 +} + +do_install_append() { + install -d ${D}${sysconfdir}/default/volatiles + install -m 0644 ${WORKDIR}/97_fontconfig ${D}${sysconfdir}/default/volatiles + rmdir ${D}${localstatedir}/cache/fontconfig + rmdir ${D}${localstatedir}/cache/ +} + +pkg_postinst_hal () { + /etc/init.d/populate-volatile.sh update +} -- cgit v1.2.3