kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

graphics/devil: Fix build with jasper 3.0.2

Browse source 
Approved by:	portmgr (blanket)
This commit is contained in:
Po-Chuan Hsieh 2022-04-16 12:14:59 +08:00
parent 87cebeb7a9
commit 7f9a658424
No known key found for this signature in database
GPG key ID: 9A4BD10F002DD04B
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
graphics/devil/files/patch-DevIL_src-IL_src_il__jp2.cpp
View file

@ -1,18 +1,27 @@
--- DevIL/src-IL/src/il_jp2.cpp.orig 2017-01-01 23:37:37 UTC
+++ DevIL/src-IL/src/il_jp2.cpp
@@ -314,13 +314,13 @@ ILboolean iLoadJp2Internal(jas_stream_t *Stream, ILima
@@ -313,14 +313,21 @@ ILboolean iLoadJp2Internal(jas_stream_t *Stream, ILima
}
-
-static int iJp2_file_read(jas_stream_obj_t *obj, char *buf, int cnt)
+static int iJp2_file_read(jas_stream_obj_t *obj, char *buf, unsigned int cnt)
+#if JAS_VERSION_MAJOR >= 3
+static ssize_t iJp2_file_read(jas_stream_obj_t *obj, char *buf, size_t cnt)
+#else
+static int iJp2_file_read(jas_stream_obj_t *obj, char *buf, unsigned long cnt)
+#endif
{
obj;
return iread(buf, 1, cnt);
}
-static int iJp2_file_write(jas_stream_obj_t *obj, char *buf, int cnt)
+static int iJp2_file_write(jas_stream_obj_t *obj, const char *buf, unsigned int cnt)
+#if JAS_VERSION_MAJOR >= 3
+static ssize_t iJp2_file_write(jas_stream_obj_t *obj, const char *buf, size_t cnt)
+#else
+static int iJp2_file_write(jas_stream_obj_t *obj, const char *buf, unsigned long cnt)
+#endif
{
obj;
return iwrite(buf, 1, cnt);