From e02887802f31c3c3e8e2bae11ba4c36f9a869611 Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Fri, 2 Jul 2010 20:12:57 +0800 Subject: 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 --- .../freetype/freetype-2.3.12/no-hardcode.patch | 11 +++++ .../freetype/freetype-2.3.5/configure.patch | 47 --------------------- .../freetype/freetype-2.3.5/fix-x86_64-build.patch | 26 ------------ .../freetype/freetype-2.3.5/no-hardcode.patch | 11 ----- meta/packages/freetype/freetype_2.3.12.bb | 49 ++++++++++++++++++++++ meta/packages/freetype/freetype_2.3.5.bb | 43 ------------------- 6 files changed, 60 insertions(+), 127 deletions(-) create mode 100644 meta/packages/freetype/freetype-2.3.12/no-hardcode.patch delete mode 100644 meta/packages/freetype/freetype-2.3.5/configure.patch delete mode 100644 meta/packages/freetype/freetype-2.3.5/fix-x86_64-build.patch delete mode 100644 meta/packages/freetype/freetype-2.3.5/no-hardcode.patch create mode 100644 meta/packages/freetype/freetype_2.3.12.bb delete mode 100644 meta/packages/freetype/freetype_2.3.5.bb diff --git a/meta/packages/freetype/freetype-2.3.12/no-hardcode.patch b/meta/packages/freetype/freetype-2.3.12/no-hardcode.patch new file mode 100644 index 0000000000..44ae450a14 --- /dev/null +++ b/meta/packages/freetype/freetype-2.3.12/no-hardcode.patch @@ -0,0 +1,11 @@ +--- 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/packages/freetype/freetype-2.3.5/configure.patch b/meta/packages/freetype/freetype-2.3.5/configure.patch deleted file mode 100644 index f11cf96be0..0000000000 --- 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 ae504dcb0b..0000000000 --- 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/no-hardcode.patch b/meta/packages/freetype/freetype-2.3.5/no-hardcode.patch deleted file mode 100644 index 44ae450a14..0000000000 --- a/meta/packages/freetype/freetype-2.3.5/no-hardcode.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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/packages/freetype/freetype_2.3.12.bb b/meta/packages/freetype/freetype_2.3.12.bb new file mode 100644 index 0000000000..da62ffb3b2 --- /dev/null +++ b/meta/packages/freetype/freetype_2.3.12.bb @@ -0,0 +1,49 @@ +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" + +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \ + file://no-hardcode.patch" + +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/packages/freetype/freetype_2.3.5.bb b/meta/packages/freetype/freetype_2.3.5.bb deleted file mode 100644 index 5bbbd7d657..0000000000 --- a/meta/packages/freetype/freetype_2.3.5.bb +++ /dev/null @@ -1,43 +0,0 @@ -DESCRIPTION = "Freetype font rendering library" -SECTION = "libs" -LICENSE = "freetype" -PR = "r3" - -SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \ - file://fix-x86_64-build.patch;patch=1 \ - file://no-hardcode.patch;patch=1 \ - " - -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 v1.2.3