diff options
author | Armin Kuster <akuster808@gmail.com> | 2016-01-01 11:41:41 -0800 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-01-14 11:22:11 +0100 |
commit | 3c1ad2dcf95e087f30ac747b8702d19b1dd073e2 (patch) | |
tree | be988d52186ca564b55b146ee0fcdb666d284b4b /meta-oe | |
parent | 428082d3220b99d5a367028f8776bd53f5c42e9e (diff) | |
download | meta-openembedded-contrib-3c1ad2dcf95e087f30ac747b8702d19b1dd073e2.tar.gz |
fltk: fix build issue.
this patch fixes:
Fl_JPEG_Image.cxx: In constructor 'Fl_JPEG_Image::Fl_JPEG_Image(const char*)':
| Fl_JPEG_Image.cxx:156:29: error: invalid conversion from 'int' to 'boolean' [-fpermissive]
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-oe')
-rw-r--r-- | meta-oe/recipes-support/fltk/fltk-1.1.10/Fl_JPEG_Image_buildix.patch | 37 | ||||
-rw-r--r-- | meta-oe/recipes-support/fltk/fltk_1.1.10.bb | 1 |
2 files changed, 38 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/fltk/fltk-1.1.10/Fl_JPEG_Image_buildix.patch b/meta-oe/recipes-support/fltk/fltk-1.1.10/Fl_JPEG_Image_buildix.patch new file mode 100644 index 0000000000..ea80011100 --- /dev/null +++ b/meta-oe/recipes-support/fltk/fltk-1.1.10/Fl_JPEG_Image_buildix.patch @@ -0,0 +1,37 @@ +fltk: Fl_JPEG_Image.cxx bug in fltk-1.3.x for jpeg-9 + +Link: http://www.fltk.org/str.php?L2920 +Version: 1.3-current + +There has been a change in jpeg-9: + +Fl_JPEG_Image.cxx: In constructor 'Fl_JPEG_Image::Fl_JPEG_Image(const +char*)': +Fl_JPEG_Image.cxx:158:29: error: invalid conversion from 'int' to +'boolean' [-fpermissive] +In file included from Fl_JPEG_Image.cxx:50:0: +/usr/include/jpeglib.h:1032:13: error: initializing argument 2 of 'int +jpeg_read_header(j_decompress_ptr, boolean)' [-fpermissive] + + +http://permalink.gmane.org/gmane.comp.lib.fltk.bugs/10893 + +Upstream-Status: Backport + +partical back port as this version is only affected by on change. + +Signed-off-by: Armin Kuster <akuster808@gmail.com> + +Index: fltk-1.1.10/src/Fl_JPEG_Image.cxx +=================================================================== +--- fltk-1.1.10.orig/src/Fl_JPEG_Image.cxx ++++ fltk-1.1.10/src/Fl_JPEG_Image.cxx +@@ -153,7 +153,7 @@ Fl_JPEG_Image::Fl_JPEG_Image(const char + + 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; diff --git a/meta-oe/recipes-support/fltk/fltk_1.1.10.bb b/meta-oe/recipes-support/fltk/fltk_1.1.10.bb index 14049614a4..22a1a50cf8 100644 --- a/meta-oe/recipes-support/fltk/fltk_1.1.10.bb +++ b/meta-oe/recipes-support/fltk/fltk_1.1.10.bb @@ -13,6 +13,7 @@ SRC_URI = "ftp://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/fltk/${PV}/fl file://dso-fix.patch \ file://libpng15.patch \ file://fltk-no-freetype-config.patch \ + file://Fl_JPEG_Image_buildix.patch \ " S = "${WORKDIR}/fltk-${PV}" |