Date: Monday, May 31, 2021 @ 20:20:33 Author: arojas Revision: 952895
archrelease: copy trunk to community-staging-x86_64 Added: dvdauthor/repos/community-staging-x86_64/ dvdauthor/repos/community-staging-x86_64/PKGBUILD (from rev 952894, dvdauthor/trunk/PKGBUILD) dvdauthor/repos/community-staging-x86_64/dvdauthor-0.7.2-imagemagick7.patch (from rev 952894, dvdauthor/trunk/dvdauthor-0.7.2-imagemagick7.patch) ------------------------------------+ PKGBUILD | 42 +++++++++++++++++++ dvdauthor-0.7.2-imagemagick7.patch | 74 +++++++++++++++++++++++++++++++++++ 2 files changed, 116 insertions(+) Copied: dvdauthor/repos/community-staging-x86_64/PKGBUILD (from rev 952894, dvdauthor/trunk/PKGBUILD) =================================================================== --- community-staging-x86_64/PKGBUILD (rev 0) +++ community-staging-x86_64/PKGBUILD 2021-05-31 20:20:33 UTC (rev 952895) @@ -0,0 +1,42 @@ +# Maintainer: Balló György <ballogyor+arch at gmail dot com> +# Contributor: Giovanni Scafora <giova...@archlinux.org> +# Contributor: Travis Willard <trav...@wmpub.ca> +# Contributor: Jaroslaw Swierczynski <swier...@juvepoland.com> +# Contributor: Nicolai Lissner <nlis...@linux01.gwdg.de> + +pkgname=dvdauthor +pkgver=0.7.2 +pkgrel=11 +pkgdesc='DVD authoring tools' +arch=('x86_64') +url='http://dvdauthor.sourceforge.net/' +license=('GPL2') +depends=('libdvdread' 'imagemagick' 'libxml2') +source=("https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz" + 'dvdauthor-0.7.2-imagemagick7.patch') +sha256sums=('3020a92de9f78eb36f48b6f22d5a001c47107826634a785a62dfcd080f612eb7' + '5c6a6c1cca2fdb2a0037507361980de7ed3bf6c603cb85e9ce273eaf0028dc00') + +prepare() { + cd $pkgname + + # Port to imagemagick 7 + # https://bugs.gentoo.org/610574#c2 + patch -Np1 -i ../dvdauthor-0.7.2-imagemagick7.patch + + # don't search for obsolete freetype-config + sed -e 's|freetype-config|pkg-config freetype2|' -i configure.ac + + autoreconf -vi +} + +build() { + cd $pkgname + ./configure --prefix=/usr + make +} + +package() { + cd $pkgname + make DESTDIR="$pkgdir" install +} Copied: dvdauthor/repos/community-staging-x86_64/dvdauthor-0.7.2-imagemagick7.patch (from rev 952894, dvdauthor/trunk/dvdauthor-0.7.2-imagemagick7.patch) =================================================================== --- community-staging-x86_64/dvdauthor-0.7.2-imagemagick7.patch (rev 0) +++ community-staging-x86_64/dvdauthor-0.7.2-imagemagick7.patch 2021-05-31 20:20:33 UTC (rev 952895) @@ -0,0 +1,74 @@ +--- 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 + }