head 1.6; access; symbols pkgsrc-2024Q2:1.5.0.68 pkgsrc-2024Q2-base:1.5 pkgsrc-2024Q1:1.5.0.66 pkgsrc-2024Q1-base:1.5 pkgsrc-2023Q4:1.5.0.64 pkgsrc-2023Q4-base:1.5 pkgsrc-2023Q3:1.5.0.62 pkgsrc-2023Q3-base:1.5 pkgsrc-2023Q2:1.5.0.60 pkgsrc-2023Q2-base:1.5 pkgsrc-2023Q1:1.5.0.58 pkgsrc-2023Q1-base:1.5 pkgsrc-2022Q4:1.5.0.56 pkgsrc-2022Q4-base:1.5 pkgsrc-2022Q3:1.5.0.54 pkgsrc-2022Q3-base:1.5 pkgsrc-2022Q2:1.5.0.52 pkgsrc-2022Q2-base:1.5 pkgsrc-2022Q1:1.5.0.50 pkgsrc-2022Q1-base:1.5 pkgsrc-2021Q4:1.5.0.48 pkgsrc-2021Q4-base:1.5 pkgsrc-2021Q3:1.5.0.46 pkgsrc-2021Q3-base:1.5 pkgsrc-2021Q2:1.5.0.44 pkgsrc-2021Q2-base:1.5 pkgsrc-2021Q1:1.5.0.42 pkgsrc-2021Q1-base:1.5 pkgsrc-2020Q4:1.5.0.40 pkgsrc-2020Q4-base:1.5 pkgsrc-2020Q3:1.5.0.38 pkgsrc-2020Q3-base:1.5 pkgsrc-2020Q2:1.5.0.34 pkgsrc-2020Q2-base:1.5 pkgsrc-2020Q1:1.5.0.14 pkgsrc-2020Q1-base:1.5 pkgsrc-2019Q4:1.5.0.36 pkgsrc-2019Q4-base:1.5 pkgsrc-2019Q3:1.5.0.32 pkgsrc-2019Q3-base:1.5 pkgsrc-2019Q2:1.5.0.30 pkgsrc-2019Q2-base:1.5 pkgsrc-2019Q1:1.5.0.28 pkgsrc-2019Q1-base:1.5 pkgsrc-2018Q4:1.5.0.26 pkgsrc-2018Q4-base:1.5 pkgsrc-2018Q3:1.5.0.24 pkgsrc-2018Q3-base:1.5 pkgsrc-2018Q2:1.5.0.22 pkgsrc-2018Q2-base:1.5 pkgsrc-2018Q1:1.5.0.20 pkgsrc-2018Q1-base:1.5 pkgsrc-2017Q4:1.5.0.18 pkgsrc-2017Q4-base:1.5 pkgsrc-2017Q3:1.5.0.16 pkgsrc-2017Q3-base:1.5 pkgsrc-2017Q2:1.5.0.12 pkgsrc-2017Q2-base:1.5 pkgsrc-2017Q1:1.5.0.10 pkgsrc-2017Q1-base:1.5 pkgsrc-2016Q4:1.5.0.8 pkgsrc-2016Q4-base:1.5 pkgsrc-2016Q3:1.5.0.6 pkgsrc-2016Q3-base:1.5 pkgsrc-2016Q2:1.5.0.4 pkgsrc-2016Q2-base:1.5 pkgsrc-2016Q1:1.5.0.2 pkgsrc-2016Q1-base:1.5 pkgsrc-2015Q4:1.4.0.14 pkgsrc-2015Q4-base:1.4 pkgsrc-2015Q3:1.4.0.12 pkgsrc-2015Q3-base:1.4 pkgsrc-2015Q2:1.4.0.10 pkgsrc-2015Q2-base:1.4 pkgsrc-2015Q1:1.4.0.8 pkgsrc-2015Q1-base:1.4 pkgsrc-2014Q4:1.4.0.6 pkgsrc-2014Q4-base:1.4 pkgsrc-2014Q3:1.4.0.4 pkgsrc-2014Q3-base:1.4 pkgsrc-2014Q2:1.4.0.2 pkgsrc-2014Q2-base:1.4 pkgsrc-2014Q1:1.3.0.2 pkgsrc-2014Q1-base:1.3 pkgsrc-2013Q4:1.2.0.12 pkgsrc-2013Q4-base:1.2 pkgsrc-2013Q3:1.2.0.10 pkgsrc-2013Q3-base:1.2 pkgsrc-2013Q2:1.2.0.8 pkgsrc-2013Q2-base:1.2 pkgsrc-2013Q1:1.2.0.6 pkgsrc-2013Q1-base:1.2 pkgsrc-2012Q4:1.2.0.4 pkgsrc-2012Q4-base:1.2 pkgsrc-2012Q3:1.2.0.2 pkgsrc-2012Q3-base:1.2 pkgsrc-2012Q2:1.1.0.12 pkgsrc-2012Q2-base:1.1 pkgsrc-2012Q1:1.1.0.10 pkgsrc-2012Q1-base:1.1 pkgsrc-2011Q4:1.1.0.8 pkgsrc-2011Q4-base:1.1 pkgsrc-2011Q3:1.1.0.6 pkgsrc-2011Q3-base:1.1 pkgsrc-2011Q2:1.1.0.4 pkgsrc-2011Q2-base:1.1 pkgsrc-2011Q1:1.1.0.2 pkgsrc-2011Q1-base:1.1; locks; strict; comment @# @; 1.6 date 2024.08.14.05.55.33; author adam; state dead; branches; next 1.5; commitid 6Jr4EKtxzKjCJKlF; 1.5 date 2016.02.04.11.50.24; author leot; state Exp; branches; next 1.4; commitid VdJkl1kCTohZMATy; 1.4 date 2014.04.21.16.14.40; author wiz; state Exp; branches; next 1.3; commitid 0Ss6ATlkH3WYgzxx; 1.3 date 2014.01.09.14.25.23; author mef; state Exp; branches; next 1.2; commitid sV6w5TKv9rU6Urkx; 1.2 date 2012.08.21.19.50.54; author drochner; state Exp; branches; next 1.1; 1.1 date 2011.03.08.17.09.25; author drochner; state Exp; branches; next ; desc @@ 1.6 log @mupdf: really disable FreeGLUT when not enabled as an option @ text @$NetBSD: patch-ae,v 1.5 2016/02/04 11:50:24 leot Exp $ Avoid namespace conflicts with bswap(3). --- source/fitz/crypt-sha2.c.orig 2015-11-10 16:19:51.000000000 +0000 +++ source/fitz/crypt-sha2.c @@@@ -17,7 +17,7 @@@@ static inline int isbigendian(void) return *(char*)&one == 0; } -static inline unsigned int bswap32(unsigned int num) +static inline unsigned int mup_bswap32(unsigned int num) { return ( (((num) << 24)) | (((num) << 8) & 0x00FF0000) @@@@ -25,7 +25,7 @@@@ static inline unsigned int bswap32(unsig | (((num) >> 24)) ); } -static inline uint64_t bswap64(uint64_t num) +static inline uint64_t mup_bswap64(uint64_t num) { return ( (((num) << 56)) | (((num) << 40) & 0x00FF000000000000ULL) @@@@ -99,7 +99,7 @@@@ transform256(unsigned int state[8], unsi /* ensure big-endian integers */ if (!isbigendian()) for (j = 0; j < 16; j++) - data[j] = bswap32(data[j]); + data[j] = mup_bswap32(data[j]); /* Copy state[] to working vars. */ memcpy(T, state, sizeof(T)); @@@@ -192,8 +192,8 @@@@ void fz_sha256_final(fz_sha256 *context, if (!isbigendian()) { - context->buffer.u32[14] = bswap32(context->count[1]); - context->buffer.u32[15] = bswap32(context->count[0]); + context->buffer.u32[14] = mup_bswap32(context->count[1]); + context->buffer.u32[15] = mup_bswap32(context->count[0]); } else { @@@@ -204,7 +204,7 @@@@ void fz_sha256_final(fz_sha256 *context, if (!isbigendian()) for (j = 0; j < 8; j++) - context->state[j] = bswap32(context->state[j]); + context->state[j] = mup_bswap32(context->state[j]); memcpy(digest, &context->state[0], 32); memset(context, 0, sizeof(fz_sha256)); @@@@ -271,7 +271,7 @@@@ transform512(uint64_t state[8], uint64_t /* ensure big-endian integers */ if (!isbigendian()) for (j = 0; j < 16; j++) - data[j] = bswap64(data[j]); + data[j] = mup_bswap64(data[j]); /* Copy state[] to working vars. */ memcpy(T, state, sizeof(T)); @@@@ -364,8 +364,8 @@@@ void fz_sha512_final(fz_sha512 *context, if (!isbigendian()) { - context->buffer.u64[14] = bswap64(context->count[1]); - context->buffer.u64[15] = bswap64(context->count[0]); + context->buffer.u64[14] = mup_bswap64(context->count[1]); + context->buffer.u64[15] = mup_bswap64(context->count[0]); } else { @@@@ -376,7 +376,7 @@@@ void fz_sha512_final(fz_sha512 *context, if (!isbigendian()) for (j = 0; j < 8; j++) - context->state[j] = bswap64(context->state[j]); + context->state[j] = mup_bswap64(context->state[j]); memcpy(digest, &context->state[0], 64); memset(context, 0, sizeof(fz_sha512)); @ 1.5 log @Add glfw option to mupdf (disabled by default). Bump PKGREVISION++. @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.4 2014/04/21 16:14:40 wiz Exp $ @ 1.4 log @Update to 1.4, provided by Leonardo Taccari in PR 48759. List of changes on master since MuPDF 1.3 * Headline changes: * CMYK rendering (mudraw PWG and PAM formats) * TIFF viewer (with multi-page support). * Added MuJS Javascript interpreter. * MuJS is the default, V8 and JavaScriptCore are compile time options. * Javascript support has to be explicitly enabled with pdf_enable_js. * All viewers now have JavaScript enabled in the default builds. * Viewers: * X11: Horizontal scroll wheel support. * X11: Status bar display with warnings. * Android: Digital signatures. * iOS: Links, form filling, annotation editing, and javascript. * iOS: Reflow mode. * WinRT: Printing. * WinRT: Improved zooming behaviour. * Tools: * mudraw: Banded rendering with -B /band-height/. * mudraw: Select output format with -F /format/. * mudraw: Write to stdout if you use '-' as the output file name. * mudraw: Add TGA output format. * mudraw: Improved SVG output. * mutool show: Write output to file instead of stdout with -o /filename/. * mutool clean: Clean content streams with -s option. * Annotations: * Improved font handling. * Form fields. * Free text. * Sticky notes. * Optimizations: * glyph cache: Partial eviction. * glyph cache: Run-length compressed glyphs. * Smarter handling of subpixel metrics in text rendering. * Optimized blitting functions. * Optimized gradient mesh drawing. * API changes and additions: * fz_stream API reworked: replace "read" function with "next". * "Rebind" functions to associate context bound objects with another context: fz_output, fz_stream, fz_device and fz_document. * Introduce "document handlers" to detect and open different file types. * Must now call fz_register_document_handlers() to register the defaults. * May register your own handlers as well to work with fz_open_document. * Hook to load system fonts: fz_install_load_system_font_funcs. * PDF xref cache flushing functions (mark/clear/clear-to-mark). * Add our own "printf" set of functions to format strings and write to fz_output: * Format %f as short as possible while preserving precision. * Has %C for formatting a unicode character as UTF-8. * Has %M to format fz_matrix. * Has %R to format fz_rect. * Has %q and %( to format strings with escaped characters. * PDF process interface: allow PDF interpreter to do more than just draw! * Content stream state cleaning filter. * Content stream rewriting filter. * PDF digital signatures. * Stroke states may now be stored on the stack. * Improved fz_path internals. * Gradient mesh drawing interface has been improved. * Save files with incremental updates. @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.3 2014/01/09 14:25:23 mef Exp $ d5 1 a5 1 --- source/fitz/crypt-sha2.c.orig 2014-04-11 15:10:41.000000000 +0000 @ 1.3 log @Update print/mupdf to 1.3 (via pkgsrc-wip by Leonardo Taccari, thanks) ============================================================================= Notes on updating mupdf to mupdf-1.3 (maybe useful for future updates too) * mupdf-1.3 depends on openjpeg-2.0 (previously mupdf-1.1 depended on openjpeg-1.5). ${WRKSRC}/Makerules is NOT correct and still looks for openjpeg-1.5 so patches/patch-ab was modified in order to fix this behaviour. Please also note the SUBST.makerules class in Makefile. * mupdf should be build with "build=release" (the default is "build=debug" and that may be indesiderable for the common user). * In order to completely disable the building of third party libraries (it is better to use the ones provided/handled by pkgsrc) a brutal ${RM} -fr completely remove the ${WRKSRC}/thirdparty directory. For more information please read ${WRKSRC}/Makethird and the post-extract target in Makefile. * ${WRKSRC}/docs/thirdparty.txt may help for adding correct version of the dependencies. * To add libcurl support (www/curl) patches/patch-Makethird was introduced and patches/patch-ab was modified in order to use pkg-config for $(SYS_CURL_CFLAGS) and $(SYS_CURL_LIBS). * By default now mupdf install different binaries, e.g. mupdf-x11 (previous it was just "mupdf"), mupdf-x11-curl, etc.. In pkgsrc we install *only* the featureful version of mupdf simply as "mupdf". For more information please give a look to patches/patch-ac. ============================================================================= (Upstream) List of changes on master since MuPDF 1.2 * Windows RT viewer app for MuPDF. * Library changes to support progressive loading (display PDF files as they download). Windows/Linux/MacOS viewer supports this using curl. * Incremental updates to PDF files are now (optionally) preserved on loading/saving. * Prototype support for checking PDF Digital Signatures. * Initial annotation support (strike-out, underline, highlight and ink) (library and android builds only). * Fix operation on Android API level 8. * Android redraw optimisations. * Android app now supports Google Cloud Print. * Android app translated into many languages. * Android support for more architectures. * Improvements to store (avoid collisions causing unnecessary evictions). * Windows apps use Unicode filenames now. * PDF function handling improved; functions can now be passed to devices without 'sampling'. * PDF image handling improved; images can now be passed to devices without decompression. * Indexed images are no longer uncompressed at load time, saving memory. * Caching of rendered tiles for speed. * Improved text analysis mode, capable of spotting columns/indents, right-to-left text etc. * HTML output mode now includes image output. * PDF password encoding handling improved. * MuPDF now opens Jpeg, Tiff and PNG files directly. * Bug preventing OpenXPS files from being opened fixed. * Initial (feature incomplete) SVG and PDF output devices. * PWG raster (mono/grey/RGB) and PCL (mono) output devices. * Various performance improvements (including tilings and mesh based shadings). * Revamped directory structure to reflect recent changes. * Various potential SEGV, SoftMask and rendering fixes. * Many potential crashes in Jpeg2000 and JBIG2 images fixed. List of changes on master since MuPDF 1.1 * Important API changes: * fz_bbox is now fz_irect. * APIs (including fz_device) now pass fz_rect/fz_matrix by reference. * fz_device API is now more consistent with regards to use of fz_rect rather than fz_bbox. * Add support for Javascript and forms handling. * Fix many SEGVs with out of spec files. Many thanks to Mateusz "j00ru" Jurczyk and Gynvael Coldwind of the Google Security team, zeniko, Sebastian Rasmussen and all other contributors. * Add fz_open_document_with_stream to allow non-file based operation. * Move to using git submodules for third party libraries. * Much enhanced Android application. Now on Google Play! * Oversized and stroke text clipping implemented. * Change shadings to decompose at render times; massive memory savings. * Renamed 'mubusy' to 'mutool'. * PDF 1.7 Extension Level 8 encryption implemented. * Added consts to various parts of the API to help C++ interworking. * Prototype transition support. * Text searching API moved to fitz. * Highlight and copy text selections. * Performance enhancements for color conversion and fax decompression. * ARM optimisations for color conversion and bitmap scaling. * Bitmap subsampling stage introduced, with ARM optimisations. * Type 3 fonts; glyphs are now handled as display lists. * Scan converter performance improvements. * Various rendering fixes. @ text @d1 1 a1 1 $NetBSD$ d5 1 a5 1 --- source/fitz/crypt-sha2.c.orig 2013-08-14 12:41:20.000000000 +0000 d14 4 a17 4 if (!isbigendian()) { @@@@ -29,7 +29,7 @@@@ static inline unsigned int bswap32(unsig return num; d23 13 d38 8 a45 1 @@@@ -107,7 +107,7 @@@@ transform256(unsigned int state[8], cons d47 8 d56 4 a59 3 for (j = 0; j < 16; j++) - data[j] = bswap32(data_xe[j]); + data[j] = mup_bswap32(data_xe[j]); d63 1 a63 15 @@@@ -198,12 +198,12 @@@@ void fz_sha256_final(fz_sha256 *context, context->count[1] = (context->count[1] << 3) + (context->count[0] >> 29); context->count[0] = context->count[0] << 3; - context->buffer.u32[14] = bswap32(context->count[1]); - context->buffer.u32[15] = bswap32(context->count[0]); + context->buffer.u32[14] = mup_bswap32(context->count[1]); + context->buffer.u32[15] = mup_bswap32(context->count[0]); transform256(context->state, context->buffer.u32); for (j = 0; j < 8; j++) - ((unsigned int *)digest)[j] = bswap32(context->state[j]); + ((unsigned int *)digest)[j] = mup_bswap32(context->state[j]); memset(context, 0, sizeof(fz_sha256)); } d65 10 a74 1 @@@@ -268,7 +268,7 @@@@ transform512(uint64_t state[8], const ui d76 4 a79 4 /* ensure big-endian integers */ for (j = 0; j < 16; j++) - data[j] = bswap64(data_xe[j]); + data[j] = mup_bswap64(data_xe[j]); d81 1 a81 15 /* Copy state[] to working vars. */ memcpy(T, state, sizeof(T)); @@@@ -359,12 +359,12 @@@@ void fz_sha512_final(fz_sha512 *context, context->count[1] = (context->count[1] << 3) + (context->count[0] >> 29); context->count[0] = context->count[0] << 3; - context->buffer.u64[14] = bswap64(context->count[1]); - context->buffer.u64[15] = bswap64(context->count[0]); + context->buffer.u64[14] = mup_bswap64(context->count[1]); + context->buffer.u64[15] = mup_bswap64(context->count[0]); transform512(context->state, context->buffer.u64); for (j = 0; j < 8; j++) - ((uint64_t *)digest)[j] = bswap64(context->state[j]); + ((uint64_t *)digest)[j] = mup_bswap64(context->state[j]); a82 2 } @ 1.2 log @update to 1.1, from Leonardo Taccari per PR pkg/46823 changes: The command line tools have been combined into one tool that does all: mubusy. Where previously you would have called "mupdfclean blah blah blah", now call "mubusy clean blah blah blah" instead. Support for UserUnits bugfixes and optimisations @ text @d3 1 a3 1 avoid namespace conflict on NetBSD d5 2 a6 2 --- fitz/crypt_sha2.c.orig 2012-08-16 13:55:20.000000000 +0000 +++ fitz/crypt_sha2.c d69 1 a69 1 for (j = 0; j < 16; j++) @ 1.1 log @update to 0.8 no changelog available, at least some security fixes were done: -fix possible memory corruption due to malformed JPEG images (was patched in pkgsrc) -fix (at least) 2 cases of integer overflow in array allocation (SA42320) @ text @d5 1 a5 1 --- fitz/crypt_sha2.c.orig 2011-03-08 16:13:19.000000000 +0000 d7 1 a7 1 @@@@ -15,7 +15,7 @@@@ static inline int isbigendian(void) d16 10 a25 1 @@@@ -86,7 +86,7 @@@@ transform(unsigned int state[8], const u d34 1 a34 1 @@@@ -172,11 +172,11 @@@@ void fz_sha256final(fz_sha256 *context, d42 1 a42 1 transform(context->state, context->buffer.u32); d49 26 @