[arch-commits] Commit in dvdauthor/repos/community-x86_64 (3 files)

[Balló György]

    Date: Monday, January 22, 2018 @ 01:16:45
  Author: bgyorgy
Revision: 284821

archrelease: copy trunk to community-x86_64

Added:
  dvdauthor/repos/community-x86_64/PKGBUILD
    (from rev 284820, dvdauthor/trunk/PKGBUILD)
  dvdauthor/repos/community-x86_64/dvdauthor-0.7.2-imagemagick7.patch
    (from rev 284820, dvdauthor/trunk/dvdauthor-0.7.2-imagemagick7.patch)
Deleted:
  dvdauthor/repos/community-x86_64/PKGBUILD

------------------------------------+
 PKGBUILD                           |   70 ++++++++++++++++++-----------------
 dvdauthor-0.7.2-imagemagick7.patch |   37 ++++++++++++++++++
 2 files changed, 74 insertions(+), 33 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-01-22 01:16:40 UTC (rev 284820)
+++ PKGBUILD	2018-01-22 01:16:45 UTC (rev 284821)
@@ -1,33 +0,0 @@
-# $Id$
-# Maintainer:
-# Contributor: Giovanni Scafora <giovanni at archlinux.org>
-# Contributor: Travis Willard <travisw at wmpub.ca>
-# Contributor: Jaroslaw Swierczynski <swiergot at juvepoland.com>
-# Contributor: Nicolai Lissner <nlissne at linux01.gwdg.de>
-
-pkgname=dvdauthor
-pkgver=0.7.2
-pkgrel=2
-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')
-
-build() {
-  cd ${pkgname}
-  PKG_CONFIG_PATH="/usr/lib/imagemagick6/pkgconfig" \
-  ./configure --prefix=/usr \
-              --sysconfdir=/etc
-  make
-}
-
-package() {
-  cd ${pkgname}
-
-  make DESTDIR="${pkgdir}" install
-}

Copied: dvdauthor/repos/community-x86_64/PKGBUILD (from rev 284820, dvdauthor/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-01-22 01:16:45 UTC (rev 284821)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Giovanni Scafora <giovanni at archlinux.org>
+# Contributor: Travis Willard <travisw at wmpub.ca>
+# Contributor: Jaroslaw Swierczynski <swiergot at juvepoland.com>
+# Contributor: Nicolai Lissner <nlissne at linux01.gwdg.de>
+
+pkgname=dvdauthor
+pkgver=0.7.2
+pkgrel=3
+pkgdesc="DVD authoring tools"
+arch=('x86_64')
+url="http://dvdauthor.sourceforge.net/"
+license=('GPL')
+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
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd $pkgname
+  make DESTDIR="$pkgdir" install
+}

Copied: dvdauthor/repos/community-x86_64/dvdauthor-0.7.2-imagemagick7.patch (from rev 284820, dvdauthor/trunk/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:45 UTC (rev 284821)
@@ -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
+ }