jfbview: update mupdf 1.8 -> 1.9
This commit is contained in:
parent
82f2e72941
commit
b8a525a8b6
2 changed files with 32 additions and 0 deletions
|
@ -31,6 +31,10 @@ stdenv.mkDerivation rec {
|
|||
imlib2
|
||||
];
|
||||
|
||||
patches = [
|
||||
./mupdf-1.9.patch
|
||||
];
|
||||
|
||||
configurePhase = ''
|
||||
# Hack. Probing (`ldconfig -p`) fails with ‘cannot execute binary file’.
|
||||
# Overriding `OPENJP2 =` later works, but makes build output misleading:
|
||||
|
|
28
pkgs/os-specific/linux/jfbview/mupdf-1.9.patch
Normal file
28
pkgs/os-specific/linux/jfbview/mupdf-1.9.patch
Normal file
|
@ -0,0 +1,28 @@
|
|||
--- JFBView-0.5.2-src/Makefile 2016-06-11 23:27:54.969894750 -0700
|
||||
+++ JFBView-0.5.2-src/Makefile 2016-06-11 23:24:45.181142832 -0700
|
||||
@@ -134,13 +134,22 @@
|
||||
|
||||
.PHONY: detect_libopenjp2
|
||||
detect_libopenjp2:
|
||||
- $(eval OPENJP2 = $(shell ldconfig -p | grep -q libopenjp2 && echo 'openjp2' || echo 'openjpeg'))
|
||||
+ $(eval OPENJP2 = $(shell echo libopenjp2 | grep -q libopenjp2 && echo 'openjp2' || echo 'openjpeg'))
|
||||
@echo "OPENJP2 = $(OPENJP2)" >> $(CONFIG_MK)
|
||||
|
||||
# mupdf_version only depends on -lmupdf.
|
||||
mupdf_version: mupdf_version.cpp
|
||||
- $(CXX) $(CXXFLAGS) -o $@ $^ $(LDLIBS) -lmupdf
|
||||
-
|
||||
+ $(CXX) $(CXXFLAGS) -o $@ $^ $(LDLIBS) -lmupdf \
|
||||
+ -lpthread \
|
||||
+ -lform \
|
||||
+ -lncurses \
|
||||
+ -lfreetype \
|
||||
+ -lharfbuzz \
|
||||
+ -lz \
|
||||
+ -ljbig2dec \
|
||||
+ -ljpeg \
|
||||
+ -lmujs \
|
||||
+ -lopenjp2
|
||||
endif
|
||||
|
||||
|
Loading…
Reference in a new issue