pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/graphics/jasper Upgrade jasper from 1.900.1 to 1.900.29.
details: https://anonhg.NetBSD.org/pkgsrc/rev/a3683d70986d
branches: trunk
changeset: 355952:a3683d70986d
user: he <he%pkgsrc.org@localhost>
date: Fri Dec 16 09:44:44 2016 +0000
description:
Upgrade jasper from 1.900.1 to 1.900.29.
This integrates most of the patches we had applied in pkgsrc.
The changes are in ChangeLog, and are not well summarized anywhere
I can find, sorry...
OK from adam@
diffstat:
graphics/jasper/Makefile | 11 +-
graphics/jasper/PLIST | 4 +-
graphics/jasper/distinfo | 45 +-
graphics/jasper/patches/patch-configure | 180 ++++-
graphics/jasper/patches/patch-src_libjasper_base_jas__cm.c | 51 -
graphics/jasper/patches/patch-src_libjasper_base_jas__icc.c | 123 ---
graphics/jasper/patches/patch-src_libjasper_base_jas__image.c | 50 -
graphics/jasper/patches/patch-src_libjasper_base_jas__malloc.c | 75 --
graphics/jasper/patches/patch-src_libjasper_base_jas__seq.c | 101 +--
graphics/jasper/patches/patch-src_libjasper_base_jas__stream.c | 48 +-
graphics/jasper/patches/patch-src_libjasper_bmp_bmp__dec.c | 16 -
graphics/jasper/patches/patch-src_libjasper_include_jasper_jas__malloc.h | 30 -
graphics/jasper/patches/patch-src_libjasper_jp2_jp2__cod.c | 62 +-
graphics/jasper/patches/patch-src_libjasper_jp2_jp2__dec.c | 49 +-
graphics/jasper/patches/patch-src_libjasper_jp2_jp2__enc.c | 33 +-
graphics/jasper/patches/patch-src_libjasper_jpc_jpc__cs.c | 88 --
graphics/jasper/patches/patch-src_libjasper_jpc_jpc__dec.c | 188 +-----
graphics/jasper/patches/patch-src_libjasper_jpc_jpc__enc.c | 103 +--
graphics/jasper/patches/patch-src_libjasper_jpc_jpc__mqdec.c | 16 -
graphics/jasper/patches/patch-src_libjasper_jpc_jpc__mqenc.c | 16 -
graphics/jasper/patches/patch-src_libjasper_jpc_jpc__qmfb.c | 344 ----------
graphics/jasper/patches/patch-src_libjasper_jpc_jpc__t1enc.c | 16 -
graphics/jasper/patches/patch-src_libjasper_jpc_jpc__t2cod.c | 16 -
graphics/jasper/patches/patch-src_libjasper_jpc_jpc__t2dec.c | 34 -
graphics/jasper/patches/patch-src_libjasper_jpc_jpc__t2enc.c | 34 -
graphics/jasper/patches/patch-src_libjasper_jpc_jpc__tagtree.c | 16 -
graphics/jasper/patches/patch-src_libjasper_jpc_jpc__util.c | 16 -
graphics/jasper/patches/patch-src_libjasper_mif_mif__cod.c | 17 -
graphics/jasper/patches/patch-src_libjasper_pnm_pnm__enc.c | 5 +-
29 files changed, 239 insertions(+), 1548 deletions(-)
diffs (truncated from 2031 to 300 lines):
diff -r 26836bcd00dd -r a3683d70986d graphics/jasper/Makefile
--- a/graphics/jasper/Makefile Fri Dec 16 09:40:52 2016 +0000
+++ b/graphics/jasper/Makefile Fri Dec 16 09:44:44 2016 +0000
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.43 2016/05/16 14:03:40 he Exp $
+# $NetBSD: Makefile,v 1.44 2016/12/16 09:44:44 he Exp $
-DISTNAME= jasper-1.900.1
-PKGREVISION= 12
+DISTNAME= jasper-1.900.29
CATEGORIES= graphics
MASTER_SITES= http://www.ece.uvic.ca/~mdadams/jasper/software/
-EXTRACT_SUFX= .zip
MAINTAINER= adam%NetBSD.org@localhost
HOMEPAGE= http://www.ece.uvic.ca/~mdadams/jasper/
@@ -16,6 +14,11 @@
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --enable-shared --without-x --disable-opengl
+USE_TOOLS+= gmake
+USE_TOOLS+= pkg-config
+
+PKGCONFIG_OVERRIDE= pkgconfig/jasper.pc
+
# The solaris stdbool.h requires c99 which is fine for jasper, but
# not so good for things that depend upon jasper. See PR#43901
CONFIGURE_ENV.SunOS+= ac_cv_header_stdbool_h=no
diff -r 26836bcd00dd -r a3683d70986d graphics/jasper/PLIST
--- a/graphics/jasper/PLIST Fri Dec 16 09:40:52 2016 +0000
+++ b/graphics/jasper/PLIST Fri Dec 16 09:44:44 2016 +0000
@@ -1,11 +1,10 @@
-@comment $NetBSD: PLIST,v 1.9 2009/06/14 17:59:19 joerg Exp $
+@comment $NetBSD: PLIST,v 1.10 2016/12/16 09:44:44 he Exp $
bin/imgcmp
bin/imginfo
bin/jasper
bin/tmrdemo
include/jasper/jas_cm.h
include/jasper/jas_config.h
-include/jasper/jas_config2.h
include/jasper/jas_debug.h
include/jasper/jas_fix.h
include/jasper/jas_getopt.h
@@ -29,3 +28,4 @@
man/man1/jiv.1
share/doc/jasper/jasper.pdf
share/doc/jasper/jpeg2000.pdf
+lib/pkgconfig/jasper.pc
diff -r 26836bcd00dd -r a3683d70986d graphics/jasper/distinfo
--- a/graphics/jasper/distinfo Fri Dec 16 09:40:52 2016 +0000
+++ b/graphics/jasper/distinfo Fri Dec 16 09:44:44 2016 +0000
@@ -1,32 +1,15 @@
-$NetBSD: distinfo,v 1.20 2016/05/16 14:03:40 he Exp $
+$NetBSD: distinfo,v 1.21 2016/12/16 09:44:44 he Exp $
-SHA1 (jasper-1.900.1.zip) = 9c5735f773922e580bf98c7c7dfda9bbed4c5191
-RMD160 (jasper-1.900.1.zip) = fb2c188abf5b8c297078ac1f913101734f72db5c
-SHA512 (jasper-1.900.1.zip) = e3a3c803de848b50482f5bd693b1945197c6999285226c45b671855734d7bb2611fbe6f28cd8ba9c56a4ea59417795eba42d72516c9fec93b8fbaa21b8210cb6
-Size (jasper-1.900.1.zip) = 1415752 bytes
-SHA1 (patch-configure) = c8aa09f8432f0e3f5667ecb3ccd738c3c03f3f05
-SHA1 (patch-src_libjasper_base_jas__cm.c) = 51bcaa7d992616c4caf764d190d42c8c802324f8
-SHA1 (patch-src_libjasper_base_jas__icc.c) = 855e8b733a4a043d06cea60deaa497784e55838c
-SHA1 (patch-src_libjasper_base_jas__image.c) = d9119ab45d95f954604167374f5f97c1d94d508f
-SHA1 (patch-src_libjasper_base_jas__malloc.c) = 887509258c8a957932bb212b747aa5b8932e82af
-SHA1 (patch-src_libjasper_base_jas__seq.c) = bc1c38439eb61e3c50a5900e38e4a8992bc790fe
-SHA1 (patch-src_libjasper_base_jas__stream.c) = 1e6cbd1cf0a273f94144e1f12624b9a5d612dd84
-SHA1 (patch-src_libjasper_bmp_bmp__dec.c) = 162f760235fba871c48afc273276fad884250ed6
-SHA1 (patch-src_libjasper_include_jasper_jas__malloc.h) = 3d6e873f11074bc54bd6dc5665d3c80413ef89fe
-SHA1 (patch-src_libjasper_jp2_jp2__cod.c) = 656f23983f97e3b5eea49898e9f29d6b3eef5b19
-SHA1 (patch-src_libjasper_jp2_jp2__dec.c) = 9b8fbb8e947e403fed6c610a0d4a0c63640462e5
-SHA1 (patch-src_libjasper_jp2_jp2__enc.c) = f6a86101e04a2efdb0840b44a2b892de18683c59
-SHA1 (patch-src_libjasper_jpc_jpc__cs.c) = 603ee1ac6089bd190581fd0e00efabc18a41f48a
-SHA1 (patch-src_libjasper_jpc_jpc__dec.c) = 026235b7f59ecaa8ee148f0301dd96dc9a570e80
-SHA1 (patch-src_libjasper_jpc_jpc__enc.c) = 81cf4df888d1542cf52fadb202b82a05c8bdfd83
-SHA1 (patch-src_libjasper_jpc_jpc__mqdec.c) = bcf41d1da270478a731494a913bd626ba7d533f4
-SHA1 (patch-src_libjasper_jpc_jpc__mqenc.c) = b6c80212129f82268c43e5a3e39a7c7e1c12655a
-SHA1 (patch-src_libjasper_jpc_jpc__qmfb.c) = 6e7b5180047c6c8855aa22a3dd94d8deeb39b560
-SHA1 (patch-src_libjasper_jpc_jpc__t1enc.c) = 3aade36d3a171ad08f7be93c48bb51ab9fb9126f
-SHA1 (patch-src_libjasper_jpc_jpc__t2cod.c) = ce1a300066db7adfed03f55fc47d6392dd2d2221
-SHA1 (patch-src_libjasper_jpc_jpc__t2dec.c) = 06a2e58843b59bbf698a5aa15ba253fa51f18568
-SHA1 (patch-src_libjasper_jpc_jpc__t2enc.c) = 0a6119b4fc5a6305a8adb92357805af1fb55f1d9
-SHA1 (patch-src_libjasper_jpc_jpc__tagtree.c) = 9f0594c4aa576ef5d0cb85ec2c01c364efecf855
-SHA1 (patch-src_libjasper_jpc_jpc__util.c) = e7069e6106d7dd883aab18a1fa20c9dbfe1bebf1
-SHA1 (patch-src_libjasper_mif_mif__cod.c) = 7c34864c0c9f82eee89795673014feb5824fc7b5
-SHA1 (patch-src_libjasper_pnm_pnm__enc.c) = 3279f184f6191ea69d1b5ef8fb270ffcc6a69640
+SHA1 (jasper-1.900.29.tar.gz) = 6d50e5ea9e822ad5f88f4451819acab2e3b47f8e
+RMD160 (jasper-1.900.29.tar.gz) = 4ae47353f3dc086b3a11eff86ec7fb57d598c6fb
+SHA512 (jasper-1.900.29.tar.gz) = fdf557889660b9068e3712ff809fe7d4ab0855e1afff9a39eb19763599b4e747472743e4c49a42f7d38beadc6a0aa7a7b402422422853e8bb6d683def81b1544
+Size (jasper-1.900.29.tar.gz) = 1746319 bytes
+SHA1 (patch-configure) = 14039911be04b88559e40f20a01bb46fd0db4488
+SHA1 (patch-src_libjasper_base_jas__seq.c) = a0208cd0271388ae0fdc2e359da3223a35a7ae14
+SHA1 (patch-src_libjasper_base_jas__stream.c) = 2e9ad538ab2c0191063fef06202949b435b0085e
+SHA1 (patch-src_libjasper_jp2_jp2__cod.c) = bfbe752e105d75fbad71a01080013c7a5a8645d8
+SHA1 (patch-src_libjasper_jp2_jp2__dec.c) = 3cbf3a6355168aaa60a68ff8042f7cb4f6d847c4
+SHA1 (patch-src_libjasper_jp2_jp2__enc.c) = 4f23040e7039514bbbc60360121f1820e82017cc
+SHA1 (patch-src_libjasper_jpc_jpc__dec.c) = f76765ff7656af6b44cd4035b26656909abe45f9
+SHA1 (patch-src_libjasper_jpc_jpc__enc.c) = 10fbe41e67da4f2575fb541013833ed85992efea
+SHA1 (patch-src_libjasper_pnm_pnm__enc.c) = a2d5d53cd28f653f9e6e302f76c187fba50b1ce2
diff -r 26836bcd00dd -r a3683d70986d graphics/jasper/patches/patch-configure
--- a/graphics/jasper/patches/patch-configure Fri Dec 16 09:40:52 2016 +0000
+++ b/graphics/jasper/patches/patch-configure Fri Dec 16 09:44:44 2016 +0000
@@ -1,10 +1,10 @@
-$NetBSD: patch-configure,v 1.1 2015/01/01 14:15:27 he Exp $
+$NetBSD: patch-configure,v 1.2 2016/12/16 09:44:44 he Exp $
Check for C99 conformance for stdbool.h, don't just test its presence.
--- configure.orig 2007-01-19 21:54:48.000000000 +0000
+++ configure 2007-08-12 20:56:30.000000000 +0000
-@@ -20979,6 +20979,163 @@ _ACEOF
+@@ -8286,6 +8286,163 @@ fi
fi
@@ -168,12 +168,174 @@
-@@ -20990,7 +21147,7 @@ fi
-
+@@ -13727,6 +13884,170 @@ _ACEOF
+ fi
--for ac_header in fcntl.h limits.h unistd.h stdint.h stdbool.h io.h windows.h sys/types.h sys/time.h stdlib.h stddef.h
-+for ac_header in fcntl.h limits.h unistd.h stdint.h io.h windows.h sys/types.h sys/time.h stdlib.h stddef.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
++echo "$as_me:$LINENO: checking for stdbool.h that conforms to C99" >&5
++echo $ECHO_N "checking for stdbool.h that conforms to C99... $ECHO_C" >&6
++if test "${ac_cv_header_stdbool_h+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++
++#include <stdbool.h>
++#ifndef bool
++# error bool is not defined
++#endif
++#ifndef false
++# error false is not defined
++#endif
++#if false
++# error false is not 0
++#endif
++#ifndef true
++# error true is not defined
++#endif
++#if true != 1
++# error true is not 1
++#endif
++#ifndef __bool_true_false_are_defined
++# error __bool_true_false_are_defined is not defined
++#endif
++
++ struct s { _Bool s: 1; _Bool t; } s;
++
++ char a[true == 1 ? 1 : -1];
++ char b[false == 0 ? 1 : -1];
++ char c[__bool_true_false_are_defined == 1 ? 1 : -1];
++ char d[(bool) -0.5 == true ? 1 : -1];
++ bool e = &s;
++ char f[(_Bool) -0.0 == false ? 1 : -1];
++ char g[true];
++ char h[sizeof (_Bool)];
++ char i[sizeof s.t];
++
++int
++main ()
++{
++ return !a + !b + !c + !d + !e + !f + !g + !h + !i;
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++ (eval $ac_compile) 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } &&
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++ (eval $ac_try) 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; } &&
++ { ac_try='test -s conftest.$ac_objext'
++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++ (eval $ac_try) 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; }; then
++ ac_cv_header_stdbool_h=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_header_stdbool_h=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_header_stdbool_h" >&5
++echo "${ECHO_T}$ac_cv_header_stdbool_h" >&6
++echo "$as_me:$LINENO: checking for _Bool" >&5
++echo $ECHO_N "checking for _Bool... $ECHO_C" >&6
++if test "${ac_cv_type__Bool+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++$ac_includes_default
++int
++main ()
++{
++if ((_Bool *) 0)
++ return 0;
++if (sizeof (_Bool))
++ return 0;
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++ (eval $ac_compile) 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } &&
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++ (eval $ac_try) 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; } &&
++ { ac_try='test -s conftest.$ac_objext'
++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++ (eval $ac_try) 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; }; then
++ ac_cv_type__Bool=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_type__Bool=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_type__Bool" >&5
++echo "${ECHO_T}$ac_cv_type__Bool" >&6
++if test $ac_cv_type__Bool = yes; then
++
++cat >>confdefs.h <<_ACEOF
++#define HAVE__BOOL 1
++_ACEOF
++
++
++fi
++
++if test $ac_cv_header_stdbool_h = yes; then
++
++cat >>confdefs.h <<\_ACEOF
++#define HAVE_STDBOOL_H 1
++_ACEOF
++
++fi
++
++
++
++
++
++
++
+ ############################################################
+ # Check for header files.
+ ############################################################
diff -r 26836bcd00dd -r a3683d70986d graphics/jasper/patches/patch-src_libjasper_base_jas__cm.c
--- a/graphics/jasper/patches/patch-src_libjasper_base_jas__cm.c Fri Dec 16 09:40:52 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
Home |
Main Index |
Thread Index |
Old Index