[oe-commits] org.oe.dev freetype: add 2.3.1 from bug #1906

[justinp commit]

freetype: add 2.3.1 from bug #1906
- Fixes problems with building that 2.3.0 had

Author: justinp at openembedded.org
Branch: org.openembedded.dev
Revision: eff88718c2617f7fedd0a3aa5901f9a36466c138
ViewMTN: http://monotone.openembedded.org/revision.psp?id=eff88718c2617f7fedd0a3aa5901f9a36466c138
Files:
1
packages/freetype/freetype-2.3.1
packages/freetype/freetype-2.3.1/fix-x86_64-build.patch
packages/freetype/freetype_2.3.1.bb
Diffs:

#
# mt diff -r931fd8344e033603b0ba4ede539a960b9133c768 -reff88718c2617f7fedd0a3aa5901f9a36466c138
#
# 
# 
# add_dir "packages/freetype/freetype-2.3.1"
# 
# add_file "packages/freetype/freetype-2.3.1/fix-x86_64-build.patch"
#  content [690894b3931340f65a16f59f1c0f40a85560ce1d]
# 
# add_file "packages/freetype/freetype_2.3.1.bb"
#  content [4e066043085f52cdd0cfa3ed9c8b69ce68436ab7]
# 
============================================================
--- packages/freetype/freetype-2.3.1/fix-x86_64-build.patch	690894b3931340f65a16f59f1c0f40a85560ce1d
+++ packages/freetype/freetype-2.3.1/fix-x86_64-build.patch	690894b3931340f65a16f59f1c0f40a85560ce1d
@@ -0,0 +1,26 @@
+Index: freetype-2.3.1/builds/unix/configure.raw
+===================================================================
+--- freetype-2.3.1.orig/builds/unix/configure.raw
++++ freetype-2.3.1/builds/unix/configure.raw
+@@ -40,7 +40,7 @@ AC_SUBST(EXEEXT)
+ # checks for native programs to generate building tool
+ 
+ if test ${cross_compiling} = yes; then
+-  AC_CHECK_PROG(CC_BUILD, ${build}-gcc, ${build-gcc})
++  AC_CHECK_PROG(CC_BUILD, ${build}-gcc, ${build}-gcc)
+   test -z "${CC_BUILD}" && AC_CHECK_PROG(CC_BUILD, gcc, gcc)
+   test -z "${CC_BUILD}" && AC_CHECK_PROG(CC_BUILD, cc, cc, , , /usr/ucb/cc)
+   test -z "${CC_BUILD}" && AC_MSG_ERROR([cannot find native C compiler])
+Index: freetype-2.3.1/builds/unix/configure.ac
+===================================================================
+--- freetype-2.3.1.orig/builds/unix/configure.ac
++++ freetype-2.3.1/builds/unix/configure.ac
+@@ -40,7 +40,7 @@ AC_SUBST(EXEEXT)
+ # checks for native programs to generate building tool
+ 
+ if test ${cross_compiling} = yes; then
+-  AC_CHECK_PROG(CC_BUILD, ${build}-gcc, ${build-gcc})
++  AC_CHECK_PROG(CC_BUILD, ${build}-gcc, ${build}-gcc)
+   test -z "${CC_BUILD}" && AC_CHECK_PROG(CC_BUILD, gcc, gcc)
+   test -z "${CC_BUILD}" && AC_CHECK_PROG(CC_BUILD, cc, cc, , , /usr/ucb/cc)
+   test -z "${CC_BUILD}" && AC_MSG_ERROR([cannot find native C compiler])
============================================================
--- packages/freetype/freetype_2.3.1.bb	4e066043085f52cdd0cfa3ed9c8b69ce68436ab7
+++ packages/freetype/freetype_2.3.1.bb	4e066043085f52cdd0cfa3ed9c8b69ce68436ab7
@@ -0,0 +1,40 @@
+DESCRIPTION = "Freetype font rendering library"
+SECTION = "libs"
+LICENSE = "freetype"
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \
+           file://fix-x86_64-build.patch;patch=1"
+#           file://no-hardcode.patch;patch=1"
+#	   file://configure.patch;patch=1 \
+S = "${WORKDIR}/freetype-${PV}"
+
+inherit autotools pkgconfig binconfig
+
+DEFAULT_PREFERENCE = "-1"
+
+LIBTOOL = "${S}/builds/unix/${HOST_SYS}-libtool"
+EXTRA_OEMAKE = "'LIBTOOL=${LIBTOOL}'"
+EXTRA_OECONF = "--without-zlib"
+
+do_configure() {
+	cd builds/unix
+	gnu-configize
+	aclocal -I .
+	autoconf
+	cd ${S}
+	oe_runconf
+}
+
+do_compile_prepend() {
+	${BUILD_CC} -o objs/apinames src/tools/apinames.c
+}
+
+do_stage() {
+     export LIBTOOL='${LIBTOOL}'
+	 autotools_stage_includes
+	 oe_libinstall -so -a -C objs libfreetype ${STAGING_LIBDIR}
+}
+
+FILES_${PN} = "${libdir}/lib*.so.*"
+FILES_${PN}-dev += "${bindir}"