diff --git a/packages/addons/service/lcdd/package.mk b/packages/addons/service/lcdd/package.mk index 0e3403bed1..cfb88b734e 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=$SYSROOT_PREFIX/usr \ +PKG_CONFIGURE_OPTS_TARGET="--with-ft-prefix=/usr \ --enable-libusb \ --enable-libftdi \ --disable-libX11 \ @@ -31,6 +31,7 @@ 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 23759c30d0..16797aec5d 100644 --- a/packages/print/freetype/package.mk +++ b/packages/print/freetype/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="freetype" -PKG_VERSION="2.6.5" -PKG_SHA256="e20a6e1400798fd5e3d831dd821b61c35b1f9a6465d6b18a53a9df4cf441acf0" +PKG_VERSION="2.9.1" +PKG_SHA256="db8d87ea720ea9d5edc5388fc7a0497bb11ba9fe972245e0f7f4c7e8b1e1e84d" PKG_LICENSE="GPL" PKG_SITE="http://www.freetype.org" PKG_URL="http://download.savannah.gnu.org/releases/freetype/$PKG_NAME-$PKG_VERSION.tar.bz2" @@ -27,7 +27,5 @@ pre_configure_target() { } post_makeinstall_target() { - sed -e "s:\(['=\" ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" -i $SYSROOT_PREFIX/usr/bin/freetype-config - - rm -rf $INSTALL/usr/bin + cp -P "${PKG_BUILD}/.${TARGET_NAME}/freetype-config" "${SYSROOT_PREFIX}/usr/bin" }