fltk: upgrade from 1.1.10 to 1.3.3

deleted file mode 100644
index 8c01a1f..0000000
@@ -1,13 +0,0 @@
-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\

deleted file mode 100644
index 867e9ef..0000000
@@ -1,13 +0,0 @@
-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@

61 lines not on this page · raw message

new file mode 100644
index 0000000..1f5fd25
@@ -0,0 +1,11 @@
+--- a/Makefile.orig	2015-11-26 15:35:31.485357862 +0800
++++ b/Makefile	2015-11-26 15:35:37.037357764 +0800
+@@ -18,7 +18,7 @@
+ 
+ include makeinclude
+ 
+-DIRS = $(IMAGEDIRS) src $(CAIRODIR) fluid test documentation
++DIRS = $(IMAGEDIRS) src $(CAIRODIR) fluid documentation
+ 
+ all: makeinclude fltk-config
+ 	for dir in $(DIRS); do\

new file mode 100644
index 0000000..014184d
@@ -0,0 +1,40 @@
+From 14c22398f8370e33a798360ed0dad513af8f1470 Mon Sep 17 00:00:00 2001
+From: AlbrechtS <AlbrechtS@ea41ed52-d2ee-0310-a9c1-e6b18d33e121>
+Date: Sun, 15 Mar 2015 19:32:33 +0000
+Subject: [PATCH] Fix 'boolean' issue with jpeg-9 library compatibility (STR
+ #2920).
+
+According to comments in STR #2920 and my own tests this is also
+compatible with older jpeg libraries (at least jpeg-8).
+
+Upstream-Status: Backport
+
+---
+ src/Fl_JPEG_Image.cxx |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/Fl_JPEG_Image.cxx b/src/Fl_JPEG_Image.cxx
+index 47120a7..6cebe88 100644
+--- a/src/Fl_JPEG_Image.cxx
++++ b/src/Fl_JPEG_Image.cxx
+@@ -155,7 +155,7 @@ Fl_JPEG_Image::Fl_JPEG_Image(const char *filename)	// I - File to load
+   
+   jpeg_create_decompress(&dinfo);
+   jpeg_stdio_src(&dinfo, fp);
+-  jpeg_read_header(&dinfo, 1);
++  jpeg_read_header(&dinfo, TRUE);
+   
+   dinfo.quantize_colors      = (boolean)FALSE;
+   dinfo.out_color_space      = JCS_RGB;
+@@ -337,7 +337,7 @@ Fl_JPEG_Image::Fl_JPEG_Image(const char *name, const unsigned char *data)
+   
+   jpeg_create_decompress(&dinfo);
+   jpeg_mem_src(&dinfo, data);
+-  jpeg_read_header(&dinfo, 1);
++  jpeg_read_header(&dinfo, TRUE);
+   
+   dinfo.quantize_colors      = (boolean)FALSE;
+   dinfo.out_color_space      = JCS_RGB;
+-- 
+1.7.9.5
+

similarity index 57%
rename from meta-oe/recipes-support/fltk/fltk-1.1.10/fltk-no-freetype-config.patch
rename to meta-oe/recipes-support/fltk/fltk/fltk-no-freetype-config.patch
index 5dbb054..4d13ffc 100644
@@ -1,18 +1,20 @@
---- a/configure.in.orig	2015-03-01 16:00:35.956432907 +0100
-+++ b/configure.in	2015-03-01 16:04:23.269580093 +0100
-@@ -865,11 +865,11 @@
-         AC_ARG_ENABLE(xft, [  --enable-xft            turn on Xft support [default=no]])
+--- a/configure.in.orig	2015-11-26 14:30:17.893426966 +0800
++++ b/configure.in	2015-11-26 14:33:00.285424099 +0800
+@@ -969,12 +969,12 @@ case $host_os_gui in
+         AC_ARG_ENABLE(xft, [  --enable-xft            turn on Xft support [[default=yes]]])
  
- 	if test x$enable_xft = xyes; then
+ 	if test x$enable_xft != xno; then
 -            AC_PATH_PROG(FTCONFIG,freetype-config)
 +            AC_PATH_PROG(PKGCONFIG,pkg-config)
  
 -	    if test "x$FTCONFIG" != x; then
 -	        CPPFLAGS="`$FTCONFIG --cflags` $CPPFLAGS"
+-	        CFLAGS="`$FTCONFIG --cflags` $CFLAGS"
 -	        CXXFLAGS="`$FTCONFIG --cflags` $CXXFLAGS"
 +	    if test "x$PKGCONFIG" != x; then
 +	        CPPFLAGS="`$PKGCONFIG --cflags xft` $CPPFLAGS"
++	        CFLAGS="`$PKGCONFIG --cflags xft` $CFLAGS"
 +	        CXXFLAGS="`$PKGCONFIG --cflags xft` $CXXFLAGS"
  
+ 	        AC_CHECK_LIB(fontconfig, FcPatternCreate)
  		AC_CHECK_HEADER(X11/Xft/Xft.h,
- 		    AC_CHECK_LIB(Xft, XftDrawCreate,

41 lines not on this page · raw message

49 lines not on this page · raw message