diff options
Diffstat (limited to 'meta/recipes-graphics/freetype')
| -rw-r--r-- | meta/recipes-graphics/freetype/freetype/use-right-libtool.patch | 14 | ||||
| -rw-r--r-- | meta/recipes-graphics/freetype/freetype_2.12.1.bb (renamed from meta/recipes-graphics/freetype/freetype_2.6.5.bb) | 25 |
2 files changed, 10 insertions, 29 deletions
diff --git a/meta/recipes-graphics/freetype/freetype/use-right-libtool.patch b/meta/recipes-graphics/freetype/freetype/use-right-libtool.patch deleted file mode 100644 index 20838813dc..0000000000 --- a/meta/recipes-graphics/freetype/freetype/use-right-libtool.patch +++ /dev/null @@ -1,14 +0,0 @@ -Freetype think that it knows best about where libtool is, and explicitly the -libtool autoconf macros telling it where to find the libtool script. Of course -we prefix the script with the target triplet, so it's wrong. Fix this by -removing the forced assignment, so the configure script's knowledge of where it -put libtool is used. - -Upstream-Status: Pending -Signed-off-by: Ross Burton <ross.burton@intel.com> - ---- freetype-2.6/builds/unix/unix-cc.in.orig 2016-01-07 19:21:45.244943479 +0000 -+++ 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@ diff --git a/meta/recipes-graphics/freetype/freetype_2.6.5.bb b/meta/recipes-graphics/freetype/freetype_2.12.1.bb index 97dde3a626..46c6182630 100644 --- a/meta/recipes-graphics/freetype/freetype_2.6.5.bb +++ b/meta/recipes-graphics/freetype/freetype_2.12.1.bb @@ -7,43 +7,38 @@ HOMEPAGE = "http://www.freetype.org/" BUGTRACKER = "https://savannah.nongnu.org/bugs/?group=freetype" SECTION = "libs" -LICENSE = "FreeType | GPLv2+" -LIC_FILES_CHKSUM = "file://docs/LICENSE.TXT;md5=4af6221506f202774ef74f64932878a1 \ - file://docs/FTL.TXT;md5=13b25413274c9b3b09b63e4028216ff4 \ +LICENSE = "FTL | GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=a5927784d823d443c6cae55701d01553 \ + file://docs/FTL.TXT;md5=9f37b4e6afa3fef9dba8932b16bd3f97 \ file://docs/GPLv2.TXT;md5=8ef380476f642c20ebf40fecb0add2ec" -SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \ - file://use-right-libtool.patch" +SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/${BPN}/${BP}.tar.xz" +SRC_URI[sha256sum] = "4766f20157cc4cf0cd292f80bf917f92d1c439b243ac3018debf6b9140c41a7f" -UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/freetype/files/freetype2/" -UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" +UPSTREAM_CHECK_REGEX = "freetype-(?P<pver>\d+(\.\d+)+)" -SRC_URI[md5sum] = "6a386964e18ba28cb93370e57a19031b" -SRC_URI[sha256sum] = "e20a6e1400798fd5e3d831dd821b61c35b1f9a6465d6b18a53a9df4cf441acf0" - -inherit autotools pkgconfig binconfig-disabled multilib_header +inherit autotools pkgconfig multilib_header # Adapt autotools to work with the minimal autoconf usage in freetype 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 PACKAGECONFIG[harfbuzz] = "--with-harfbuzz,--without-harfbuzz,harfbuzz" PACKAGECONFIG[pixmap] = "--with-png,--without-png,libpng" PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib" +PACKAGECONFIG[freetypeconfig] = "--enable-freetype-config=yes,--enable-freetype-config=no," EXTRA_OECONF = "CC_BUILD='${BUILD_CC}'" TARGET_CPPFLAGS += "-D_FILE_OFFSET_BITS=64" -do_install_append() { +do_install:append() { oe_multilib_header freetype2/freetype/config/ftconfig.h } -BINCONFIG = "${bindir}/freetype-config" - BBCLASSEXTEND = "native nativesdk" |