Skip to contentSkip to conversation

freetype: bump to version 2.5.0.1

PATCH New Gustavo Zacarias 2 participants 8 messages Oct 25, 2013 – Oct 26, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/4 freetype: bump to version 2.5.0.1

---
 package/freetype/freetype.mk | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)
package/freetype/freetype.mk +12 -2
index 177adf5..1ca779e 100644
@@ -4,9 +4,11 @@
 #
 ################################################################################
 
-FREETYPE_VERSION = 2.4.12
+FREETYPE_VERSION_MAJOR = 2.5.0
+FREETYPE_VERSION_MINOR = 1
+FREETYPE_VERSION = $(FREETYPE_VERSION_MAJOR).$(FREETYPE_VERSION_MINOR)
 FREETYPE_SOURCE = freetype-$(FREETYPE_VERSION).tar.bz2
-FREETYPE_SITE = http://downloads.sourceforge.net/project/freetype/freetype2/$(FREETYPE_VERSION)
+FREETYPE_SITE = http://downloads.sourceforge.net/project/freetype/freetype2/$(FREETYPE_VERSION_MAJOR)
 FREETYPE_INSTALL_STAGING = YES
 FREETYPE_MAKE_OPT = CCexe="$(HOSTCC)"
 FREETYPE_LICENSE = Dual FTL/GPLv2+
@@ -18,6 +20,14 @@ FREETYPE_CONFIG_SCRIPTS = freetype-config
 
 HOST_FREETYPE_DEPENDENCIES = host-pkgconf
 
+ifeq ($(BR2_PACKAGE_LIBPNG),y)
+FREETYPE_DEPENDENCIES += libpng
+FREETYPE_CONF_OPT += LIBPNG_CFLAGS="`$(STAGING_DIR)/usr/bin/libpng-config --cflags`" \
+	LIBPNG_LDFLAGS="`$(STAGING_DIR)/usr/bin/libpng-config --ldflags`"
+else
+FREETYPE_CONF_OPT += --without-png
+endif
+
 # Extra fixing since includedir and libdir are expanded from configure values
 define FREETYPE_FIX_CONFIG_FILE
 	$(SED) 's:^includedir=.*:includedir="$${prefix}/include":' \
Signature · 1 line
1.8.1.5
#1 lore raw

PATCH 2/4 libpng: bump to version 1.6.6

---
 package/libpng/libpng.mk | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
package/libpng/libpng.mk +4 -3
index f5bf956..5ce828e 100644
@@ -4,15 +4,16 @@
 #
 ################################################################################
 
-LIBPNG_VERSION = 1.4.12
-LIBPNG_SERIES = 14
-LIBPNG_SOURCE = libpng-$(LIBPNG_VERSION).tar.bz2
+LIBPNG_VERSION = 1.6.6
+LIBPNG_SERIES = 16
+LIBPNG_SOURCE = libpng-$(LIBPNG_VERSION).tar.xz
 LIBPNG_SITE = http://downloads.sourceforge.net/project/libpng/libpng${LIBPNG_SERIES}/$(LIBPNG_VERSION)
 LIBPNG_LICENSE = libpng license
 LIBPNG_LICENSE_FILES = LICENSE
 LIBPNG_INSTALL_STAGING = YES
 LIBPNG_DEPENDENCIES = host-pkgconf zlib
 LIBPNG_CONFIG_SCRIPTS = libpng$(LIBPNG_SERIES)-config libpng-config
+LIBPNG_CONF_OPT = $(if $(BR2_ARM_CPU_HAS_NEON),--enable-arm-neon=yes,--enable-arm-neon=no)
 
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
Signature · 1 line
1.8.1.5
#3 lore raw

PATCH 3/4 fbv: patch up support for libpng 1.5+

In reply to Gustavo Zacarias
---
 package/fbv/fbv-1.0b-libpng15.patch | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 package/fbv/fbv-1.0b-libpng15.patch
package/fbv/fbv-1.0b-libpng15.patch new file +24 -0
new file mode 100644
index 0000000..7872a73
@@ -0,0 +1,24 @@
+Support for libpng 1.5+ shamelessly taken from Gentoo.
+
+Signed-off-by: Gustavo Zacarias <[email protected]>
+
+--- a/png.c
++++ b/png.c
+@@ -69,7 +69,7 @@
+         fclose(fh); return(FH_ERROR_FORMAT);
+     }
+     rp=0;
+-    if (setjmp(png_ptr->jmpbuf))
++    if (setjmp(png_jmpbuf(png_ptr)))
+     {
+ 	png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
+         if(rp) free(rp);
+@@ -161,7 +161,7 @@
+         fclose(fh); return(FH_ERROR_FORMAT);
+     }
+     rp=0;
+-    if (setjmp(png_ptr->jmpbuf))
++    if (setjmp(png_jmpbuf(png_ptr)))
+     {
+ 	png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
+         if(rp) free(rp);
Signature · 1 line
1.8.1.5
#5 lore raw

PATCH 4/4 matchbox-lib: patch up support for libpng 1.5+

In reply to Gustavo Zacarias
---
 .../matchbox-lib/matchbox-lib-1.9-libpng15.patch   | 26 ++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 package/matchbox/matchbox-lib/matchbox-lib-1.9-libpng15.patch
package/matchbox/matchbox-lib/matchbox-lib-1.9-libpng15.patch new file +26 -0
new file mode 100644
index 0000000..3d68573
@@ -0,0 +1,26 @@
+Support for libpng 1.5+ shamelessly taken from Gentoo.
+
+Signed-off-by: Gustavo Zacarias <[email protected]>
+
+--- a/libmb/mbpixbuf.c
++++ b/libmb/mbpixbuf.c
+@@ -247,7 +247,7 @@
+     return NULL;
+   }
+ 
+-  if ( setjmp( png_ptr->jmpbuf ) ) {
++  if ( setjmp( png_jmpbuf(png_ptr) ) ) {
+     png_destroy_read_struct( &png_ptr, &info_ptr, NULL);
+     fclose(fd);
+     return NULL;
+@@ -269,8 +269,8 @@
+       ( color_type == PNG_COLOR_TYPE_GRAY_ALPHA ))
+     png_set_gray_to_rgb(png_ptr);
+  
+-  if ( info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA 
+-       || info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA
++  if ( color_type == PNG_COLOR_TYPE_RGB_ALPHA 
++       || color_type == PNG_COLOR_TYPE_GRAY_ALPHA
+        )
+     *has_alpha = 1;
+   else
Signature · 1 line
1.8.1.5