From e2ceb7ad81a1899993f23e829a41af4d406d31a4 Mon Sep 17 00:00:00 2001
From: malc <av1474@comtv.ru>
Date: Mon, 20 Aug 2012 18:04:11 +0400
Subject: [PATCH] Sync with upstream

---
 BUILDING    |  6 +++---
 buildall.sh | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/BUILDING b/BUILDING
index ca8fa6d..172f021 100644
--- a/BUILDING
+++ b/BUILDING
@@ -6,7 +6,7 @@ be found here[3], dependencies here[4]
 Note that MuPDF is a moving target therefore bellow is the commit id
 of the git version of MuPDF that this version of llpp is known to work
 with:
-a606f714258677688c67e9561b87cc70f9e9b6b0
+6e7b3abc34267f351810bb7b01dafa9586cdd9c8
 
 llpp also depends on OCaml[5], lablGL[6], having a C compiler wouldn't
 hurt either.
@@ -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-a606f714258677688c67e9561b87cc70f9e9b6b0.tgz (4242429 bytes)
-    mupdf-thirdparty-2012-04-23.zip (6890659 bytes)
+[7] mupdf-6e7b3abc34267f351810bb7b01dafa9586cdd9c8.tgz (4252623 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 42578c4..376fb50 100644
--- a/buildall.sh
+++ b/buildall.sh
@@ -17,9 +17,9 @@ cd 3rdp
 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-04-23.zip
-mupdfrev=a606f714258677688c67e9561b87cc70f9e9b6b0
-mudir=mupdf-a606f71
+mupdf3p=http://mupdf.com/download/archive/mupdf-thirdparty-2012-08-14.zip
+mupdfrev=6e7b3abc34267f351810bb7b01dafa9586cdd9c8
+mudir=mupdf-6e7b3ab
 
 test -d lablGL-1.04 || (wget -nc $lablgl && tar -xzf lablgl-1.04.tar.gz)
 
@@ -60,13 +60,13 @@ tp=$root/$mudir/thirdparty
 ccopt="-O"
 ccopt="$ccopt -I $tp/jbig2dec"
 ccopt="$ccopt -I $tp/jpeg-8d"
-ccopt="$ccopt -I $tp/freetype-2.4.9/include"
+ccopt="$ccopt -I $tp/freetype-2.4.10/include"
 ccopt="$ccopt -I $tp/openjpeg-1.4/libopenjpeg"
 ccopt="$ccopt -I $tp/zlib-1.2.5"
 ccopt="$ccopt -I $root/$mudir/fitz -I $root/$mudir/pdf -I $root/$mudir/xps"
 ccopt="$ccopt -I $root/$mudir/cbz"
 
-ccopt="$ccopt -include $tp/freetype-2.4.9/include/ft2build.h -D_GNU_SOURCE"
+ccopt="$ccopt -include $tp/freetype-2.4.10/include/ft2build.h -D_GNU_SOURCE"
 
 cclib="$cclib -L$root/$mudir/build/release"
 cclib="$cclib -lfitz"
-- 
2.11.4.GIT