mupdf: update to 1.13.0.
This commit is contained in:
parent
d650c3d0c6
commit
8ed8b6a6ab
|
@ -2979,9 +2979,10 @@ libccext2-1.8.so.0 commoncpp2-1.8.1_1
|
||||||
libucommon.so.8 ucommon-7.0.0_1
|
libucommon.so.8 ucommon-7.0.0_1
|
||||||
libusecure.so.8 ucommon-7.0.0_1
|
libusecure.so.8 ucommon-7.0.0_1
|
||||||
libcommoncpp.so.8 ucommon-7.0.0_1
|
libcommoncpp.so.8 ucommon-7.0.0_1
|
||||||
libmupdf.so.1.12.0 libmupdf-1.12.0_1
|
libmupdf.so.1.13.0 libmupdf-1.13.0_1
|
||||||
libmupdfthird.so.1.12.0 libmupdf-1.12.0_1
|
libmupdfthird.so.1.13.0 libmupdf-1.13.0_1
|
||||||
libmuthreads.so.1.12.0 libmupdf-1.12.0_1
|
libmuthreads.so.1.13.0 libmupdf-1.13.0_1
|
||||||
|
libmupkcs7.so.1.13.0 libmupdf-1.13.0_1
|
||||||
libdatrie.so.1 libdatrie-0.2.10_1
|
libdatrie.so.1 libdatrie-0.2.10_1
|
||||||
libthai.so.0 libthai-0.1.26_1
|
libthai.so.0 libthai-0.1.26_1
|
||||||
libm17n-flt.so.0 m17n-lib-1.7.0_1
|
libm17n-flt.so.0 m17n-lib-1.7.0_1
|
||||||
|
|
|
@ -23,67 +23,60 @@ diff -Naur mupdf-1.12.0-source.orig/Makefile mupdf-1.12.0-source/Makefile
|
||||||
LIBS += $(XLIBS) -lm
|
LIBS += $(XLIBS) -lm
|
||||||
|
|
||||||
LIBS += $(FREETYPE_LIBS)
|
LIBS += $(FREETYPE_LIBS)
|
||||||
@@ -312,9 +312,9 @@
|
@@ -312,10 +312,10 @@
|
||||||
|
|
||||||
# --- Library ---
|
# --- Library ---
|
||||||
|
|
||||||
-MUPDF_LIB = $(OUT)/libmupdf.a
|
-MUPDF_LIB = $(OUT)/libmupdf.a
|
||||||
-THIRD_LIB = $(OUT)/libmupdfthird.a
|
-THIRD_LIB = $(OUT)/libmupdfthird.a
|
||||||
-THREAD_LIB = $(OUT)/libmuthreads.a
|
-THREAD_LIB = $(OUT)/libmuthreads.a
|
||||||
|
-PKCS7_LIB = $(OUT)/libmupkcs7.a
|
||||||
+MUPDF_LIB = $(OUT)/libmupdf.so.$(VOID_VERSION)
|
+MUPDF_LIB = $(OUT)/libmupdf.so.$(VOID_VERSION)
|
||||||
+THIRD_LIB = $(OUT)/libmupdfthird.so.$(VOID_VERSION)
|
+THIRD_LIB = $(OUT)/libmupdfthird.so.$(VOID_VERSION)
|
||||||
+THREAD_LIB = $(OUT)/libmuthreads.so.$(VOID_VERSION)
|
+THREAD_LIB = $(OUT)/libmuthreads.so.$(VOID_VERSION)
|
||||||
|
+PKCS7_LIB = $(OUT)/libmupkcs7.so.$(VOID_VERSION)
|
||||||
|
|
||||||
MUPDF_OBJ := \
|
MUPDF_OBJ := \
|
||||||
$(FITZ_OBJ) \
|
$(FITZ_OBJ) \
|
||||||
@@ -343,11 +343,14 @@
|
@@ -343,12 +343,16 @@
|
||||||
|
|
||||||
THREAD_OBJ := $(THREAD_OBJ)
|
THREAD_OBJ := $(THREAD_OBJ)
|
||||||
|
|
||||||
-$(MUPDF_LIB) : $(MUPDF_OBJ)
|
-$(MUPDF_LIB) : $(MUPDF_OBJ)
|
||||||
+$(MUPDF_LIB) : $(MUPDF_OBJ) $(THIRD_LIB) $(THREAD_LIB)
|
+$(MUPDF_LIB) : $(MUPDF_OBJ) $(THIRD_LIB) $(THREAD_LIB) $(PKCS7_LIB)
|
||||||
+ $(LINK_CMD) -shared -Wl,-soname -Wl,libmupdf.so.$(VOID_VERSION) -Wl,--no-undefined
|
+ $(LINK_CMD) -shared -Wl,-soname -Wl,libmupdf.so.$(VOID_VERSION) -Wl,--no-undefined
|
||||||
$(THIRD_LIB) : $(THIRD_OBJ)
|
$(THIRD_LIB) : $(THIRD_OBJ)
|
||||||
+ $(LINK_CMD) -shared -Wl,-soname -Wl,libmupdfthird.so.$(VOID_VERSION) -Wl,--no-undefined
|
+ $(LINK_CMD) -shared -Wl,-soname -Wl,libmupdfthird.so.$(VOID_VERSION) -Wl,--no-undefined
|
||||||
$(THREAD_LIB) : $(THREAD_OBJ)
|
$(THREAD_LIB) : $(THREAD_OBJ)
|
||||||
+ $(LINK_CMD) -shared -Wl,-soname -Wl,libmuthreads.so.$(VOID_VERSION) -Wl,--no-undefined -lpthread
|
+ $(LINK_CMD) -shared -Wl,-soname -Wl,libmuthreads.so.$(VOID_VERSION) -Wl,--no-undefined -lpthread
|
||||||
|
$(PKCS7_LIB) : $(PKCS7_OBJ)
|
||||||
|
+ $(LINK_CMD) -shared -Wl,-soname -Wl,libmupkcs7.so.$(VOID_VERSION) -lssl -lcrypto
|
||||||
|
|
||||||
-INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB)
|
-INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB)
|
||||||
+INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB) $(THREAD_LIB)
|
+INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB) $(THREAD_LIB) $(PKCS7_LIB)
|
||||||
|
|
||||||
# --- Tools and Apps ---
|
# --- Tools and Apps ---
|
||||||
|
|
||||||
diff -Naur mupdf-1.12.0-source.orig/source/fitz/load-jpx.c mupdf-1.12.0-source/source/fitz/load-jpx.c
|
diff -Naur mupdf-1.12.0-source.orig/source/fitz/load-jpx.c mupdf-1.12.0-source/source/fitz/load-jpx.c
|
||||||
--- source/fitz/load-jpx.c 2017-12-13 08:00:30.000000000 -0600
|
--- source/fitz/load-jpx.c 2017-12-13 08:00:30.000000000 -0600
|
||||||
+++ source/fitz/load-jpx.c 2017-12-17 18:03:03.259071255 -0600
|
+++ source/fitz/load-jpx.c 2017-12-17 18:03:03.259071255 -0600
|
||||||
@@ -445,14 +445,18 @@
|
@@ -445,7 +445,7 @@
|
||||||
|
|
||||||
#else /* HAVE_LURATECH */
|
#else /* HAVE_LURATECH */
|
||||||
|
|
||||||
+#ifdef __cplusplus
|
|
||||||
+extern "C"
|
|
||||||
+{
|
|
||||||
#define OPJ_STATIC
|
|
||||||
#define OPJ_HAVE_INTTYPES_H
|
|
||||||
#if !defined(_MSC_VER) || _MSC_VER >= 1600
|
|
||||||
#define OPJ_HAVE_STDINT_H
|
|
||||||
#endif
|
|
||||||
+#endif
|
|
||||||
#define USE_JPIP
|
|
||||||
|
|
||||||
-#include <openjpeg.h>
|
-#include <openjpeg.h>
|
||||||
+#include <openjpeg-2.3/openjpeg.h>
|
+#include <openjpeg-2.3/openjpeg.h>
|
||||||
|
|
||||||
struct fz_jpxd_s
|
struct fz_jpxd_s
|
||||||
{
|
{
|
||||||
@@ -930,6 +934,10 @@
|
--- Makerules.orig
|
||||||
*yresp = state.yres;
|
+++ Makerules
|
||||||
}
|
@@ -97,7 +97,7 @@
|
||||||
|
SYS_GLUT_CFLAGS :=
|
||||||
|
SYS_GLUT_LIBS := -lglut -lGL
|
||||||
|
|
||||||
+#ifdef __cplusplus
|
-ifeq "$(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes)" "yes"
|
||||||
+}
|
+ifeq "$(shell pkg-config --exists 'libcrypto >= 1.1.0 && libcrypto <= 2.0' && echo yes)" "yes"
|
||||||
+#endif
|
HAVE_LIBCRYPTO := yes
|
||||||
+
|
SYS_LIBCRYPTO_CFLAGS := -DHAVE_LIBCRYPTO $(shell pkg-config --cflags libcrypto)
|
||||||
#endif /* HAVE_LURATECH */
|
SYS_LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto)
|
||||||
|
|
||||||
#else /* FZ_ENABLE_JPX */
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'mupdf'
|
# Template file for 'mupdf'
|
||||||
pkgname=mupdf
|
pkgname=mupdf
|
||||||
version=1.12.0
|
version=1.13.0
|
||||||
revision=2
|
revision=1
|
||||||
wrksrc="${pkgname}-${version}-source"
|
wrksrc="${pkgname}-${version}-source"
|
||||||
hostmakedepends="pkg-config zlib-devel libcurl-devel freetype-devel
|
hostmakedepends="pkg-config zlib-devel libcurl-devel freetype-devel
|
||||||
libjpeg-turbo-devel jbig2dec-devel libXext-devel libXcursor-devel
|
libjpeg-turbo-devel jbig2dec-devel libXext-devel libXcursor-devel
|
||||||
|
@ -14,7 +14,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
||||||
license="AGPL-3"
|
license="AGPL-3"
|
||||||
homepage="http://mupdf.com"
|
homepage="http://mupdf.com"
|
||||||
distfiles="http://mupdf.com/downloads/archive/${pkgname}-${version}-source.tar.gz"
|
distfiles="http://mupdf.com/downloads/archive/${pkgname}-${version}-source.tar.gz"
|
||||||
checksum=5c6353a82f1512f4f5280cf69a3725d1adac9c8b22377ec2a447c4fc45528755
|
checksum=071c6962cbee1136188da62136596a9d704b81e35fe617cd34874bbb0ae7ca09
|
||||||
export VOID_VERSION="${version}"
|
export VOID_VERSION="${version}"
|
||||||
|
|
||||||
pre_configure() {
|
pre_configure() {
|
||||||
|
@ -33,10 +33,10 @@ do_build() {
|
||||||
CFLAGS+=" -fPIC"
|
CFLAGS+=" -fPIC"
|
||||||
CFLAGS+=" $(pkg-config --cflags libopenjp2)"
|
CFLAGS+=" $(pkg-config --cflags libopenjp2)"
|
||||||
if [ "$CROSS_BUILD" ]; then
|
if [ "$CROSS_BUILD" ]; then
|
||||||
make CURL_LIBS='-lcurl -lpthread' build=release CROSSCOMPILE=yes
|
make CURL_LIBS='-lcurl -lpthread' build=release CROSSCOMPILE=yes all extra-apps
|
||||||
make CFLAGS="$CFLAGS" build=release -C thirdparty/mujs CROSSCOMPILE=yes
|
make CFLAGS="$CFLAGS" build=release -C thirdparty/mujs CROSSCOMPILE=yes
|
||||||
else
|
else
|
||||||
make CURL_LIBS='-lcurl -lpthread' build=release
|
make CURL_LIBS='-lcurl -lpthread' build=release all extra-apps
|
||||||
make CFLAGS="$CFLAGS" build=release -C thirdparty/mujs
|
make CFLAGS="$CFLAGS" build=release -C thirdparty/mujs
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
@ -46,10 +46,13 @@ do_install() {
|
||||||
|
|
||||||
ln -s mupdf-x11-curl ${DESTDIR}/usr/bin/mupdf
|
ln -s mupdf-x11-curl ${DESTDIR}/usr/bin/mupdf
|
||||||
|
|
||||||
|
vbin build/release/mujstest
|
||||||
|
vbin build/release/muraster
|
||||||
vinstall build/release/libmupdf.so.${version} 644 usr/lib
|
vinstall build/release/libmupdf.so.${version} 644 usr/lib
|
||||||
vinstall build/release/libmupdfthird.so.${version} 644 usr/lib
|
vinstall build/release/libmupdfthird.so.${version} 644 usr/lib
|
||||||
vinstall build/release/libmuthreads.so.${version} 644 usr/lib
|
vinstall build/release/libmuthreads.so.${version} 644 usr/lib
|
||||||
vinstall thirdparty/mujs/build/libmujs.a 644 usr/lib
|
vinstall build/release/libmupkcs7.so.${version} 644 usr/lib
|
||||||
|
vinstall thirdparty/mujs/build/release/libmujs.a 644 usr/lib
|
||||||
|
|
||||||
vinstall ${FILESDIR}/mupdf.xpm 644 usr/share/pixmaps
|
vinstall ${FILESDIR}/mupdf.xpm 644 usr/share/pixmaps
|
||||||
vinstall ${FILESDIR}/mupdf.desktop 644 usr/share/applications
|
vinstall ${FILESDIR}/mupdf.desktop 644 usr/share/applications
|
||||||
|
@ -65,6 +68,7 @@ libmupdf_package() {
|
||||||
vmove usr/lib/libmupdf.so.${version}
|
vmove usr/lib/libmupdf.so.${version}
|
||||||
vmove usr/lib/libmupdfthird.so.${version}
|
vmove usr/lib/libmupdfthird.so.${version}
|
||||||
vmove usr/lib/libmuthreads.so.${version}
|
vmove usr/lib/libmuthreads.so.${version}
|
||||||
|
vmove usr/lib/libmupkcs7.so.${version}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue