1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
|
diff --git a/build.bash b/build.bash
index 9f72c04..6462b11 100755
--- a/build.bash
+++ b/build.bash
@@ -32,10 +32,7 @@
outd=$1
srcd=$(dirname $0)
-mudir=$outd/mupdf
-muinc="-I $mudir/include -I $mudir/thirdparty/freetype/include"
-
-test -d $mudir || die muPDF wasn\'t found in $outd/, consult $srcd/BUILDING
+mudeps=('freetype2' 'gumbo' 'harfbuzz' 'libjpeg' 'libopenjp2' 'x11' 'zlib')
mkdir -p $outd/{$wsid,lablGL}
@@ -45,8 +42,7 @@
test -n "${gmk:-}" && gmk=false || gmk=true
mulibs="$mudir/build/$mbt/libmupdf.a $mudir/build/$mbt/libmupdf-third.a"
-make="make -C "$mudir" build=$mbt -j $mjobs libs"
-$make -q -s || $make
+
oincs() {
local b=$1 incs
@@ -85,7 +81,7 @@
version.o) f=-DLLPP_VERSION=$ver;;
lablGL/*.o) f="-g -Wno-pointer-sign -Werror -O2";;
link.o)
- f="-g -std=c11 $muinc -Wall -Werror -Wextra -pedantic "
+ f="$CFLAGS -g -std=c11 $(pkg-config --cflags "${mudeps[@]}") -Wall -Werror -Wextra -pedantic "
test "${mbt-}" = "debug" || f+="-O2 "
$darwin && f+="-DMACOS -D_GNU_SOURCE -DGL_H='<OpenGL/gl.h>'" \
|| f+="-D_POSIX_C_SOURCE -DGL_H='<GL/gl.h>'"
@@ -104,39 +100,6 @@
}
overs=$(ocamlc -vnum 2>/dev/null) || overs=""
-if test "$overs" != "4.14.0~rc1"; then
- url=https://caml.inria.fr/pub/distrib/ocaml-4.14/ocaml-4.14.0~rc1.tar.xz
- txz=$outd/$(basename $url)
- keycmd="printf $url; digest $txz;"
- isfresh $txz "$(eval $keycmd)" || {
- if executable_p wget; then dl() { wget "$1" -O "$2"; }
- elif executable_p curl; then dl() { curl -L "$1" -o "$2"; }
- else die "no program to fetch remote urls found"
- fi
- dl $url $txz
- eval $keycmd >$txz.past
- } && vecho "fresh $txz"
- absprefix=$(realpath $outd)
- export PATH=$absprefix/bin:$PATH
- ocamlc=$absprefix/bin/ocamlc
- keycmd="printf $url; digest $ocamlc;"
- isfresh $ocamlc "$(eval $keycmd)" || (
- # This will needlessly re{configure,make} ocaml since "past"
- # of configure/make is hard to ascertain. "Better safe than
- # sorry" approach is taken here. The check will work for a
- # single ocaml url/version, but _will_ redo _everything_
- # otherwise (even if fully built artifacts are available)
- tar xf $txz -C $outd
- bn=$(basename $url)
- cd $outd/${bn%.tar.xz}
- ./configure --disable-ocamldoc --disable-ocamltest \
- --enable-debugger=no --prefix=$absprefix
- make -j $mjobs world
- make install
- eval $keycmd >$absprefix/bin/ocamlc.past
- ) && vecho "fresh ocamlc"
- overs=$(ocamlc -vnum 2>/dev/null)
-fi
while read k v; do
case "$k" in
@@ -307,7 +270,7 @@
done
libs="str.cma unix.cma"
-clibs="-L$mudir/build/$mbt -lmupdf -lmupdf-third -lpthread"
+clibs="-ljbig2dec $(pkg-config --libs "${mudeps[@]}") -lmupdf -lmupdf-third -lpthread
if $darwin; then
mcomp=$ccomp
clibs+=" -framework Cocoa -framework OpenGL"
|