summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoradam <adam@pkgsrc.org>2007-01-07 19:00:59 +0000
committeradam <adam@pkgsrc.org>2007-01-07 19:00:59 +0000
commit269cdf660031fa162c600e8fc18121014d31b0c1 (patch)
treeef465d92ff77d4d0874a9ecc7d5790b043226047
parente86833292115fffe531d2a11ab0277ff17b4ebce (diff)
downloadpkgsrc-269cdf660031fa162c600e8fc18121014d31b0c1.tar.gz
Fix building on Darwin/Mac OS X
-rw-r--r--graphics/jasper/Makefile9
-rw-r--r--graphics/jasper/distinfo3
-rw-r--r--graphics/jasper/patches/patch-aa14
3 files changed, 19 insertions, 7 deletions
diff --git a/graphics/jasper/Makefile b/graphics/jasper/Makefile
index 0fa239832a2..fea2f3e4633 100644
--- a/graphics/jasper/Makefile
+++ b/graphics/jasper/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2007/01/06 23:28:07 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.23 2007/01/07 19:00:59 adam Exp $
DISTNAME= jasper-1.900.0
CATEGORIES= graphics
@@ -12,9 +11,9 @@ COMMENT= Software-based reference implementation of the JPEG-2000 codec
PKG_INSTALLATION_TYPES= overwrite pkgviews
-GNU_CONFIGURE= YES
USE_LANGUAGES+= c99
-USE_LIBTOOL= YES
+USE_LIBTOOL= yes
+GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --enable-shared --without-x --disable-opengl
post-install:
@@ -23,7 +22,5 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/doc/${doc}.pdf ${PREFIX}/share/doc/jasper
.endfor
-.include "../../mk/bsd.prefs.mk"
-
.include "../../graphics/jpeg/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/jasper/distinfo b/graphics/jasper/distinfo
index b16279d56ae..f1cab002f3b 100644
--- a/graphics/jasper/distinfo
+++ b/graphics/jasper/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.8 2007/01/06 23:28:07 wiz Exp $
+$NetBSD: distinfo,v 1.9 2007/01/07 19:00:59 adam Exp $
SHA1 (jasper-1.900.0.zip) = 1959a9e5d35d15b8be8789c993e743cb657207ef
RMD160 (jasper-1.900.0.zip) = ac02698b747954c1e64b8b217fd1bde72c2c7178
Size (jasper-1.900.0.zip) = 1401734 bytes
+SHA1 (patch-aa) = be18bd14b9eb7b9b3c69816ee39f047ae87a056a
SHA1 (patch-ad) = 85637e42cdb1245babd5736c2d039558025738a6
SHA1 (patch-ae) = bfe00f76582a44ad748706c3fc81c4d6b8aede35
SHA1 (patch-ag) = 63da6dcbdca3f8e4508be8f934ec047abf5cb1f1
diff --git a/graphics/jasper/patches/patch-aa b/graphics/jasper/patches/patch-aa
new file mode 100644
index 00000000000..e9e2d760bd4
--- /dev/null
+++ b/graphics/jasper/patches/patch-aa
@@ -0,0 +1,14 @@
+$NetBSD: patch-aa,v 1.3 2007/01/07 19:00:59 adam Exp $
+
+--- src/libjasper/jpc/jpc_qmfb.h.orig 2007-01-07 19:51:43.000000000 +0100
++++ src/libjasper/jpc/jpc_qmfb.h
+@@ -107,7 +107,7 @@ typedef struct {
+ double *hpenergywts;
+ } jpc_qmfb2d_t;
+
+-jpc_qmfb2d_t jpc_ft_qmfb2d;
+-jpc_qmfb2d_t jpc_ns_qmfb2d;
++extern jpc_qmfb2d_t jpc_ft_qmfb2d;
++extern jpc_qmfb2d_t jpc_ns_qmfb2d;
+
+ #endif