diff options
author | Dexuan Cui <dexuan.cui@intel.com> | 2010-07-02 20:12:57 +0800 |
---|---|---|
committer | Saul Wold <Saul.Wold@intel.com> | 2010-07-02 15:32:46 -0700 |
commit | e02887802f31c3c3e8e2bae11ba4c36f9a869611 (patch) | |
tree | b23f090fc1b0fbe2ca86f6a934c670173f3fa70b /meta | |
parent | efdb82b4b59079933a02e01296ddfb33b2e108c6 (diff) | |
download | openembedded-core-e02887802f31c3c3e8e2bae11ba4c36f9a869611.tar.gz openembedded-core-e02887802f31c3c3e8e2bae11ba4c36f9a869611.tar.bz2 openembedded-core-e02887802f31c3c3e8e2bae11ba4c36f9a869611.tar.xz openembedded-core-e02887802f31c3c3e8e2bae11ba4c36f9a869611.zip |
freetype: upgrade to the latest version 2.3.12
rename freetype-2.3.5/ to freetype-2.3.12/;
remove configure.patch as it's not used at all;
remove fix-x86_64-build.patch as 2.3.12 has been integrated the patch;
update the licence from "freetype" to "FreeTypeLicense | GPLv2+".
Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/packages/freetype/freetype-2.3.12/no-hardcode.patch (renamed from meta/packages/freetype/freetype-2.3.5/no-hardcode.patch) | 0 | ||||
-rw-r--r-- | meta/packages/freetype/freetype-2.3.5/configure.patch | 47 | ||||
-rw-r--r-- | meta/packages/freetype/freetype-2.3.5/fix-x86_64-build.patch | 26 | ||||
-rw-r--r-- | meta/packages/freetype/freetype_2.3.12.bb (renamed from meta/packages/freetype/freetype_2.3.5.bb) | 16 |
4 files changed, 11 insertions, 78 deletions
diff --git a/meta/packages/freetype/freetype-2.3.5/no-hardcode.patch b/meta/packages/freetype/freetype-2.3.12/no-hardcode.patch index 44ae450a1..44ae450a1 100644 --- a/meta/packages/freetype/freetype-2.3.5/no-hardcode.patch +++ b/meta/packages/freetype/freetype-2.3.12/no-hardcode.patch diff --git a/meta/packages/freetype/freetype-2.3.5/configure.patch b/meta/packages/freetype/freetype-2.3.5/configure.patch deleted file mode 100644 index f11cf96be..000000000 --- a/meta/packages/freetype/freetype-2.3.5/configure.patch +++ /dev/null @@ -1,47 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - -Index: freetype-2.1.8/builds/unix/configure.ac -=================================================================== ---- freetype-2.1.8.orig/builds/unix/configure.ac 2004-04-14 04:49:11.000000000 -0400 -+++ freetype-2.1.8/builds/unix/configure.ac 2005-03-12 03:14:23.000000000 -0500 -@@ -111,8 +111,8 @@ - # Check for system zlib - - AC_ARG_WITH([zlib], -- dnl don't quote AS_HELP_STRING! -- AS_HELP_STRING([--without-zlib], -+ dnl don't quote AC_HELP_STRING! -+ AC_HELP_STRING([--without-zlib], - [use internal zlib instead of system-wide])) - if test x$with_zlib != xno && test -z "$LIBZ"; then - AC_CHECK_LIB([z], [gzsetparams], [AC_CHECK_HEADER([zlib.h], [LIBZ='-lz'])]) -@@ -127,7 +127,7 @@ - # Whether to use Mac OS resource-based fonts or not - - AC_ARG_WITH([old-mac-fonts], -- dnl don't quote AS_HELP_STRING! -- AS_HELP_STRING([--with-old-mac-fonts], -+ dnl don't quote AC_HELP_STRING! -+ AC_HELP_STRING([--with-old-mac-fonts], - [allow Mac resource-based fonts to be used])) - if test x$with_old_mac_fonts = xyes; then -Index: freetype-2.1.8/builds/unix/unix-cc.in -=================================================================== ---- freetype-2.1.8.orig/builds/unix/unix-cc.in 2003-11-09 03:37:13.000000000 -0500 -+++ freetype-2.1.8/builds/unix/unix-cc.in 2005-03-12 18:37:24.613693760 -0500 -@@ -14,9 +14,11 @@ - - CC := @CC@ - COMPILER_SEP := $(SEP) -+SHELL := @SHELL@ -+top_builddir := $(BUILD_DIR) - - ifndef LIBTOOL -- LIBTOOL := $(BUILD_DIR)/libtool -+ LIBTOOL := @LIBTOOL@ - endif - - diff --git a/meta/packages/freetype/freetype-2.3.5/fix-x86_64-build.patch b/meta/packages/freetype/freetype-2.3.5/fix-x86_64-build.patch deleted file mode 100644 index ae504dcb0..000000000 --- a/meta/packages/freetype/freetype-2.3.5/fix-x86_64-build.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: freetype-2.3.1/builds/unix/configure.raw -=================================================================== ---- freetype-2.3.1.orig/builds/unix/configure.raw -+++ freetype-2.3.1/builds/unix/configure.raw -@@ -40,7 +40,7 @@ AC_SUBST(EXEEXT) - # checks for native programs to generate building tool - - if test ${cross_compiling} = yes; then -- AC_CHECK_PROG(CC_BUILD, ${build}-gcc, ${build-gcc}) -+ AC_CHECK_PROG(CC_BUILD, ${build}-gcc, ${build}-gcc) - test -z "${CC_BUILD}" && AC_CHECK_PROG(CC_BUILD, gcc, gcc) - test -z "${CC_BUILD}" && AC_CHECK_PROG(CC_BUILD, cc, cc, , , /usr/ucb/cc) - test -z "${CC_BUILD}" && AC_MSG_ERROR([cannot find native C compiler]) -Index: freetype-2.3.1/builds/unix/configure.ac -=================================================================== ---- freetype-2.3.1.orig/builds/unix/configure.ac -+++ freetype-2.3.1/builds/unix/configure.ac -@@ -40,7 +40,7 @@ AC_SUBST(EXEEXT) - # checks for native programs to generate building tool - - if test ${cross_compiling} = yes; then -- AC_CHECK_PROG(CC_BUILD, ${build}-gcc, ${build-gcc}) -+ AC_CHECK_PROG(CC_BUILD, ${build}-gcc, ${build}-gcc) - test -z "${CC_BUILD}" && AC_CHECK_PROG(CC_BUILD, gcc, gcc) - test -z "${CC_BUILD}" && AC_CHECK_PROG(CC_BUILD, cc, cc, , , /usr/ucb/cc) - test -z "${CC_BUILD}" && AC_MSG_ERROR([cannot find native C compiler]) diff --git a/meta/packages/freetype/freetype_2.3.5.bb b/meta/packages/freetype/freetype_2.3.12.bb index 5bbbd7d65..da62ffb3b 100644 --- a/meta/packages/freetype/freetype_2.3.5.bb +++ b/meta/packages/freetype/freetype_2.3.12.bb @@ -1,12 +1,18 @@ DESCRIPTION = "Freetype font rendering library" +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" -LICENSE = "freetype" -PR = "r3" + +PR = "r0" SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \ - file://fix-x86_64-build.patch;patch=1 \ - file://no-hardcode.patch;patch=1 \ - " + file://no-hardcode.patch" S = "${WORKDIR}/freetype-${PV}" |