X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=meta-agl-core-test%2Frecipes-test%2Ffreetype%2Ffreetype_2.%25.bbappend;h=b6c14c47ed201ebc54880608d58095e3e93b1988;hb=50ed1c04261248c66a052d8b84be0c0288fe1728;hp=8fc56fa354742b893af08489ae9a4b1edddf7265;hpb=dd6fc5dcaa0a027b7651bb365d5dd0f623498f8f;p=AGL%2Fmeta-agl.git

diff --git a/meta-agl-core-test/recipes-test/freetype/freetype_2.%.bbappend b/meta-agl-core-test/recipes-test/freetype/freetype_2.%.bbappend
index 8fc56fa35..b6c14c47e 100644
--- a/meta-agl-core-test/recipes-test/freetype/freetype_2.%.bbappend
+++ b/meta-agl-core-test/recipes-test/freetype/freetype_2.%.bbappend
@@ -1,27 +1,26 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
-SRC_URI =+ "${SOURCEFORGE_MIRROR}/freetype/freetype-demos/${PV}/ft2demos-${PV}.tar.gz;name=ft2demos \
-           file://0001-Makefile-dont-build-gfx-demos.patch;patchdir=../ft2demos-${PV} \
-           file://0001-ft2demos-Makefile-Do-not-hardcode-libtool-path.patch;patchdir=../ft2demos-${PV} \
-          "
-SRC_URI[ft2demos.md5sum] = "c376adf4782bac9b9ac8e427884752d2"
-SRC_URI[ft2demos.sha256sum] = "5e9e94a2db9d1a945293a1644a502f6664a2173a454d4a55b19695e2e2f4a0bc"
+SRC_URI += "${SOURCEFORGE_MIRROR}/freetype/freetype-demos/${PV}/ft2demos-${PV}.tar.gz;name=ft2demos \
+            file://0001-Makefile-dont-build-gfx-demos.patch;patchdir=../ft2demos-${PV} \
+           "
+SRC_URI[ft2demos.sha256sum] = "95939c04b72872f2c6053a436b385c614530322bda7a7966efbc4d281f710af6"
 
-PACKAGES =+ "${PN}-demos"
-
-B = "${S}"
+# Enable pixmap/libpng support to allow color emojis
+PACKAGECONFIG:append = " pixmap"
 
 do_compile:append () {
-    oe_runmake -C ${WORKDIR}/ft2demos-${PV} TOP_DIR=${WORKDIR}/${BPN}-${PV}/
+    oe_runmake -C ${B} FT2DEMOS=1 TOP_DIR_2=${WORKDIR}/ft2demos-${PV}
 }
 
 do_install:append () {
-    install -d -m 0755 ${D}/${bindir}
+    install -d -m 0755 ${D}${bindir}
     for x in ftbench ftdump ftlint ftvalid ttdebug; do
-        install -m 0755 ${WORKDIR}/ft2demos-${PV}/bin/.libs/$x ${D}/${bindir}
+        install -m 0755 ${WORKDIR}/ft2demos-${PV}/bin/.libs/$x ${D}${bindir}
     done
 }
 
+PACKAGE_BEFORE_PN = "${PN}-demos"
+
 FILES:${PN}-demos = "\
     ${bindir}/ftbench \
     ${bindir}/ftdump \
@@ -29,6 +28,3 @@ FILES:${PN}-demos = "\
     ${bindir}/ftvalid \
     ${bindir}/ttdebug \
 "
-
-# enable pixmap/libpng support to allow color emojis
-PACKAGECONFIG:append = " pixmap"