commit: 7b987bb0143edbbf0f7e34512c1e90d78db8e692 Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> AuthorDate: Sun Oct 30 08:12:13 2016 +0000 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> CommitDate: Sun Oct 30 08:16:52 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b987bb0
app-text/mupdf: Fix openjpeg-2.1 patch (#595406 by Oleg) Package-Manager: portage-2.3.2 app-text/mupdf/files/mupdf-1.5-openjpeg-2.1.patch | 50 ++++++++++++++++++++--- 1 file changed, 45 insertions(+), 5 deletions(-) diff --git a/app-text/mupdf/files/mupdf-1.5-openjpeg-2.1.patch b/app-text/mupdf/files/mupdf-1.5-openjpeg-2.1.patch index 7048140..f3b09eb 100644 --- a/app-text/mupdf/files/mupdf-1.5-openjpeg-2.1.patch +++ b/app-text/mupdf/files/mupdf-1.5-openjpeg-2.1.patch @@ -1,11 +1,51 @@ ---- mupdf-1.5/source/fitz/load-jpx.c -+++ mupdf-1.5/source/fitz/load-jpx.c -@@ -116,7 +116,7 @@ +From: =?utf-8?q?=22Kan-Ru_Chen_=28=E9=99=B3=E4=BE=83=E5=A6=82=29=22?= + <[email protected]> +Date: Sat, 20 Sep 2014 12:33:08 +0800 +Subject: Fix build with libopenjp2 + +--- + Makerules | 4 ++-- + source/fitz/load-jpx.c | 10 +--------- + 2 files changed, 3 insertions(+), 11 deletions(-) + +diff --git a/Makerules b/Makerules +index 766ad53..a93b9cf 100644 +--- a/Makerules ++++ b/Makerules +@@ -105,8 +105,8 @@ SYS_HARFBUZZ_CFLAGS = $(shell pkg-config --cflags harfbuzz) + SYS_HARFBUZZ_LIBS = $(shell pkg-config --libs harfbuzz) + SYS_FREETYPE_CFLAGS = $(shell pkg-config --cflags freetype2) + SYS_FREETYPE_LIBS = $(shell pkg-config --libs freetype2) +-SYS_OPENJPEG_CFLAGS = $(shell pkg-config --cflags libopenjp2) +-SYS_OPENJPEG_LIBS = $(shell pkg-config --libs libopenjp2) ++SYS_OPENJPEG_CFLAGS = -I/usr/include/openjpeg-2.1 ++SYS_OPENJPEG_LIBS = -lopenjp2 + SYS_JBIG2DEC_LIBS = -ljbig2dec + SYS_JPEG_LIBS = -ljpeg + SYS_ZLIB_LIBS = -lz +diff --git a/source/fitz/load-jpx.c b/source/fitz/load-jpx.c +index 6b92e5c..72dea50 100644 +--- a/source/fitz/load-jpx.c ++++ b/source/fitz/load-jpx.c +@@ -1,13 +1,5 @@ + #include "mupdf/fitz.h" + +-/* Without the definition of OPJ_STATIC, compilation fails on windows +- * due to the use of __stdcall. We believe it is required on some +- * linux toolchains too. */ +-#define OPJ_STATIC +-#ifndef _MSC_VER +-#define OPJ_HAVE_STDINT_H +-#endif +- + #include <openjpeg.h> + + static void fz_opj_error_callback(const char *msg, void *client_data) +@@ -117,7 +109,7 @@ fz_load_jpx(fz_context *ctx, unsigned char *data, int size, fz_colorspace *defcs opj_stream_set_read_function(stream, fz_opj_stream_read); opj_stream_set_skip_function(stream, fz_opj_stream_skip); opj_stream_set_seek_function(stream, fz_opj_stream_seek); - opj_stream_set_user_data(stream, &sb); + opj_stream_set_user_data(stream, &sb, NULL); /* Set the length to avoid an assert */ - opj_stream_set_user_data_length(stream, size); - + opj_stream_set_user_data_length(stream, size); \ No newline at end of file
