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

[Christian Hesse]

    Date: Monday, October 9, 2017 @ 10:43:04
  Author: eworm
Revision: 262222

fix for openjpeg

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

---------------------------+
 0001-mupdf-openjpeg.patch |    2 +-
 PKGBUILD                  |    6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

Modified: 0001-mupdf-openjpeg.patch
===================================================================
--- 0001-mupdf-openjpeg.patch	2017-10-09 09:41:54 UTC (rev 262221)
+++ 0001-mupdf-openjpeg.patch	2017-10-09 10:43:04 UTC (rev 262222)
@@ -18,7 +18,7 @@
  #define USE_JPIP
  
 -#include <openjpeg.h>
-+#include <openjpeg-2.2/openjpeg.h>
++#include <openjpeg-__OPENJPEG__VERSION__/openjpeg.h>
  
  struct fz_jpxd_s
  {

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-10-09 09:41:54 UTC (rev 262221)
+++ PKGBUILD	2017-10-09 10:43:04 UTC (rev 262222)
@@ -10,6 +10,7 @@
 pkgname=(libmupdf mupdf mupdf-gl mupdf-tools)
 pkgver=1.11
 pkgrel=4
+_openjpeg_version=2.3
 pkgdesc='Lightweight PDF and XPS viewer'
 arch=('i686' 'x86_64')
 url='http://mupdf.com'
@@ -23,7 +24,7 @@
         'mupdf.desktop'
         'mupdf.xpm')
 sha256sums=('209474a80c56a035ce3f4958a63373a96fad75c927c7b1acdc553fc85855f00a'
-            '01ad0365bc7be670a7a11603cb48ef89d85d804029dcf5420aa70846fe5dce4a'
+            'e87b0911121753ab24758a8c2bd533abe347b425f0681e84c945a225c62c63be'
             '70f632e22902ad4224b1d88696702b3ba4eb3c28eb7acf735f06d16e6884a078'
             'a435f44425f5432c074dee745d8fbaeb879038ec1f1ec64f037c74662f09aca8')
 
@@ -33,8 +34,9 @@
   # remove bundled packages, we want our system libraries
   rm -rf thirdparty/{curl,freetype,glfw,harfbuzz,jbig2dec,libjpeg,openjpeg,zlib}
 
-  # fix function for openjpeg 2.1.x
+  # fix function for openjpeg
   patch -Np1 < "${srcdir}/0001-mupdf-openjpeg.patch"
+  sed -i "s/__OPENJPEG__VERSION__/${_openjpeg_version}/" source/fitz/load-jpx.c
 
   # fix includes for jbig2dec
   sed '/^JBIG2DEC_CFLAGS :=/s|$| -I./include/mupdf|' -i Makethird