[packages/DevIL] - fix building with jasper 2 - rel 17

baggins baggins at pld-linux.org
Sun Feb 26 10:19:10 CET 2017


commit 8c0a98dfc2512eef22c488b397f39a0e32a5b060
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Feb 26 10:18:55 2017 +0100

    - fix building with jasper 2
    - rel 17

 DevIL.spec    |  4 +++-
 jasper2.patch | 11 +++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)
---
diff --git a/DevIL.spec b/DevIL.spec
index d5f7f38..7087a71 100644
--- a/DevIL.spec
+++ b/DevIL.spec
@@ -15,7 +15,7 @@ Summary:	Full featured image library
 Summary(pl.UTF-8):	Biblioteka obsługi obrazów z mnóstwem funkcji
 Name:		DevIL
 Version:	1.7.8
-Release:	16
+Release:	17
 License:	LGPL v2.1
 Group:		Libraries
 Source0:	http://downloads.sourceforge.net/openil/%{name}-%{version}.tar.gz
@@ -28,6 +28,7 @@ Patch0:		libpng14.patch
 Patch1:		%{name}-squish.patch
 Patch2:		%{name}-as-needed.patch
 Patch3:		gcc5.patch
+Patch4:		jasper2.patch
 URL:		http://openil.sourceforge.net/
 BuildRequires:	OpenEXR-devel
 BuildRequires:	OpenGL-GLU-devel
@@ -177,6 +178,7 @@ Dokumentacja DevIL.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 cd devil-%{version}
diff --git a/jasper2.patch b/jasper2.patch
new file mode 100644
index 0000000..8b1e685
--- /dev/null
+++ b/jasper2.patch
@@ -0,0 +1,11 @@
+--- DevIL-1.7.8/devil-1.7.8/src-IL/src/il_jp2.c~	2009-03-08 08:10:09.000000000 +0100
++++ DevIL-1.7.8/devil-1.7.8/src-IL/src/il_jp2.c	2017-02-26 10:17:23.557034810 +0100
+@@ -459,7 +459,7 @@
+ 			/* The buffer must be large enough to accommodate maximum
+ 			  putback. */
+ 			assert(bufsize > JAS_STREAM_MAXPUTBACK);
+-			stream->bufbase_ = JAS_CAST(uchar *, buf);
++			stream->bufbase_ = JAS_CAST(unsigned char *, buf);
+ 			stream->bufsize_ = bufsize - JAS_STREAM_MAXPUTBACK;
+ 		}
+ 	} else {
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/DevIL.git/commitdiff/8c0a98dfc2512eef22c488b397f39a0e32a5b060



More information about the pld-cvs-commit mailing list