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

Collapse All | Expand All

(-)graphics/mupdf/Makefile (-1 / +8 lines)
Lines 2-8 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	mupdf
4
PORTNAME=	mupdf
5
PORTVERSION=	1.12.0
5
PORTVERSION=	1.13.0
6
DISTVERSIONSUFFIX=	-source
6
DISTVERSIONSUFFIX=	-source
7
PORTEPOCH=	1
7
PORTEPOCH=	1
8
CATEGORIES=	graphics
8
CATEGORIES=	graphics
Lines 27-32 Link Here
27
LIBS+=		-L${LOCALBASE}/lib
27
LIBS+=		-L${LOCALBASE}/lib
28
MAKE_ARGS=	build=release prefix=${PREFIX} mandir=${PREFIX}/man verbose=yes \
28
MAKE_ARGS=	build=release prefix=${PREFIX} mandir=${PREFIX}/man verbose=yes \
29
		SOVERSION=${PORTVERSION}
29
		SOVERSION=${PORTVERSION}
30
ALL_TARGET=	all extra
30
USES=		cpe compiler:c++11-lang gmake jpeg pkgconfig
31
USES=		cpe compiler:c++11-lang gmake jpeg pkgconfig
31
USE_XORG=	x11 xcursor xext xinerama xrandr
32
USE_XORG=	x11 xcursor xext xinerama xrandr
32
USE_GL=		gl glut
33
USE_GL=		gl glut
Lines 61-66 Link Here
61
62
62
post-install:
63
post-install:
63
	${MV} ${STAGEDIR}${PREFIX}/bin/mupdf-x11 ${STAGEDIR}${PREFIX}/bin/mupdf
64
	${MV} ${STAGEDIR}${PREFIX}/bin/mupdf-x11 ${STAGEDIR}${PREFIX}/bin/mupdf
65
	${INSTALL_PROGRAM} \
66
		${WRKSRC}/build/release/mjsgen \
67
		${WRKSRC}/build/release/mujstest \
68
		${WRKSRC}/build/release/mupdf-x11-curl \
69
		${WRKSRC}/build/release/muraster \
70
		${STAGEDIR}${PREFIX}/bin
64
	${LN} -s libmupdf.so.${PORTVERSION} \
71
	${LN} -s libmupdf.so.${PORTVERSION} \
65
		${STAGEDIR}${PREFIX}/lib/libmupdf.so
72
		${STAGEDIR}${PREFIX}/lib/libmupdf.so
66
	${LN} -s libmupdfthird.so.${PORTVERSION} \
73
	${LN} -s libmupdfthird.so.${PORTVERSION} \
(-)graphics/mupdf/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1514557967
1
TIMESTAMP = 1529321680
2
SHA256 (mupdf-1.12.0-source.tar.gz) = 5c6353a82f1512f4f5280cf69a3725d1adac9c8b22377ec2a447c4fc45528755
2
SHA256 (mupdf-1.13.0-source.tar.gz) = 071c6962cbee1136188da62136596a9d704b81e35fe617cd34874bbb0ae7ca09
3
SIZE (mupdf-1.12.0-source.tar.gz) = 51508917
3
SIZE (mupdf-1.13.0-source.tar.gz) = 51425034
(-)graphics/mupdf/files/patch-Makerules (-2 / +2 lines)
Lines 1-4 Link Here
1
--- Makerules.orig	2017-12-13 14:00:30 UTC
1
--- Makerules.orig	2018-06-18 11:40:10 UTC
2
+++ Makerules
2
+++ Makerules
3
@@ -87,7 +87,7 @@ LD = xcrun ld
3
@@ -87,7 +87,7 @@ LD = xcrun ld
4
 RANLIB_CMD = xcrun ranlib $@
4
 RANLIB_CMD = xcrun ranlib $@
Lines 13-19 Link Here
13
 SYS_GLUT_CFLAGS :=
13
 SYS_GLUT_CFLAGS :=
14
 SYS_GLUT_LIBS := -lglut -lGL
14
 SYS_GLUT_LIBS := -lglut -lGL
15
 
15
 
16
-ifeq "$(shell pkg-config --exists 'libcrypto <= 1.0.1t' && echo yes)" "yes"
16
-ifeq "$(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes)" "yes"
17
-HAVE_LIBCRYPTO := yes
17
-HAVE_LIBCRYPTO := yes
18
-SYS_LIBCRYPTO_CFLAGS := -DHAVE_LIBCRYPTO $(shell pkg-config --cflags libcrypto)
18
-SYS_LIBCRYPTO_CFLAGS := -DHAVE_LIBCRYPTO $(shell pkg-config --cflags libcrypto)
19
-SYS_LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto)
19
-SYS_LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto)
(-)graphics/mupdf/files/patch-source__fitz__load-jpx.c (-33 lines)
Lines 1-33 Link Here
1
--- source/fitz/load-jpx.c.orig	2017-12-13 14:00:30 UTC
2
+++ source/fitz/load-jpx.c
3
@@ -445,14 +445,18 @@ fz_load_jpx_info(fz_context *ctx, const 
4
 
5
 #else /* HAVE_LURATECH */
6
 
7
+#ifdef __cplusplus
8
+extern "C"
9
+{
10
 #define OPJ_STATIC
11
 #define OPJ_HAVE_INTTYPES_H
12
 #if !defined(_MSC_VER) || _MSC_VER >= 1600
13
 #define OPJ_HAVE_STDINT_H
14
 #endif
15
+#endif
16
 #define USE_JPIP
17
 
18
-#include <openjpeg.h>
19
+#include <openjpeg-2.3/openjpeg.h>
20
 
21
 struct fz_jpxd_s
22
 {
23
@@ -930,6 +934,10 @@ fz_load_jpx_info(fz_context *ctx, const 
24
 	*yresp = state.yres;
25
 }
26
 
27
+#ifdef __cplusplus
28
+}
29
+#endif
30
+
31
 #endif /* HAVE_LURATECH */
32
 
33
 #else /* FZ_ENABLE_JPX */
(-)graphics/zathura-pdf-mupdf/Makefile (-6 / +9 lines)
Lines 2-8 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	zathura-pdf-mupdf
4
PORTNAME=	zathura-pdf-mupdf
5
PORTVERSION=	0.3.2
5
PORTVERSION=	0.3.3
6
CATEGORIES=	graphics
6
CATEGORIES=	graphics
7
MASTER_SITES=	https://pwmt.org/projects/zathura-pdf-mupdf/download/ \
7
MASTER_SITES=	https://pwmt.org/projects/zathura-pdf-mupdf/download/ \
8
		http://www.madpilot.net/~mad/pwmt.org/
8
		http://www.madpilot.net/~mad/pwmt.org/
Lines 22-36 Link Here
22
		libmupdf.so:graphics/mupdf \
22
		libmupdf.so:graphics/mupdf \
23
		libopenjp2.so:graphics/openjpeg
23
		libopenjp2.so:graphics/openjpeg
24
24
25
PLIST_FILES=	lib/zathura/pdf.so share/applications/zathura-pdf-mupdf.desktop
25
PLIST_FILES=	lib/zathura/libpdf-mupdf.so \
26
		share/applications/org.pwmt.zathura-pdf-mupdf.desktop \
27
		share/metainfo/org.pwmt.zathura-pdf-mupdf.metainfo.xml
26
28
27
MAKE_ARGS=	OPENSSL_INC=-I${OPENSSLINC} OPENSSL_LIB="-L${OPENSSLLIB} -lcrypto"
29
#MAKE_ARGS=	OPENSSL_INC=-I${OPENSSLINC} OPENSSL_LIB="-L${OPENSSLLIB} -lcrypto"
28
USES=		compiler:c11 desktop-file-utils gmake gettext jpeg pkgconfig ssl
30
USES=		compiler:c11 desktop-file-utils gmake jpeg meson pkgconfig tar:xz
29
USE_GNOME=	cairo gdkpixbuf2 glib20 gtk30
31
USE_GNOME=	cairo gdkpixbuf2 glib20 gtk30
32
USE_LDCONFIG=	yes
30
33
31
CONFLICTS_INSTALL=	zathura-pdf-poppler-[0-9]*
34
CONFLICTS_INSTALL=	zathura-pdf-poppler-[0-9]*
32
35
33
post-install:
36
post-patch:
34
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/zathura/pdf.so
37
	${REINPLACE_CMD} "s@\(cc.find_library(.*\))@\1,dirs:'${PREFIX}/lib')@" ${WRKSRC}/meson.build
35
38
36
.include <bsd.port.mk>
39
.include <bsd.port.mk>
(-)graphics/zathura-pdf-mupdf/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1514565077
1
TIMESTAMP = 1531483831
2
SHA256 (zathura-pdf-mupdf-0.3.2.tar.gz) = 931d88c4d1adc3be77a8fa9f28c25fc2aa9c9ffbabfaeac4aacc1e1d07936a76
2
SHA256 (zathura-pdf-mupdf-0.3.3.tar.xz) = 52b02ceee272a47f7ef9c2b73cc4f6fb480c02fdce0e7f6b7c8e93ad6ac46dfd
3
SIZE (zathura-pdf-mupdf-0.3.2.tar.gz) = 9687
3
SIZE (zathura-pdf-mupdf-0.3.3.tar.xz) = 7880

Return to bug 229110