diff options
| author | Marko Lindqvist <cazfi74@gmail.com> | 2013-05-24 10:41:13 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-05-29 22:07:55 +0100 |
| commit | dad870937aa92284a16b0671459ad8ed37fe0a11 (patch) | |
| tree | 284c3a24084d537c8f44b6ee650ebe56967c7345 | |
| parent | 3426ee809914de6675b4a61c9e0d95f78fb87482 (diff) | |
| download | poky-dad870937aa92284a16b0671459ad8ed37fe0a11.tar.gz | |
freetype: update to upstream version 2.4.12
LICENSE.TXT md5sum changed as there's mention about part
of the code being in public domain added.
no-hardcode.patch removed as upstream has no longer the
problematic code to patch at all.
(From OE-Core rev: 2bd4982a466d913767318a961b0c70bb453f7018)
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-graphics/freetype/freetype-2.4.11/no-hardcode.patch | 13 | ||||
| -rw-r--r-- | meta/recipes-graphics/freetype/freetype_2.4.12.bb (renamed from meta/recipes-graphics/freetype/freetype_2.4.11.bb) | 8 |
2 files changed, 4 insertions, 17 deletions
diff --git a/meta/recipes-graphics/freetype/freetype-2.4.11/no-hardcode.patch b/meta/recipes-graphics/freetype/freetype-2.4.11/no-hardcode.patch deleted file mode 100644 index 0f21d1ff26..0000000000 --- a/meta/recipes-graphics/freetype/freetype-2.4.11/no-hardcode.patch +++ /dev/null | |||
| @@ -1,13 +0,0 @@ | |||
| 1 | Upstream-Status: Inappropriate [configuration] | ||
| 2 | |||
| 3 | --- freetype-2.1.10/builds/unix/freetype-config.in.old 2006-05-01 12:39:20.000000000 +0100 | ||
| 4 | +++ freetype-2.1.10/builds/unix/freetype-config.in 2006-05-01 12:39:34.000000000 +0100 | ||
| 5 | @@ -16,7 +16,7 @@ | ||
| 6 | libdir=@libdir@ | ||
| 7 | enable_shared=@enable_shared@ | ||
| 8 | wl=@wl@ | ||
| 9 | -hardcode_libdir_flag_spec='@hardcode_libdir_flag_spec@' | ||
| 10 | +hardcode_libdir_flag_spec='' | ||
| 11 | |||
| 12 | usage() | ||
| 13 | { | ||
diff --git a/meta/recipes-graphics/freetype/freetype_2.4.11.bb b/meta/recipes-graphics/freetype/freetype_2.4.12.bb index 53fde1d948..8cf79d35f8 100644 --- a/meta/recipes-graphics/freetype/freetype_2.4.11.bb +++ b/meta/recipes-graphics/freetype/freetype_2.4.12.bb | |||
| @@ -7,7 +7,7 @@ HOMEPAGE = "http://www.freetype.org/" | |||
| 7 | BUGTRACKER = "https://savannah.nongnu.org/bugs/?group=freetype" | 7 | BUGTRACKER = "https://savannah.nongnu.org/bugs/?group=freetype" |
| 8 | 8 | ||
| 9 | LICENSE = "FreeType | GPLv2+" | 9 | LICENSE = "FreeType | GPLv2+" |
| 10 | LIC_FILES_CHKSUM = "file://docs/LICENSE.TXT;md5=28d5381b1bef2649c59f20c20bae4f39 \ | 10 | LIC_FILES_CHKSUM = "file://docs/LICENSE.TXT;md5=c017ff17fc6f0794adf93db5559ccd56 \ |
| 11 | file://docs/FTL.TXT;md5=d479e83797f699fe873b38dadd0fcd4c \ | 11 | file://docs/FTL.TXT;md5=d479e83797f699fe873b38dadd0fcd4c \ |
| 12 | file://docs/GPLv2.TXT;md5=8ef380476f642c20ebf40fecb0add2ec" | 12 | file://docs/GPLv2.TXT;md5=8ef380476f642c20ebf40fecb0add2ec" |
| 13 | 13 | ||
| @@ -16,10 +16,10 @@ SECTION = "libs" | |||
| 16 | PR = "r0" | 16 | PR = "r0" |
| 17 | 17 | ||
| 18 | SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \ | 18 | SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \ |
| 19 | file://no-hardcode.patch" | 19 | " |
| 20 | 20 | ||
| 21 | SRC_URI[md5sum] = "b93435488942486c8d0ca22e8f768034" | 21 | SRC_URI[md5sum] = "3463102764315eb86c0d3c2e1f3ffb7d" |
| 22 | SRC_URI[sha256sum] = "ef9d0bcb64647d9e5125dc7534d7ca371c98310fec87677c410f397f71ffbe3f" | 22 | SRC_URI[sha256sum] = "a78a17486689ab6852a9e1a759b179827ac9dfd7e2f237ddf169c73398c85381" |
| 23 | 23 | ||
| 24 | S = "${WORKDIR}/freetype-${PV}" | 24 | S = "${WORKDIR}/freetype-${PV}" |
| 25 | 25 | ||
