From 1953598385456a535914205baef470cbe46cdd4f Mon Sep 17 00:00:00 2001
From: malc <av1474@comtv.ru>
Date: Fri, 5 Oct 2012 08:12:34 +0400
Subject: [PATCH] Sync with upstream

---
 BUILDING    |  2 +-
 buildall.sh | 25 +++++++++++++++----------
 link.c      |  2 +-
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/BUILDING b/BUILDING
index feb4e01..7882d38 100644
--- a/BUILDING
+++ b/BUILDING
@@ -36,6 +36,6 @@ $ ./llpp -p password /path/to/some.password.protected.pdf
 [4] http://mupdf.com/download/source/mupdf-thirdparty.zip
 [5] http://caml.inria.fr/
 [6] http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgl.html
-[7] mupdf-6e7b3abc34267f351810bb7b01dafa9586cdd9c8.tgz (4252623 bytes)
+[7] mupdf-a1a37ae36043d8dba89cecfa345119ad32f81b9e.tgz (6864786 bytes)
     mupdf-thirdparty-2012-08-14.zip (6944385 bytes)
     lablgl-1.04.tar.gz (410525 bytes)
diff --git a/buildall.sh b/buildall.sh
index 093c008..52443db 100644
--- a/buildall.sh
+++ b/buildall.sh
@@ -18,8 +18,8 @@ root=$(pwd)
 
 lablgl=http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/dist/lablgl-1.04.tar.gz
 mupdf3p=http://mupdf.com/download/archive/mupdf-thirdparty-2012-08-14.zip
-mupdfrev=6e7b3abc34267f351810bb7b01dafa9586cdd9c8
-mudir=mupdf-6e7b3ab
+mupdfrev=a1a37ae36043d8dba89cecfa345119ad32f81b9e
+mudir=mupdf-a1a37ae
 
 test -d lablGL-1.04 || (wget -nc $lablgl && tar -xzf lablgl-1.04.tar.gz)
 
@@ -38,16 +38,21 @@ executable_p() {
 
 executable_p gmake && make=gmake || make=make
 
-(cd lablGL-1.04 \
-    && sed 17d Makefile.config.linux.mdk > Makefile.config \
-    && $make lib $(test "$1" = opt && echo libopt) \
-    && $make install \
-            BINDIR=$root/bin \
-            LIBDIR=$root/lib/ocaml \
-            DLLDIR=$root/lib/ocaml/stublibs \
+(cd lablGL-1.04                                             \
+    && sed 17d Makefile.config.linux.mdk > Makefile.config  \
+    && $make lib $(test "$1" = opt && echo libopt)          \
+    && $make install                                        \
+            BINDIR=$root/bin                                \
+            LIBDIR=$root/lib/ocaml                          \
+            DLLDIR=$root/lib/ocaml/stublibs                 \
             INSTALLDIR=$root/lib/ocaml/lablGL)
 
-(cd $mudir && $make -j "$jobs" build=release)
+(cd $mudir && $make -j "$jobs" build=release        \
+    FREETYPE_DIR=thirdparty/freetype-2.4.10         \
+    JBIG2DEC_DIR=thirdparty/jbig2dec                \
+    JPEG_DIR=thirdparty/jpeg-9                      \
+    OPENJPEG_DIR=thirdparty/openjpeg-1.5.0-patched  \
+    ZLIB_DIR=thirdparty/zlib-1.2.7)
 
 cd ..
 
diff --git a/link.c b/link.c
index b5f9b33..511dd39 100644
--- a/link.c
+++ b/link.c
@@ -513,7 +513,7 @@ static void pdfinfo (void)
 
             for (i = 0; i < sizeof (items) / sizeof (*items); ++i) {
                 pdf_obj *obj = pdf_dict_gets (infoobj, items[i]);
-                s = pdf_to_utf8 (state.ctx, obj);
+                s = pdf_to_utf8 (state.u.pdf, obj);
                 if (*s) {
                     if (i == 0) {
                         printd ("title %s", s);
-- 
2.11.4.GIT