- Update to version 0.9.2 and make it build on both amd64 and i386 by

  defining __LONG_LONG_SUPPORTED macro, which allows to pull llabs(3)
  for 64-bit numbers; was not a problem on amd64 because sizeof(long)
  == 8 there and thus no `long long' help needed

- Bump required C++ standard to C++03; it's not quite ready for later
  ones due to the this:

    bardecode/code25i.hh:34:29: error: in-class initializer for static
    data member of type 'const double' requires 'constexpr' specifier

- GC no-op `post-extract' target, patches that were applied upstream,
  and no longer relevant libungif -> libgif fixups in the Makefile

1 files changed, 48 insertions, 12 deletions

diff --git a/graphics/exact-image/files/patch-codecs_dcraw.h b/graphics/exact-image/files/patch-codecs_dcraw.h
index 7c5a9306a091..ddd61241f099 100644
--- a/graphics/exact-image/files/patch-codecs_dcraw.h
+++ b/graphics/exact-image/files/patch-codecs_dcraw.h
@@ -1,16 +1,6 @@
---- codecs/dcraw.h.orig	2013-10-22 14:00:07 UTC
+--- codecs/dcraw.h.orig	2015-07-16 15:20:12 UTC
 +++ codecs/dcraw.h
-@@ -775,7 +775,8 @@ struct jhead {
- 
- int CLASS ljpeg_start (struct jhead *jh, int info_only)
- {
--  int c, tag, len;
-+  int c,tag;
-+  ushort len;
-   uchar data[0x10000];
-   const uchar *dp;
- 
-@@ -786,8 +787,9 @@ int CLASS ljpeg_start (struct jhead *jh,
+@@ -843,8 +843,9 @@ int CLASS ljpeg_start (struct jhead *jh, int info_only
    do {
      fread (data, 2, 2, ifp);
      tag =  data[0] << 8 | data[1];
@@ -22,3 +12,49 @@
      fread (data, 1, len, ifp);
      switch (tag) {
        case 0xffc3:
+@@ -4393,22 +4394,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,
+-    -1,-2,-1,+0,0,0x80, -1,-2,+0,-1,0,0x01, -1,-2,+1,-1,0,0x01,
+-    -1,-2,+1,+0,1,0x01, -1,-1,-1,+1,0,0x88, -1,-1,+1,-2,0,0x40,
++    -1,-2,-1,+0,0,-128, -1,-2,+0,-1,0,0x01, -1,-2,+1,-1,0,0x01,
++    -1,-2,+1,+0,1,0x01, -1,-1,-1,+1,0,-120, -1,-1,+1,-2,0,0x40,
+     -1,-1,+1,-1,0,0x22, -1,-1,+1,+0,0,0x33, -1,-1,+1,+1,1,0x11,
+     -1,+0,-1,+2,0,0x08, -1,+0,+0,-1,0,0x44, -1,+0,+0,+1,0,0x11,
+     -1,+0,+1,-2,1,0x40, -1,+0,+1,-1,0,0x66, -1,+0,+1,+0,1,0x22,
+     -1,+0,+1,+1,0,0x33, -1,+0,+1,+2,1,0x10, -1,+1,+1,-1,1,0x44,
+     -1,+1,+1,+0,0,0x66, -1,+1,+1,+1,0,0x22, -1,+1,+1,+2,0,0x10,
+     -1,+2,+0,+1,0,0x04, -1,+2,+1,+0,1,0x04, -1,+2,+1,+1,0,0x04,
+-    +0,-2,+0,+0,1,0x80, +0,-1,+0,+1,1,0x88, +0,-1,+1,-2,0,0x40,
++    +0,-2,+0,+0,1,-128, +0,-1,+0,+1,1,-120, +0,-1,+1,-2,0,0x40,
+     +0,-1,+1,+0,0,0x11, +0,-1,+2,-2,0,0x40, +0,-1,+2,-1,0,0x20,
+     +0,-1,+2,+0,0,0x30, +0,-1,+2,+1,1,0x10, +0,+0,+0,+2,1,0x08,
+     +0,+0,+2,-2,1,0x40, +0,+0,+2,-1,0,0x60, +0,+0,+2,+0,1,0x20,
+     +0,+0,+2,+1,0,0x30, +0,+0,+2,+2,1,0x10, +0,+1,+1,+0,0,0x44,
+     +0,+1,+1,+2,0,0x10, +0,+1,+2,-1,1,0x40, +0,+1,+2,+0,0,0x60,
+-    +0,+1,+2,+1,0,0x20, +0,+1,+2,+2,0,0x10, +1,-2,+1,+0,0,0x80,
+-    +1,-1,+1,+1,0,0x88, +1,+0,+1,+2,0,0x08, +1,+0,+2,-1,0,0x40,
++    +0,+1,+2,+1,0,0x20, +0,+1,+2,+2,0,0x10, +1,-2,+1,+0,0,-128,
++    +1,-1,+1,+1,0,-120, +1,+0,+1,+2,0,0x08, +1,+0,+2,-1,0,0x40,
+     +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 *
+ 	{ 8035,435,-962,-6001,13872,2320,-1159,3065,5434 } },
+     { "Phase One P65", 0, 0,
+ 	{ 8035,435,-962,-6001,13872,2320,-1159,3065,5434 } },
+-    { "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)
+   strncpy (th->desc, desc, 512);
+   strncpy (th->make, make, 64);
+   strncpy (th->model, model, 64);
+-  strcpy (th->soft, "dcraw v"DCRAW_VERSION);
++  strcpy (th->soft, "dcraw v" DCRAW_VERSION);
+   t = localtime (&timestamp);
+   sprintf (th->date, "%04d:%02d:%02d %02d:%02d:%02d",
+       t->tm_year+1900,t->tm_mon+1,t->tm_mday,t->tm_hour,t->tm_min,t->tm_sec);