commit: 10a498f912d67a62c960035c005f3cd6990e8ac6
parent a95903c286ec3d097b96a4ae13997fb61f66f92f
Author: Michael Forney <mforney@mforney.org>
Date: Mon, 18 Mar 2019 23:48:05 -0700
mupdf: Update to 1.14.0
Diffstat:
4 files changed, 128 insertions(+), 111 deletions(-)
diff --git a/pkg/mupdf/fonts.txt b/pkg/mupdf/fonts.txt
@@ -1,108 +1,124 @@
-# 2,<cd src/resources/fonts && ls noto/*.ttf urw/*.cff
+# 2,<cd src/resources/fonts && ls noto/*.otf noto/*.ttf urw/*.cff
noto/NotoEmoji-Regular.ttf
noto/NotoKufiArabic-Regular.ttf
noto/NotoNaskhArabic-Regular.ttf
noto/NotoNastaliqUrdu-Regular.ttf
-noto/NotoSans-Regular.ttf
-noto/NotoSansArmenian-Regular.ttf
-noto/NotoSansAvestan-Regular.ttf
-noto/NotoSansBalinese-Regular.ttf
-noto/NotoSansBamum-Regular.ttf
-noto/NotoSansBatak-Regular.ttf
-noto/NotoSansBengali-Regular.ttf
-noto/NotoSansBrahmi-Regular.ttf
-noto/NotoSansBuginese-Regular.ttf
-noto/NotoSansBuhid-Regular.ttf
-noto/NotoSansCanadianAboriginal-Regular.ttf
-noto/NotoSansCarian-Regular.ttf
-noto/NotoSansCham-Regular.ttf
-noto/NotoSansCherokee-Regular.ttf
-noto/NotoSansCoptic-Regular.ttf
-noto/NotoSansCuneiform-Regular.ttf
-noto/NotoSansCypriot-Regular.ttf
-noto/NotoSansDeseret-Regular.ttf
-noto/NotoSansDevanagari-Regular.ttf
-noto/NotoSansEgyptianHieroglyphs-Regular.ttf
-noto/NotoSansEthiopic-Regular.ttf
-noto/NotoSansGeorgian-Regular.ttf
-noto/NotoSansGlagolitic-Regular.ttf
-noto/NotoSansGothic-Regular.ttf
-noto/NotoSansGujarati-Regular.ttf
-noto/NotoSansGurmukhi-Regular.ttf
-noto/NotoSansHanunoo-Regular.ttf
-noto/NotoSansHebrew-Regular.ttf
-noto/NotoSansImperialAramaic-Regular.ttf
-noto/NotoSansInscriptionalPahlavi-Regular.ttf
-noto/NotoSansInscriptionalParthian-Regular.ttf
+noto/NotoSans-Regular.otf
+noto/NotoSansAdlam-Regular.otf
+noto/NotoSansAhom-Regular.otf
+noto/NotoSansAnatolianHieroglyphs-Regular.otf
+noto/NotoSansArabic-Regular.otf
+noto/NotoSansAvestan-Regular.otf
+noto/NotoSansBamum-Regular.otf
+noto/NotoSansBassaVah-Regular.otf
+noto/NotoSansBatak-Regular.otf
+noto/NotoSansBengali-Regular.otf
+noto/NotoSansBhaiksuki-Regular.otf
+noto/NotoSansBrahmi-Regular.otf
+noto/NotoSansBuginese-Regular.otf
+noto/NotoSansBuhid-Regular.otf
+noto/NotoSansCanadianAboriginal-Regular.otf
+noto/NotoSansCarian-Regular.otf
+noto/NotoSansChakma-Regular.otf
+noto/NotoSansCham-Regular.otf
+noto/NotoSansCherokee-Regular.otf
+noto/NotoSansCoptic-Regular.otf
+noto/NotoSansCuneiform-Regular.otf
+noto/NotoSansCypriot-Regular.otf
+noto/NotoSansDeseret-Regular.otf
+noto/NotoSansDevanagari-Regular.otf
+noto/NotoSansEgyptianHieroglyphs-Regular.otf
+noto/NotoSansElbasan-Regular.otf
+noto/NotoSansGlagolitic-Regular.otf
+noto/NotoSansGothic-Regular.otf
+noto/NotoSansHanunoo-Regular.otf
+noto/NotoSansHatran-Regular.otf
+noto/NotoSansImperialAramaic-Regular.otf
+noto/NotoSansInscriptionalPahlavi-Regular.otf
+noto/NotoSansInscriptionalParthian-Regular.otf
noto/NotoSansJavanese-Regular.ttf
-noto/NotoSansKaithi-Regular.ttf
-noto/NotoSansKannada-Regular.ttf
-noto/NotoSansKayahLi-Regular.ttf
-noto/NotoSansKharoshthi-Regular.ttf
-noto/NotoSansKhmer-Regular.ttf
-noto/NotoSansLao-Regular.ttf
-noto/NotoSansLepcha-Regular.ttf
-noto/NotoSansLimbu-Regular.ttf
-noto/NotoSansLinearB-Regular.ttf
-noto/NotoSansLisu-Regular.ttf
-noto/NotoSansLycian-Regular.ttf
-noto/NotoSansLydian-Regular.ttf
-noto/NotoSansMalayalam-Regular.ttf
-noto/NotoSansMandaic-Regular.ttf
-noto/NotoSansMeeteiMayek-Regular.ttf
+noto/NotoSansKaithi-Regular.otf
+noto/NotoSansKayahLi-Regular.otf
+noto/NotoSansKharoshthi-Regular.otf
+noto/NotoSansLepcha-Regular.otf
+noto/NotoSansLimbu-Regular.otf
+noto/NotoSansLinearA-Regular.otf
+noto/NotoSansLinearB-Regular.otf
+noto/NotoSansLisu-Regular.otf
+noto/NotoSansLycian-Regular.otf
+noto/NotoSansLydian-Regular.otf
+noto/NotoSansMalayalam-Regular.otf
+noto/NotoSansMandaic-Regular.otf
+noto/NotoSansManichaean-Regular.otf
+noto/NotoSansMarchen-Regular.otf
+noto/NotoSansMeeteiMayek-Regular.otf
+noto/NotoSansMendeKikakui-Regular.otf
+noto/NotoSansMeroitic-Regular.otf
+noto/NotoSansMiao-Regular.otf
noto/NotoSansMongolian-Regular.ttf
-noto/NotoSansMyanmar-Regular.ttf
-noto/NotoSansNKo-Regular.ttf
-noto/NotoSansNewTaiLue-Regular.ttf
-noto/NotoSansOgham-Regular.ttf
-noto/NotoSansOlChiki-Regular.ttf
-noto/NotoSansOldItalic-Regular.ttf
-noto/NotoSansOldPersian-Regular.ttf
-noto/NotoSansOldSouthArabian-Regular.ttf
-noto/NotoSansOldTurkic-Regular.ttf
+noto/NotoSansMro-Regular.otf
+noto/NotoSansMultani-Regular.otf
+noto/NotoSansNKo-Regular.otf
+noto/NotoSansNabataean-Regular.otf
+noto/NotoSansNewTaiLue-Regular.otf
+noto/NotoSansNewa-Regular.otf
+noto/NotoSansOgham-Regular.otf
+noto/NotoSansOlChiki-Regular.otf
+noto/NotoSansOldItalic-Regular.otf
+noto/NotoSansOldNorthArabian-Regular.otf
+noto/NotoSansOldPermic-Regular.otf
+noto/NotoSansOldPersian-Regular.otf
+noto/NotoSansOldSouthArabian-Regular.otf
+noto/NotoSansOldTurkic-Regular.otf
noto/NotoSansOriya-Regular.ttf
-noto/NotoSansOsmanya-Regular.ttf
-noto/NotoSansPhagsPa-Regular.ttf
-noto/NotoSansPhoenician-Regular.ttf
-noto/NotoSansRejang-Regular.ttf
-noto/NotoSansRunic-Regular.ttf
-noto/NotoSansSamaritan-Regular.ttf
-noto/NotoSansSaurashtra-Regular.ttf
-noto/NotoSansShavian-Regular.ttf
-noto/NotoSansSinhala-Regular.ttf
-noto/NotoSansSundanese-Regular.ttf
-noto/NotoSansSylotiNagri-Regular.ttf
-noto/NotoSansSymbols-Regular.ttf
+noto/NotoSansOsage-Regular.otf
+noto/NotoSansOsmanya-Regular.otf
+noto/NotoSansPahawhHmong-Regular.otf
+noto/NotoSansPalmyrene-Regular.otf
+noto/NotoSansPauCinHau-Regular.otf
+noto/NotoSansPhagsPa-Regular.otf
+noto/NotoSansPhoenician-Regular.otf
+noto/NotoSansRejang-Regular.otf
+noto/NotoSansRunic-Regular.otf
+noto/NotoSansSamaritan-Regular.otf
+noto/NotoSansSaurashtra-Regular.otf
+noto/NotoSansSharada-Regular.otf
+noto/NotoSansShavian-Regular.otf
+noto/NotoSansSoraSompeng-Regular.otf
+noto/NotoSansSundanese-Regular.otf
+noto/NotoSansSylotiNagri-Regular.otf
+noto/NotoSansSymbols-Regular.otf
+noto/NotoSansSymbols2-Regular.otf
noto/NotoSansSyriacEastern-Regular.ttf
noto/NotoSansSyriacEstrangela-Regular.ttf
noto/NotoSansSyriacWestern-Regular.ttf
-noto/NotoSansTagalog-Regular.ttf
-noto/NotoSansTagbanwa-Regular.ttf
-noto/NotoSansTaiLe-Regular.ttf
+noto/NotoSansTagalog-Regular.otf
+noto/NotoSansTagbanwa-Regular.otf
+noto/NotoSansTaiLe-Regular.otf
noto/NotoSansTaiTham-Regular.ttf
-noto/NotoSansTaiViet-Regular.ttf
-noto/NotoSansTamil-Regular.ttf
-noto/NotoSansTelugu-Regular.ttf
+noto/NotoSansTaiViet-Regular.otf
noto/NotoSansThaana-Regular.ttf
-noto/NotoSansThai-Regular.ttf
noto/NotoSansTibetan-Regular.ttf
-noto/NotoSansTifinagh-Regular.ttf
-noto/NotoSansUgaritic-Regular.ttf
-noto/NotoSansVai-Regular.ttf
-noto/NotoSansYi-Regular.ttf
-noto/NotoSerif-Regular.ttf
-noto/NotoSerifArmenian-Regular.ttf
-noto/NotoSerifBengali-Regular.ttf
-noto/NotoSerifDevanagari-Regular.ttf
-noto/NotoSerifGeorgian-Regular.ttf
-noto/NotoSerifGujarati-Regular.ttf
-noto/NotoSerifKannada-Regular.ttf
-noto/NotoSerifKhmer-Regular.ttf
-noto/NotoSerifLao-Regular.ttf
-noto/NotoSerifMalayalam-Regular.ttf
-noto/NotoSerifTamil-Regular.ttf
+noto/NotoSansTifinagh-Regular.otf
+noto/NotoSansUgaritic-Regular.otf
+noto/NotoSansVai-Regular.otf
+noto/NotoSansYi-Regular.otf
+noto/NotoSerif-Regular.otf
+noto/NotoSerifArmenian-Regular.otf
+noto/NotoSerifBalinese-Regular.otf
+noto/NotoSerifEthiopic-Regular.otf
+noto/NotoSerifGeorgian-Regular.otf
+noto/NotoSerifGujarati-Regular.otf
+noto/NotoSerifGurmukhi-Regular.otf
+noto/NotoSerifHebrew-Regular.otf
+noto/NotoSerifKannada-Regular.otf
+noto/NotoSerifKhmer-Regular.otf
+noto/NotoSerifLao-Regular.otf
+noto/NotoSerifMyanmar-Regular.otf
+noto/NotoSerifSinhala-Regular.otf
+noto/NotoSerifTamil-Regular.otf
noto/NotoSerifTelugu-Regular.ttf
-noto/NotoSerifThai-Regular.ttf
+noto/NotoSerifThai-Regular.otf
urw/Dingbats.cff
urw/NimbusMonoPS-Bold.cff
urw/NimbusMonoPS-BoldItalic.cff
@@ -113,7 +129,7 @@ urw/NimbusRoman-BoldItalic.cff
urw/NimbusRoman-Italic.cff
urw/NimbusRoman-Regular.cff
urw/NimbusSans-Bold.cff
-urw/NimbusSans-BoldOblique.cff
-urw/NimbusSans-Oblique.cff
+urw/NimbusSans-BoldItalic.cff
+urw/NimbusSans-Italic.cff
urw/NimbusSans-Regular.cff
urw/StandardSymbolsPS.cff
diff --git a/pkg/mupdf/gen.lua b/pkg/mupdf/gen.lua
@@ -10,7 +10,7 @@ cflags{
'-D FZ_ENABLE_JPX=0',
'-D HAVE_PTHREAD',
'-D NOTO_SMALL',
- '-D NOCJK',
+ '-D NO_CJK',
'-D NO_ICC',
'-D SHARE_JPEG',
'-I $srcdir/include',
@@ -24,24 +24,16 @@ cflags{
sub('tools.ninja', function()
toolchain 'host'
cflags{'-Wall'}
-
- exe('namedump', {'scripts/namedump.c'})
exe('hexdump', {'scripts/hexdump.c'})
end)
-rule('namedump', '$outdir/namedump $in $out')
-build('namedump', {'$outdir/mupdf/pdf/name-table.h', '$outdir/pdf-name-table.h'}, {
- '$srcdir/resources/pdf/names.txt', '|', '$outdir/namedump',
-})
-
-rule('hexdump', '$outdir/hexdump -s -p $srcdir/ $out.tmp $in && mv $out.tmp $out')
+rule('hexdump', '$outdir/hexdump -s $out.tmp $in && mv $out.tmp $out')
local fonts = lines('fonts.txt')
for _, font in ipairs(fonts) do
build('hexdump', '$outdir/'..font..'.c', {'$srcdir/resources/fonts/'..font, '|', '$outdir/hexdump'})
end
pkg.deps = {
- '$outdir/mupdf/pdf/name-table.h',
'pkg/curl/headers',
'pkg/freetype/fetch',
'pkg/jbig2dec/fetch',
@@ -57,14 +49,23 @@ lib('libmupdf.a', {
'$builddir/pkg/libjpeg-turbo/libjpeg-turbo.a',
'$builddir/pkg/zlib/libz.a',
})
+lib('libmupdf-threads.a', {
+ 'source/helpers/mu-threads/mu-threads.c',
+})
+lib('libmupdf-pkcs7.a', {
+ 'source/helpers/pkcs7/pkcs7-check.c',
+ 'source/helpers/pkcs7/pkcs7-openssl.c',
+})
exe('bin/mutool', [[
source/tools/(
- mutool.c muconvert.c mudraw.c murun.c mutrace.c
+ 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
)
libmupdf.a.d
+ libmupdf-pkcs7.a
+ libmupdf-threads.a
]])
file('bin/mutool', '755', '$outdir/bin/mutool')
@@ -87,6 +88,7 @@ cc('platform/x11/wl_main.c', {
exe('bin/mupdf', [[
platform/x11/(pdfapp.c curl_stream.c.o wl_main.c.o)
libmupdf.a.d
+ libmupdf-pkcs7.a
$builddir/pkg/(
curl/libcurl.a.d
jbig2dec/libjbig2dec.a
diff --git a/pkg/mupdf/sources.txt b/pkg/mupdf/sources.txt
@@ -1,7 +1,6 @@
-# 2,<cd src/source && ls fitz/*.c pdf/*.c xps/*.c svg/*.c cbz/*.c gprf/*.c helpers/mu-threads/*.c | grep -v fitz/harfbuzz.c
+# 2,<cd src/source && ls fitz/*.c pdf/*.c xps/*.c svg/*.c cbz/*.c gprf/*.c | grep -v fitz/harfbuzz.c
cbz/mucbz.c
cbz/muimg.c
-cbz/mutiff.c
fitz/archive.c
fitz/bbox-device.c
fitz/bidi-std.c
@@ -34,6 +33,7 @@ fitz/draw-path.c
fitz/draw-rasterize.c
fitz/draw-scale-simple.c
fitz/draw-unpack.c
+fitz/encode-basic.c
fitz/error.c
fitz/filter-basic.c
fitz/filter-dct.c
@@ -83,6 +83,7 @@ fitz/path.c
fitz/pixmap.c
fitz/pool.c
fitz/printf.c
+fitz/random.c
fitz/separation.c
fitz/shade.c
fitz/stext-device.c
@@ -112,15 +113,12 @@ fitz/xml.c
fitz/zip.c
gprf/gprf-doc.c
gprf/gprf-skeleton.c
-helpers/mu-threads/mu-threads.c
-pdf/pdf-annot-edit.c
pdf/pdf-annot.c
pdf/pdf-appearance.c
pdf/pdf-clean-file.c
pdf/pdf-clean.c
pdf/pdf-cmap-load.c
pdf/pdf-cmap-parse.c
-pdf/pdf-cmap-table.c
pdf/pdf-cmap.c
pdf/pdf-colorspace.c
pdf/pdf-crypt.c
@@ -137,6 +135,7 @@ pdf/pdf-interpret.c
pdf/pdf-js.c
pdf/pdf-layer.c
pdf/pdf-lex.c
+pdf/pdf-link.c
pdf/pdf-metrics.c
pdf/pdf-nametree.c
pdf/pdf-object.c
@@ -147,12 +146,12 @@ pdf/pdf-outline.c
pdf/pdf-page.c
pdf/pdf-parse.c
pdf/pdf-pattern.c
-pdf/pdf-pkcs7.c
pdf/pdf-portfolio.c
pdf/pdf-repair.c
pdf/pdf-resources.c
pdf/pdf-run.c
pdf/pdf-shade.c
+pdf/pdf-signature.c
pdf/pdf-store.c
pdf/pdf-stream.c
pdf/pdf-type3.c
diff --git a/pkg/mupdf/ver b/pkg/mupdf/ver
@@ -1 +1 @@
-1.12.0 r0
+1.14.0 r0
