Merge remote-tracking branch 'remotes/Artifex-user-tor/openjpegX'

# Conflicts:
#	thirdparty/openjpeg

Makelists

@@ -473,6 +473,7 @@ JBIG2DEC_SRC += thirdparty/jbig2dec/jbig2_text.c
 # --- OPENJPEG ---
 
 OPENJPEG_CFLAGS += -Ithirdparty/openjpeg/src/lib/openjp2
+OPENJPEG_CFLAGS += -Iscripts/openjpeg
 OPENJPEG_CFLAGS += -DOPJ_STATIC
 OPENJPEG_CFLAGS += -DOPJ_HAVE_INTTYPES_H
 OPENJPEG_CFLAGS += -DOPJ_HAVE_STDINT_H

scripts/archive.sh

@@ -33,7 +33,7 @@ make_submodule_archive lcms2		testbed plugins/fast_float
 make_submodule_archive leptonica	prog
 make_submodule_archive libjpeg		libjpeg/test*
 make_submodule_archive mujs
-make_submodule_archive openjpeg
+make_submodule_archive openjpeg		thirdparty/openjpeg/thirdparty tests tools wrapping bin
 make_submodule_archive tesseract	unittest
 make_submodule_archive zlib		test contrib
 make_submodule_archive libwebp		tests webp_js

scripts/openjpeg/opj_config.h

@@ -0,0 +1,4 @@
+#define OPJ_HAVE_STDINT_H 		1
+#define OPJ_VERSION_MAJOR 2
+#define OPJ_VERSION_MINOR 5
+#define OPJ_VERSION_BUILD 0

scripts/openjpeg/opj_config_private.h

@@ -0,0 +1,14 @@
+#define OPJ_PACKAGE_VERSION "2.5.0"
+
+/* Byte order.  */
+/* All compilers that support Mac OS X define either __BIG_ENDIAN__ or
+__LITTLE_ENDIAN__ to match the endianness of the architecture being
+compiled for. This is not necessarily the same as the architecture of the
+machine doing the building. In order to support Universal Binaries on
+Mac OS X, we prefer those defines to decide the endianness.
+On other platforms we use the result of the TRY_RUN. */
+#if !defined(__APPLE__)
+/* #undef OPJ_BIG_ENDIAN */
+#elif defined(__BIG_ENDIAN__)
+# define OPJ_BIG_ENDIAN
+#endif