summaryrefslogtreecommitdiff
path: root/print/mupdf
diff options
context:
space:
mode:
authoradam <adam@pkgsrc.org>2012-12-08 23:09:39 +0000
committeradam <adam@pkgsrc.org>2012-12-08 23:09:39 +0000
commit4fcb53fe80b29957bd4fdeb62deff805f480f342 (patch)
tree0baf86965d856c331725a777f28ee520ff2cd727 /print/mupdf
parent5b9991a3adcfda094b7a34068fe47ab1e270f54e (diff)
downloadpkgsrc-4fcb53fe80b29957bd4fdeb62deff805f480f342.tar.gz
Use openjpeg15 instead of openjpeg, since openjpeg has been updated to 2.0.0
Diffstat (limited to 'print/mupdf')
-rw-r--r--print/mupdf/Makefile9
-rw-r--r--print/mupdf/distinfo3
-rw-r--r--print/mupdf/patches/patch-fitz_image_jpx.c15
3 files changed, 21 insertions, 6 deletions
diff --git a/print/mupdf/Makefile b/print/mupdf/Makefile
index f2b6abbe161..f226a39e9ce 100644
--- a/print/mupdf/Makefile
+++ b/print/mupdf/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2012/10/23 10:24:10 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.16 2012/12/08 23:09:39 adam Exp $
DISTNAME= mupdf-1.1-source
PKGNAME= ${DISTNAME:S/-source//}
+PKGREVISION= 1
CATEGORIES= print
MASTER_SITES= http://ccxvii.net/mupdf/download/ \
http://ccxvii.net/mupdf/download/archive/
@@ -12,9 +12,8 @@ HOMEPAGE= http://mupdf.com/
COMMENT= Lightweight PDF viewer and toolkit
LICENSE= gnu-gpl-v3
-USE_TOOLS+= pkg-config gmake
-
USE_LIBTOOL= yes
+USE_TOOLS+= pkg-config gmake
INSTALLATION_DIRS+= bin include lib/pkgconfig
INSTALL_MAKE_FLAGS+= prefix=${DESTDIR}${PREFIX}
@@ -32,6 +31,6 @@ post-install:
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../graphics/jbig2dec/buildlink3.mk"
.include "../../mk/jpeg.buildlink3.mk"
-.include "../../graphics/openjpeg/buildlink3.mk"
+.include "../../graphics/openjpeg15/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/print/mupdf/distinfo b/print/mupdf/distinfo
index 07656e8ff31..6dfaf5b891d 100644
--- a/print/mupdf/distinfo
+++ b/print/mupdf/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2012/08/21 19:50:53 drochner Exp $
+$NetBSD: distinfo,v 1.9 2012/12/08 23:09:39 adam Exp $
SHA1 (mupdf-1.1-source.tar.gz) = e2c2cd555d790ed97bd6507accf29817945dfe81
RMD160 (mupdf-1.1-source.tar.gz) = 7ebdbd3a1cc64a4de1de920d7b149a3682ba1431
@@ -6,3 +6,4 @@ Size (mupdf-1.1-source.tar.gz) = 4281735 bytes
SHA1 (patch-ab) = fa8d1acb5ff8cf3562e0f27f0b2a0d27408d2542
SHA1 (patch-ac) = dbda8ee49ac4cfe43b09329d25a7d7e6b45ef164
SHA1 (patch-ae) = 792df3bea1f8c13230bfdce5495eaaf99c62cc12
+SHA1 (patch-fitz_image_jpx.c) = 6ca57a09c527b11f1b1bcf5364a5a2dfbe39f79d
diff --git a/print/mupdf/patches/patch-fitz_image_jpx.c b/print/mupdf/patches/patch-fitz_image_jpx.c
new file mode 100644
index 00000000000..76ef8e3af44
--- /dev/null
+++ b/print/mupdf/patches/patch-fitz_image_jpx.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-fitz_image_jpx.c,v 1.1 2012/12/08 23:09:40 adam Exp $
+
+Fix path to openjpeg include.
+
+--- fitz/image_jpx.c.orig 2012-12-08 22:53:28.000000000 +0000
++++ fitz/image_jpx.c
+@@ -1,7 +1,7 @@
+ #include "fitz-internal.h"
+
+ #define OPJ_STATIC
+-#include <openjpeg.h>
++#include <openjpeg-1.5/openjpeg.h>
+
+ static void fz_opj_error_callback(const char *msg, void *client_data)
+ {