Skip to contentSkip to conversation

freetype: bump to version 2.5.1

PATCH New Gustavo Zacarias 2 participants 3 messages Dec 5, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 freetype: bump to version 2.5.1

---
 package/freetype/freetype.mk | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
package/freetype/freetype.mk +2 -4
index 1e378d3..398bf61 100644
@@ -4,11 +4,9 @@
 #
 ################################################################################
 
-FREETYPE_VERSION_MAJOR = 2.5.0
-FREETYPE_VERSION_MINOR = 1
-FREETYPE_VERSION = $(FREETYPE_VERSION_MAJOR).$(FREETYPE_VERSION_MINOR)
+FREETYPE_VERSION = 2.5.1
 FREETYPE_SOURCE = freetype-$(FREETYPE_VERSION).tar.bz2
-FREETYPE_SITE = http://downloads.sourceforge.net/project/freetype/freetype2/$(FREETYPE_VERSION_MAJOR)
+FREETYPE_SITE = http://downloads.sourceforge.net/project/freetype/freetype2/$(FREETYPE_VERSION)
 FREETYPE_INSTALL_STAGING = YES
 FREETYPE_MAKE_OPT = CCexe="$(HOSTCC)"
 FREETYPE_LICENSE = Dual FTL/GPLv2+
Signature · 1 line
1.8.3.2
#1 lore raw

PATCH 2/2 fontconfig: bump to version 2.11.0

---
 package/fontconfig/Config.in                       |  2 +-
 ...fontconfig-2.6.0-parallel-compilation-fix.patch | 26 -------
 .../fontconfig-2.6.0-use_for_build.patch           | 80 ----------------------
 package/fontconfig/fontconfig.mk                   | 14 +---
 4 files changed, 4 insertions(+), 118 deletions(-)
 delete mode 100644 package/fontconfig/fontconfig-2.6.0-parallel-compilation-fix.patch
 delete mode 100644 package/fontconfig/fontconfig-2.6.0-use_for_build.patch
package/fontconfig/Config.in +1 -1
index 49878d2..1c54a43 100644
@@ -3,6 +3,6 @@ config BR2_PACKAGE_FONTCONFIG
 	select BR2_PACKAGE_FREETYPE
 	select BR2_PACKAGE_EXPAT
 	help
-	  a library for font customization and configuration.
+	  Fontconfig is a library for configuring and customizing font access.
 
 	  http://www.fontconfig.org/
package/fontconfig/fontconfig-2.6.0-parallel-compilation-fix.patch deleted +0 -26
deleted file mode 100644
index 56623cf..0000000
@@ -1,26 +0,0 @@
----
- fc-case/Makefile.am |    4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-Index: fontconfig-2.6.0/fc-case/Makefile.am
-===================================================================
---- fontconfig-2.6.0.orig/fc-case/Makefile.am
-+++ fontconfig-2.6.0/fc-case/Makefile.am
-@@ -36,6 +36,8 @@
- 
- noinst_MANS=fc-case.man
- 
-+noinst_HEADERS=$(TARG)
-+
- fc_case_SRCS= \
- 	fc-case.c \
- 	fccaseint.h \
-@@ -52,7 +54,7 @@
- 
- ALIAS_FILES = fcalias.h fcaliastail.h
- 
--BUILT_SOURCES = $(ALIAS_FILES) $(TARG)
-+BUILT_SOURCES = $(ALIAS_FILES)
- 
- $(ALIAS_FILES): 
- 	touch $(ALIAS_FILES)
package/fontconfig/fontconfig-2.6.0-use_for_build.patch deleted +0 -80

80 lines not on this page · raw message

package/fontconfig/fontconfig.mk +3 -11
index 5ce6be2..f6b238a 100644
@@ -4,25 +4,17 @@
 #
 ################################################################################
 
-FONTCONFIG_VERSION = 2.6.0
+FONTCONFIG_VERSION = 2.11.0
 FONTCONFIG_SITE = http://fontconfig.org/release
+FONTCONFIG_INSTALL_STAGING = YES
+FONTCONFIG_DEPENDENCIES = freetype expat host-pkgconf
 FONTCONFIG_LICENSE = fontconfig license
 FONTCONFIG_LICENSE_FILES = COPYING
-FONTCONFIG_AUTORECONF = YES
-FONTCONFIG_INSTALL_STAGING = YES
-# This package does not like using the target cflags for some reason.
-FONTCONFIG_CONF_ENV = CFLAGS="-I$(STAGING_DIR)/usr/include/freetype2"
 
 FONTCONFIG_CONF_OPT = --with-arch=$(GNU_TARGET_NAME) \
-		--with-freetype-config="$(STAGING_DIR)/usr/bin/freetype-config" \
 		--with-cache-dir=/var/cache/fontconfig \
-		--with-expat="$(STAGING_DIR)/usr/lib" \
-		--with-expat-lib=$(STAGING_DIR)/usr/lib \
-		--with-expat-includes=$(STAGING_DIR)/usr/include \
 		--disable-docs
 
-FONTCONFIG_DEPENDENCIES = freetype expat
-
 HOST_FONTCONFIG_CONF_OPT = \
 		--disable-static
 
Signature · 1 line
1.8.3.2