mupdf: Update to 1.15.0

4 files changed, 9 insertions, 13 deletions

diff --git a/pkg/mupdf/gen.lua b/pkg/mupdf/gen.lua
index 4c5dbe29..393e1931 100644
--- a/pkg/mupdf/gen.lua
+++ b/pkg/mupdf/gen.lua
@@ -6,6 +6,8 @@ cflags{
 	-- HTML and EPUB require harfbuzz
 	'-D FZ_ENABLE_HTML=0',
 	'-D FZ_ENABLE_EPUB=0',
+	-- ICS requires lcms2
+	'-D FZ_ENABLE_ICC=0',
 	-- JPX requires openjpeg
 	'-D FZ_ENABLE_JPX=0',
 	'-D HAVE_PTHREAD',
@@ -34,7 +36,6 @@ for _, font in ipairs(fonts) do
 end
 
 pkg.deps = {
-	'pkg/curl/headers',
 	'pkg/freetype/fetch',
 	'pkg/jbig2dec/fetch',
 	'pkg/libjpeg-turbo/headers',
@@ -61,7 +62,7 @@ exe('bin/mutool', [[
 	source/tools/(
 		mutool.c muconvert.c mudraw.c murun.c mutrace.c cmapdump.c
 		pdfclean.c pdfcreate.c pdfextract.c pdfinfo.c pdfmerge.c pdfpages.c
-		pdfportfolio.c pdfposter.c pdfshow.c pdfsign.c
+		pdfposter.c pdfshow.c pdfsign.c
 	)
 	libmupdf.a.d
 	libmupdf-pkcs7.a
@@ -69,9 +70,6 @@ exe('bin/mutool', [[
 ]])
 file('bin/mutool', '755', '$outdir/bin/mutool')
 
-cc('platform/x11/curl_stream.c', {'pkg/curl/headers'}, {
-	cflags='$cflags -I $builddir/pkg/curl/include',
-})
 cc('platform/x11/wl_main.c', {
 	'$dir/deps',
 	'pkg/libxkbcommon/fetch',
@@ -86,11 +84,10 @@ cc('platform/x11/wl_main.c', {
 	'-I pkg/libxkbcommon/src',
 }})
 exe('bin/mupdf', [[
-	platform/x11/(pdfapp.c curl_stream.c.o wl_main.c.o)
+	platform/x11/(pdfapp.c wl_main.c.o)
 	libmupdf.a.d
 	libmupdf-pkcs7.a
 	$builddir/pkg/(
-		curl/libcurl.a.d
 		jbig2dec/libjbig2dec.a
 		libxkbcommon/libxkbcommon.a
 		pixman/libpixman.a
diff --git a/pkg/mupdf/sources.txt b/pkg/mupdf/sources.txt
index 46f7042d..88e8d30d 100644
--- a/pkg/mupdf/sources.txt
+++ b/pkg/mupdf/sources.txt
@@ -34,6 +34,7 @@ fitz/draw-rasterize.c
 fitz/draw-scale-simple.c
 fitz/draw-unpack.c
 fitz/encode-basic.c
+fitz/encodings.c
 fitz/error.c
 fitz/filter-basic.c
 fitz/filter-dct.c
@@ -58,6 +59,7 @@ fitz/link.c
 fitz/list-device.c
 fitz/load-bmp.c
 fitz/load-gif.c
+fitz/load-jbig2.c
 fitz/load-jpeg.c
 fitz/load-jpx.c
 fitz/load-jxr.c
@@ -77,7 +79,6 @@ fitz/output-ps.c
 fitz/output-psd.c
 fitz/output-pwg.c
 fitz/output-svg.c
-fitz/output-tga.c
 fitz/output.c
 fitz/path.c
 fitz/pixmap.c
@@ -91,7 +92,6 @@ fitz/stext-output.c
 fitz/stext-search.c
 fitz/store.c
 fitz/stream-open.c
-fitz/stream-prog.c
 fitz/stream-read.c
 fitz/string.c
 fitz/strtof.c
@@ -123,9 +123,8 @@ pdf/pdf-cmap.c
 pdf/pdf-colorspace.c
 pdf/pdf-crypt.c
 pdf/pdf-device.c
-pdf/pdf-encoding.c
 pdf/pdf-event.c
-pdf/pdf-field.c
+pdf/pdf-font-add.c
 pdf/pdf-font.c
 pdf/pdf-form.c
 pdf/pdf-function.c
@@ -146,7 +145,6 @@ pdf/pdf-outline.c
 pdf/pdf-page.c
 pdf/pdf-parse.c
 pdf/pdf-pattern.c
-pdf/pdf-portfolio.c
 pdf/pdf-repair.c
 pdf/pdf-resources.c
 pdf/pdf-run.c
@@ -156,6 +154,7 @@ pdf/pdf-store.c
 pdf/pdf-stream.c
 pdf/pdf-type3.c
 pdf/pdf-unicode.c
+pdf/pdf-util.c
 pdf/pdf-write.c
 pdf/pdf-xobject.c
 pdf/pdf-xref.c
diff --git a/pkg/mupdf/src b/pkg/mupdf/src
-Subproject b2d09bcccfff7934e6cef240bd81dc48e96aaf9
+Subproject c1265db219f3dc360f0fc7f9965ad8e03efaa5d
diff --git a/pkg/mupdf/ver b/pkg/mupdf/ver
index 0c1d553b..f901cc30 100644
--- a/pkg/mupdf/ver
+++ b/pkg/mupdf/ver
@@ -1 +1 @@
-1.14.0 r1
+1.15.0 r0