updated mupdf to latest version

Makefile

@@ -8,8 +8,8 @@ DJVUDIR=djvulibre
 KPVCRLIBDIR=kpvcrlib
 CRENGINEDIR=$(KPVCRLIBDIR)/crengine
 
-FREETYPEDIR=$(MUPDFDIR)/thirdparty/freetype-2.4.10
-JPEGDIR=$(MUPDFDIR)/thirdparty/jpeg-9
+FREETYPEDIR=$(MUPDFDIR)/thirdparty/freetype
+JPEGDIR=$(MUPDFDIR)/thirdparty/jpeg
 LFSDIR=luafilesystem
 
 POPENNSDIR=popen-noshell
@@ -186,7 +186,7 @@ lfs.o: $(LFSDIR)/src/lfs.c
 
 fetchthirdparty:
 	rm -rf mupdf/thirdparty
-	test -d mupdf && (cd mupdf; git checkout .)  || echo warn: mupdf folder not found
+	test -d mupdf && (cd mupdf; git checkout .; cd thirdparty; git submodule init; git submodule update)  || echo warn: mupdf folder not found
 	test -d $(LUADIR) && (cd $(LUADIR); git checkout .)  || echo warn: $(LUADIR) folder not found
 	git submodule init
 	git submodule update
@@ -195,15 +195,13 @@ fetchthirdparty:
 	test -d fonts || ln -sf $(TTF_FONTS_DIR) fonts
 	# CREngine patch: disable fontconfig
 	grep USE_FONTCONFIG $(CRENGINEDIR)/crengine/include/crsetup.h && grep -v USE_FONTCONFIG $(CRENGINEDIR)/crengine/include/crsetup.h > /tmp/new && mv /tmp/new $(CRENGINEDIR)/crengine/include/crsetup.h || echo "USE_FONTCONFIG already disabled"
-	test -f mupdf-thirdparty.zip || wget http://www.mupdf.com/download/mupdf-thirdparty.zip
 	# CREngine patch: change child nodes' type face
 	# @TODO replace this dirty hack  24.04 2012 (houqp)
 	cd kpvcrlib/crengine/crengine/src && \
 		patch -N -p0 < ../../../lvrend_node_type_face.patch && \
 		patch -N -p3 < ../../../lvdocview-getCurrentPageLinks.patch || true
-	unzip mupdf-thirdparty.zip -d mupdf
 	# dirty patch in MuPDF's thirdparty liby for CREngine
-	cd mupdf/thirdparty/jpeg-*/ && \
+	cd mupdf/thirdparty/jpeg*/ && \
 		patch -N -p0 < ../../../kpvcrlib/jpeg_compress_struct_size.patch &&\
 		patch -N -p0 < ../../../kpvcrlib/jpeg_decompress_struct_size.patch
 	# MuPDF patch: use external fonts
@@ -225,23 +223,17 @@ cleanthirdparty:
 	test -d $(CRENGINEDIR)/crengine && ($(MAKE) -C $(CRENGINEDIR)/crengine clean) || echo warn: chmlib folder not found
 	test -d $(KPVCRLIBDIR) && ($(MAKE) -C $(KPVCRLIBDIR) clean) || echo warn: chmlib folder not found
 	rm -rf $(DJVUDIR)/build
-	rm -f $(MUPDFDIR)/fontdump.host
-	rm -f $(MUPDFDIR)/cmapdump.host
 	$(MAKE) -C $(POPENNSDIR) clean
 
-$(MUPDFDIR)/fontdump.host:
-	CFLAGS="$(HOSTCFLAGS)" $(MAKE) -C mupdf build="release" CC="$(HOSTCC)" $(MUPDFTARGET)/fontdump
-	cp -a $(MUPDFLIBDIR)/fontdump $(MUPDFDIR)/fontdump.host
-	$(MAKE) -C mupdf clean
-
-$(MUPDFDIR)/cmapdump.host:
-	CFLAGS="$(HOSTCFLAGS)" $(MAKE) -C mupdf build="release" CC="$(HOSTCC)" $(MUPDFTARGET)/cmapdump
-	cp -a $(MUPDFLIBDIR)/cmapdump $(MUPDFDIR)/cmapdump.host
-	$(MAKE) -C mupdf clean
-
-$(MUPDFLIBS) $(THIRDPARTYLIBS): $(MUPDFDIR)/cmapdump.host $(MUPDFDIR)/fontdump.host
+$(MUPDFLIBS) $(THIRDPARTYLIBS):
 	# build only thirdparty libs, libfitz and pdf utils, which will care for libmupdf.a being built
-	CFLAGS="$(CFLAGS) -DNOBUILTINFONT" $(MAKE) -C mupdf build="release" CC="$(CC)" CMAPDUMP=cmapdump.host FONTDUMP=fontdump.host MUPDF= MU_APPS= BUSY_APP= XPS_APPS= verbose=1
+ifdef EMULATE_READER
+	$(MAKE) -C mupdf XCFLAGS="$(CFLAGS) -DNOBUILTINFONT" build="release" CC="$(CC)" MUPDF= MU_APPS= BUSY_APP= XPS_APPS= verbose=1 NOX11=yes
+else
+	# generate data headers
+	$(MAKE) -C mupdf generate
+	$(MAKE) -C mupdf XCFLAGS="$(CFLAGS) -DNOBUILTINFONT" build="release" CC="$(CC)" MUPDF= MU_APPS= BUSY_APP= XPS_APPS= verbose=1 NOX11=yes CROSSCOMPILE=yes OS=Kindle
+endif
 
 $(DJVULIBS):
 	mkdir -p $(DJVUDIR)/build

mupdf

@@ -1 +1 @@
-Subproject commit bdb6b688a238df56b2cf47fa17a08a4dd4b7a122
+Subproject commit dd4f6ffd475b0e769ba6231cf24b050bcdc97814

mupdf.patch

@@ -1,62 +1,60 @@
 diff --git a/pdf/pdf_font.c b/pdf/pdf_font.c
-index 5e54e0b..38bd1d8 100644
+index 33a1a65..c2fdee3 100644
 --- a/pdf/pdf_font.c
 +++ b/pdf/pdf_font.c
-@@ -182,8 +182,13 @@ pdf_load_builtin_font(fz_context *ctx, pdf_font_desc *fontdesc, char *fontname)
+@@ -185,7 +185,12 @@ pdf_load_builtin_font(fz_context *ctx, pdf_font_desc *fontdesc, char *fontname)
  	if (!data)
  		fz_throw(ctx, "cannot find builtin font: '%s'", fontname);
-
+ 
 +#ifndef NOBUILTINFONT
- 	fontdesc->font = fz_new_font_from_memory(ctx, data, len, 0, 1);
- 	/* RJW: "cannot load freetype font from memory" */
+ 	fontdesc->font = fz_new_font_from_memory(ctx, fontname, data, len, 0, 1);
 +#else
-+	fontdesc->font = fz_new_font_from_file(ctx, data, 0, 1);
++	fontdesc->font = fz_new_font_from_file(ctx, fontname, data, 0, 1);
 +	free(data);
 +#endif
-
+ 
  	if (!strcmp(fontname, "Symbol") || !strcmp(fontname, "ZapfDingbats"))
  		fontdesc->flags |= PDF_FD_SYMBOLIC;
-@@ -199,8 +204,13 @@ pdf_load_substitute_font(fz_context *ctx, pdf_font_desc *fontdesc, int mono, int
+@@ -201,7 +206,12 @@ pdf_load_substitute_font(fz_context *ctx, pdf_font_desc *fontdesc, char *fontnam
  	if (!data)
  		fz_throw(ctx, "cannot find substitute font");
-
+ 
 +#ifndef NOBUILTINFONT
- 	fontdesc->font = fz_new_font_from_memory(ctx, data, len, 0, 1);
- 	/* RJW: "cannot load freetype font from memory" */
+ 	fontdesc->font = fz_new_font_from_memory(ctx, fontname, data, len, 0, 1);
 +#else
-+	fontdesc->font = fz_new_font_from_file(ctx, data, 0, 1);
++	fontdesc->font = fz_new_font_from_file(ctx, fontname, data, 0, 1);
 +	free(data);
 +#endif
-
+ 
  	fontdesc->font->ft_substitute = 1;
  	fontdesc->font->ft_bold = bold && !ft_is_bold(fontdesc->font->ft_face);
-@@ -218,7 +228,12 @@ pdf_load_substitute_cjk_font(fz_context *ctx, pdf_font_desc *fontdesc, int ros,
+@@ -219,7 +229,12 @@ pdf_load_substitute_cjk_font(fz_context *ctx, pdf_font_desc *fontdesc, char *fon
  		fz_throw(ctx, "cannot find builtin CJK font");
-
+ 
  	/* a glyph bbox cache is too big for droid sans fallback (51k glyphs!) */
 +#ifndef NOBUILTINFONT
- 	fontdesc->font = fz_new_font_from_memory(ctx, data, len, 0, 0);
+ 	fontdesc->font = fz_new_font_from_memory(ctx, fontname, data, len, 0, 0);
 +#else
-+	fontdesc->font = fz_new_font_from_file(ctx, data, 0, 0);
++	fontdesc->font = fz_new_font_from_file(ctx, fontname, data, 0, 1);
 +	free(data);
 +#endif
- 	/* RJW: "cannot load builtin CJK font" */
-
+ 
  	fontdesc->font->ft_substitute = 1;
+ }
 diff --git a/pdf/pdf_fontfile.c b/pdf/pdf_fontfile.c
-index 543ce76..a076033 100644
+index 99565da..a91380f 100644
 --- a/pdf/pdf_fontfile.c
 +++ b/pdf/pdf_fontfile.c
-@@ -1,6 +1,8 @@
- #include "fitz.h"
- #include "mupdf.h"
-
+@@ -15,6 +15,8 @@
+ 	Set NODROIDFONT to use the base 14 fonts as substitute fonts.
+ */
+ 
 +#ifndef NOBUILTINFONT
 +
  #ifdef NOCJK
  #define NOCJKFONT
  #endif
-@@ -129,3 +131,112 @@ pdf_find_substitute_cjk_font(int ros, int serif, unsigned int *len)
+@@ -152,3 +154,112 @@ pdf_lookup_substitute_cjk_font(int ros, int serif, unsigned int *len)
  	return NULL;
  #endif
  }