diff options
| author | Thomas Zander <riggs@FreeBSD.org> | 2018-07-14 07:37:00 +0000 |
|---|---|---|
| committer | Thomas Zander <riggs@FreeBSD.org> | 2018-07-14 07:37:00 +0000 |
| commit | 73663b8b514dab0948f1aa56735529351b735d8a (patch) | |
| tree | 2fb16216f9365dc293cb5429516275c00e9319cb /graphics/mupdf/files | |
| parent | 834c1cba1f65dadde613f2af6d5c7cc6f91945d2 (diff) | |
| download | ports-73663b8b514dab0948f1aa56735529351b735d8a.tar.gz ports-73663b8b514dab0948f1aa56735529351b735d8a.zip | |
Notes
Diffstat (limited to 'graphics/mupdf/files')
| -rw-r--r-- | graphics/mupdf/files/patch-Makerules | 4 | ||||
| -rw-r--r-- | graphics/mupdf/files/patch-source__fitz__load-jpx.c | 33 |
2 files changed, 2 insertions, 35 deletions
diff --git a/graphics/mupdf/files/patch-Makerules b/graphics/mupdf/files/patch-Makerules index c5a0c9f13e69..7b1f77534089 100644 --- a/graphics/mupdf/files/patch-Makerules +++ b/graphics/mupdf/files/patch-Makerules @@ -1,4 +1,4 @@ ---- Makerules.orig 2017-12-13 14:00:30 UTC +--- Makerules.orig 2018-06-18 11:40:10 UTC +++ Makerules @@ -87,7 +87,7 @@ LD = xcrun ld RANLIB_CMD = xcrun ranlib $@ @@ -13,7 +13,7 @@ SYS_GLUT_CFLAGS := SYS_GLUT_LIBS := -lglut -lGL --ifeq "$(shell pkg-config --exists 'libcrypto <= 1.0.1t' && echo yes)" "yes" +-ifeq "$(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes)" "yes" -HAVE_LIBCRYPTO := yes -SYS_LIBCRYPTO_CFLAGS := -DHAVE_LIBCRYPTO $(shell pkg-config --cflags libcrypto) -SYS_LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto) diff --git a/graphics/mupdf/files/patch-source__fitz__load-jpx.c b/graphics/mupdf/files/patch-source__fitz__load-jpx.c deleted file mode 100644 index 17151d9a60d5..000000000000 --- a/graphics/mupdf/files/patch-source__fitz__load-jpx.c +++ /dev/null @@ -1,33 +0,0 @@ ---- source/fitz/load-jpx.c.orig 2017-12-13 14:00:30 UTC -+++ source/fitz/load-jpx.c -@@ -445,14 +445,18 @@ fz_load_jpx_info(fz_context *ctx, const - - #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 @@ fz_load_jpx_info(fz_context *ctx, const - *yresp = state.yres; - } - -+#ifdef __cplusplus -+} -+#endif -+ - #endif /* HAVE_LURATECH */ - - #else /* FZ_ENABLE_JPX */ |