From: Grazvydas Ignotas Date: Thu, 15 Oct 2015 20:13:27 +0000 (+0300) Subject: freetype: update to 2.4.3 X-Git-Tag: sz_173~3 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b1617131dc31a3819063d946b1daa6f06b3fc6b;p=openembedded.git freetype: update to 2.4.3 enables bytecode interpreter that was disabled because of patents that later expired --- diff --git a/recipes/freetype/files/configure.patch b/recipes/freetype/files/configure.patch deleted file mode 100644 index f11cf96be0..0000000000 --- a/recipes/freetype/files/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/recipes/freetype/freetype-2.2.1/configure.patch b/recipes/freetype/freetype-2.2.1/configure.patch deleted file mode 100644 index 2b62ddf8c2..0000000000 --- a/recipes/freetype/freetype-2.2.1/configure.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- freetype-2.2.1/builds/unix/configure.ac.orig 2006-07-10 10:31:58.000000000 +0100 -+++ freetype-2.2.1/builds/unix/configure.ac 2006-07-10 10:33:50.000000000 +0100 -@@ -119,9 +119,9 @@ - - # Check for system zlib - --# don't quote AS_HELP_STRING! -+# don't quote AC_HELP_STRING! - AC_ARG_WITH([zlib], -- AS_HELP_STRING([--without-zlib], -+ 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'])]) -@@ -135,9 +135,9 @@ - - # Whether to use Mac OS resource-based fonts. - --# don't quote AS_HELP_STRING! -+# don't quote AC_HELP_STRING! - AC_ARG_WITH([old-mac-fonts], -- AS_HELP_STRING([--with-old-mac-fonts], -+ AC_HELP_STRING([--with-old-mac-fonts], - [allow Mac resource-based fonts to be used])) - if test x$with_old_mac_fonts = xyes; then - orig_LDFLAGS="${LDFLAGS}" ---- freetype-2.2.1/builds/unix/unix-cc.in.orig 2006-07-10 10:40:41.000000000 +0100 -+++ freetype-2.2.1/builds/unix/unix-cc.in 2006-07-10 10:43:10.000000000 +0100 -@@ -14,8 +14,11 @@ - - CC := @CC@ - COMPILER_SEP := $(SEP) -+SHELL := @SHELL@ -+top_builddir := $(BUILD_DIR) - --LIBTOOL ?= $(BUILD_DIR)/libtool -+ -+LIBTOOL ?= @LIBTOOL@ - - - # The object file extension (for standard and static libraries). This can be diff --git a/recipes/freetype/freetype-2.2.1/no-hardcode.patch b/recipes/freetype/freetype-2.2.1/no-hardcode.patch deleted file mode 100644 index 65289758d5..0000000000 --- a/recipes/freetype/freetype-2.2.1/no-hardcode.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- freetype-2.2.1/builds/unix/freetype-config.in.orig 2006-07-10 10:51:47.000000000 +0100 -+++ freetype-2.2.1/builds/unix/freetype-config.in 2006-07-10 10:52:27.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/recipes/freetype/freetype-2.3.0/configure.patch b/recipes/freetype/freetype-2.3.0/configure.patch deleted file mode 100644 index 7c2035d7e8..0000000000 --- a/recipes/freetype/freetype-2.3.0/configure.patch +++ /dev/null @@ -1,43 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - -Index: freetype-2.3.0/builds/unix/configure.ac -=================================================================== ---- freetype-2.3.0.orig/builds/unix/configure.ac 2007-01-17 12:51:51.000000000 +0100 -+++ freetype-2.3.0/builds/unix/configure.ac 2007-01-19 00:10:00.000000000 +0100 -@@ -159,7 +159,7 @@ - - # don't quote AS_HELP_STRING! - AC_ARG_WITH([zlib], -- AS_HELP_STRING([--without-zlib], -+ 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'])]) -@@ -175,7 +175,7 @@ - - # don't quote AS_HELP_STRING! - AC_ARG_WITH([old-mac-fonts], -- AS_HELP_STRING([--with-old-mac-fonts], -+ AC_HELP_STRING([--with-old-mac-fonts], - [allow Mac resource-based fonts to be used])) - if test x$with_old_mac_fonts = xyes; then - orig_LDFLAGS="${LDFLAGS}" -Index: freetype-2.3.0/builds/unix/unix-cc.in -=================================================================== ---- freetype-2.3.0.orig/builds/unix/unix-cc.in 2006-10-15 10:57:22.000000000 +0200 -+++ freetype-2.3.0/builds/unix/unix-cc.in 2007-01-19 00:10:53.000000000 +0100 -@@ -14,8 +14,10 @@ - - CC := @CC@ - COMPILER_SEP := $(SEP) -+SHELL := @SHELL@ -+top_builddir := $(BUILD_DIR) - --LIBTOOL ?= $(BUILD_DIR)/libtool -+LIBTOOL := @LIBTOOL@ - - - # The object file extension (for standard and static libraries). This can be diff --git a/recipes/freetype/freetype-2.3.0/no-hardcode.patch b/recipes/freetype/freetype-2.3.0/no-hardcode.patch deleted file mode 100644 index 65289758d5..0000000000 --- a/recipes/freetype/freetype-2.3.0/no-hardcode.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- freetype-2.2.1/builds/unix/freetype-config.in.orig 2006-07-10 10:51:47.000000000 +0100 -+++ freetype-2.2.1/builds/unix/freetype-config.in 2006-07-10 10:52:27.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/recipes/freetype/freetype-2.3.1/fix-x86_64-build.patch b/recipes/freetype/freetype-2.3.1/fix-x86_64-build.patch deleted file mode 100644 index ae504dcb0b..0000000000 --- a/recipes/freetype/freetype-2.3.1/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/recipes/freetype/freetype-2.3.4/fix-x86_64-build.patch b/recipes/freetype/freetype-2.3.4/fix-x86_64-build.patch deleted file mode 100644 index ae504dcb0b..0000000000 --- a/recipes/freetype/freetype-2.3.4/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/recipes/freetype/freetype-2.3.5/fix-x86_64-build.patch b/recipes/freetype/freetype-2.3.5/fix-x86_64-build.patch deleted file mode 100644 index ae504dcb0b..0000000000 --- a/recipes/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/recipes/freetype/freetype-2.3.6/fix-configure.patch b/recipes/freetype/freetype-2.3.6/fix-configure.patch deleted file mode 100644 index ecd96738d4..0000000000 --- a/recipes/freetype/freetype-2.3.6/fix-configure.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: freetype-2.3.6/builds/unix/configure.ac -=================================================================== ---- freetype-2.3.6.orig/builds/unix/configure.ac -+++ freetype-2.3.6/builds/unix/configure.ac -@@ -506,8 +506,6 @@ AC_SUBST([FT2_EXTRA_LIBS]) - AC_SUBST([SYSTEM_ZLIB]) - - --LT_INIT(win32-dll) -- - AC_SUBST([hardcode_libdir_flag_spec]) - AC_SUBST([wl]) - AC_SUBST([build_libtool_libs]) diff --git a/recipes/freetype/freetype-2.3.9/fix-configure.patch b/recipes/freetype/freetype-2.3.9/fix-configure.patch deleted file mode 100644 index ecd96738d4..0000000000 --- a/recipes/freetype/freetype-2.3.9/fix-configure.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: freetype-2.3.6/builds/unix/configure.ac -=================================================================== ---- freetype-2.3.6.orig/builds/unix/configure.ac -+++ freetype-2.3.6/builds/unix/configure.ac -@@ -506,8 +506,6 @@ AC_SUBST([FT2_EXTRA_LIBS]) - AC_SUBST([SYSTEM_ZLIB]) - - --LT_INIT(win32-dll) -- - AC_SUBST([hardcode_libdir_flag_spec]) - AC_SUBST([wl]) - AC_SUBST([build_libtool_libs]) diff --git a/recipes/freetype/freetype-2.3.9/libtool-tag.patch b/recipes/freetype/freetype-2.3.9/libtool-tag.patch deleted file mode 100644 index 2f096cdd46..0000000000 --- a/recipes/freetype/freetype-2.3.9/libtool-tag.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- freetype-2.3.6/builds/unix/unix-cc.in -+++ freetype-2.3.6/builds/unix/unix-cc.in -@@ -88,7 +88,7 @@ - # - # - CCraw := $(CC) --CC := $(LIBTOOL) --mode=compile $(CCraw) -+CC := $(LIBTOOL) --tag=CC --mode=compile $(CCraw) - - # Linker flags. - # -@@ -105,7 +105,7 @@ - - # Library linking - # --LINK_LIBRARY = $(LIBTOOL) --mode=link $(CCraw) -o $@ $(OBJECTS_LIST) \ -+LINK_LIBRARY = $(LIBTOOL) --tag=CC --mode=link $(CCraw) -o $@ $(OBJECTS_LIST) \ - -rpath $(libdir) -version-info $(version_info) \ - $(LDFLAGS) -no-undefined \ - # -export-symbols $(EXPORTS_LIST) diff --git a/recipes/freetype/freetype-2.3.6/libtool-tag.patch b/recipes/freetype/freetype-2.4.3/libtool-tag.patch similarity index 100% rename from recipes/freetype/freetype-2.3.6/libtool-tag.patch rename to recipes/freetype/freetype-2.4.3/libtool-tag.patch diff --git a/recipes/freetype/freetype-native_2.1.10.bb b/recipes/freetype/freetype-native_2.1.10.bb deleted file mode 100644 index 6f99f7ee84..0000000000 --- a/recipes/freetype/freetype-native_2.1.10.bb +++ /dev/null @@ -1,20 +0,0 @@ -require freetype_${PV}.bb -inherit pkgconfig native -DEPENDS = "" -FILESPATH = "${FILE_DIRNAME}/freetype-${PV}:${FILE_DIRNAME}/freetype:${FILE_DIRNAME}/files" - -EXTRA_OEMAKE= - -do_configure() { - (cd builds/unix && gnu-configize) || die "failure running gnu-configize" - oe_runconf -} - -do_stage() { - autotools_stage_all -} - -do_install() { - : -} - diff --git a/recipes/freetype/freetype-native_2.1.8.bb b/recipes/freetype/freetype-native_2.1.8.bb deleted file mode 100644 index b5e8b307cd..0000000000 --- a/recipes/freetype/freetype-native_2.1.8.bb +++ /dev/null @@ -1,21 +0,0 @@ -require freetype_${PV}.bb -inherit native -DEPENDS = "" -FILESPATH = "${FILE_DIRNAME}/freetype-${PV}:${FILE_DIRNAME}/freetype:${FILE_DIRNAME}/files" - -EXTRA_OEMAKE= - -do_configure() { - (cd builds/unix && gnu-configize) || die "failure running gnu-configize" - oe_runconf -} - -do_stage() { - autotools_stage_includes - oe_libinstall -so -a -C objs libfreetype ${STAGING_LIBDIR} -} - -do_install() { - : -} - diff --git a/recipes/freetype/freetype-native_2.2.1.bb b/recipes/freetype/freetype-native_2.2.1.bb deleted file mode 100644 index 8c439d796a..0000000000 --- a/recipes/freetype/freetype-native_2.2.1.bb +++ /dev/null @@ -1,23 +0,0 @@ -require freetype_${PV}.bb -inherit native -DEPENDS = "" -FILESPATH = "${FILE_DIRNAME}/freetype-${PV}:${FILE_DIRNAME}/freetype:${FILE_DIRNAME}/files" - -EXTRA_OEMAKE= - -DEFAULT_PREFERENCE = "-1" - -do_configure() { - (cd builds/unix && gnu-configize) || die "failure running gnu-configize" - oe_runconf -} - -do_stage() { - autotools_stage_includes - oe_libinstall -so -a -C objs libfreetype ${STAGING_LIBDIR} -} - -do_install() { - : -} - diff --git a/recipes/freetype/freetype-native_2.3.5.bb b/recipes/freetype/freetype-native_2.3.5.bb deleted file mode 100644 index b5e8b307cd..0000000000 --- a/recipes/freetype/freetype-native_2.3.5.bb +++ /dev/null @@ -1,21 +0,0 @@ -require freetype_${PV}.bb -inherit native -DEPENDS = "" -FILESPATH = "${FILE_DIRNAME}/freetype-${PV}:${FILE_DIRNAME}/freetype:${FILE_DIRNAME}/files" - -EXTRA_OEMAKE= - -do_configure() { - (cd builds/unix && gnu-configize) || die "failure running gnu-configize" - oe_runconf -} - -do_stage() { - autotools_stage_includes - oe_libinstall -so -a -C objs libfreetype ${STAGING_LIBDIR} -} - -do_install() { - : -} - diff --git a/recipes/freetype/freetype-native_2.3.6.bb b/recipes/freetype/freetype-native_2.3.6.bb deleted file mode 100644 index b5e8b307cd..0000000000 --- a/recipes/freetype/freetype-native_2.3.6.bb +++ /dev/null @@ -1,21 +0,0 @@ -require freetype_${PV}.bb -inherit native -DEPENDS = "" -FILESPATH = "${FILE_DIRNAME}/freetype-${PV}:${FILE_DIRNAME}/freetype:${FILE_DIRNAME}/files" - -EXTRA_OEMAKE= - -do_configure() { - (cd builds/unix && gnu-configize) || die "failure running gnu-configize" - oe_runconf -} - -do_stage() { - autotools_stage_includes - oe_libinstall -so -a -C objs libfreetype ${STAGING_LIBDIR} -} - -do_install() { - : -} - diff --git a/recipes/freetype/freetype-native_2.3.9.bb b/recipes/freetype/freetype-native_2.3.9.bb deleted file mode 100644 index b5e8b307cd..0000000000 --- a/recipes/freetype/freetype-native_2.3.9.bb +++ /dev/null @@ -1,21 +0,0 @@ -require freetype_${PV}.bb -inherit native -DEPENDS = "" -FILESPATH = "${FILE_DIRNAME}/freetype-${PV}:${FILE_DIRNAME}/freetype:${FILE_DIRNAME}/files" - -EXTRA_OEMAKE= - -do_configure() { - (cd builds/unix && gnu-configize) || die "failure running gnu-configize" - oe_runconf -} - -do_stage() { - autotools_stage_includes - oe_libinstall -so -a -C objs libfreetype ${STAGING_LIBDIR} -} - -do_install() { - : -} - diff --git a/recipes/freetype/files/no-hardcode.patch b/recipes/freetype/freetype/no-hardcode.patch similarity index 100% rename from recipes/freetype/files/no-hardcode.patch rename to recipes/freetype/freetype/no-hardcode.patch diff --git a/recipes/freetype/freetype_2.1.10.bb b/recipes/freetype/freetype_2.1.10.bb deleted file mode 100644 index 2b632c97a5..0000000000 --- a/recipes/freetype/freetype_2.1.10.bb +++ /dev/null @@ -1,28 +0,0 @@ -DESCRIPTION = "Freetype font rendering library" -HOMEPAGE = "http://www.freetype.org" -SECTION = "libs" -LICENSE = "freetype" -PR = "r2" - -SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \ - file://configure.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_OECONF = "--without-zlib" - -do_configure() { - cd builds/unix - gnu-configize - aclocal -I . - autoconf - cd ${S} - oe_runconf -} - -FILES_${PN} = "${libdir}/lib*.so.*" -FILES_${PN}-dev += "${bindir}" diff --git a/recipes/freetype/freetype_2.1.8.bb b/recipes/freetype/freetype_2.1.8.bb deleted file mode 100644 index d3b9ae25d7..0000000000 --- a/recipes/freetype/freetype_2.1.8.bb +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION = "Freetype font rendering library" -SECTION = "libs" -LICENSE = "freetype" -PR = "r2" - -SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \ - file://configure.patch;patch=1" -S = "${WORKDIR}/freetype-${PV}" - -inherit autotools pkgconfig binconfig - -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 -} - -FILES_${PN} = "${libdir}/lib*.so.*" -FILES_${PN}-dev += "${bindir}" diff --git a/recipes/freetype/freetype_2.2.1.bb b/recipes/freetype/freetype_2.2.1.bb deleted file mode 100644 index d4b00de65f..0000000000 --- a/recipes/freetype/freetype_2.2.1.bb +++ /dev/null @@ -1,33 +0,0 @@ -DESCRIPTION = "Freetype font rendering library" -SECTION = "libs" -LICENSE = "freetype" -PR = "r2" - -SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \ - file://configure.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 -} - -FILES_${PN} = "${libdir}/lib*.so.*" -FILES_${PN}-dev += "${bindir}" diff --git a/recipes/freetype/freetype_2.3.0.bb b/recipes/freetype/freetype_2.3.0.bb deleted file mode 100644 index db967f2984..0000000000 --- a/recipes/freetype/freetype_2.3.0.bb +++ /dev/null @@ -1,33 +0,0 @@ -DESCRIPTION = "Freetype font rendering library" -SECTION = "libs" -LICENSE = "freetype" -PR = "r0" - -SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \ - file://configure.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 -} - -FILES_${PN} = "${libdir}/lib*.so.*" -FILES_${PN}-dev += "${bindir}" diff --git a/recipes/freetype/freetype_2.3.1.bb b/recipes/freetype/freetype_2.3.1.bb deleted file mode 100644 index 54338104b5..0000000000 --- a/recipes/freetype/freetype_2.3.1.bb +++ /dev/null @@ -1,34 +0,0 @@ -DESCRIPTION = "Freetype font rendering library" -SECTION = "libs" -LICENSE = "freetype" -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://configure.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 -} - -FILES_${PN} = "${libdir}/lib*.so.*" -FILES_${PN}-dev += "${bindir}" diff --git a/recipes/freetype/freetype_2.3.4.bb b/recipes/freetype/freetype_2.3.4.bb deleted file mode 100644 index 970d02851d..0000000000 --- a/recipes/freetype/freetype_2.3.4.bb +++ /dev/null @@ -1,35 +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 -} - -FILES_${PN} = "${libdir}/lib*.so.*" -FILES_${PN}-dev += "${bindir}" diff --git a/recipes/freetype/freetype_2.3.5.bb b/recipes/freetype/freetype_2.3.5.bb deleted file mode 100644 index 596d191899..0000000000 --- a/recipes/freetype/freetype_2.3.5.bb +++ /dev/null @@ -1,34 +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_OECONF = "--without-zlib" - -do_configure() { - cd builds/unix - libtoolize --force --copy - gnu-configize --force - aclocal -I . - autoconf - cd ${S} - oe_runconf -} - -do_compile_prepend() { - ${BUILD_CC} -o objs/apinames src/tools/apinames.c -} - -FILES_${PN} = "${libdir}/lib*.so.*" -FILES_${PN}-dev += "${bindir}" diff --git a/recipes/freetype/freetype_2.3.6.bb b/recipes/freetype/freetype_2.3.6.bb deleted file mode 100644 index 0ee241498b..0000000000 --- a/recipes/freetype/freetype_2.3.6.bb +++ /dev/null @@ -1,35 +0,0 @@ -DESCRIPTION = "Freetype font rendering library" -SECTION = "libs" -LICENSE = "freetype" -PR = "r0" - -SRC_URI = "\ - ${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \ - file://no-hardcode.patch;patch=1 \ - file://fix-configure.patch;patch=1 \ - file://libtool-tag.patch;patch=1 \ -" -S = "${WORKDIR}/freetype-${PV}" - -inherit autotools pkgconfig binconfig - -LIBTOOL = "${HOST_SYS}-libtool" -EXTRA_OEMAKE = "'LIBTOOL=${LIBTOOL}'" -EXTRA_OECONF = "--without-zlib" - -do_configure() { - cd builds/unix - libtoolize --force --copy - gnu-configize --force - aclocal -I . - autoconf - cd ${S} - oe_runconf -} - -do_compile_prepend() { - ${BUILD_CC} -o objs/apinames src/tools/apinames.c -} - -FILES_${PN} = "${libdir}/lib*.so.*" -FILES_${PN}-dev += "${bindir}" diff --git a/recipes/freetype/freetype_2.3.9.bb b/recipes/freetype/freetype_2.4.3.bb similarity index 63% rename from recipes/freetype/freetype_2.3.9.bb rename to recipes/freetype/freetype_2.4.3.bb index 0980f06a00..28ec6e4228 100644 --- a/recipes/freetype/freetype_2.3.9.bb +++ b/recipes/freetype/freetype_2.4.3.bb @@ -1,27 +1,31 @@ DESCRIPTION = "Freetype font rendering library" SECTION = "libs" -LICENSE = "freetype" -PR = "r1" +LICENSE = "freetype GPLv2" +PR = "r2" +DEPENDS = "zlib" SRC_URI = "\ ${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \ file://no-hardcode.patch;patch=1 \ - file://fix-configure.patch;patch=1 \ file://libtool-tag.patch;patch=1 \ " S = "${WORKDIR}/freetype-${PV}" +SRC_URI[md5sum] = "75ac7082bde7b3805dc5d6bc806fa045" +SRC_URI[sha256sum] = "b4e626db62fd1b4549ff5d57f5eca3a41631fd6066adf8a31c11879b51249afc" + inherit autotools pkgconfig binconfig -LIBTOOL = "${HOST_SYS}-libtool" +LIBTOOL = "${S}/builds/unix/${HOST_SYS}-libtool" EXTRA_OEMAKE = "'LIBTOOL=${LIBTOOL}'" -EXTRA_OECONF = "--without-zlib" + +LDFLAGS_append = " -Wl,-rpath-link -Wl,${STAGING_DIR_TARGET}${libdir}" do_configure() { cd builds/unix libtoolize --force --copy - gnu-configize --force aclocal -I . + gnu-configize --force autoconf cd ${S} oe_runconf @@ -31,5 +35,7 @@ do_compile_prepend() { ${BUILD_CC} -o objs/apinames src/tools/apinames.c } +BBCLASSEXTEND = "native" + FILES_${PN} = "${libdir}/lib*.so.*" FILES_${PN}-dev += "${bindir}"