[packages/fltk] - fix building with libjpeg 9

hawk hawk at pld-linux.org
Mon May 6 12:34:05 CEST 2013


commit f1004040896fad3aab208166ebca6759923f7111
Author: Marcin Krol <hawk at tld-linux.org>
Date:   Mon May 6 10:57:15 2013 +0000

    - fix building with libjpeg 9

 fltk-libjpeg.patch | 21 +++++++++++++++++++++
 fltk.spec          |  2 ++
 2 files changed, 23 insertions(+)
---
diff --git a/fltk.spec b/fltk.spec
index ced0576..00bfdff 100644
--- a/fltk.spec
+++ b/fltk.spec
@@ -17,6 +17,7 @@ Source0:	http://fltk.org/pub/fltk/%{version}/%{name}-%{version}-source.tar.gz
 Patch0:		%{name}-desktop.patch
 Patch1:		%{name}-1.3.0-as-needed.patch
 Patch2:		%{name}-link.patch
+Patch3:		%{name}-libjpeg.patch
 URL:		http://www.fltk.org/
 %{?with_opengl:BuildRequires:	OpenGL-GLU-devel}
 BuildRequires:	autoconf >= 2.50
@@ -153,6 +154,7 @@ Gry FLTK: Atak Klocków!, Warcaby, Sudoku.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %{__autoconf}
diff --git a/fltk-libjpeg.patch b/fltk-libjpeg.patch
new file mode 100644
index 0000000..bb2d2a2
--- /dev/null
+++ b/fltk-libjpeg.patch
@@ -0,0 +1,21 @@
+diff -ur fltk-1.3.2.orig/src/Fl_JPEG_Image.cxx fltk-1.3.2/src/Fl_JPEG_Image.cxx
+--- fltk-1.3.2.orig/src/Fl_JPEG_Image.cxx	2012-11-09 16:02:08.000000000 +0000
++++ fltk-1.3.2/src/Fl_JPEG_Image.cxx	2013-05-06 10:51:18.248634358 +0000
+@@ -155,7 +155,7 @@
+   
+   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;
+@@ -333,7 +333,7 @@
+   
+   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;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/fltk.git/commitdiff/f1004040896fad3aab208166ebca6759923f7111



More information about the pld-cvs-commit mailing list