From 978058847aa2b9a0b92be5ce59a512c421de8ee6 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Tue, 19 Jun 2007 15:37:30 +0000 Subject: freetype: update to 2.3.4. Closes 2218. --- packages/freetype/freetype-2.3.3/.mtn2git_empty | 0 .../freetype/freetype-2.3.3/fix-x86_64-build.patch | 26 -------------- packages/freetype/freetype-2.3.4/.mtn2git_empty | 0 .../freetype/freetype-2.3.4/fix-x86_64-build.patch | 26 ++++++++++++++ packages/freetype/freetype_2.3.3.bb | 41 ---------------------- packages/freetype/freetype_2.3.4.bb | 41 ++++++++++++++++++++++ 6 files changed, 67 insertions(+), 67 deletions(-) delete mode 100644 packages/freetype/freetype-2.3.3/.mtn2git_empty delete mode 100644 packages/freetype/freetype-2.3.3/fix-x86_64-build.patch create mode 100644 packages/freetype/freetype-2.3.4/.mtn2git_empty create mode 100644 packages/freetype/freetype-2.3.4/fix-x86_64-build.patch delete mode 100644 packages/freetype/freetype_2.3.3.bb create mode 100644 packages/freetype/freetype_2.3.4.bb (limited to 'packages/freetype') diff --git a/packages/freetype/freetype-2.3.3/.mtn2git_empty b/packages/freetype/freetype-2.3.3/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/freetype/freetype-2.3.3/fix-x86_64-build.patch b/packages/freetype/freetype-2.3.3/fix-x86_64-build.patch deleted file mode 100644 index ae504dcb0b..0000000000 --- a/packages/freetype/freetype-2.3.3/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/packages/freetype/freetype-2.3.4/.mtn2git_empty b/packages/freetype/freetype-2.3.4/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/freetype/freetype-2.3.4/fix-x86_64-build.patch b/packages/freetype/freetype-2.3.4/fix-x86_64-build.patch new file mode 100644 index 0000000000..ae504dcb0b --- /dev/null +++ b/packages/freetype/freetype-2.3.4/fix-x86_64-build.patch @@ -0,0 +1,26 @@ +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/packages/freetype/freetype_2.3.3.bb b/packages/freetype/freetype_2.3.3.bb deleted file mode 100644 index c1febe8a90..0000000000 --- a/packages/freetype/freetype_2.3.3.bb +++ /dev/null @@ -1,41 +0,0 @@ -DESCRIPTION = "Freetype font rendering library" -SECTION = "libs" -LICENSE = "freetype" -PR = "r2" - -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 - -DEFAULT_PREFERENCE = "-1" - -LIBTOOL = "${S}/builds/unix/${HOST_SYS}-libtool" -EXTRA_OEMAKE = "'LIBTOOL=${LIBTOOL}'" -EXTRA_OECONF = "--without-zlib" - -do_configure() { - cd builds/unix - gnu-configize - aclocal -I . - autoconf - cd ${S} - oe_runconf -} - -do_compile_prepend() { - ${BUILD_CC} -o objs/apinames src/tools/apinames.c -} - -do_stage() { - export LIBTOOL='${LIBTOOL}' - autotools_stage_all - oe_libinstall -so -a -C objs libfreetype ${STAGING_LIBDIR} -} - -FILES_${PN} = "${libdir}/lib*.so.*" -FILES_${PN}-dev += "${bindir}" diff --git a/packages/freetype/freetype_2.3.4.bb b/packages/freetype/freetype_2.3.4.bb new file mode 100644 index 0000000000..c1febe8a90 --- /dev/null +++ b/packages/freetype/freetype_2.3.4.bb @@ -0,0 +1,41 @@ +DESCRIPTION = "Freetype font rendering library" +SECTION = "libs" +LICENSE = "freetype" +PR = "r2" + +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 + +DEFAULT_PREFERENCE = "-1" + +LIBTOOL = "${S}/builds/unix/${HOST_SYS}-libtool" +EXTRA_OEMAKE = "'LIBTOOL=${LIBTOOL}'" +EXTRA_OECONF = "--without-zlib" + +do_configure() { + cd builds/unix + gnu-configize + aclocal -I . + autoconf + cd ${S} + oe_runconf +} + +do_compile_prepend() { + ${BUILD_CC} -o objs/apinames src/tools/apinames.c +} + +do_stage() { + export LIBTOOL='${LIBTOOL}' + autotools_stage_all + oe_libinstall -so -a -C objs libfreetype ${STAGING_LIBDIR} +} + +FILES_${PN} = "${libdir}/lib*.so.*" +FILES_${PN}-dev += "${bindir}" -- cgit v1.2.3