commit: 070c5274a522921f52eb05ab3389c1a2356c98fd
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 20 10:36:08 2018 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Feb 20 10:36:08 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=070c5274
media-video/dvdauthor: Marked 0.7.2-r2 stable where 0.7.2-r1 was stable
Renamed fixed patch file.
Package-Manager: Portage-2.3.24, Repoman-2.3.6
media-video/dvdauthor/dvdauthor-0.7.2-r2.ebuild | 4 +-
.../files/dvdauthor-0.7.2-imagemagick7.patch | 48 ++++++++++++--
.../files/dvdauthor-0.7.2-r2-imagemagick7.patch | 75 ----------------------
3 files changed, 45 insertions(+), 82 deletions(-)
diff --git a/media-video/dvdauthor/dvdauthor-0.7.2-r2.ebuild
b/media-video/dvdauthor/dvdauthor-0.7.2-r2.ebuild
index bab0a74a5cf..6ac055e70b4 100644
--- a/media-video/dvdauthor/dvdauthor-0.7.2-r2.ebuild
+++ b/media-video/dvdauthor/dvdauthor-0.7.2-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ppc ppc64 ~sparc x86"
IUSE="graphicsmagick +imagemagick"
REQUIRED_USE="^^ ( graphicsmagick imagemagick )"
@@ -32,7 +32,7 @@ src_prepare() {
default
if use imagemagick && has_version '>=media-gfx/imagemagick-7.0.1.0' ;
then
- eapply "${FILESDIR}/${PN}-0.7.2-r2-imagemagick7.patch"
+ eapply "${FILESDIR}/${PN}-0.7.2-imagemagick7.patch"
fi
if use graphicsmagick ; then
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 9f9e3a0b301..e7b9ac15d3c 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
}
+
diff --git a/media-video/dvdauthor/files/dvdauthor-0.7.2-r2-imagemagick7.patch
b/media-video/dvdauthor/files/dvdauthor-0.7.2-r2-imagemagick7.patch
deleted file mode 100644
index 0f6bed4372a..00000000000
--- a/media-video/dvdauthor/files/dvdauthor-0.7.2-r2-imagemagick7.patch
+++ /dev/null
@@ -1,75 +0,0 @@
---- dvdauthor/src/subgen-image.c 2014-01-21 00:12:37.000000000 +0100
-+++ dvdauthor/src/subgen-image.c 2017-11-27 20:26:53.682914041 +0100
-@@ -30,7 +30,7 @@
-
- #if defined(HAVE_MAGICK) || defined(HAVE_GMAGICK)
- #include <stdarg.h>
--#include <magick/api.h>
-+#include <MagickWand/MagickWand.h>
- #else
- #include <png.h>
- #endif
-@@ -176,18 +176,18 @@
- {
- Image *im;
- ImageInfo *ii;
-- ExceptionInfo ei;
-+ ExceptionInfo *ei;
- int x,y;
- unsigned long magickver;
- unsigned char amask;
-
-- GetExceptionInfo(&ei);
-+ ei = AcquireExceptionInfo();
- ii=CloneImageInfo(NULL);
- strcpy(ii->filename,s->fname);
-- 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)
-- InitializeMagick(NULL);
-+ MagickCoreGenesis("", MagickFalse);
- #endif
- }
-
- void image_shutdown()
- {
- #if defined(HAVE_MAGICK) || defined(HAVE_GMAGICK)
-- DestroyMagick();
-+ MagickCoreTerminus();
- #endif
- }
-
