Date: Sat, 4 May 2019 11:43:14 +0000 (UTC) From: Matthias Andree <mandree@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r500805 - in head/graphics/exact-image: . files Message-ID: <201905041143.x44BhE4d051108@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mandree Date: Sat May 4 11:43:14 2019 New Revision: 500805 URL: https://svnweb.freebsd.org/changeset/ports/500805 Log: Upgrade to new upstream release 1.0.2. Reported by: portscout Deleted: head/graphics/exact-image/files/patch-api_api-swig.hh head/graphics/exact-image/files/patch-codecs_raw.cc Modified: head/graphics/exact-image/Makefile head/graphics/exact-image/distinfo head/graphics/exact-image/files/patch-api-api.cc head/graphics/exact-image/files/patch-build__bottom.make head/graphics/exact-image/files/patch-codecs__jpeg.cc head/graphics/exact-image/files/patch-codecs_dcraw.h Modified: head/graphics/exact-image/Makefile ============================================================================== --- head/graphics/exact-image/Makefile Sat May 4 11:02:16 2019 (r500804) +++ head/graphics/exact-image/Makefile Sat May 4 11:43:14 2019 (r500805) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= exact-image -PORTVERSION= 0.9.2 +PORTVERSION= 1.0.2 CATEGORIES= graphics perl5 python MASTER_SITES= https://dl.exactcode.de/oss/exact-image/ @@ -20,6 +20,7 @@ LIB_DEPENDS= libagg.so:graphics/agg \ libpng.so:graphics/png \ libgif.so:graphics/giflib \ libjasper.so:graphics/jasper \ + libImath-2_3.so:graphics/ilmbase \ libIlmImf.so:graphics/openexr \ liblcms.so:graphics/lcms \ libfreetype.so:print/freetype2 \ Modified: head/graphics/exact-image/distinfo ============================================================================== --- head/graphics/exact-image/distinfo Sat May 4 11:02:16 2019 (r500804) +++ head/graphics/exact-image/distinfo Sat May 4 11:43:14 2019 (r500805) @@ -1,3 +1,3 @@ -TIMESTAMP = 1480938306 -SHA256 (exact-image-0.9.2.tar.bz2) = 665b205740b17b4162fae73aa36eb7046f28bb216d612461ca0499ff47a566ba -SIZE (exact-image-0.9.2.tar.bz2) = 312995 +TIMESTAMP = 1556965227 +SHA256 (exact-image-1.0.2.tar.bz2) = 0694c66be5dec41377acead475de69b3d7ffb42c702402f8b713f8b44cdc2791 +SIZE (exact-image-1.0.2.tar.bz2) = 322174 Modified: head/graphics/exact-image/files/patch-api-api.cc ============================================================================== --- head/graphics/exact-image/files/patch-api-api.cc Sat May 4 11:02:16 2019 (r500804) +++ head/graphics/exact-image/files/patch-api-api.cc Sat May 4 11:43:14 2019 (r500805) @@ -1,6 +1,6 @@ ---- api/api.cc.orig 2009-06-15 14:39:45.000000000 +0400 -+++ api/api.cc 2014-01-13 07:25:57.460488862 +0400 -@@ -909,7 +909,7 @@ +--- api/api.cc.orig 2009-06-15 10:39:45 UTC ++++ api/api.cc +@@ -909,7 +909,7 @@ char** imageDecodeBarcodes (Image* image, const char* } std::vector<std::string> ret; Modified: head/graphics/exact-image/files/patch-build__bottom.make ============================================================================== --- head/graphics/exact-image/files/patch-build__bottom.make Sat May 4 11:02:16 2019 (r500804) +++ head/graphics/exact-image/files/patch-build__bottom.make Sat May 4 11:43:14 2019 (r500805) @@ -1,6 +1,6 @@ ---- build/bottom.make.orig 2010-07-22 18:35:17.000000000 +0400 -+++ build/bottom.make 2014-12-12 00:07:13.000000000 +0300 -@@ -43,23 +43,23 @@ +--- build/bottom.make.orig 2018-05-03 16:50:06 UTC ++++ build/bottom.make +@@ -43,23 +43,23 @@ $(X_MODULE): $($(X_MODULE)_BINARY) $($(X_MODULE)_OUTPUT)/%.o: $(X_MODULE)/%.c @echo ' C $@' Modified: head/graphics/exact-image/files/patch-codecs__jpeg.cc ============================================================================== --- head/graphics/exact-image/files/patch-codecs__jpeg.cc Sat May 4 11:02:16 2019 (r500804) +++ head/graphics/exact-image/files/patch-codecs__jpeg.cc Sat May 4 11:43:14 2019 (r500805) @@ -1,8 +1,8 @@ ---- codecs/jpeg.cc.orig 2009-06-14 08:19:28.000000000 -0400 -+++ codecs/jpeg.cc 2010-01-16 21:51:34.000000000 -0500 -@@ -683,7 +683,7 @@ - * We need to clean up the JPEG object, close the input file, and return. - */ +--- codecs/jpeg.cc.orig 2017-08-08 14:31:16 UTC ++++ codecs/jpeg.cc +@@ -901,7 +901,7 @@ bool JPEGCodec::readMeta (std::istream* stream, Image& + // If we get here, the JPEG code has signaled an error. + // We need to clean up the JPEG object, close the input file, and return. jpeg_destroy_decompress (cinfo); - free (cinfo); + delete cinfo; Modified: head/graphics/exact-image/files/patch-codecs_dcraw.h ============================================================================== --- head/graphics/exact-image/files/patch-codecs_dcraw.h Sat May 4 11:02:16 2019 (r500804) +++ head/graphics/exact-image/files/patch-codecs_dcraw.h Sat May 4 11:43:14 2019 (r500805) @@ -1,8 +1,8 @@ ---- codecs/dcraw.h.orig 2015-07-16 15:20:12 UTC +--- codecs/dcraw.h.orig 2018-06-06 15:17:56 UTC +++ codecs/dcraw.h -@@ -843,8 +843,9 @@ int CLASS ljpeg_start (struct jhead *jh, int info_only +@@ -825,8 +825,9 @@ int CLASS ljpeg_start (struct jhead *jh, int info_only do { - fread (data, 2, 2, ifp); + if (!fread (data, 2, 2, ifp)) return 0; tag = data[0] << 8 | data[1]; - len = (data[2] << 8 | data[3]) - 2; - if (tag <= 0xff00) return 0; @@ -12,7 +12,7 @@ fread (data, 1, len, ifp); switch (tag) { case 0xffc3: -@@ -4393,22 +4394,22 @@ void CLASS vng_interpolate() +@@ -4438,22 +4439,22 @@ void CLASS vng_interpolate() -2,+0,+0,-1,0,0x06, -2,+0,+0,+0,1,0x02, -2,+0,+0,+1,0,0x03, -2,+1,-1,+0,0,0x04, -2,+1,+0,-1,1,0x04, -2,+1,+0,+0,0,0x06, -2,+1,+0,+1,0,0x02, -2,+2,+0,+0,1,0x04, -2,+2,+0,+1,0,0x04, @@ -40,16 +40,16 @@ +1,+0,+2,+1,0,0x10 }, chood[] = { -1,-1, -1,0, -1,+1, 0,+1, +1,+1, +1,0, +1,-1, 0,-1 }; ushort (*brow[5])[4], *pix; -@@ -7771,7 +7772,7 @@ void CLASS adobe_coeff (const char *make, const char * +@@ -8096,7 +8097,7 @@ void CLASS adobe_coeff (const char *make, const char * { 8035,435,-962,-6001,13872,2320,-1159,3065,5434 } }, - { "Phase One P65", 0, 0, - { 8035,435,-962,-6001,13872,2320,-1159,3065,5434 } }, + { "Photron BC2-HD", 0, 0, /* DJC */ + { 14603,-4122,-528,-1810,9794,2017,-297,2763,5936 } }, - { "Red One", 704, 0xffff, /* DJC */ + { "Red One", 704, -1, /* DJC */ { 21014,-7891,-2613,-3056,12201,856,-2203,5125,8042 } }, - { "Samsung EX1", 0, 0x3e00, - { 8898,-2498,-994,-3144,11328,2066,-760,1381,4576 } }, -@@ -9547,7 +9548,7 @@ void CLASS tiff_head (struct tiff_hdr *th, int full) + { "Ricoh GR II", 0, 0, + { 4630,-834,-423,-4977,12805,2417,-638,1467,6115 } }, +@@ -9956,7 +9957,7 @@ void CLASS tiff_head (struct tiff_hdr *th, int full) strncpy (th->desc, desc, 512); strncpy (th->make, make, 64); strncpy (th->model, model, 64);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201905041143.x44BhE4d051108>