From e1de7b43d13f357c901e599cda620fbf6af06e13 Mon Sep 17 00:00:00 2001 From: Constantin Musca Date: Mon, 27 Aug 2012 10:31:59 +0300 Subject: freetype: upgrade to 2.4.10 (From OE-Core rev: a3f2ee236d7445ded9fb7535964a0b80bd593368) Signed-off-by: Constantin Musca Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- .../freetype/freetype-2.4.10/no-hardcode.patch | 13 ++++++ .../freetype/freetype-2.4.9/no-hardcode.patch | 13 ------ meta/recipes-graphics/freetype/freetype_2.4.10.bb | 53 ++++++++++++++++++++++ meta/recipes-graphics/freetype/freetype_2.4.9.bb | 53 ---------------------- 4 files changed, 66 insertions(+), 66 deletions(-) create mode 100644 meta/recipes-graphics/freetype/freetype-2.4.10/no-hardcode.patch delete mode 100644 meta/recipes-graphics/freetype/freetype-2.4.9/no-hardcode.patch create mode 100644 meta/recipes-graphics/freetype/freetype_2.4.10.bb delete mode 100644 meta/recipes-graphics/freetype/freetype_2.4.9.bb (limited to 'meta') diff --git a/meta/recipes-graphics/freetype/freetype-2.4.10/no-hardcode.patch b/meta/recipes-graphics/freetype/freetype-2.4.10/no-hardcode.patch new file mode 100644 index 0000000000..0f21d1ff26 --- /dev/null +++ b/meta/recipes-graphics/freetype/freetype-2.4.10/no-hardcode.patch @@ -0,0 +1,13 @@ +Upstream-Status: Inappropriate [configuration] + +--- freetype-2.1.10/builds/unix/freetype-config.in.old 2006-05-01 12:39:20.000000000 +0100 ++++ freetype-2.1.10/builds/unix/freetype-config.in 2006-05-01 12:39:34.000000000 +0100 +@@ -16,7 +16,7 @@ + libdir=@libdir@ + enable_shared=@enable_shared@ + wl=@wl@ +-hardcode_libdir_flag_spec='@hardcode_libdir_flag_spec@' ++hardcode_libdir_flag_spec='' + + usage() + { diff --git a/meta/recipes-graphics/freetype/freetype-2.4.9/no-hardcode.patch b/meta/recipes-graphics/freetype/freetype-2.4.9/no-hardcode.patch deleted file mode 100644 index 0f21d1ff26..0000000000 --- a/meta/recipes-graphics/freetype/freetype-2.4.9/no-hardcode.patch +++ /dev/null @@ -1,13 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - ---- freetype-2.1.10/builds/unix/freetype-config.in.old 2006-05-01 12:39:20.000000000 +0100 -+++ freetype-2.1.10/builds/unix/freetype-config.in 2006-05-01 12:39:34.000000000 +0100 -@@ -16,7 +16,7 @@ - libdir=@libdir@ - enable_shared=@enable_shared@ - wl=@wl@ --hardcode_libdir_flag_spec='@hardcode_libdir_flag_spec@' -+hardcode_libdir_flag_spec='' - - usage() - { diff --git a/meta/recipes-graphics/freetype/freetype_2.4.10.bb b/meta/recipes-graphics/freetype/freetype_2.4.10.bb new file mode 100644 index 0000000000..cf2a78e02c --- /dev/null +++ b/meta/recipes-graphics/freetype/freetype_2.4.10.bb @@ -0,0 +1,53 @@ +SUMMARY = "Freetype font rendering library" +DESCRIPTION = "FreeType is a software font engine that is designed to be small, efficient, \ +highly customizable, and portable while capable of producing high-quality output (glyph \ +images). It can be used in graphics libraries, display servers, font conversion tools, text \ +image generation tools, and many other products as well." +HOMEPAGE = "http://www.freetype.org/" +BUGTRACKER = "https://savannah.nongnu.org/bugs/?group=freetype" + +LICENSE = "FreeType | GPLv2+" +LIC_FILES_CHKSUM = "file://docs/LICENSE.TXT;md5=28d5381b1bef2649c59f20c20bae4f39 \ + file://docs/FTL.TXT;md5=d479e83797f699fe873b38dadd0fcd4c \ + file://docs/GPLv2.TXT;md5=8ef380476f642c20ebf40fecb0add2ec" + +SECTION = "libs" + +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \ + file://no-hardcode.patch" + +SRC_URI[md5sum] = "13286702e9390a91661f980608adaff1" +SRC_URI[sha256sum] = "0c8e242c33c45928de560d7d595db06feb41d1b22167e37260ceabe72f9e992f" + +S = "${WORKDIR}/freetype-${PV}" + +inherit autotools pkgconfig binconfig + +LIBTOOL = "${S}/builds/unix/${HOST_SYS}-libtool" +EXTRA_OEMAKE = "'LIBTOOL=${LIBTOOL}'" +EXTRA_OEMAKE_virtclass-native = "" +EXTRA_OECONF = "--without-zlib --without-bzip2" + +do_configure() { + cd builds/unix + libtoolize --force --copy + aclocal -I . + gnu-configize --force + autoconf + cd ${S} + oe_runconf +} + +do_configure_virtclass-native() { + (cd builds/unix && gnu-configize) || die "failure running gnu-configize" + oe_runconf +} + +do_compile_prepend() { + ${BUILD_CC} -o objs/apinames src/tools/apinames.c +} + +BBCLASSEXTEND = "native" + diff --git a/meta/recipes-graphics/freetype/freetype_2.4.9.bb b/meta/recipes-graphics/freetype/freetype_2.4.9.bb deleted file mode 100644 index 199a529617..0000000000 --- a/meta/recipes-graphics/freetype/freetype_2.4.9.bb +++ /dev/null @@ -1,53 +0,0 @@ -SUMMARY = "Freetype font rendering library" -DESCRIPTION = "FreeType is a software font engine that is designed to be small, efficient, \ -highly customizable, and portable while capable of producing high-quality output (glyph \ -images). It can be used in graphics libraries, display servers, font conversion tools, text \ -image generation tools, and many other products as well." -HOMEPAGE = "http://www.freetype.org/" -BUGTRACKER = "https://savannah.nongnu.org/bugs/?group=freetype" - -LICENSE = "FreeType | GPLv2+" -LIC_FILES_CHKSUM = "file://docs/LICENSE.TXT;md5=28d5381b1bef2649c59f20c20bae4f39 \ - file://docs/FTL.TXT;md5=d479e83797f699fe873b38dadd0fcd4c \ - file://docs/GPLv2.TXT;md5=8ef380476f642c20ebf40fecb0add2ec" - -SECTION = "libs" - -PR = "r1" - -SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \ - file://no-hardcode.patch" - -SRC_URI[md5sum] = "77a893dae81fd5b896632715ca041179" -SRC_URI[sha256sum] = "c4204ac1d48e99d4375a2f32bf4f3f92780a9d9f015e64e57e852f6c004859b9" - -S = "${WORKDIR}/freetype-${PV}" - -inherit autotools pkgconfig binconfig - -LIBTOOL = "${S}/builds/unix/${HOST_SYS}-libtool" -EXTRA_OEMAKE = "'LIBTOOL=${LIBTOOL}'" -EXTRA_OEMAKE_virtclass-native = "" -EXTRA_OECONF = "--without-zlib --without-bzip2" - -do_configure() { - cd builds/unix - libtoolize --force --copy - aclocal -I . - gnu-configize --force - autoconf - cd ${S} - oe_runconf -} - -do_configure_virtclass-native() { - (cd builds/unix && gnu-configize) || die "failure running gnu-configize" - oe_runconf -} - -do_compile_prepend() { - ${BUILD_CC} -o objs/apinames src/tools/apinames.c -} - -BBCLASSEXTEND = "native" - -- cgit v1.2.3-54-g00ecf