summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarko Lindqvist <cazfi74@gmail.com>2013-05-24 10:41:13 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-05-29 22:07:22 +0100
commit2bd4982a466d913767318a961b0c70bb453f7018 (patch)
tree0ac94694f27a10c30d95348e2c659b520f9818a5
parent2d79a2f88b6676847ef868d3cc6475bd643b28a3 (diff)
downloadopenembedded-core-contrib-2bd4982a466d913767318a961b0c70bb453f7018.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. Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
-rw-r--r--meta/recipes-graphics/freetype/freetype-2.4.11/no-hardcode.patch13
-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 @@
-Upstream-Status: Inappropriate [configuration]
-
---- 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/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/"
BUGTRACKER = "https://savannah.nongnu.org/bugs/?group=freetype"
LICENSE = "FreeType | GPLv2+"
-LIC_FILES_CHKSUM = "file://docs/LICENSE.TXT;md5=28d5381b1bef2649c59f20c20bae4f39 \
+LIC_FILES_CHKSUM = "file://docs/LICENSE.TXT;md5=c017ff17fc6f0794adf93db5559ccd56 \
file://docs/FTL.TXT;md5=d479e83797f699fe873b38dadd0fcd4c \
file://docs/GPLv2.TXT;md5=8ef380476f642c20ebf40fecb0add2ec"
@@ -16,10 +16,10 @@ SECTION = "libs"
PR = "r0"
SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \
- file://no-hardcode.patch"
+"
-SRC_URI[md5sum] = "b93435488942486c8d0ca22e8f768034"
-SRC_URI[sha256sum] = "ef9d0bcb64647d9e5125dc7534d7ca371c98310fec87677c410f397f71ffbe3f"
+SRC_URI[md5sum] = "3463102764315eb86c0d3c2e1f3ffb7d"
+SRC_URI[sha256sum] = "a78a17486689ab6852a9e1a759b179827ac9dfd7e2f237ddf169c73398c85381"
S = "${WORKDIR}/freetype-${PV}"