Bug 210398
| Summary: | graphics/mupdf: Update to 1.9a | ||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Product: | Ports & Packages | Reporter: | Zsolt Udvari <uzsolt> | ||||||||||||||||||
| Component: | Individual Port(s) | Assignee: | Pawel Pekala <pawel> | ||||||||||||||||||
| Status: | Closed FIXED | ||||||||||||||||||||
| Severity: | Affects Some People | CC: | jakub_lach, pawel, tobik, uzsolt | ||||||||||||||||||
| Priority: | --- | Keywords: | easy, patch, patch-ready | ||||||||||||||||||
| Version: | Latest | ||||||||||||||||||||
| Hardware: | Any | ||||||||||||||||||||
| OS: | Any | ||||||||||||||||||||
| Attachments: |
|
||||||||||||||||||||
|
Description
Zsolt Udvari
2016-06-20 06:02:14 UTC
Comment on attachment 171594 [details]
patch
Thanks for the patch. Please flag your patches for ports your maintain with maintainer-approval(+) as that makes the PR visible in the "Maintainer approved" saved search. ;)
Summary clean up in favor of patch flags. (In reply to Vladimir Krstulja from comment #1) Okay, thanks! :) This upgrade breaks at least: graphics/llpp graphics/zathura-pdf-mupdf This must be resolved before we can commit this PR. Created attachment 171702 [details] Patch to zathura-pdf-mupdf Patch to use mupdf-1.9a in zathura-pdf-mupdf. Poudriere log: http://freebsd.uzsolt.hu/logs/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.0_1.log Created attachment 171725 [details] llpp.diff Here is a patch for graphics/llpp to build with mupdf 1.9a. Poudriere testport log for FreeBSD 10.2/amd64 is here: https://gist.github.com/t6/427522876cd634198a8c1794f30ac0c4 (In reply to Pawel Pekala from comment #4) I think no more port: $ find /usr/ports/ -depth 3 -name Makefile | xargs grep -l mupdf /usr/ports/graphics/llpp/Makefile /usr/ports/graphics/mupdf/Makefile /usr/ports/graphics/zathura-pdf-mupdf/Makefile /usr/ports/graphics/zathura-pdf-poppler/Makefile graphics/zathura-pdf-poppler only conflicts with zathura-pdf-mupdf. It seems like there is still an issue with the mupdf update. When loading PDF files with embedded JPEG images llpp fails with: > error: jpeg error: Wrong JPEG library version: library is 90, caller expects 80 It also looks like graphics/mupdf starts (re-)building stuff during the stage phase. The zathura-pdf-mupdf patch did not work for me. If I open the same PDF in zathura I get this: > error: could not load plugin /usr/local/lib/zathura/pdf.so (/usr/local/lib/zathura/pdf.so: Undefined symbol "js_newobject") I had to link llpp with libmupdfthird.a in addition to libmupdf.a. The same likely applies here. I tried to quickly fix this by adding MUPDF_LIB="-lmupdf -lmupdfthird" to the Makefile but that did not work: > LD pdf.so > /usr/bin/ld: /usr/local/lib/libmupdf.a(list-device.o): relocation R_X86_64_32S against `a local symbol' can not be used when making a shared object; recompile with -fPIC > /usr/local/lib/libmupdf.a: could not read symbols: Bad value I think mupdf's build/pic/libmupdfthird.a should be installed as ${LOCALBASE}/lib/libmupdfthird_pic.a as well. zathura-pdf-mupdf also gives quite a lot of undefined function warnings which leads to zathura failing to load the mupdf pugin. I'll attach a new patch for zathura-pdf-mupdf next. The fixed zathura-pdf-mupdf can open PDF with JPEG images, so the JPEG issue seems to be only in llpp. I'll investigate. Created attachment 171754 [details]
zathura-pdf-mupdf.diff
Here is an updated patch for graphics/zathura-pdf-mupdf. This requires an update to graphics/mupdf to also install libmupdfthird_pic.a.
Created attachment 171755 [details]
llpp.diff
llpp's JPEG issue can be fixed by linking with libmupdf_pic.a and libmupdfthird_pic.a.
Created attachment 171756 [details]
mupdf.diff
And here is an update mupdf patch which also install libmupdfthird_pic.a.
@Tobias Thank for your work! I attach the full patches. Created attachment 171796 [details]
mupdf updated patch
Created attachment 171797 [details]
Updated patch to zathura-pdf-mupdf
The poudriere logs: http://freebsd.uzsolt.hu/logs/mupdf/mupdf-1.9a%2C1_1.log http://freebsd.uzsolt.hu/logs/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.0_1_1.log A commit references this bug: Author: pawel Date: Thu Jun 30 16:05:56 UTC 2016 New revision: 417832 URL: https://svnweb.freebsd.org/changeset/ports/417832 Log: - Update graphics/mupdf to version 1.9a [1] - Fix graphics/zathura-pdf-mupdf after mupdf update [1] - Fix graphics/llpp after mupdf update [2] PR: 210398 Submitted by: Zsolt Udvari (maintainer) [1] Tobias Kortkamp (maintainer) [2] Changes: head/graphics/llpp/Makefile head/graphics/llpp/files/patch-build.sh head/graphics/llpp/files/patch-glfont.c head/graphics/llpp/files/patch-link.c head/graphics/llpp/files/patch-misc_llppac head/graphics/llpp/pkg-message head/graphics/mupdf/Makefile head/graphics/mupdf/distinfo head/graphics/mupdf/files/patch-scripts_fontdump.c head/graphics/mupdf/pkg-plist head/graphics/zathura-pdf-mupdf/Makefile head/graphics/zathura-pdf-mupdf/files/ head/graphics/zathura-pdf-mupdf/files/patch-document.c head/graphics/zathura-pdf-mupdf/files/patch-image.c head/graphics/zathura-pdf-mupdf/files/patch-page.c head/graphics/zathura-pdf-mupdf/files/patch-plugin.h head/graphics/zathura-pdf-mupdf/files/patch-search.c head/graphics/zathura-pdf-mupdf/files/patch-utils.c Hello, I got this - http://pastebin.com/WYDBDGtq (In reply to jakub_lach from comment #17) Works for me with poudriere and simple "cd /usr/ports/graphics/mupdf && make package". How did you want to build (command, etc.)? /Maybe you should open a new bug report./ (In reply to Zsolt Udvari from comment #18) This behaviour was introduced with this update, though I can open new PR. I'm sorry for being so laconic. I've tried portmaster and make build (package) with the same results, also tried commenting out make.conf. Jakub: Build failure seems to occur because you have old version of
mupdf installed and new mupdf tries to compile against old headers.
Deleting old package and installing new one should fix this issue.
Zsolt: This build failure is caused by adding -I${LOCALBASE}/include to
CFLAGS in last update. Removing it fixes build for me and it seems
unnecessary. Can you explain why it was added?
(In reply to Pawel Pekala from comment #20) See here: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=210741 |