From 86180838e730d7ef96256f2c1e49081072ad84b6 Mon Sep 17 00:00:00 2001 From: Stephane Desneux Date: Fri, 17 Jun 2016 14:35:16 +0000 Subject: meta-ivi-common: amend freetype recipe to package freetype-demos Binaries present in ft2demos source project are packaged in freetype-demos to satisfy JTA dependencies (job Functional.ft2demos) Change-Id: I0f2088c1d1e8586617f66292de652f3783f3f00f Signed-off-by: Stephane Desneux --- .../files/0001-Makefile-dont-build-gfx-demos.patch | 32 ++++++++++++++++++++++ .../recipes-test/freetype/freetype_%.bbappend | 28 +++++++++++++++++++ 2 files changed, 60 insertions(+) create mode 100644 meta-ivi-common/recipes-test/freetype/files/0001-Makefile-dont-build-gfx-demos.patch create mode 100644 meta-ivi-common/recipes-test/freetype/freetype_%.bbappend diff --git a/meta-ivi-common/recipes-test/freetype/files/0001-Makefile-dont-build-gfx-demos.patch b/meta-ivi-common/recipes-test/freetype/files/0001-Makefile-dont-build-gfx-demos.patch new file mode 100644 index 000000000..1f3acf28e --- /dev/null +++ b/meta-ivi-common/recipes-test/freetype/files/0001-Makefile-dont-build-gfx-demos.patch @@ -0,0 +1,32 @@ +diff -urN /tmp/ft2demos-2.6.orig/Makefile /tmp/ft2demos-2.6/Makefile +--- ft2demos-2.6.orig/Makefile 2015-06-07 07:34:19.000000000 +0000 ++++ ft2demos-2.6/Makefile 2016-06-17 14:25:37.640456725 +0000 +@@ -153,7 +153,8 @@ + + ifeq ($(PLATFORM),unix) + CC = $(CCraw) +- LINK_CMD = $(subst /,$(SEP),$(OBJ_BUILD)/libtool) \ ++ LIBTOOL = $(OBJ_BUILD)/libtool ++ LINK_CMD = $(subst /,$(SEP),$(LIBTOOL)) \ + --mode=link $(CC) \ + $(subst /,$(COMPILER_SEP),$(LDFLAGS)) + LINK_LIBS = $(subst /,$(COMPILER_SEP),$(FTLIB) $(EFENCE)) +@@ -279,12 +280,12 @@ + ttdebug + + # Comment out the next line if you don't have a graphics subsystem. +- EXES += ftdiff \ +- ftgamma \ +- ftgrid \ +- ftmulti \ +- ftstring \ +- ftview ++ # EXES += ftdiff \ ++ # ftgamma \ ++ # ftgrid \ ++ # ftmulti \ ++ # ftstring \ ++ # ftview + + # ftvalid requires ftgxval.c and ftotval.c + # diff --git a/meta-ivi-common/recipes-test/freetype/freetype_%.bbappend b/meta-ivi-common/recipes-test/freetype/freetype_%.bbappend new file mode 100644 index 000000000..835580f1d --- /dev/null +++ b/meta-ivi-common/recipes-test/freetype/freetype_%.bbappend @@ -0,0 +1,28 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/files:" + +SRC_URI =+ "${SOURCEFORGE_MIRROR}/freetype/ft2demos-${PV}.tar.bz2;name=ft2demos \ + file://0001-Makefile-dont-build-gfx-demos.patch;patchdir=../ft2demos-${PV} \ + " +SRC_URI[ft2demos.md5sum] = "c6c209b37f10621d6ff100620b8292b4" +SRC_URI[ft2demos.sha256sum] = "f8f4bc2a2e76e0dbe61838e452c5a7daf1d4bd9dfa44691940bf308f776d32b6" + +PACKAGES =+ "${PN}-demos" + +do_compile_append () { + oe_runmake -C ${WORKDIR}/ft2demos-${PV} TOP_DIR=${WORKDIR}/${PN}-${PV} +} + +do_install_append () { + install -d -m 0755 ${D}/${bindir} + for x in ftbench ftdump ftlint ftvalid ttdebug; do + install -m 0755 ${WORKDIR}/ft2demos-${PV}/bin/$x ${D}/${bindir} + done +} + +FILES_${PN}-demos = "\ + ${bindir}/ftbench \ + ${bindir}/ftdump \ + ${bindir}/ftlint \ + ${bindir}/ftvalid \ + ${bindir}/ttdebug \ +" -- cgit 1.2.3-korg