gentoo resync : 24.02.2018

3 files changed, 45 insertions, 7 deletions

diff --git a/media-video/dvdauthor/Manifest b/media-video/dvdauthor/Manifest
index c627f1ea92fa..cdf7f055ba78 100644
--- a/media-video/dvdauthor/Manifest
+++ b/media-video/dvdauthor/Manifest
@@ -1,7 +1,7 @@
 AUX dvdauthor-0.7.1-glibc220.patch 3462 BLAKE2B 82e609fe64fd74311beebca13a23c1d281a0cc328caf7ea07cec1cd8ab85eaa25ce53303aa5552c52b0e3371a43718e9bcc7761a1cf6735986f1382e7842be82 SHA512 1f1dd830ab7e101e412429453185a7221f1c417e441aa0f7937576695fc079a3935ddd5925c983e48b716b08059942541942a392c5bce7c360942f67c47e22ea
-AUX dvdauthor-0.7.2-imagemagick7.patch 850 BLAKE2B 9347652fe9d8c46691ef0143dc3884f221fe9ee7115a51678f4c9cb58236981cb411c063de1e2327f0b6b3fe8e8452df6433c2b1dee88814e404d6d8b79837bd SHA512 9b1862efaedf97dd9f8a138fe172c76b442e4c4203ed8133f9e0f77a9edef7a5f1d5d9ced4f358892375493f7d3547eff6bb07572d2fbd288255eeaeaadfc04b
+AUX dvdauthor-0.7.2-imagemagick7.patch 2076 BLAKE2B 121de0091628c1e95adb5c742b54a53aad9b6843b84cacc6d2831a29a3ab1091f3ead7c2072c278068da9c4bccee326aeed549c5a0a5d173aa58a88926cb7ade SHA512 85e21a1e87be49244f15ad64b08fdfba97235d5680e7691e8b2c63cf966a7ce1f08b3bcccbd77714a4693b052000008ad53ed4c811c73e67e900aecbb975ead3
 DIST dvdauthor-0.7.1.tar.gz 421324 BLAKE2B 34d7f20cc7f8a5f8ea10cfd1404a15b04e909a343e008da18035f6bf78de7b4f16729b3c2ba5ebedd7bd12e72a801874d99d5c1e6f7458a311501e07afc11788 SHA512 0875300df4711bf5758cb8a3ec03793689abd403cdebfc5736463d9b6df49a22e66e9e1f0c2abfcb7d25469c2e7f7e76789f7779cc0743ec972f8965b0f744a9
 DIST dvdauthor-0.7.2.tar.gz 648305 BLAKE2B e3c918e101be1627b32d19a4ba17e676593ce260c72c4a1126acc691d9dec484e3d70817abfa1f1542d5a29d603ecbd9226e305caadd77abfb1278125f7d6c64 SHA512 202b8bba38939d122dc864921a57e89906ca99ddabf44e3b07419cc42cc052567cd892b41f1171c9c195c9a770758e9319a942ea64d14ee8fa847588c7761125
 EBUILD dvdauthor-0.7.1-r1.ebuild 1179 BLAKE2B e812e3d0702e464680c98ed47a6216250ed449e7e884993339b2bbd9ef1ab50c1e21464cead9cd54b0b18872931a7d99e170ca676976884b96d727ceb71ec669 SHA512 5b32d4c47c63cf0fc42be1b50d6175a18ab61f629bc731fb965c441b0f99dc7e4f2bef6646afac2dfa751cd4bf72d5a1ac6149bafa83274f472ae427cbae72b0
-EBUILD dvdauthor-0.7.2-r1.ebuild 1270 BLAKE2B fbaeaf26c7e1eadca226d1b54591b967a599dc94a1470798bb5740eb8f97a95a86f2e0eabfdc482f8c20e2edec576d381c3c75bb7a7cde3ae5cd30fc670477f2 SHA512 a206699088977e1f98fa813ba10d7b550a07313bc68b083b7cb78414bb04e80bf19f9490cde95be0a84e68f664ccf3b3c728506f8819e1bf883020625a316475
+EBUILD dvdauthor-0.7.2-r2.ebuild 1270 BLAKE2B fbaeaf26c7e1eadca226d1b54591b967a599dc94a1470798bb5740eb8f97a95a86f2e0eabfdc482f8c20e2edec576d381c3c75bb7a7cde3ae5cd30fc670477f2 SHA512 a206699088977e1f98fa813ba10d7b550a07313bc68b083b7cb78414bb04e80bf19f9490cde95be0a84e68f664ccf3b3c728506f8819e1bf883020625a316475
 MISC metadata.xml 310 BLAKE2B 98950538160adf1178a053c79da3802c04ef0ae8c45436df86f5da69c4ad200e38b971134dfc4d94c90f061502247a45d39d319b6bff1ec3f4e3cd3a9c432ac5 SHA512 e9f2f78be647d48778accbf7da1d1b925dd8c441fa07743c776eee3362bf75f57a7051a7805ad1b2ab76a5958a18ae1b889ccb006da66d3197fefb0498e1f0c4
diff --git a/media-video/dvdauthor/dvdauthor-0.7.2-r1.ebuild b/media-video/dvdauthor/dvdauthor-0.7.2-r2.ebuild
index 6ac055e70b4b..6ac055e70b4b 100644
--- a/media-video/dvdauthor/dvdauthor-0.7.2-r1.ebuild
+++ b/media-video/dvdauthor/dvdauthor-0.7.2-r2.ebuild
diff --git a/media-video/dvdauthor/files/dvdauthor-0.7.2-imagemagick7.patch b/media-video/dvdauthor/files/dvdauthor-0.7.2-imagemagick7.patch
index 9f9e3a0b3016..e7b9ac15d3c9 100644
--- a/media-video/dvdauthor/files/dvdauthor-0.7.2-imagemagick7.patch
+++ b/media-video/dvdauthor/files/dvdauthor-0.7.2-imagemagick7.patch
@@ -9,17 +9,54 @@
  #else
  #include <png.h>
  #endif
-@@ -181,7 +181,8 @@
+@@ -176,18 +176,18 @@
+ {
+     Image *im;
+     ImageInfo *ii;
+-    ExceptionInfo ei;
++    ExceptionInfo *ei;
+     int x,y;
      unsigned long magickver;
      unsigned char amask;
  
 -    GetExceptionInfo(&ei);
-+    ExceptionInfo *exception_info;
-+    exception_info = AcquireExceptionInfo();
++    ei = AcquireExceptionInfo();
      ii=CloneImageInfo(NULL);
      strcpy(ii->filename,s->fname);
-     im=ReadImage(ii,&ei);
-@@ -1098,13 +1099,13 @@
+-    im=ReadImage(ii,&ei);
++    im=ReadImage(ii,ei);
+ 
+     if( !im ) {
+-        MagickError(ei.severity,"Unable to load file",ii->filename);
++        MagickError(ei->severity,"Unable to load file",ii->filename);
+         return -1;
+     }
+ 
+@@ -202,10 +202,10 @@
+     for( y=0; y<im->rows; y++ ) {
+         char pdata[MAXX*4];
+ 
+-        if(!ExportImagePixels(im,0,y,im->columns,1,"RGBA",CharPixel,pdata,&ei)) {
+-            fprintf(stderr,"ERR:  Extracting row %d from %s (%s,%s)\n",y,s->fname,ei.reason,ei.description);
+-            CatchException(&ei);
+-            MagickError(ei.severity,ei.reason,ei.description);
++        if(!ExportImagePixels(im,0,y,im->columns,1,"RGBA",CharPixel,pdata,ei)) {
++            fprintf(stderr,"ERR:  Extracting row %d from %s (%s,%s)\n",y,s->fname,ei->reason,ei->description);
++            CatchException(ei);
++            MagickError(ei->severity,ei->reason,ei->description);
+             DestroyImage(im);
+             return -1;
+         }
+@@ -219,7 +219,7 @@
+         }
+     }
+     DestroyImage(im);
+-    DestroyExceptionInfo(&ei);
++    DestroyExceptionInfo(ei);
+     fprintf(stderr,"INFO: Picture %s had %d colors\n",s->fname,s->numpal);
+ 
+     return 0;
+@@ -1098,13 +1098,13 @@
  void image_init()
  {
  #if defined(HAVE_MAGICK) || defined(HAVE_GMAGICK)
@@ -35,3 +72,4 @@
 +    MagickCoreTerminus();
  #endif
  }
+