[arch-commits] Commit in dvdauthor/trunk (PKGBUILD dvdauthor-0.7.2-imagemagick7.patch)
Balló György
bgyorgy at archlinux.org
Sat Jan 27 11:15:58 UTC 2018
Date: Saturday, January 27, 2018 @ 11:15:57
Author: bgyorgy
Revision: 287410
upgpkg: dvdauthor 0.7.2-4
Fix ImageMagick 7 support (FS#57240)
Modified:
dvdauthor/trunk/PKGBUILD
dvdauthor/trunk/dvdauthor-0.7.2-imagemagick7.patch
------------------------------------+
PKGBUILD | 7 ++--
dvdauthor-0.7.2-imagemagick7.patch | 51 ++++++++++++++++++++++++++++++-----
2 files changed, 48 insertions(+), 10 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2018-01-27 11:12:22 UTC (rev 287409)
+++ PKGBUILD 2018-01-27 11:15:57 UTC (rev 287410)
@@ -7,7 +7,7 @@
pkgname=dvdauthor
pkgver=0.7.2
-pkgrel=3
+pkgrel=4
pkgdesc="DVD authoring tools"
arch=('x86_64')
url="http://dvdauthor.sourceforge.net/"
@@ -17,11 +17,12 @@
source=("https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
"dvdauthor-0.7.2-imagemagick7.patch")
sha256sums=('3020a92de9f78eb36f48b6f22d5a001c47107826634a785a62dfcd080f612eb7'
- '0c190fab9cc548de3981a352c4310205f536f71ba6e31198b61f67d10d27a1fd')
+ '5c6a6c1cca2fdb2a0037507361980de7ed3bf6c603cb85e9ce273eaf0028dc00')
prepare() {
cd $pkgname
- # Port to imagemagick 7 (taken from Gentoo)
+ # Port to imagemagick 7
+ # https://bugs.gentoo.org/610574#c2
patch -Np1 -i ../dvdauthor-0.7.2-imagemagick7.patch
}
Modified: dvdauthor-0.7.2-imagemagick7.patch
===================================================================
--- dvdauthor-0.7.2-imagemagick7.patch 2018-01-27 11:12:22 UTC (rev 287409)
+++ dvdauthor-0.7.2-imagemagick7.patch 2018-01-27 11:15:57 UTC (rev 287410)
@@ -1,5 +1,5 @@
---- dvdauthor/src/subgen-image.c
-+++ dvdauthor/src/subgen-image.c
+--- 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)
@@ -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)
More information about the arch-commits
mailing list