[PATCH 0/2] freetype: formatting tweaks + update 2.6.2 -> 2.6.3

[PATCH 0/2] freetype: formatting tweaks + update 2.6.2 -> 2.6.3

[Andre McCurdy]

Andre McCurdy (2):
  freetype: minor formatting improvements
  freetype: update 2.6.2 -> 2.6.3

 .../{freetype_2.6.2.bb => freetype_2.6.3.bb}       | 26 ++++++++++++----------
 1 file changed, 14 insertions(+), 12 deletions(-)
 rename meta/recipes-graphics/freetype/{freetype_2.6.2.bb => freetype_2.6.3.bb} (84%)

-- 
1.9.1

[PATCH 1/2] freetype: minor formatting improvements

[Andre McCurdy]

No functional changes.

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
---
 meta/recipes-graphics/freetype/freetype_2.6.2.bb | 22 ++++++++++++----------
 1 file 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 63e8ff4..a41f5c8 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
 image generation tools, and many other products as well."
 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=c017ff17fc6f0794adf93db5559ccd56 \
                     file://docs/FTL.TXT;md5=d479e83797f699fe873b38dadd0fcd4c \
                     file://docs/GPLv2.TXT;md5=8ef380476f642c20ebf40fecb0add2ec"
 
-SECTION = "libs"
-
 SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \
            file://use-right-libtool.patch"
+
 SRC_URI[md5sum] = "86109d0c998787d81ac582bad9adf82e"
 SRC_URI[sha256sum] = "baf6bdef7cdcc12ac270583f76ef245efe936267dbecef835f02a3409fcbb892"
 
-BINCONFIG = "${bindir}/freetype-config"
-
 inherit autotools pkgconfig binconfig-disabled multilib_header
 
-EXTRA_OECONF = "CC_BUILD='${BUILD_CC}'"
-TARGET_CPPFLAGS += "-D_FILE_OFFSET_BITS=64"
-
 PACKAGECONFIG ??= "zlib"
+
 PACKAGECONFIG[bzip2] = "--with-bzip2,--without-bzip2,bzip2"
-PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib"
-PACKAGECONFIG[pixmap] = "--with-png,--without-png,libpng"
-# This results in a circular dependency so enabling is non-trivial
+# 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"
+
+EXTRA_OECONF = "CC_BUILD='${BUILD_CC}'"
+
+TARGET_CPPFLAGS += "-D_FILE_OFFSET_BITS=64"
 
 do_configure() {
 	# Need this because although the autotools infrastructure is in
@@ -49,4 +49,6 @@ do_install_append() {
 	oe_multilib_header freetype2/freetype/config/ftconfig.h
 }
 
+BINCONFIG = "${bindir}/freetype-config"
+
 BBCLASSEXTEND = "native"
-- 
1.9.1

[PATCH 2/2] freetype: update 2.6.2 -> 2.6.3

[Andre McCurdy]

Update LICENSE.TXT hash due to minor rewording to clarify licensing
of fthash.c and fthash.h files. No changes to overall licensing.

Other changes from the upstream changelog:

  I. IMPORTANT CHANGES

    - Khmer,  Myanmar, Bengali,  and Kannada  script support  has been
      added to the auto-hinter.

  II. MISCELLANEOUS

    - Better  support of  Indic  scripts like  Devanagari  by using  a
      top-to-bottom hinting flow.

    - All  FreeType macros  starting  with two  underscores have  been
      renamed to  avoid a violation of  both the C and  C++ standards.
      Example: Header  macros of the  form `__FOO_H__' are  now called
      `FOO_H_'.  In most cases,  this should be completely transparent
      to the user.   The exception to this  is `__FTERRORS_H__', which
      must be  sometimes undefined by  the user to get  FreeType error
      strings:  Both this  form and  the new  `FTERRORS_H_' macro  are
      accepted for backwards compatibility.

    - Minor improvements mainly to the Type 1 driver.

    - The  new CFF  engine now  supports all  Type 2  operators except
      `random'.

    - The macro `_STANDALONE_', used for  compiling the B/W and smooth
      rasterizers  as   stand-alone  modules,  has  been   renamed  to
      `STANDALONE_', since macro names starting with an underscore and
      followed by an uppercase letter are reserved in both C and C++.

    - Function  `FT_Library_SetLcdFilterWeights'  now  also  activates
      custom LCD filter weights (instead of just adjusting them).

    - Support for  `unpatented hinting'  has been  completely removed:
      Consequently,  the two  functions `FT_Face_CheckTrueTypePatents'
      and  `FT_Face_SetUnpatentedHinting'  now  return  always  false,
      doing nothing.

    - The `ftgamma' demo  program has been modernized;  the gamma grid
      display has been moved from `ftview' to this program.

    - It is now possible to  cycle through the available LCD fitlering
      modes.

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
---
 .../freetype/{freetype_2.6.2.bb => freetype_2.6.3.bb}               | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-graphics/freetype/{freetype_2.6.2.bb => freetype_2.6.3.bb} (88%)

diff --git a/meta/recipes-graphics/freetype/freetype_2.6.2.bb b/meta/recipes-graphics/freetype/freetype_2.6.3.bb
similarity index 88%
rename from meta/recipes-graphics/freetype/freetype_2.6.2.bb
rename to meta/recipes-graphics/freetype/freetype_2.6.3.bb
index a41f5c8..cf6882a 100644
--- a/meta/recipes-graphics/freetype/freetype_2.6.2.bb
+++ b/meta/recipes-graphics/freetype/freetype_2.6.3.bb
@@ -8,15 +8,15 @@ BUGTRACKER = "https://savannah.nongnu.org/bugs/?group=freetype"
 SECTION = "libs"
 
 LICENSE = "FreeType | GPLv2+"
-LIC_FILES_CHKSUM = "file://docs/LICENSE.TXT;md5=c017ff17fc6f0794adf93db5559ccd56 \
+LIC_FILES_CHKSUM = "file://docs/LICENSE.TXT;md5=4af6221506f202774ef74f64932878a1 \
                     file://docs/FTL.TXT;md5=d479e83797f699fe873b38dadd0fcd4c \
                     file://docs/GPLv2.TXT;md5=8ef380476f642c20ebf40fecb0add2ec"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \
            file://use-right-libtool.patch"
 
-SRC_URI[md5sum] = "86109d0c998787d81ac582bad9adf82e"
-SRC_URI[sha256sum] = "baf6bdef7cdcc12ac270583f76ef245efe936267dbecef835f02a3409fcbb892"
+SRC_URI[md5sum] = "0037b25a8c090bc8a1218e867b32beb1"
+SRC_URI[sha256sum] = "371e707aa522acf5b15ce93f11183c725b8ed1ee8546d7b3af549863045863a2"
 
 inherit autotools pkgconfig binconfig-disabled multilib_header
 
-- 
1.9.1