Date: Monday, January 22, 2018 @ 01:16:40 Author: bgyorgy Revision: 284820
upgpkg: dvdauthor 0.7.2-3 Adopt the package, rebuild with imagemagick 7 Added: dvdauthor/trunk/dvdauthor-0.7.2-imagemagick7.patch Modified: dvdauthor/trunk/PKGBUILD ------------------------------------+ PKGBUILD | 32 +++++++++++++++++------------- dvdauthor-0.7.2-imagemagick7.patch | 37 +++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 14 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-01-22 00:50:59 UTC (rev 284819) +++ PKGBUILD 2018-01-22 01:16:40 UTC (rev 284820) @@ -1,5 +1,5 @@ # $Id$ -# Maintainer: +# Maintainer: Balló György <ballogyor+arch at gmail dot com> # Contributor: Giovanni Scafora <[email protected]> # Contributor: Travis Willard <[email protected]> # Contributor: Jaroslaw Swierczynski <[email protected]> @@ -7,27 +7,31 @@ pkgname=dvdauthor pkgver=0.7.2 -pkgrel=2 +pkgrel=3 pkgdesc="DVD authoring tools" arch=('x86_64') url="http://dvdauthor.sourceforge.net/"; license=('GPL') -depends=('libdvdread' 'libmagick6' 'libxml2' 'libpng' 'fribidi') -makedepends=('imagemagick') # for the *-config wrappers -options=('!makeflags') -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz";) -sha256sums=('3020a92de9f78eb36f48b6f22d5a001c47107826634a785a62dfcd080f612eb7') +depends=('libdvdread' 'libmagick' 'libxml2') +makedepends=('imagemagick') +source=("https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"; + "dvdauthor-0.7.2-imagemagick7.patch") +sha256sums=('3020a92de9f78eb36f48b6f22d5a001c47107826634a785a62dfcd080f612eb7' + '0c190fab9cc548de3981a352c4310205f536f71ba6e31198b61f67d10d27a1fd') +prepare() { + cd $pkgname + # Port to imagemagick 7 (taken from Gentoo) + patch -Np1 -i ../dvdauthor-0.7.2-imagemagick7.patch +} + build() { - cd ${pkgname} - PKG_CONFIG_PATH="/usr/lib/imagemagick6/pkgconfig" \ - ./configure --prefix=/usr \ - --sysconfdir=/etc + cd $pkgname + ./configure --prefix=/usr make } package() { - cd ${pkgname} - - make DESTDIR="${pkgdir}" install + cd $pkgname + make DESTDIR="$pkgdir" install } Added: dvdauthor-0.7.2-imagemagick7.patch =================================================================== --- dvdauthor-0.7.2-imagemagick7.patch (rev 0) +++ dvdauthor-0.7.2-imagemagick7.patch 2018-01-22 01:16:40 UTC (rev 284820) @@ -0,0 +1,37 @@ +--- dvdauthor/src/subgen-image.c ++++ dvdauthor/src/subgen-image.c +@@ -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 +@@ -181,7 +181,8 @@ + unsigned long magickver; + unsigned char amask; + +- GetExceptionInfo(&ei); ++ ExceptionInfo *exception_info; ++ exception_info = AcquireExceptionInfo(); + ii=CloneImageInfo(NULL); + strcpy(ii->filename,s->fname); + im=ReadImage(ii,&ei); +@@ -1098,13 +1099,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 + }
