From 8e219dea0373dc3a37d51f63c41f1a8449029dd5 Mon Sep 17 00:00:00 2001 From: Laurentiu Palcu Date: Mon, 28 May 2012 08:47:58 +0300 Subject: fontconfig: upgrade to 2.9.0 Other changes: - licence checksums because the licence headers changed slightly: several other authors were added and Keith Packard's name has been replaced with "author(s)". That's it. - rebased the fix-pkgconfig.patch to apply on 2.9.0 - removed all sed instructions in do_configure_append() that were changing fc-arch/Makefile. In the new version the fc-arch/ directory has been removed in order to make the package cross-compiling safe Signed-off-by: Laurentiu Palcu Signed-off-by: Richard Purdie --- .../fontconfig/fontconfig-2.8.0/97_fontconfig | 1 - .../fontconfig-2.8.0/fix-pkgconfig.patch | 15 ---- .../fontconfig/fontconfig-2.9.0/97_fontconfig | 1 + .../fontconfig-2.9.0/fix-pkgconfig.patch | 15 ++++ .../fontconfig/fontconfig-native_2.8.0.bb | 14 ---- .../fontconfig/fontconfig-native_2.9.0.bb | 14 ++++ .../fontconfig/fontconfig_2.8.0.bb | 93 ---------------------- .../fontconfig/fontconfig_2.9.0.bb | 89 +++++++++++++++++++++ 8 files changed, 119 insertions(+), 123 deletions(-) delete mode 100644 meta/recipes-graphics/fontconfig/fontconfig-2.8.0/97_fontconfig delete mode 100644 meta/recipes-graphics/fontconfig/fontconfig-2.8.0/fix-pkgconfig.patch create mode 100644 meta/recipes-graphics/fontconfig/fontconfig-2.9.0/97_fontconfig create mode 100644 meta/recipes-graphics/fontconfig/fontconfig-2.9.0/fix-pkgconfig.patch delete mode 100644 meta/recipes-graphics/fontconfig/fontconfig-native_2.8.0.bb create mode 100644 meta/recipes-graphics/fontconfig/fontconfig-native_2.9.0.bb delete mode 100644 meta/recipes-graphics/fontconfig/fontconfig_2.8.0.bb create mode 100644 meta/recipes-graphics/fontconfig/fontconfig_2.9.0.bb diff --git a/meta/recipes-graphics/fontconfig/fontconfig-2.8.0/97_fontconfig b/meta/recipes-graphics/fontconfig/fontconfig-2.8.0/97_fontconfig deleted file mode 100644 index 2993959dbb..0000000000 --- a/meta/recipes-graphics/fontconfig/fontconfig-2.8.0/97_fontconfig +++ /dev/null @@ -1 +0,0 @@ -d root root 0755 /var/cache/fontconfig none diff --git a/meta/recipes-graphics/fontconfig/fontconfig-2.8.0/fix-pkgconfig.patch b/meta/recipes-graphics/fontconfig/fontconfig-2.8.0/fix-pkgconfig.patch deleted file mode 100644 index 30415fce76..0000000000 --- a/meta/recipes-graphics/fontconfig/fontconfig-2.8.0/fix-pkgconfig.patch +++ /dev/null @@ -1,15 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - ---- - 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/recipes-graphics/fontconfig/fontconfig-2.9.0/97_fontconfig b/meta/recipes-graphics/fontconfig/fontconfig-2.9.0/97_fontconfig new file mode 100644 index 0000000000..2993959dbb --- /dev/null +++ b/meta/recipes-graphics/fontconfig/fontconfig-2.9.0/97_fontconfig @@ -0,0 +1 @@ +d root root 0755 /var/cache/fontconfig none diff --git a/meta/recipes-graphics/fontconfig/fontconfig-2.9.0/fix-pkgconfig.patch b/meta/recipes-graphics/fontconfig/fontconfig-2.9.0/fix-pkgconfig.patch new file mode 100644 index 0000000000..6be04a1509 --- /dev/null +++ b/meta/recipes-graphics/fontconfig/fontconfig-2.9.0/fix-pkgconfig.patch @@ -0,0 +1,15 @@ +Upstream-Status: Inappropriate [configuration] + +--- + fontconfig.pc.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- fontconfig-2.9.0.orig/fontconfig.pc.in ++++ fontconfig-2.9.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/recipes-graphics/fontconfig/fontconfig-native_2.8.0.bb b/meta/recipes-graphics/fontconfig/fontconfig-native_2.8.0.bb deleted file mode 100644 index cee94de534..0000000000 --- a/meta/recipes-graphics/fontconfig/fontconfig-native_2.8.0.bb +++ /dev/null @@ -1,14 +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' % d.getVar('STAGING_BINDIR', True)][os.path.isfile('%s/freetype-config' % d.getVar('STAGING_BINDIR', True))]}" - -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}-${PV}:" - -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/recipes-graphics/fontconfig/fontconfig-native_2.9.0.bb b/meta/recipes-graphics/fontconfig/fontconfig-native_2.9.0.bb new file mode 100644 index 0000000000..cee94de534 --- /dev/null +++ b/meta/recipes-graphics/fontconfig/fontconfig-native_2.9.0.bb @@ -0,0 +1,14 @@ +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' % d.getVar('STAGING_BINDIR', True)][os.path.isfile('%s/freetype-config' % d.getVar('STAGING_BINDIR', True))]}" + +FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}-${PV}:" + +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/recipes-graphics/fontconfig/fontconfig_2.8.0.bb b/meta/recipes-graphics/fontconfig/fontconfig_2.8.0.bb deleted file mode 100644 index 55c04cc909..0000000000 --- a/meta/recipes-graphics/fontconfig/fontconfig_2.8.0.bb +++ /dev/null @@ -1,93 +0,0 @@ -SUMMARY = "Generic font configuration library" -DESCRIPTION = "Fontconfig is a font configuration and customization library, which \ -does not depend on the X Window System. It is designed to locate \ -fonts within the system and select them according to requirements \ -specified by applications. \ -Fontconfig is not a rasterization library, nor does it impose a \ -particular rasterization library on the application. The X-specific \ -library 'Xft' uses fontconfig along with freetype to specify and \ -rasterize fonts." - -HOMEPAGE = "http://www.fontconfig.org" -BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=fontconfig" - -LICENSE = "MIT-style & MIT & PD" -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 = "r4" - -SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \ - file://fix-pkgconfig.patch \ - file://97_fontconfig" - -SRC_URI[md5sum] = "77e15a92006ddc2adbb06f840d591c0e" -SRC_URI[sha256sum] = "fa2a1c6eea654d9fce7a4b1220f10c99cdec848dccaf1625c01f076b31382335" - -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} --with-default-fonts=${datadir}/fonts" -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_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/ -} diff --git a/meta/recipes-graphics/fontconfig/fontconfig_2.9.0.bb b/meta/recipes-graphics/fontconfig/fontconfig_2.9.0.bb new file mode 100644 index 0000000000..7f3f111a91 --- /dev/null +++ b/meta/recipes-graphics/fontconfig/fontconfig_2.9.0.bb @@ -0,0 +1,89 @@ +SUMMARY = "Generic font configuration library" +DESCRIPTION = "Fontconfig is a font configuration and customization library, which \ +does not depend on the X Window System. It is designed to locate \ +fonts within the system and select them according to requirements \ +specified by applications. \ +Fontconfig is not a rasterization library, nor does it impose a \ +particular rasterization library on the application. The X-specific \ +library 'Xft' uses fontconfig along with freetype to specify and \ +rasterize fonts." + +HOMEPAGE = "http://www.fontconfig.org" +BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=fontconfig" + +LICENSE = "MIT-style & MIT & PD" +LIC_FILES_CHKSUM = "file://COPYING;md5=dc5b39c592e47a22dbec44855988d2a0 \ + file://src/fcfreetype.c;endline=45;md5=5d9513e3196a1fbfdfa94051c09dfc84 \ + file://src/fccache.c;beginline=1077;endline=1092;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" + +SRC_URI[md5sum] = "26c83855ed256b5c032baae032fadc4f" +SRC_URI[sha256sum] = "ca7e25071cf044bdcdaf7c48845243c115b9269b4e369c6bd78a29e71f01b41a" + +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} --with-default-fonts=${datadir}/fonts" +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|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|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|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 + +} + +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/ +} -- cgit v1.2.3