From: Markham <markham001@gmx.de>
Date: Thu, 11 Jan 2018 20:50:29 +0000 (+0100)
Subject: bump version freetype-2.8.1
X-Git-Url: https://git.webhop.me/?a=commitdiff_plain;h=70664dcbde1c4a194335010990689b9ecc96c807;p=bs-cst-neutrino-hd.git

bump version freetype-2.8.1
---

diff --git a/make/libraries.mk b/make/libraries.mk
index 5fcde2d..424503d 100755
--- a/make/libraries.mk
+++ b/make/libraries.mk
@@ -228,32 +228,30 @@ $(D)/librtmp: $(D)/zlib $(D)/openssl $(ARCHIVE)/rtmpdump-$(LIBRTMP_VER).tar.gz |
 $(D)/freetype: $(D)/zlib $(D)/libpng $(ARCHIVE)/freetype-$(FREETYPE_VER).tar.bz2 | $(TARGETPREFIX)
 	$(START_BUILD)
 	$(UNTAR)/freetype-$(FREETYPE_VER).tar.bz2
-	pushd $(BUILD_TMP)/freetype-$(FREETYPE_VER); \
-		sed -i '/#define TT_CONFIG_OPTION_BYTECODE_INTERPRETER/d' include/freetype/config/ftoption.h; \
-		sed -i 's@\/\* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING \*\/@#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING@' include/freetype/config/ftoption.h; \
+	set -e; cd $(BUILD_TMP)/freetype-$(FREETYPE_VER); \
+		sed -r "s:.*(#.*SUBPIXEL_(RENDERING|HINTING  2)) .*:\1:g" \
+			-i include/freetype/config/ftoption.h; \
 		sed -i '/^FONT_MODULES += \(type1\|cid\|pfr\|type42\|pcf\|bdf\|winfonts\|cff\)/d' modules.cfg; \
 		$(CONFIGURE) \
-				--prefix= \
-				--build=$(BUILD) \
-				--host=$(TARGET) \
-				--disable-static \
-				--enable-shared \
-				--with-png \
-				--with-zlib \
-				--without-harfbuzz \
-				--without-bzip2; \
+			--prefix= \
+			--mandir=/.remove \
+			--disable-static \
+			--enable-shared \
+			--with-png \
+			--with-zlib \
+			--without-harfbuzz \
+			--without-bzip2 \
+		; \
 		$(MAKE) all; \
 		sed -e "s,^prefix=,prefix=$(TARGETPREFIX)," < builds/unix/freetype-config > $(HOSTPREFIX)/bin/freetype-config; \
-		chmod 755 $(HOSTPREFIX)/bin/freetype-config; \
-		$(MAKE) install mandir=$(BUILD_TMP)/.remove libdir=$(TARGETPREFIX)/lib includedir=$(TARGETPREFIX)/include bindir=$(TARGETPREFIX)/bin prefix=$(TARGETPREFIX)
+		$(MAKE) install DESTDIR=$(TARGETPREFIX)
 	pushd $(TARGETPREFIX)/include; \
 			ln -sf freetype2/freetype freetype; \
 			ln -sf freetype2/ft2build.h ft2build.h
-	rm $(TARGETPREFIX)/bin/freetype-config
+	mv $(TARGETPREFIX)/bin/freetype-config $(HOSTPREFIX)/bin/freetype-config
 	$(REWRITE_LIBTOOL)/libfreetype.la
 	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/freetype2.pc
 	$(REMOVE)/freetype-$(FREETYPE_VER)
-	$(REMOVE)/.remove
 	$(TOUCH)
 
 $(D)/libpng: $(D)/zlib $(ARCHIVE)/libpng-$(LIBPNG_VER).tar.xz | $(TARGETPREFIX)
diff --git a/make/versions.mk b/make/versions.mk
index fbfa2a7..061b866 100644
--- a/make/versions.mk
+++ b/make/versions.mk
@@ -51,7 +51,7 @@ FFMPEG_GIT = 2ba896f
 FLEX_VER=2.5.35
 
 # FREETYPE free high-quality and portable Font engine
-FREETYPE_VER=2.7.1
+FREETYPE_VER=2.8.1
 
 # Unicode Bidirectional Algorithm (BIDI). This is useful for supporting Arabic and Hebrew alphabets
 FRIBIDI_VER = 0.19.7