mupdf: update to 1.12.0
This commit is contained in:
svenper
lemmi
parent
c18a1a48f8
commit
df4adfdfae
5 changed files with 96 additions and 87 deletions
|
|
@ -2917,9 +2917,9 @@ libccext2-1.8.so.0 commoncpp2-1.8.1_1
|
|||
libucommon.so.8 ucommon-7.0.0_1
|
||||
libusecure.so.8 ucommon-7.0.0_1
|
||||
libcommoncpp.so.8 ucommon-7.0.0_1
|
||||
libmupdf.so.1.11 libmupdf-1.11_4
|
||||
libmupdfthird.so.1.11 libmupdf-1.11_4
|
||||
libmuthreads.so.1.11 libmupdf-1.11_4
|
||||
libmupdf.so.1.12.0 libmupdf-1.12.0_1
|
||||
libmupdfthird.so.1.12.0 libmupdf-1.12.0_1
|
||||
libmuthreads.so.1.12.0 libmupdf-1.12.0_1
|
||||
libdatrie.so.1 libdatrie-0.2.10_1
|
||||
libthai.so.0 libthai-0.1.26_1
|
||||
libm17n-flt.so.0 m17n-lib-1.7.0_1
|
||||
|
|
|
|||
89
srcpkgs/mupdf/patches/0001-consolidated_fixes-1.patch
Normal file
89
srcpkgs/mupdf/patches/0001-consolidated_fixes-1.patch
Normal file
|
|
@ -0,0 +1,89 @@
|
|||
Submitted By: Bruce Dubbs <bdubbs at linuxfromscratch dot org>
|
||||
Date: 2017-12-17
|
||||
Initial Package Version: 1.12.0
|
||||
Upstream Status: Not submitted
|
||||
Origin: Arch Linux, rolled forward for openjpeg-2.3
|
||||
Description: Fixes for openjpeg-2.2
|
||||
Update: 2017-10-15 Change include directory to openjpeg-2.3
|
||||
|
||||
Consolidated patch for installing shared libraries.
|
||||
Original patch by Ken Moffat
|
||||
|
||||
With minor changes for Void by svenper
|
||||
|
||||
diff -Naur mupdf-1.12.0-source.orig/Makefile mupdf-1.12.0-source/Makefile
|
||||
--- Makefile 2017-12-13 08:00:30.000000000 -0600
|
||||
+++ Makefile 2017-12-17 18:07:39.809057239 -0600
|
||||
@@ -14,7 +14,7 @@
|
||||
# Do not specify CFLAGS or LIBS on the make invocation line - specify
|
||||
# XCFLAGS or XLIBS instead. Make ignores any lines in the makefile that
|
||||
# set a variable that was set on the command line.
|
||||
-CFLAGS += $(XCFLAGS) -Iinclude
|
||||
+CFLAGS += $(XCFLAGS) -Iinclude -fPIC
|
||||
LIBS += $(XLIBS) -lm
|
||||
|
||||
LIBS += $(FREETYPE_LIBS)
|
||||
@@ -312,9 +312,9 @@
|
||||
|
||||
# --- Library ---
|
||||
|
||||
-MUPDF_LIB = $(OUT)/libmupdf.a
|
||||
-THIRD_LIB = $(OUT)/libmupdfthird.a
|
||||
-THREAD_LIB = $(OUT)/libmuthreads.a
|
||||
+MUPDF_LIB = $(OUT)/libmupdf.so.$(VOID_VERSION)
|
||||
+THIRD_LIB = $(OUT)/libmupdfthird.so.$(VOID_VERSION)
|
||||
+THREAD_LIB = $(OUT)/libmuthreads.so.$(VOID_VERSION)
|
||||
|
||||
MUPDF_OBJ := \
|
||||
$(FITZ_OBJ) \
|
||||
@@ -343,11 +343,14 @@
|
||||
|
||||
THREAD_OBJ := $(THREAD_OBJ)
|
||||
|
||||
-$(MUPDF_LIB) : $(MUPDF_OBJ)
|
||||
+$(MUPDF_LIB) : $(MUPDF_OBJ) $(THIRD_LIB) $(THREAD_LIB)
|
||||
+ $(LINK_CMD) -shared -Wl,-soname -Wl,libmupdf.so.$(VOID_VERSION) -Wl,--no-undefined
|
||||
$(THIRD_LIB) : $(THIRD_OBJ)
|
||||
+ $(LINK_CMD) -shared -Wl,-soname -Wl,libmupdfthird.so.$(VOID_VERSION) -Wl,--no-undefined
|
||||
$(THREAD_LIB) : $(THREAD_OBJ)
|
||||
+ $(LINK_CMD) -shared -Wl,-soname -Wl,libmuthreads.so.$(VOID_VERSION) -Wl,--no-undefined -lpthread
|
||||
|
||||
-INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB)
|
||||
+INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB) $(THREAD_LIB)
|
||||
|
||||
# --- 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
|
||||
--- 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
|
||||
@@ -445,14 +445,18 @@
|
||||
|
||||
#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-2.3/openjpeg.h>
|
||||
|
||||
struct fz_jpxd_s
|
||||
{
|
||||
@@ -930,6 +934,10 @@
|
||||
*yresp = state.yres;
|
||||
}
|
||||
|
||||
+#ifdef __cplusplus
|
||||
+}
|
||||
+#endif
|
||||
+
|
||||
#endif /* HAVE_LURATECH */
|
||||
|
||||
#else /* FZ_ENABLE_JPX */
|
||||
|
|
@ -1,30 +0,0 @@
|
|||
--- source/fitz/load-jpx.c.orig
|
||||
+++ source/fitz/load-jpx.c
|
||||
@@ -444,12 +444,17 @@
|
||||
|
||||
#else /* HAVE_LURATECH */
|
||||
|
||||
+
|
||||
+#ifdef __cplusplus
|
||||
+extern "C"
|
||||
+{
|
||||
#define OPJ_STATIC
|
||||
#define OPJ_HAVE_INTTYPES_H
|
||||
#if !defined(_WIN32) && !defined(_WIN64)
|
||||
#define OPJ_HAVE_STDINT_H
|
||||
#endif
|
||||
#define USE_JPIP
|
||||
+#endif
|
||||
|
||||
#include <openjpeg.h>
|
||||
|
||||
@@ -919,6 +924,9 @@
|
||||
*yresp = state.yres;
|
||||
}
|
||||
|
||||
+#ifdef __cplusplus
|
||||
+}
|
||||
+#endif
|
||||
#endif /* HAVE_LURATECH */
|
||||
|
||||
#else /* FZ_ENABLE_JPX */
|
||||
|
|
@ -1,50 +0,0 @@
|
|||
Submitted By: Pierre Labastie <pierre dot labastie at neuf dot fr>
|
||||
Date: 2016-11-27
|
||||
Initial Package Version: 1.10
|
||||
Upstream Status: N/A
|
||||
Origin: Armin K and Gentoo
|
||||
Description: Generate shared libraries for mupdf, instead of static ones. This
|
||||
allows to have the font information (around 35 MB) at one place
|
||||
only, instead of in all the executables.
|
||||
Update: Bruce Dubbs 2017/07/15. Changes to include new threads library.
|
||||
|
||||
diff -Naur mupdf-1.11-source.orig/Makefile mupdf-1.11-source/Makefile
|
||||
--- Makefile 2017-04-05 06:02:21.000000000 -0500
|
||||
+++ Makefile 2017-04-15 18:26:46.286239623 -0500
|
||||
@@ -14,7 +14,7 @@
|
||||
# Do not specify CFLAGS or LIBS on the make invocation line - specify
|
||||
# XCFLAGS or XLIBS instead. Make ignores any lines in the makefile that
|
||||
# set a variable that was set on the command line.
|
||||
-CFLAGS += $(XCFLAGS) -Iinclude -Igenerated
|
||||
+CFLAGS += $(XCFLAGS) -Iinclude -Igenerated -fPIC
|
||||
LIBS += $(XLIBS) -lm
|
||||
|
||||
LIBS += $(FREETYPE_LIBS)
|
||||
@@ -300,19 +300,22 @@
|
||||
|
||||
# --- Library ---
|
||||
|
||||
-MUPDF_LIB = $(OUT)/libmupdf.a
|
||||
-THIRD_LIB = $(OUT)/libmupdfthird.a
|
||||
-THREAD_LIB = $(OUT)/libmuthreads.a
|
||||
+MUPDF_LIB = $(OUT)/libmupdf.so.$(VOID_VERSION)
|
||||
+THIRD_LIB = $(OUT)/libmupdfthird.so.$(VOID_VERSION)
|
||||
+THREAD_LIB = $(OUT)/libmuthreads.so.$(VOID_VERSION)
|
||||
|
||||
MUPDF_OBJ := $(FITZ_OBJ) $(FONT_OBJ) $(PDF_OBJ) $(XPS_OBJ) $(SVG_OBJ) $(CBZ_OBJ) $(HTML_OBJ) $(GPRF_OBJ)
|
||||
THIRD_OBJ := $(FREETYPE_OBJ) $(HARFBUZZ_OBJ) $(JBIG2DEC_OBJ) $(LIBJPEG_OBJ) $(JPEGXR_OBJ) $(LURATECH_OBJ) $(MUJS_OBJ) $(OPENJPEG_OBJ) $(ZLIB_OBJ)
|
||||
THREAD_OBJ := $(THREAD_OBJ)
|
||||
|
||||
-$(MUPDF_LIB) : $(MUPDF_OBJ)
|
||||
+$(MUPDF_LIB) : $(MUPDF_OBJ) $(THIRD_LIB) $(THREAD_LIB)
|
||||
+ $(LINK_CMD) -shared -Wl,-soname -Wl,libmupdf.so.$(VOID_VERSION) -Wl,--no-undefined
|
||||
$(THIRD_LIB) : $(THIRD_OBJ)
|
||||
+ $(LINK_CMD) -shared -Wl,-soname -Wl,libmupdfthird.so.$(VOID_VERSION) -Wl,--no-undefined
|
||||
$(THREAD_LIB) : $(THREAD_OBJ)
|
||||
+ $(LINK_CMD) -shared -Wl,-soname -Wl,libmuthreads.so.$(VOID_VERSION) -Wl,--no-undefined -lpthread
|
||||
|
||||
-INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB)
|
||||
+INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB) $(THREAD_LIB)
|
||||
|
||||
# --- Tools and Apps ---
|
||||
|
||||
|
|
@ -1,12 +1,12 @@
|
|||
# Template file for 'mupdf'
|
||||
pkgname=mupdf
|
||||
version=1.11
|
||||
revision=4
|
||||
version=1.12.0
|
||||
revision=1
|
||||
wrksrc="${pkgname}-${version}-source"
|
||||
hostmakedepends="pkg-config zlib-devel libcurl-devel freetype-devel
|
||||
libjpeg-turbo-devel jbig2dec-devel libXext-devel libXcursor-devel
|
||||
libXrandr-devel libXinerama-devel harfbuzz-devel
|
||||
MesaLib-devel libopenjpeg2-devel"
|
||||
MesaLib-devel libopenjpeg2-devel glu-devel libXi-devel"
|
||||
makedepends="${hostmakedepends}"
|
||||
depends="desktop-file-utils"
|
||||
short_desc="Lightweight PDF and XPS viewer"
|
||||
|
|
@ -14,7 +14,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
|||
license="AGPL-3"
|
||||
homepage="http://mupdf.com"
|
||||
distfiles="http://mupdf.com/downloads/archive/${pkgname}-${version}-source.tar.gz"
|
||||
checksum=209474a80c56a035ce3f4958a63373a96fad75c927c7b1acdc553fc85855f00a
|
||||
checksum=5c6353a82f1512f4f5280cf69a3725d1adac9c8b22377ec2a447c4fc45528755
|
||||
export VOID_VERSION="${version}"
|
||||
|
||||
pre_configure() {
|
||||
|
|
|
|||
Loading…
Reference in a new issue