Make it possible to build MuPDF with OpenJPEG 2.1, which is the latest
release series and contains many important bug fixes.

Patch adapted from Debian:

https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=745246

And related to this upstream commit:

http://git.ghostscript.com/?p=mupdf.git;a=commit;h=f88bfe2e62dbadb96d4f52d7aa025f0a516078da

diff --git a/source/fitz/load-jpx.c b/source/fitz/load-jpx.c
index 6b92e5c..72dea50 100644
--- a/source/fitz/load-jpx.c
+++ b/source/fitz/load-jpx.c
@@ -1,13 +1,5 @@
 #include "mupdf/fitz.h"
 
-/* Without the definition of OPJ_STATIC, compilation fails on windows
- * due to the use of __stdcall. We believe it is required on some
- * linux toolchains too. */
-#define OPJ_STATIC
-#ifndef _MSC_VER
-#define OPJ_HAVE_STDINT_H
-#endif
-
 #include <openjpeg.h>
 
 static void fz_opj_error_callback(const char *msg, void *client_data)
ch'/></form></td></tr>
<tr><td class='sub'>Wojtek's customized Guix</td><td class='sub right'></td></tr></table>
<table class='tabs'><tr><td>
<a href='/guix/about/'>about</a><a href='/guix/'>summary</a><a href='/guix/refs/?id=1655e7be7858cbe4dc1ada88a53d4efe50a5d957'>refs</a><a class='active' href='/guix/log/gnu/packages/android.scm'>log</a><a href='/guix/tree/gnu/packages/android.scm?id=1655e7be7858cbe4dc1ada88a53d4efe50a5d957'>tree</a><a href='/guix/commit/gnu/packages/android.scm?id=1655e7be7858cbe4dc1ada88a53d4efe50a5d957'>commit</a><a href='/guix/diff/gnu/packages/android.scm?id=1655e7be7858cbe4dc1ada88a53d4efe50a5d957'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/android.scm'>
<input type='hidden' name='id' value='1655e7be7858cbe4dc1ada88a53d4efe50a5d957'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=1655e7be7858cbe4dc1ada88a53d4efe50a5d957'>root</a>/<a href='/guix/log/gnu?id=1655e7be7858cbe4dc1ada88a53d4efe50a5d957'>gnu</a>/<a href='/guix/log/gnu/packages?id=1655e7be7858cbe4dc1ada88a53d4efe50a5d957'>packages</a>/<a href='/guix/log/gnu/packages/android.scm?id=1655e7be7858cbe4dc1ada88a53d4efe50a5d957'>android.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/packages/android.scm?id=1655e7be7858cbe4dc1ada88a53d4efe50a5d957&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-02-27 09:34:46 -0500'>2020-02-27</span></td><td><a href='/guix/commit/gnu/packages/android.scm?id=e64c5a8fe4e99eb4af24ca37574b5d4ab5a389d6'>gnu: git-repo: Really disable self update.</a><span class='msg-avail'>...</span></td><td>Maxim Cournoyer</td></tr>
<tr><td><span title='2020-02-27 09:34:46 -0500'>2020-02-27</span></td><td><a href='/guix/commit/gnu/packages/android.scm?id=0c0156089cac0b8d4d3c761ba27d3e7e8d6d3bca'>gnu: git-repo: Update to 2.4.1.</a><span class='msg-avail'>...</span></td><td>Maxim Cournoyer</td></tr>
<tr><td><span title='2020-02-24 10:54:04 -0500'>2020-02-24</span></td><td><a href='/guix/commit/gnu/packages/android.scm?id=af52ba64fa6350690d65a1aca9c89e13103fd8d0'>gnu: git-repo: Update to 2.3.</a><span class='msg-avail'>...</span></td><td>Maxim Cournoyer</td></tr>
<tr><td><span title='2019-12-02 11:32:17 +0100'>2019-12-02</span></td><td><a href='/guix/commit/gnu/packages/android.scm?id=e1b88fde12305fca3c4a739a7e8f1449f42390f1'>gnu: android-libselinux: Avoid top-level references to 'libsellinux'.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-11-03 20:09:29 +0100'>2019-11-03</span></td><td><a href='/guix/commit/gnu/packages/android.scm?id=105b5e1630a869aae701663e241d60e80fd845ea'>gnu: android-udev-rules: Use GIT-FILE-NAME.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2019-11-03 20:09:29 +0100'>2019-11-03</span></td><td><a href='/guix/commit/gnu/packages/android.scm?id=b7db2c66027c6b1be8d1dbd879d282c01782128e'>gnu: android-udev-rules: Update to 20191103.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2019-10-20 14:00:12 +0200'>2019-10-20</span></td><td><a href='/guix/commit/gnu/packages/android.scm?id=0fe041bd9fa87d23b44969a3bcd99b1165a0f06e'>gnu: Remove more GCC &lt; 7 workarounds.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2019-09-24 10:11:38 +0200'>2019-09-24</span></td><td><a href='/guix/commit/gnu/packages/android.scm?id=11da634a6e64afa2904542e2174aa2a185f9ac3a'>Merge branch 'master' into core-updates</a></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-09-20 23:11:46 -0700'>2019-09-20</span></td><td><a href='/guix/commit/gnu/packages/android.scm?id=3eb4adc2c41896c202f3d9131c36160c0a1311e6'>gnu: enjarify: Adjust native-inputs.</a><span class='msg-avail'>...</span></td><td>Vagrant Cascadian</td></tr>
<tr><td><span title='2019-09-19 16:45:34 -0700'>2019-09-19</span></td><td><a href='/guix/commit/gnu/packages/android.scm?id=68620d62f5cd49d6455c351f3a68e3c41dc6ce22'>gnu: Add enjarify.</a><span class='msg-avail'>...</span></td><td>Vagrant Cascadian</td></tr>
<tr><td><span title='2019-09-19 12:56:54 +0200'>2019-09-19</span></td><td><a href='/guix/commit/gnu/packages/android.scm?id=a747ae609b683f205c4c253ad033114c92d4d093'>gnu: android-libutils: Build with GCC 5.</a><span class='msg-avail'>...</span></td><td>Ricardo Wurmus</td></tr>
<tr><td><span title='2019-06-27 23:33:48 +0200'>2019-06-27</span></td><td><a href='/guix/commit/gnu/packages/android.scm?id=5cc1075a76392666d3d733837f5c6252b1e48002'>Merge branch 'master' into core-updates</a></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-06-25 17:20:19 +0200'>2019-06-25</span></td><td><a href='/guix/commit/gnu/packages/android.scm?id=89c943dfdc650da972c857158378c5ce05bbc305'>gnu: android-googletest: Downgrade to 1.8.0.</a><span class='msg-avail'>...</span></td><td>Ricardo Wurmus</td></tr>
<tr><td><span title='2019-06-15 23:47:34 +0200'>2019-06-15</span></td><td><a href='/guix/commit/gnu/packages/android.scm?id=e960c20a0613b8e9561385eef67c4427f1ec0296'>gnu: adb: Build against OpenSSL 1.0.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>