summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2016-02-10 15:19:37 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-11 22:33:40 +0000
commit1ba1aa33f5e6fda6b1d1c6146188a9f29630b9bd (patch)
treeaee96280181b8d9d50bc225dfc24056900b68927
parent0d5e611f37f9d6edec320c4fcb6e3317d23e3d20 (diff)
downloadpoky-1ba1aa33f5e6fda6b1d1c6146188a9f29630b9bd.tar.gz
freetype: minor formatting improvements
No functional changes. (From OE-Core rev: 77c8871c165c36a70f77b76ff6bd4c2b8be63e96) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/freetype/freetype_2.6.2.bb22
1 files changed, 12 insertions, 10 deletions
diff --git a/meta/recipes-graphics/freetype/freetype_2.6.2.bb b/meta/recipes-graphics/freetype/freetype_2.6.2.bb
index 63e8ff4c1d..a41f5c80a0 100644
--- a/meta/recipes-graphics/freetype/freetype_2.6.2.bb
+++ b/meta/recipes-graphics/freetype/freetype_2.6.2.bb
@@ -5,32 +5,32 @@ images). It can be used in graphics libraries, display servers, font conversion
5image generation tools, and many other products as well." 5image generation tools, and many other products as well."
6HOMEPAGE = "http://www.freetype.org/" 6HOMEPAGE = "http://www.freetype.org/"
7BUGTRACKER = "https://savannah.nongnu.org/bugs/?group=freetype" 7BUGTRACKER = "https://savannah.nongnu.org/bugs/?group=freetype"
8SECTION = "libs"
8 9
9LICENSE = "FreeType | GPLv2+" 10LICENSE = "FreeType | GPLv2+"
10LIC_FILES_CHKSUM = "file://docs/LICENSE.TXT;md5=c017ff17fc6f0794adf93db5559ccd56 \ 11LIC_FILES_CHKSUM = "file://docs/LICENSE.TXT;md5=c017ff17fc6f0794adf93db5559ccd56 \
11 file://docs/FTL.TXT;md5=d479e83797f699fe873b38dadd0fcd4c \ 12 file://docs/FTL.TXT;md5=d479e83797f699fe873b38dadd0fcd4c \
12 file://docs/GPLv2.TXT;md5=8ef380476f642c20ebf40fecb0add2ec" 13 file://docs/GPLv2.TXT;md5=8ef380476f642c20ebf40fecb0add2ec"
13 14
14SECTION = "libs"
15
16SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \ 15SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \
17 file://use-right-libtool.patch" 16 file://use-right-libtool.patch"
17
18SRC_URI[md5sum] = "86109d0c998787d81ac582bad9adf82e" 18SRC_URI[md5sum] = "86109d0c998787d81ac582bad9adf82e"
19SRC_URI[sha256sum] = "baf6bdef7cdcc12ac270583f76ef245efe936267dbecef835f02a3409fcbb892" 19SRC_URI[sha256sum] = "baf6bdef7cdcc12ac270583f76ef245efe936267dbecef835f02a3409fcbb892"
20 20
21BINCONFIG = "${bindir}/freetype-config"
22
23inherit autotools pkgconfig binconfig-disabled multilib_header 21inherit autotools pkgconfig binconfig-disabled multilib_header
24 22
25EXTRA_OECONF = "CC_BUILD='${BUILD_CC}'"
26TARGET_CPPFLAGS += "-D_FILE_OFFSET_BITS=64"
27
28PACKAGECONFIG ??= "zlib" 23PACKAGECONFIG ??= "zlib"
24
29PACKAGECONFIG[bzip2] = "--with-bzip2,--without-bzip2,bzip2" 25PACKAGECONFIG[bzip2] = "--with-bzip2,--without-bzip2,bzip2"
30PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib" 26# harfbuzz results in a circular dependency so enabling is non-trivial
31PACKAGECONFIG[pixmap] = "--with-png,--without-png,libpng"
32# This results in a circular dependency so enabling is non-trivial
33PACKAGECONFIG[harfbuzz] = "--with-harfbuzz,--without-harfbuzz,harfbuzz" 27PACKAGECONFIG[harfbuzz] = "--with-harfbuzz,--without-harfbuzz,harfbuzz"
28PACKAGECONFIG[pixmap] = "--with-png,--without-png,libpng"
29PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib"
30
31EXTRA_OECONF = "CC_BUILD='${BUILD_CC}'"
32
33TARGET_CPPFLAGS += "-D_FILE_OFFSET_BITS=64"
34 34
35do_configure() { 35do_configure() {
36 # Need this because although the autotools infrastructure is in 36 # Need this because although the autotools infrastructure is in
@@ -49,4 +49,6 @@ do_install_append() {
49 oe_multilib_header freetype2/freetype/config/ftconfig.h 49 oe_multilib_header freetype2/freetype/config/ftconfig.h
50} 50}
51 51
52BINCONFIG = "${bindir}/freetype-config"
53
52BBCLASSEXTEND = "native" 54BBCLASSEXTEND = "native"