summaryrefslogtreecommitdiffstats
path: root/external/poky/meta/recipes-graphics/freetype
diff options
context:
space:
mode:
Diffstat (limited to 'external/poky/meta/recipes-graphics/freetype')
-rw-r--r--external/poky/meta/recipes-graphics/freetype/freetype/use-right-libtool.patch2
-rw-r--r--external/poky/meta/recipes-graphics/freetype/freetype_2.10.1.bb (renamed from external/poky/meta/recipes-graphics/freetype/freetype_2.9.1.bb)10
2 files changed, 5 insertions, 7 deletions
diff --git a/external/poky/meta/recipes-graphics/freetype/freetype/use-right-libtool.patch b/external/poky/meta/recipes-graphics/freetype/freetype/use-right-libtool.patch
index 20838813..3368f7dd 100644
--- a/external/poky/meta/recipes-graphics/freetype/freetype/use-right-libtool.patch
+++ b/external/poky/meta/recipes-graphics/freetype/freetype/use-right-libtool.patch
@@ -11,4 +11,4 @@ Signed-off-by: Ross Burton <ross.burton@intel.com>
+++ freetype-2.6/builds/unix/unix-cc.in 2016-01-07 19:21:50.213112131 +0000
@@ -19,1 +18,1 @@
-LIBTOOL := $(FT_LIBTOOL_DIR)/libtool
-+LIBTOOL := $(FT_LIBTOOL_DIR)/@LIBTOOL@
++LIBTOOL := $(FT_LIBTOOL_DIR)/@LIBTOOL@ --tag CC
diff --git a/external/poky/meta/recipes-graphics/freetype/freetype_2.9.1.bb b/external/poky/meta/recipes-graphics/freetype/freetype_2.10.1.bb
index 1e6f66ee..d1c09305 100644
--- a/external/poky/meta/recipes-graphics/freetype/freetype_2.9.1.bb
+++ b/external/poky/meta/recipes-graphics/freetype/freetype_2.10.1.bb
@@ -12,16 +12,14 @@ LIC_FILES_CHKSUM = "file://docs/LICENSE.TXT;md5=4af6221506f202774ef74f64932878a1
file://docs/FTL.TXT;md5=9f37b4e6afa3fef9dba8932b16bd3f97 \
file://docs/GPLv2.TXT;md5=8ef380476f642c20ebf40fecb0add2ec"
-SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \
+SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/${BPN}/${BP}.tar.xz \
file://use-right-libtool.patch \
"
+SRC_URI[md5sum] = "bd42e75127f8431923679480efb5ba8f"
+SRC_URI[sha256sum] = "16dbfa488a21fe827dc27eaf708f42f7aa3bb997d745d31a19781628c36ba26f"
-UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/freetype/files/freetype2/"
UPSTREAM_CHECK_REGEX = "freetype-(?P<pver>\d+(\.\d+)+)"
-SRC_URI[md5sum] = "60ef7d8160cd4bf8cb118ee9d65367ca"
-SRC_URI[sha256sum] = "db8d87ea720ea9d5edc5388fc7a0497bb11ba9fe972245e0f7f4c7e8b1e1e84d"
-
inherit autotools pkgconfig multilib_header
# Adapt autotools to work with the minimal autoconf usage in freetype
@@ -29,7 +27,7 @@ AUTOTOOLS_SCRIPT_PATH = "${S}/builds/unix"
CONFIGURE_SCRIPT = "${S}/configure"
EXTRA_AUTORECONF += "--exclude=autoheader --exclude=automake"
-PACKAGECONFIG ??= "zlib"
+PACKAGECONFIG ??= "zlib pixmap"
PACKAGECONFIG[bzip2] = "--with-bzip2,--without-bzip2,bzip2"
# harfbuzz results in a circular dependency so enabling is non-trivial