From 5285c7805ff57dadacc0f031866ffddcbf1901e5 Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Mon, 29 Apr 2019 18:13:53 +0100
Subject: [PATCH 1/2] lcdd: configure prefix to prevent using host includes

---
 packages/addons/service/lcdd/package.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/addons/service/lcdd/package.mk b/packages/addons/service/lcdd/package.mk
index 2e649ce2e4..34e3094a4b 100644
--- a/packages/addons/service/lcdd/package.mk
+++ b/packages/addons/service/lcdd/package.mk
@@ -21,7 +21,7 @@ PKG_IS_ADDON="yes"
 PKG_ADDON_NAME="LCDproc"
 PKG_ADDON_TYPE="xbmc.service"
 
-PKG_CONFIGURE_OPTS_TARGET="--with-ft-prefix=/usr \
+PKG_CONFIGURE_OPTS_TARGET="--with-ft-prefix=$SYSROOT_PREFIX/usr \
                            --enable-libusb \
                            --enable-libftdi \
                            --disable-libX11 \

From 453fb574095e8c3313fd761fe37e7813628320a0 Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Mon, 29 Apr 2019 23:16:59 +0100
Subject: [PATCH 2/2] freetype: pkconfig needs to use sysroot as prefix

Can't set --prefix=$SYSROOT_PREFIX/usr as this creates sysroot-within-sysroot, so
patch it into freetype2.pc.

Once freetype2 is using the correct prefix we can drop the CFLAGS workaround from lcdd.
---
 packages/addons/service/lcdd/package.mk | 1 -
 packages/print/freetype/package.mk      | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/addons/service/lcdd/package.mk b/packages/addons/service/lcdd/package.mk
index 34e3094a4b..456bec317d 100644
--- a/packages/addons/service/lcdd/package.mk
+++ b/packages/addons/service/lcdd/package.mk
@@ -31,7 +31,6 @@ PKG_CONFIGURE_OPTS_TARGET="--with-ft-prefix=$SYSROOT_PREFIX/usr \
 
 pre_configure_target() {
   CFLAGS="$CFLAGS -O3"
-  CFLAGS="$CFLAGS -I$SYSROOT_PREFIX/usr/include/freetype2"
 }
 
 addon() {
diff --git a/packages/print/freetype/package.mk b/packages/print/freetype/package.mk
index 16797aec5d..0216b83bac 100644
--- a/packages/print/freetype/package.mk
+++ b/packages/print/freetype/package.mk
@@ -27,5 +27,7 @@ pre_configure_target() {
 }
 
 post_makeinstall_target() {
+  sed -e "s#prefix=/usr#prefix=${SYSROOT_PREFIX}/usr#" -i "${SYSROOT_PREFIX}/usr/lib/pkgconfig/freetype2.pc"
+
   cp -P "${PKG_BUILD}/.${TARGET_NAME}/freetype-config" "${SYSROOT_PREFIX}/usr/bin"
 }