[arch-commits] Commit in mupdf/trunk (0001-mupdf-openjpeg.patch PKGBUILD)

[Christian Hesse]

    Date: Tuesday, April 11, 2017 @ 10:26:23
  Author: eworm
Revision: 222163

upgpkg: mupdf 1.11-1

new upstream release

Modified:
  mupdf/trunk/0001-mupdf-openjpeg.patch
  mupdf/trunk/PKGBUILD

---------------------------+
 0001-mupdf-openjpeg.patch |   38 +++++++++++++++++++++-----------------
 PKGBUILD                  |    8 ++++----
 2 files changed, 25 insertions(+), 21 deletions(-)

Modified: 0001-mupdf-openjpeg.patch
===================================================================
--- 0001-mupdf-openjpeg.patch	2017-04-11 10:07:20 UTC (rev 222162)
+++ 0001-mupdf-openjpeg.patch	2017-04-11 10:26:23 UTC (rev 222163)
@@ -1,31 +1,35 @@
---- a/source/fitz/load-jpx.c                                                                                                                                                                                        
+diff --git a/source/fitz/load-jpx.c b/source/fitz/load-jpx.c
+index d01de58..6ca3838 100644
+--- a/source/fitz/load-jpx.c
 +++ b/source/fitz/load-jpx.c
-@@ -484,13 +484,18 @@
- /* 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. */
-+
+@@ -444,14 +444,18 @@ fz_load_jpx_info(fz_context *ctx, unsigned char *data, size_t size, int *wp, int
+ 
+ #else /* HAVE_LURATECH */
+ 
 +#ifdef __cplusplus
 +extern "C"
 +{
  #define OPJ_STATIC
- #ifndef _MSC_VER
+ #define OPJ_HAVE_INTTYPES_H
+ #if !defined(_WIN32) && !defined(_WIN64)
  #define OPJ_HAVE_STDINT_H
  #endif
 +#endif
+ #define USE_JPIP
  
 -#include <openjpeg.h>
--
 +#include <openjpeg-2.1/openjpeg.h>
-+    
- /* OpenJPEG does not provide a safe mechanism to intercept
-  * allocations. In the latest version all allocations go
-  * though opj_malloc etc, but no context is passed around.
-@@ -972,3 +977,7 @@
+ 
+ struct fz_jpxd_s
+ {
+@@ -919,6 +923,10 @@ fz_load_jpx_info(fz_context *ctx, unsigned char *data, size_t size, int *wp, int
+ 	*yresp = state.yres;
  }
  
++#ifdef __cplusplus
++}
++#endif
++
  #endif /* HAVE_LURATECH */
-+
-+#ifdef __cplusplus                                                                                                                                                                                                 
-+}                                                                                                                                                                                                                  
-+#endif
+ 
+ #else /* FZ_ENABLE_JPX */

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-04-11 10:07:20 UTC (rev 222162)
+++ PKGBUILD	2017-04-11 10:26:23 UTC (rev 222163)
@@ -8,8 +8,8 @@
 
 pkgbase=mupdf
 pkgname=(libmupdf mupdf mupdf-gl mupdf-tools)
-pkgver=1.10_a
-pkgrel=2
+pkgver=1.11
+pkgrel=1
 pkgdesc='Lightweight PDF and XPS viewer'
 arch=('i686' 'x86_64')
 url='http://mupdf.com'
@@ -22,8 +22,8 @@
         '0001-mupdf-openjpeg.patch'
         'mupdf.desktop'
         'mupdf.xpm')
-sha256sums=('aacc1f36b9180f562022ef1ab3439b009369d944364f3cff8a2a898834e3a836'
-            'e55c3b876149d46983b155b0a237fa7d8d47a49e4ecab848bfca3fd549c644c4'
+sha256sums=('209474a80c56a035ce3f4958a63373a96fad75c927c7b1acdc553fc85855f00a'
+            '899ca42045806f69919929c2af1921868c053441648524212aa386c7f14bae4f'
             '70f632e22902ad4224b1d88696702b3ba4eb3c28eb7acf735f06d16e6884a078'
             'a435f44425f5432c074dee745d8fbaeb879038ec1f1ec64f037c74662f09aca8')