From 1219bf8a90a7bf8cd3a5363551ef635d51e8fc8e Mon Sep 17 00:00:00 2001
From: Tudor Florea <tudor.florea@enea.com>
Date: Thu, 8 Oct 2015 22:51:41 +0200
Subject: initial commit for Enea Linux 5.0 arm

Signed-off-by: Tudor Florea <tudor.florea@enea.com>
---
 .../fltk/fltk-1.1.10/disable_test.patch            | 13 +++++
 .../recipes-support/fltk/fltk-1.1.10/dso-fix.patch | 13 +++++
 .../fltk/fltk-1.1.10/libpng15.patch                | 61 ++++++++++++++++++++++
 3 files changed, 87 insertions(+)
 create mode 100644 meta-oe/recipes-support/fltk/fltk-1.1.10/disable_test.patch
 create mode 100644 meta-oe/recipes-support/fltk/fltk-1.1.10/dso-fix.patch
 create mode 100644 meta-oe/recipes-support/fltk/fltk-1.1.10/libpng15.patch

(limited to 'meta-oe/recipes-support/fltk/fltk-1.1.10')

diff --git a/meta-oe/recipes-support/fltk/fltk-1.1.10/disable_test.patch b/meta-oe/recipes-support/fltk/fltk-1.1.10/disable_test.patch
new file mode 100644
index 000000000..8c01a1f80
--- /dev/null
+++ b/meta-oe/recipes-support/fltk/fltk-1.1.10/disable_test.patch
@@ -0,0 +1,13 @@
+Index: fltk-1.1.9/Makefile
+===================================================================
+--- fltk-1.1.9.orig/Makefile	2008-06-06 16:14:11.936736201 +0200
++++ fltk-1.1.9/Makefile	2008-06-06 16:14:22.526357637 +0200
+@@ -27,7 +27,7 @@
+ 
+ include makeinclude
+ 
+-DIRS	=	$(IMAGEDIRS) src fluid test documentation
++DIRS	=	$(IMAGEDIRS) src fluid documentation
+ 
+ all: makeinclude fltk-config
+ 	for dir in $(DIRS); do\
diff --git a/meta-oe/recipes-support/fltk/fltk-1.1.10/dso-fix.patch b/meta-oe/recipes-support/fltk/fltk-1.1.10/dso-fix.patch
new file mode 100644
index 000000000..867e9efcb
--- /dev/null
+++ b/meta-oe/recipes-support/fltk/fltk-1.1.10/dso-fix.patch
@@ -0,0 +1,13 @@
+src/fl_set_fonts_xft.cxx is using fontconfig symbols
+
+--- a/makeinclude.in	2012-01-26 18:09:58.628799060 +0100
++++ b/makeinclude.in	2012-01-26 18:08:58.115801758 +0100
+@@ -81,7 +81,7 @@
+ AUDIOLIBS	= @AUDIOLIBS@
+ DSOFLAGS	= -L. @DSOFLAGS@
+ LDFLAGS		= $(OPTIM) @LDFLAGS@
+-LDLIBS		= @LIBS@
++LDLIBS		= @LIBS@ -lfontconfig
+ GLDLIBS		= @GLLIB@ @LIBS@
+ LINKFLTK	= @LINKFLTK@
+ LINKFLTKGL	= @LINKFLTKGL@
diff --git a/meta-oe/recipes-support/fltk/fltk-1.1.10/libpng15.patch b/meta-oe/recipes-support/fltk/fltk-1.1.10/libpng15.patch
new file mode 100644
index 000000000..b2eb8d6fd
--- /dev/null
+++ b/meta-oe/recipes-support/fltk/fltk-1.1.10/libpng15.patch
@@ -0,0 +1,61 @@
+Imported from gentoo
+http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/x11-libs/fltk/files/fltk-1.1.10-libpng15.patch
+
+--- a/src/Fl_PNG_Image.cxx
++++ b/src/Fl_PNG_Image.cxx
+@@ -66,7 +66,8 @@ Fl_PNG_Image::Fl_PNG_Image(const char *png) // I - File to read
+   png_structp	pp;			// PNG read pointer
+   png_infop	info;			// PNG info pointers
+   png_bytep	*rows;			// PNG row pointers
+-
++  png_byte     color_type;             // PNG color type
++  png_byte     bit_depth;              // PNG bit depth
+ 
+   // Open the PNG file...
+   if ((fp = fopen(png, "rb")) == NULL) return;
+@@ -75,7 +76,7 @@ Fl_PNG_Image::Fl_PNG_Image(const char *png) // I - File to read
+   pp   = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
+   info = png_create_info_struct(pp);
+ 
+-  if (setjmp(pp->jmpbuf))
++  if (setjmp(png_jmpbuf(pp)))
+   {
+     Fl::warning("PNG file \"%s\" contains errors!\n", png);
+     return;
+@@ -86,28 +87,24 @@ Fl_PNG_Image::Fl_PNG_Image(const char *png) // I - File to read
+ 
+   // Get the image dimensions and convert to grayscale or RGB...
+   png_read_info(pp, info);
++  color_type = png_get_color_type(pp, info);
+ 
+-  if (info->color_type == PNG_COLOR_TYPE_PALETTE)
++  if (color_type == PNG_COLOR_TYPE_PALETTE)
+     png_set_expand(pp);
+ 
+-  if (info->color_type & PNG_COLOR_MASK_COLOR)
+-    channels = 3;
+-  else
+-    channels = 1;
+-
+-  if ((info->color_type & PNG_COLOR_MASK_ALPHA) || info->num_trans)
+-    channels ++;
++  channels = png_get_channels(pp, info);
+ 
+-  w((int)(info->width));
+-  h((int)(info->height));
++  w((int)(png_get_image_width(pp, info)));
++  h((int)(png_get_image_height(pp, info)));
+   d(channels);
+ 
+-  if (info->bit_depth < 8)
++  bit_depth = png_get_bit_depth(pp, info);
++  if (bit_depth < 8)
+   {
+     png_set_packing(pp);
+     png_set_expand(pp);
+   }
+-  else if (info->bit_depth == 16)
++  else if (bit_depth == 16)
+     png_set_strip_16(pp);
+ 
+ #  if defined(HAVE_PNG_GET_VALID) && defined(HAVE_PNG_SET_TRNS_TO_ALPHA)
-- 
cgit v1.2.3-54-g00ecf