View | Details | Raw Unified | Return to bug 224712 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-3 / +3 lines)
Lines 2-9 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	mupdf
4
PORTNAME=	mupdf
5
PORTVERSION=	1.11
5
PORTVERSION=	1.12.0
6
PORTREVISION=	2
7
DISTVERSIONSUFFIX=	-source
6
DISTVERSIONSUFFIX=	-source
8
PORTEPOCH=	1
7
PORTEPOCH=	1
9
CATEGORIES=	graphics
8
CATEGORIES=	graphics
Lines 28-34 Link Here
28
		SOVERSION=${PORTVERSION}
27
		SOVERSION=${PORTVERSION}
29
USES=		cpe compiler:c++11-lang gmake jpeg pkgconfig
28
USES=		cpe compiler:c++11-lang gmake jpeg pkgconfig
30
USE_XORG=	x11 xcursor xext xinerama xrandr
29
USE_XORG=	x11 xcursor xext xinerama xrandr
31
USE_GL=		gl
30
USE_GL=		gl glut
32
USE_LDCONFIG=	yes
31
USE_LDCONFIG=	yes
33
32
34
CPE_VENDOR=	artifex
33
CPE_VENDOR=	artifex
Lines 51-56 Link Here
51
	@${REINPLACE_CMD} -e 's/-ldl //' ${WRKSRC}/Makerules ${WRKSRC}/Makethird
50
	@${REINPLACE_CMD} -e 's/-ldl //' ${WRKSRC}/Makerules ${WRKSRC}/Makethird
52
	@${RM} -r ${WRKSRC}/thirdparty/curl \
51
	@${RM} -r ${WRKSRC}/thirdparty/curl \
53
		${WRKSRC}/thirdparty/freetype \
52
		${WRKSRC}/thirdparty/freetype \
53
		${WRKSRC}/thirdparty/freeglut \
54
		${WRKSRC}/thirdparty/harfbuzz \
54
		${WRKSRC}/thirdparty/harfbuzz \
55
		${WRKSRC}/thirdparty/jbig2dec \
55
		${WRKSRC}/thirdparty/jbig2dec \
56
		${WRKSRC}/thirdparty/libjpeg \
56
		${WRKSRC}/thirdparty/libjpeg \
(-)distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1492430059
1
TIMESTAMP = 1514557967
2
SHA256 (mupdf-1.11-source.tar.gz) = 209474a80c56a035ce3f4958a63373a96fad75c927c7b1acdc553fc85855f00a
2
SHA256 (mupdf-1.12.0-source.tar.gz) = 5c6353a82f1512f4f5280cf69a3725d1adac9c8b22377ec2a447c4fc45528755
3
SIZE (mupdf-1.11-source.tar.gz) = 40156070
3
SIZE (mupdf-1.12.0-source.tar.gz) = 51508917
(-)files/patch-Makefile (-4 / +4 lines)
Lines 1-7 Link Here
1
$OpenBSD: patch-Makefile,v 1.12 2016/12/12 10:54:39 sthen Exp $
1
$OpenBSD: patch-Makefile,v 1.12 2016/12/12 10:54:39 sthen Exp $
2
--- Makefile.orig	2017-04-05 11:02:21 UTC
2
--- Makefile.orig	2017-12-13 14:00:30 UTC
3
+++ Makefile
3
+++ Makefile
4
@@ -300,8 +300,8 @@ generate: $(JAVASCRIPT_GEN)
4
@@ -312,8 +312,8 @@ generate: $(JAVASCRIPT_GEN)
5
 
5
 
6
 # --- Library ---
6
 # --- Library ---
7
 
7
 
Lines 11-18 Link Here
11
+THIRD_LIB = libmupdfthird.so.$(SOVERSION)
11
+THIRD_LIB = libmupdfthird.so.$(SOVERSION)
12
 THREAD_LIB = $(OUT)/libmuthreads.a
12
 THREAD_LIB = $(OUT)/libmuthreads.a
13
 
13
 
14
 MUPDF_OBJ := $(FITZ_OBJ) $(FONT_OBJ) $(PDF_OBJ) $(XPS_OBJ) $(SVG_OBJ) $(CBZ_OBJ) $(HTML_OBJ) $(GPRF_OBJ)
14
 MUPDF_OBJ := \
15
@@ -309,7 +309,11 @@ THIRD_OBJ := $(FREETYPE_OBJ) $(HARFBUZZ_
15
@@ -344,7 +344,11 @@ THIRD_OBJ := \
16
 THREAD_OBJ := $(THREAD_OBJ)
16
 THREAD_OBJ := $(THREAD_OBJ)
17
 
17
 
18
 $(MUPDF_LIB) : $(MUPDF_OBJ)
18
 $(MUPDF_LIB) : $(MUPDF_OBJ)
(-)files/patch-Makerules (-4 / +6 lines)
Lines 1-7 Link Here
1
--- Makerules.orig	2017-04-05 11:02:21 UTC
1
--- Makerules.orig	2017-12-13 14:00:30 UTC
2
+++ Makerules
2
+++ Makerules
3
@@ -110,27 +110,21 @@ LD := xcrun ld
3
@@ -87,7 +87,7 @@ LD = xcrun ld
4
 RANLIB_CMD := xcrun ranlib $@
4
 RANLIB_CMD = xcrun ranlib $@
5
 
5
 
6
 # Linux uses pkg-config for system libraries.
6
 # Linux uses pkg-config for system libraries.
7
-else ifeq "$(OS)" "Linux"
7
-else ifeq "$(OS)" "Linux"
Lines 9-15 Link Here
9
 
9
 
10
 HAVE_PTHREAD := yes
10
 HAVE_PTHREAD := yes
11
 SYS_PTHREAD_CFLAGS :=
11
 SYS_PTHREAD_CFLAGS :=
12
 SYS_PTHREAD_LIBS := -lpthread
12
@@ -97,21 +97,15 @@ HAVE_GLUT := yes
13
 SYS_GLUT_CFLAGS :=
14
 SYS_GLUT_LIBS := -lglut -lGL
13
 
15
 
14
-ifeq "$(shell pkg-config --exists 'libcrypto <= 1.0.1t' && echo yes)" "yes"
16
-ifeq "$(shell pkg-config --exists 'libcrypto <= 1.0.1t' && echo yes)" "yes"
15
-HAVE_LIBCRYPTO := yes
17
-HAVE_LIBCRYPTO := yes
(-)files/patch-scripts_hexdump.c (-10 lines)
Lines 1-10 Link Here
1
--- scripts/hexdump.c.orig	2017-04-05 11:02:21 UTC
2
+++ scripts/hexdump.c
3
@@ -50,7 +50,6 @@ main(int argc, char **argv)
4
 	fprintf(fo, "#ifndef __STRICT_ANSI__\n");
5
 	fprintf(fo, "#if defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__)\n");
6
 	fprintf(fo, "#if !defined(__ICC) && !defined(__ANDROID__)\n");
7
-	fprintf(fo, "#define HAVE_INCBIN\n");
8
 	fprintf(fo, "#endif\n");
9
 	fprintf(fo, "#endif\n");
10
 	fprintf(fo, "#endif\n");
(-)files/patch-source__fitz__load-jpx.c (-4 / +4 lines)
Lines 1-6 Link Here
1
--- source/fitz/load-jpx.c.orig	2017-04-05 11:02:21 UTC
1
--- source/fitz/load-jpx.c.orig	2017-12-13 14:00:30 UTC
2
+++ source/fitz/load-jpx.c
2
+++ source/fitz/load-jpx.c
3
@@ -444,14 +444,18 @@ fz_load_jpx_info(fz_context *ctx, unsign
3
@@ -445,14 +445,18 @@ fz_load_jpx_info(fz_context *ctx, const 
4
 
4
 
5
 #else /* HAVE_LURATECH */
5
 #else /* HAVE_LURATECH */
6
 
6
 
Lines 9-15 Link Here
9
+{
9
+{
10
 #define OPJ_STATIC
10
 #define OPJ_STATIC
11
 #define OPJ_HAVE_INTTYPES_H
11
 #define OPJ_HAVE_INTTYPES_H
12
 #if !defined(_WIN32) && !defined(_WIN64)
12
 #if !defined(_MSC_VER) || _MSC_VER >= 1600
13
 #define OPJ_HAVE_STDINT_H
13
 #define OPJ_HAVE_STDINT_H
14
 #endif
14
 #endif
15
+#endif
15
+#endif
Lines 20-26 Link Here
20
 
20
 
21
 struct fz_jpxd_s
21
 struct fz_jpxd_s
22
 {
22
 {
23
@@ -919,6 +923,10 @@ fz_load_jpx_info(fz_context *ctx, unsign
23
@@ -930,6 +934,10 @@ fz_load_jpx_info(fz_context *ctx, const 
24
 	*yresp = state.yres;
24
 	*yresp = state.yres;
25
 }
25
 }
26
 
26
 
(-)pkg-plist (-11 / +38 lines)
Lines 1-3 Link Here
1
bin/mjsgen
1
bin/mujstest
2
bin/mujstest
2
bin/mupdf
3
bin/mupdf
3
bin/mupdf-gl
4
bin/mupdf-gl
Lines 11-17 Link Here
11
include/mupdf/fitz/bidi.h
12
include/mupdf/fitz/bidi.h
12
include/mupdf/fitz/bitmap.h
13
include/mupdf/fitz/bitmap.h
13
include/mupdf/fitz/buffer.h
14
include/mupdf/fitz/buffer.h
15
include/mupdf/fitz/color-management.h
14
include/mupdf/fitz/colorspace.h
16
include/mupdf/fitz/colorspace.h
17
include/mupdf/fitz/compress.h
15
include/mupdf/fitz/compressed-buffer.h
18
include/mupdf/fitz/compressed-buffer.h
16
include/mupdf/fitz/config.h
19
include/mupdf/fitz/config.h
17
include/mupdf/fitz/context.h
20
include/mupdf/fitz/context.h
Lines 21-27 Link Here
21
include/mupdf/fitz/document.h
24
include/mupdf/fitz/document.h
22
include/mupdf/fitz/filter.h
25
include/mupdf/fitz/filter.h
23
include/mupdf/fitz/font.h
26
include/mupdf/fitz/font.h
24
include/mupdf/fitz/function.h
25
include/mupdf/fitz/geometry.h
27
include/mupdf/fitz/geometry.h
26
include/mupdf/fitz/getopt.h
28
include/mupdf/fitz/getopt.h
27
include/mupdf/fitz/glyph-cache.h
29
include/mupdf/fitz/glyph-cache.h
Lines 31-39 Link Here
31
include/mupdf/fitz/link.h
33
include/mupdf/fitz/link.h
32
include/mupdf/fitz/outline.h
34
include/mupdf/fitz/outline.h
33
include/mupdf/fitz/output-pcl.h
35
include/mupdf/fitz/output-pcl.h
36
include/mupdf/fitz/output-pclm.h
34
include/mupdf/fitz/output-png.h
37
include/mupdf/fitz/output-png.h
35
include/mupdf/fitz/output-pnm.h
38
include/mupdf/fitz/output-pnm.h
36
include/mupdf/fitz/output-ps.h
39
include/mupdf/fitz/output-ps.h
40
include/mupdf/fitz/output-psd.h
37
include/mupdf/fitz/output-pwg.h
41
include/mupdf/fitz/output-pwg.h
38
include/mupdf/fitz/output-svg.h
42
include/mupdf/fitz/output-svg.h
39
include/mupdf/fitz/output-tga.h
43
include/mupdf/fitz/output-tga.h
Lines 52-66 Link Here
52
include/mupdf/fitz/track-usage.h
56
include/mupdf/fitz/track-usage.h
53
include/mupdf/fitz/transition.h
57
include/mupdf/fitz/transition.h
54
include/mupdf/fitz/tree.h
58
include/mupdf/fitz/tree.h
55
include/mupdf/fitz/ucdn.h
56
include/mupdf/fitz/util.h
59
include/mupdf/fitz/util.h
57
include/mupdf/fitz/version.h
60
include/mupdf/fitz/version.h
58
include/mupdf/fitz/writer.h
61
include/mupdf/fitz/writer.h
59
include/mupdf/fitz/xml.h
62
include/mupdf/fitz/xml.h
60
include/mupdf/html.h
61
include/mupdf/memento.h
63
include/mupdf/memento.h
64
include/mupdf/pdf-tools.h
62
include/mupdf/pdf.h
65
include/mupdf/pdf.h
63
include/mupdf/pdf-tools.h
64
include/mupdf/pdf/annot.h
66
include/mupdf/pdf/annot.h
65
include/mupdf/pdf/appearance.h
67
include/mupdf/pdf/appearance.h
66
include/mupdf/pdf/clean.h
68
include/mupdf/pdf/clean.h
Lines 80-86 Link Here
80
include/mupdf/pdf/resource.h
82
include/mupdf/pdf/resource.h
81
include/mupdf/pdf/widget.h
83
include/mupdf/pdf/widget.h
82
include/mupdf/pdf/xref.h
84
include/mupdf/pdf/xref.h
83
include/mupdf/svg.h
85
include/mupdf/ucdn.h
84
lib/libmupdf.so
86
lib/libmupdf.so
85
lib/libmupdf.so.%%SOVERSION%%
87
lib/libmupdf.so.%%SOVERSION%%
86
lib/libmupdfthird.so
88
lib/libmupdfthird.so
Lines 90-98 Link Here
90
%%PORTDOCS%%%%DOCSDIR%%/CHANGES
92
%%PORTDOCS%%%%DOCSDIR%%/CHANGES
91
%%PORTDOCS%%%%DOCSDIR%%/COPYING
93
%%PORTDOCS%%%%DOCSDIR%%/COPYING
92
%%PORTDOCS%%%%DOCSDIR%%/README
94
%%PORTDOCS%%%%DOCSDIR%%/README
93
%%PORTDOCS%%%%DOCSDIR%%/naming.txt
95
%%PORTDOCS%%%%DOCSDIR%%/android-sdk.html
94
%%PORTDOCS%%%%DOCSDIR%%/overview.txt
96
%%PORTDOCS%%%%DOCSDIR%%/artifex-logo.png
95
%%PORTDOCS%%%%DOCSDIR%%/progressive.txt
97
%%PORTDOCS%%%%DOCSDIR%%/building.html
96
%%PORTDOCS%%%%DOCSDIR%%/refcount.txt
98
%%PORTDOCS%%%%DOCSDIR%%/coding-overview.html
97
%%PORTDOCS%%%%DOCSDIR%%/thirdparty.txt
99
%%PORTDOCS%%%%DOCSDIR%%/coding-progressive.html
98
%%PORTDOCS%%%%DOCSDIR%%/types.txt
100
%%PORTDOCS%%%%DOCSDIR%%/coding-style.html
101
%%PORTDOCS%%%%DOCSDIR%%/examples/create-thumbnail.js
102
%%PORTDOCS%%%%DOCSDIR%%/examples/draw-device.js
103
%%PORTDOCS%%%%DOCSDIR%%/examples/draw-document.js
104
%%PORTDOCS%%%%DOCSDIR%%/examples/example.c
105
%%PORTDOCS%%%%DOCSDIR%%/examples/jpx-to-pdf.js
106
%%PORTDOCS%%%%DOCSDIR%%/examples/multi-threaded.c
107
%%PORTDOCS%%%%DOCSDIR%%/examples/pdf-create-lowlevel.js
108
%%PORTDOCS%%%%DOCSDIR%%/examples/pdf-create.js
109
%%PORTDOCS%%%%DOCSDIR%%/examples/pdf-merge.js
110
%%PORTDOCS%%%%DOCSDIR%%/examples/trace-device.js
111
%%PORTDOCS%%%%DOCSDIR%%/index.html
112
%%PORTDOCS%%%%DOCSDIR%%/manual-mupdf-gl.html
113
%%PORTDOCS%%%%DOCSDIR%%/manual-mutool-clean.html
114
%%PORTDOCS%%%%DOCSDIR%%/manual-mutool-convert.html
115
%%PORTDOCS%%%%DOCSDIR%%/manual-mutool-create.html
116
%%PORTDOCS%%%%DOCSDIR%%/manual-mutool-draw.html
117
%%PORTDOCS%%%%DOCSDIR%%/manual-mutool-extract.html
118
%%PORTDOCS%%%%DOCSDIR%%/manual-mutool-merge.html
119
%%PORTDOCS%%%%DOCSDIR%%/manual-mutool-portfolio.html
120
%%PORTDOCS%%%%DOCSDIR%%/manual-mutool-run.html
121
%%PORTDOCS%%%%DOCSDIR%%/manual-mutool-show.html
122
%%PORTDOCS%%%%DOCSDIR%%/manual-mutool-trace.html
123
%%PORTDOCS%%%%DOCSDIR%%/style.css
124
%%PORTDOCS%%%%DOCSDIR%%/template.html
125
%%PORTDOCS%%%%DOCSDIR%%/thirdparty.html

Return to bug 224712