Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

libfreetype: update to 2.8.1, fix host install issue

Browse source 
This commit updates Freetype 2 to the latest upstream version and fixes
the issue where freetype-config was incorrectly installed into the
host, rather than the target, staging directory, therefore causing
compilation issues with other packages that depend on libfreetype.

Signed-off-by: Val Kulkov <val.kulkov@gmail.com>
This commit is contained in:
Val Kulkov 2017-11-14 16:19:13 -05:00
parent 68ae65f3bc
commit b2b31e7ef3
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
libs/freetype/Makefile
View file

@ -8,16 +8,16 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=freetype
PKG_VERSION:=2.7.1
PKG_VERSION:=2.8.1
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=@SF/freetype
PKG_HASH:=3a3bb2c4e15ffb433f2032f50a5b5a92558206822e22bfe8cbe339af4aa82f88
PKG_HASH:=e5435f02e02d2b87bb8e4efdcaa14b1f78c9cf3ab1ed80f94b6382fb6acc7d78
PKG_LICENSE:=FTL GPL-2.0 MIT ZLIB
PKG_LICENSE_FILES:=docs/LICENSE.TXT docs/FTL.TXT docs/GPLv2.TXT src/bdf/README src/pcf/README src/gzip/zlib.h
PKG_MAINTAINER:=Nicolas Thill <nico@openwrt.org>
PKG_MAINTAINER:=Val Kulkov <val.kulkov@gmail.com>
PKG_FIXUP:=autoreconf
PKG_LIBTOOL_PATHS:=builds/unix
@ -30,7 +30,7 @@ define Package/libfreetype
CATEGORY:=Libraries
TITLE:=A free, high-quality and portable font engine
URL:=http://www.freetype.org/
DEPENDS:=+zlib +libbz2
DEPENDS:=+zlib +libbz2 +libpng
endef
define Package/libfreetype/description
@ -47,15 +47,15 @@ CONFIGURE_ARGS += \
--enable-static \
--with-bzip2=yes \
--with-zlib=yes \
--with-png=no \
--with-png=yes
define Build/Compile
$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" all install
endef
define Build/InstallDev
$(INSTALL_DIR) $(2)/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/freetype-config $(2)/bin/
$(INSTALL_DIR) $(1)/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/freetype-config $(1)/bin/
$(INSTALL_DIR) $(1)/usr/include
$(CP) $(PKG_INSTALL_DIR)/usr/include/freetype2 $(1)/usr/include/
$(INSTALL_DIR) $(1)/usr/lib
@ -67,7 +67,7 @@ define Build/InstallDev
's,^\(prefix\|exec_prefix\)=.*,\1="$(STAGING_DIR)/usr",; \
s,^\(includedir\)=.*,\1="$(STAGING_DIR)/usr/include",; \
s,^\(libdir\)=.*,\1="$(STAGING_DIR)/usr/lib",' \
$(2)/bin/freetype-config
$(1)/bin/freetype-config
$(SED) \
's,/usr/include,$$$${prefix}/include,g; \
s,/usr/lib,$$$${exec_prefix}/lib,g' \
@ -80,5 +80,4 @@ define Package/libfreetype/install
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libfreetype.so.* $(1)/usr/lib/
endef
$(eval $(call HostBuild))
$(eval $(call BuildPackage,libfreetype))