From 06e0d50a936c01d4f02e7208b7e3784947436462 Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Tue, 16 Aug 2011 16:17:28 +0800 Subject: freetype: upgrade from 2.4.4 to 2.4.6 freetype-2.4.6/docs/LICENSE.TXT changed a little to describe more clearly the compatibility about FreeTypeLicense and GPLv2+, but the actual license remains unchanged: it's still LICENSE = "FreeTypeLicense | GPLv2+". Signed-off-by: Dexuan Cui --- .../freetype/freetype-2.4.4/no-hardcode.patch | 13 ----- .../freetype/freetype-2.4.6/no-hardcode.patch | 13 +++++ meta/recipes-graphics/freetype/freetype_2.4.4.bb | 56 ---------------------- meta/recipes-graphics/freetype/freetype_2.4.6.bb | 56 ++++++++++++++++++++++ 4 files changed, 69 insertions(+), 69 deletions(-) delete mode 100644 meta/recipes-graphics/freetype/freetype-2.4.4/no-hardcode.patch create mode 100644 meta/recipes-graphics/freetype/freetype-2.4.6/no-hardcode.patch delete mode 100644 meta/recipes-graphics/freetype/freetype_2.4.4.bb create mode 100644 meta/recipes-graphics/freetype/freetype_2.4.6.bb (limited to 'meta/recipes-graphics/freetype') diff --git a/meta/recipes-graphics/freetype/freetype-2.4.4/no-hardcode.patch b/meta/recipes-graphics/freetype/freetype-2.4.4/no-hardcode.patch deleted file mode 100644 index 0f21d1ff26..0000000000 --- a/meta/recipes-graphics/freetype/freetype-2.4.4/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.6/no-hardcode.patch b/meta/recipes-graphics/freetype/freetype-2.4.6/no-hardcode.patch new file mode 100644 index 0000000000..0f21d1ff26 --- /dev/null +++ b/meta/recipes-graphics/freetype/freetype-2.4.6/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.4.bb b/meta/recipes-graphics/freetype/freetype_2.4.4.bb deleted file mode 100644 index 661650cce7..0000000000 --- a/meta/recipes-graphics/freetype/freetype_2.4.4.bb +++ /dev/null @@ -1,56 +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 = "FreeTypeLicense | GPLv2+" -LIC_FILES_CHKSUM = "file://docs/LICENSE.TXT;md5=8bc1a580aeb518100d00a2dd29e68edf \ - file://docs/FTL.TXT;md5=d479e83797f699fe873b38dadd0fcd4c \ - file://docs/GPL.TXT;md5=8ef380476f642c20ebf40fecb0add2ec" - -SECTION = "libs" - -PR = "r0" - -SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \ - file://no-hardcode.patch" - -SRC_URI[md5sum] = "b3e2b6e2f1c3e0dffa1fd2a0f848b671" -SRC_URI[sha256sum] = "4b8281c7dc4d375c6b65d3c6f4808e488a313fab47d7be82aad2c871c8480fef" - -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" - -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 -} - -FILES_${PN} = "${libdir}/lib*${SOLIBS}" -FILES_${PN}-dev += "${bindir}" - -BBCLASSEXTEND = "native" - diff --git a/meta/recipes-graphics/freetype/freetype_2.4.6.bb b/meta/recipes-graphics/freetype/freetype_2.4.6.bb new file mode 100644 index 0000000000..8150dd41eb --- /dev/null +++ b/meta/recipes-graphics/freetype/freetype_2.4.6.bb @@ -0,0 +1,56 @@ +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 = "FreeTypeLicense | 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] = "5e6510613f612809d2d7862592b92ab7" +SRC_URI[sha256sum] = "24a4a57f3a6859887e91f90f93f754cfc7bf9ab9246a3a696435a0c6a7a1e92a" + +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" + +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 +} + +FILES_${PN} = "${libdir}/lib*${SOLIBS}" +FILES_${PN}-dev += "${bindir}" + +BBCLASSEXTEND = "native" + -- cgit 1.2.3-korg