From f8e4906de8e21b9affb9f901527d587eb31b68ff Mon Sep 17 00:00:00 2001
From: Scott Murray <scott.murray@konsulko.com>
Date: Mon, 1 Mar 2021 16:51:26 -0500
Subject: meta-agl-core-test: Fix freetype-demos build

Update freetype bbappend and patches for building freetype-demos
with freetype 2.11 in poky master.

Bug-AGL: SPEC-3819

Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: I393cec758934786cfa1d9d261b7e069b4d7514b5
---
 .../files/0001-Makefile-dont-build-gfx-demos.patch | 41 +++++++++++-----------
 1 file changed, 21 insertions(+), 20 deletions(-)

(limited to 'meta-agl-core-test/recipes-test/freetype/files/0001-Makefile-dont-build-gfx-demos.patch')

diff --git a/meta-agl-core-test/recipes-test/freetype/files/0001-Makefile-dont-build-gfx-demos.patch b/meta-agl-core-test/recipes-test/freetype/files/0001-Makefile-dont-build-gfx-demos.patch
index 4d0d09aea..bd9b4c064 100644
--- a/meta-agl-core-test/recipes-test/freetype/files/0001-Makefile-dont-build-gfx-demos.patch
+++ b/meta-agl-core-test/recipes-test/freetype/files/0001-Makefile-dont-build-gfx-demos.patch
@@ -1,17 +1,16 @@
-diff -ur ft2demos-2.9.1.orig/Makefile ft2demos-2.9.1/Makefile
---- ft2demos-2.9.1.orig/Makefile	2018-04-22 05:41:50.000000000 -0400
-+++ ft2demos-2.9.1/Makefile	2019-02-18 23:28:59.794678736 -0500
-@@ -163,7 +163,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)) $(LIB_CLOCK_GETTIME)
-@@ -289,12 +290,12 @@
+Do not build graphics tests
+
+Upstream-Status: Inappropriate [disable feature]
+Signed-off-by: Scott Murray <scott.murray@konsulko.com>
+---
+ Makefile | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 8bb8666..95e5e45 100644
+--- a/Makefile
++++ b/Makefile
+@@ -297,13 +297,13 @@ else
            ttdebug
  
    # Comment out the next line if you don't have a graphics subsystem.
@@ -19,14 +18,16 @@ diff -ur ft2demos-2.9.1.orig/Makefile ft2demos-2.9.1/Makefile
 -          ftgamma  \
 -          ftgrid   \
 -          ftmulti  \
+-          ftsdf    \
 -          ftstring \
 -          ftview
-+  # EXES += ftdiff   \
-+  #         ftgamma  \
-+  #         ftgrid   \
-+  #         ftmulti  \
-+  #         ftstring \
-+  #         ftview
++  #EXES += ftdiff   \
++  #        ftgamma  \
++  #        ftgrid   \
++  #        ftmulti  \
++  #        ftsdf    \
++  #        ftstring \
++  #        ftview
  
    # ftvalid requires ftgxval.c and ftotval.c
    #
-- 
cgit 1.2.3-korg