Mercurial > mxe-octave

annotate src/jasper-1-fixes.patch @ 7250:ce6bd65c37c6 default tip @

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* src/proj.mk: update to v9.4.1
author John Donoghue <john.donoghue@ieee.org>
date Mon, 10 Jun 2024 10:08:59 -0400
parents 59b146523889
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
7009
59b146523889 jasper: update to v4.1.1
John Donoghue <john.donoghue@ieee.org>
parents: 2911
diff changeset
1 diff -ur jasper-version-4.1.1.orig/CMakeLists.txt jasper-version-4.1.1/CMakeLists.txt
59b146523889 jasper: update to v4.1.1
John Donoghue <john.donoghue@ieee.org>
parents: 2911
diff changeset
2 --- jasper-version-4.1.1.orig/CMakeLists.txt 2023-12-18 08:52:34.109693740 -0500
59b146523889 jasper: update to v4.1.1
John Donoghue <john.donoghue@ieee.org>
parents: 2911
diff changeset
3 +++ jasper-version-4.1.1/CMakeLists.txt 2023-12-18 08:53:34.680118322 -0500
59b146523889 jasper: update to v4.1.1
John Donoghue <john.donoghue@ieee.org>
parents: 2911
diff changeset
4 @@ -789,10 +789,12 @@
59b146523889 jasper: update to v4.1.1
John Donoghue <john.donoghue@ieee.org>
parents: 2911
diff changeset
5 # Check for the Math library.
59b146523889 jasper: update to v4.1.1
John Donoghue <john.donoghue@ieee.org>
parents: 2911
diff changeset
6 ################################################################################
2911
5fa15cc31dd3 use libtool for building jasper dlls
John W. Eaton <jwe@octave.org>
parents:
diff changeset
7
7009
59b146523889 jasper: update to v4.1.1
John Donoghue <john.donoghue@ieee.org>
parents: 2911
diff changeset
8 +if(NOT WIN32)
59b146523889 jasper: update to v4.1.1
John Donoghue <john.donoghue@ieee.org>
parents: 2911
diff changeset
9 find_library(MATH_LIBRARY m)
59b146523889 jasper: update to v4.1.1
John Donoghue <john.donoghue@ieee.org>
parents: 2911
diff changeset
10 if(NOT MATH_LIBRARY)
59b146523889 jasper: update to v4.1.1
John Donoghue <john.donoghue@ieee.org>
parents: 2911
diff changeset
11 set(MATH_LIBRARY "")
59b146523889 jasper: update to v4.1.1
John Donoghue <john.donoghue@ieee.org>
parents: 2911
diff changeset
12 endif()
59b146523889 jasper: update to v4.1.1
John Donoghue <john.donoghue@ieee.org>
parents: 2911
diff changeset
13 +endif()
2911
5fa15cc31dd3 use libtool for building jasper dlls
John W. Eaton <jwe@octave.org>
parents:
diff changeset
14
7009
59b146523889 jasper: update to v4.1.1
John Donoghue <john.donoghue@ieee.org>
parents: 2911
diff changeset
15 ################################################################################
59b146523889 jasper: update to v4.1.1
John Donoghue <john.donoghue@ieee.org>
parents: 2911
diff changeset
16 # Perform shared library setup.
59b146523889 jasper: update to v4.1.1
John Donoghue <john.donoghue@ieee.org>
parents: 2911
diff changeset
17 diff -ur jasper-version-4.1.1.orig/src/libjasper/CMakeLists.txt jasper-version-4.1.1/src/libjasper/CMakeLists.txt
59b146523889 jasper: update to v4.1.1
John Donoghue <john.donoghue@ieee.org>
parents: 2911
diff changeset
18 --- jasper-version-4.1.1.orig/src/libjasper/CMakeLists.txt 2023-12-18 08:52:34.121694418 -0500
59b146523889 jasper: update to v4.1.1
John Donoghue <john.donoghue@ieee.org>
parents: 2911
diff changeset
19 +++ jasper-version-4.1.1/src/libjasper/CMakeLists.txt 2023-12-18 08:54:36.677623584 -0500
59b146523889 jasper: update to v4.1.1
John Donoghue <john.donoghue@ieee.org>
parents: 2911
diff changeset
20 @@ -188,7 +188,7 @@
59b146523889 jasper: update to v4.1.1
John Donoghue <john.donoghue@ieee.org>
parents: 2911
diff changeset
21 target_compile_definitions(libjasper PRIVATE _CRT_NONSTDC_NO_DEPRECATE)
59b146523889 jasper: update to v4.1.1
John Donoghue <john.donoghue@ieee.org>
parents: 2911
diff changeset
22 endif()
2911
5fa15cc31dd3 use libtool for building jasper dlls
John W. Eaton <jwe@octave.org>
parents:
diff changeset
23
7009
59b146523889 jasper: update to v4.1.1
John Donoghue <john.donoghue@ieee.org>
parents: 2911
diff changeset
24 -if(UNIX)
59b146523889 jasper: update to v4.1.1
John Donoghue <john.donoghue@ieee.org>
parents: 2911
diff changeset
25 +if(UNIX OR MINGW)
59b146523889 jasper: update to v4.1.1
John Donoghue <john.donoghue@ieee.org>
parents: 2911
diff changeset
26 set_target_properties(libjasper PROPERTIES
59b146523889 jasper: update to v4.1.1
John Donoghue <john.donoghue@ieee.org>
parents: 2911
diff changeset
27 VERSION ${JAS_SO_NAME} SOVERSION ${JAS_SO_VERSION})
59b146523889 jasper: update to v4.1.1
John Donoghue <john.donoghue@ieee.org>
parents: 2911
diff changeset
28 endif()
59b146523889 jasper: update to v4.1.1
John Donoghue <john.donoghue@ieee.org>
parents: 2911
diff changeset
29 diff -ur jasper-version-4.1.1.orig/src/libjasper/include/jasper/jas_stream.h jasper-version-4.1.1/src/libjasper/include/jasper/jas_stream.h
59b146523889 jasper: update to v4.1.1
John Donoghue <john.donoghue@ieee.org>
parents: 2911
diff changeset
30 --- jasper-version-4.1.1.orig/src/libjasper/include/jasper/jas_stream.h 2023-12-18 08:52:34.123694531 -0500
59b146523889 jasper: update to v4.1.1
John Donoghue <john.donoghue@ieee.org>
parents: 2911
diff changeset
31 +++ jasper-version-4.1.1/src/libjasper/include/jasper/jas_stream.h 2023-12-18 08:58:41.750479720 -0500
59b146523889 jasper: update to v4.1.1
John Donoghue <john.donoghue@ieee.org>
parents: 2911
diff changeset
32 @@ -258,6 +258,10 @@
59b146523889 jasper: update to v4.1.1
John Donoghue <john.donoghue@ieee.org>
parents: 2911
diff changeset
33 typedef struct {
59b146523889 jasper: update to v4.1.1
John Donoghue <john.donoghue@ieee.org>
parents: 2911
diff changeset
34 int fd;
59b146523889 jasper: update to v4.1.1
John Donoghue <john.donoghue@ieee.org>
parents: 2911
diff changeset
35 int flags;
59b146523889 jasper: update to v4.1.1
John Donoghue <john.donoghue@ieee.org>
parents: 2911
diff changeset
36 +#ifndef _UCRT
59b146523889 jasper: update to v4.1.1
John Donoghue <john.donoghue@ieee.org>
parents: 2911
diff changeset
37 +#undef L_tmpnam
59b146523889 jasper: update to v4.1.1
John Donoghue <john.donoghue@ieee.org>
parents: 2911
diff changeset
38 +#define L_tmpnam FILENAME_MAX
59b146523889 jasper: update to v4.1.1
John Donoghue <john.donoghue@ieee.org>
parents: 2911
diff changeset
39 +#endif
59b146523889 jasper: update to v4.1.1
John Donoghue <john.donoghue@ieee.org>
parents: 2911
diff changeset
40 #if defined(JAS_WASI_LIBC)
59b146523889 jasper: update to v4.1.1
John Donoghue <john.donoghue@ieee.org>
parents: 2911
diff changeset
41 #define L_tmpnam 4096
59b146523889 jasper: update to v4.1.1
John Donoghue <john.donoghue@ieee.org>
parents: 2911
diff changeset
42 #endif
59b146523889 jasper: update to v4.1.1
John Donoghue <john.donoghue@ieee.org>
parents: 2911
diff changeset
43 diff -ur jasper-version-4.1.1.orig/src/libjasper/jp2/jp2_cod.h jasper-version-4.1.1/src/libjasper/jp2/jp2_cod.h
59b146523889 jasper: update to v4.1.1
John Donoghue <john.donoghue@ieee.org>
parents: 2911
diff changeset
44 --- jasper-version-4.1.1.orig/src/libjasper/jp2/jp2_cod.h 2023-12-18 08:52:34.123694531 -0500
59b146523889 jasper: update to v4.1.1
John Donoghue <john.donoghue@ieee.org>
parents: 2911
diff changeset
45 +++ jasper-version-4.1.1/src/libjasper/jp2/jp2_cod.h 2023-12-18 08:56:24.907742782 -0500
59b146523889 jasper: update to v4.1.1
John Donoghue <john.donoghue@ieee.org>
parents: 2911
diff changeset
46 @@ -288,10 +288,10 @@
59b146523889 jasper: update to v4.1.1
John Donoghue <john.donoghue@ieee.org>
parents: 2911
diff changeset
47 * Box class.
59b146523889 jasper: update to v4.1.1
John Donoghue <john.donoghue@ieee.org>
parents: 2911
diff changeset
48 \******************************************************************************/
2911
5fa15cc31dd3 use libtool for building jasper dlls
John W. Eaton <jwe@octave.org>
parents:
diff changeset
49
7009
59b146523889 jasper: update to v4.1.1
John Donoghue <john.donoghue@ieee.org>
parents: 2911
diff changeset
50 -jp2_box_t *jp2_box_create(int type);
59b146523889 jasper: update to v4.1.1
John Donoghue <john.donoghue@ieee.org>
parents: 2911
diff changeset
51 -void jp2_box_destroy(jp2_box_t *box);
59b146523889 jasper: update to v4.1.1
John Donoghue <john.donoghue@ieee.org>
parents: 2911
diff changeset
52 -jp2_box_t *jp2_box_get(jas_stream_t *in);
59b146523889 jasper: update to v4.1.1
John Donoghue <john.donoghue@ieee.org>
parents: 2911
diff changeset
53 -int jp2_box_put(jp2_box_t *box, jas_stream_t *out);
59b146523889 jasper: update to v4.1.1
John Donoghue <john.donoghue@ieee.org>
parents: 2911
diff changeset
54 +JAS_DLLEXPORT jp2_box_t *jp2_box_create(int type);
59b146523889 jasper: update to v4.1.1
John Donoghue <john.donoghue@ieee.org>
parents: 2911
diff changeset
55 +JAS_DLLEXPORT void jp2_box_destroy(jp2_box_t *box);
59b146523889 jasper: update to v4.1.1
John Donoghue <john.donoghue@ieee.org>
parents: 2911
diff changeset
56 +JAS_DLLEXPORT jp2_box_t *jp2_box_get(jas_stream_t *in);
59b146523889 jasper: update to v4.1.1
John Donoghue <john.donoghue@ieee.org>
parents: 2911
diff changeset
57 +JAS_DLLEXPORT int jp2_box_put(jp2_box_t *box, jas_stream_t *out);
2911
5fa15cc31dd3 use libtool for building jasper dlls
John W. Eaton <jwe@octave.org>
parents:
diff changeset
58
7009
59b146523889 jasper: update to v4.1.1
John Donoghue <john.donoghue@ieee.org>
parents: 2911
diff changeset
59 JAS_ATTRIBUTE_CONST
59b146523889 jasper: update to v4.1.1
John Donoghue <john.donoghue@ieee.org>
parents: 2911
diff changeset
60 static inline uint_least8_t JP2_DTYPETOBPC(uint_least8_t dtype)
59b146523889 jasper: update to v4.1.1
John Donoghue <john.donoghue@ieee.org>
parents: 2911
diff changeset
61 @@ -309,6 +309,6 @@
59b146523889 jasper: update to v4.1.1
John Donoghue <john.donoghue@ieee.org>
parents: 2911
diff changeset
62 #define ICC_CS_YCBCR 0x59436272
59b146523889 jasper: update to v4.1.1
John Donoghue <john.donoghue@ieee.org>
parents: 2911
diff changeset
63 #define ICC_CS_GRAY 0x47524159
2911
5fa15cc31dd3 use libtool for building jasper dlls
John W. Eaton <jwe@octave.org>
parents:
diff changeset
64
7009
59b146523889 jasper: update to v4.1.1
John Donoghue <john.donoghue@ieee.org>
parents: 2911
diff changeset
65 -const jp2_cdefchan_t *jp2_cdef_lookup(jp2_cdef_t *cdef, int channo);
59b146523889 jasper: update to v4.1.1
John Donoghue <john.donoghue@ieee.org>
parents: 2911
diff changeset
66 +JAS_DLLEXPORT const jp2_cdefchan_t *jp2_cdef_lookup(jp2_cdef_t *cdef, int channo);
2911
5fa15cc31dd3 use libtool for building jasper dlls
John W. Eaton <jwe@octave.org>
parents:
diff changeset
67
7009
59b146523889 jasper: update to v4.1.1
John Donoghue <john.donoghue@ieee.org>
parents: 2911
diff changeset
68 #endif