[arch-commits] Commit in dvdauthor/repos (3 files)
Date: Saturday, November 7, 2020 @ 22:50:18 Author: arojas Revision: 746140 archrelease: copy trunk to community-staging-x86_64 Added: dvdauthor/repos/community-staging-x86_64/ dvdauthor/repos/community-staging-x86_64/PKGBUILD (from rev 746139, dvdauthor/trunk/PKGBUILD) dvdauthor/repos/community-staging-x86_64/dvdauthor-0.7.2-imagemagick7.patch (from rev 746139, dvdauthor/trunk/dvdauthor-0.7.2-imagemagick7.patch) + PKGBUILD | 39 ++ dvdauthor-0.7.2-imagemagick7.patch | 74 +++ 2 files changed, 113 insertions(+) Copied: dvdauthor/repos/community-staging-x86_64/PKGBUILD (from rev 746139, dvdauthor/trunk/PKGBUILD) === --- community-staging-x86_64/PKGBUILD (rev 0) +++ community-staging-x86_64/PKGBUILD 2020-11-07 22:50:18 UTC (rev 746140) @@ -0,0 +1,39 @@ +# Maintainer: Balló György +# Contributor: Giovanni Scafora +# Contributor: Travis Willard +# Contributor: Jaroslaw Swierczynski +# Contributor: Nicolai Lissner + +pkgname=dvdauthor +pkgver=0.7.2 +pkgrel=9 +pkgdesc="DVD authoring tools" +arch=('x86_64') +url="http://dvdauthor.sourceforge.net/; +license=('GPL') +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 746139, 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 2020-11-07 22:50:18 UTC (rev 746140) @@ -0,0 +1,74 @@ +--- dvdauthor/src/subgen-image.c 2014-01-21 00:12:37.0 +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 +-#include ++#include + #else + #include + #endif +@@ -176,18 +176,18 @@ + { + Image *im; + ImageInfo *ii; +-ExceptionInfo ei; ++ExceptionInfo *ei; + int x,y; + unsigned long magickver; + unsigned char amask; + +-GetExceptionInfo(); ++ei = AcquireExceptionInfo(); + ii=CloneImageInfo(NULL); + strcpy(ii->filename,s->fname); +-im=ReadImage(ii,); ++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; yrows; y++ ) { + char pdata[MAXX*4]; + +- if(!ExportImagePixels(im,0,y,im->columns,1,"RGBA",CharPixel,pdata,)) { +-fprintf(stderr,"ERR: Extracting row %d from %s (%s,%s)\n",y,s->fname,ei.reason,ei.description); +-CatchException(); +-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(); ++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 + }
[arch-commits] Commit in dvdauthor/repos (3 files)
Date: Sunday, April 5, 2020 @ 10:46:28 Author: arojas Revision: 611823 archrelease: copy trunk to community-staging-x86_64 Added: dvdauthor/repos/community-staging-x86_64/ dvdauthor/repos/community-staging-x86_64/PKGBUILD (from rev 611822, dvdauthor/trunk/PKGBUILD) dvdauthor/repos/community-staging-x86_64/dvdauthor-0.7.2-imagemagick7.patch (from rev 611822, dvdauthor/trunk/dvdauthor-0.7.2-imagemagick7.patch) + PKGBUILD | 39 ++ dvdauthor-0.7.2-imagemagick7.patch | 74 +++ 2 files changed, 113 insertions(+) Copied: dvdauthor/repos/community-staging-x86_64/PKGBUILD (from rev 611822, dvdauthor/trunk/PKGBUILD) === --- community-staging-x86_64/PKGBUILD (rev 0) +++ community-staging-x86_64/PKGBUILD 2020-04-05 10:46:28 UTC (rev 611823) @@ -0,0 +1,39 @@ +# Maintainer: Balló György +# Contributor: Giovanni Scafora +# Contributor: Travis Willard +# Contributor: Jaroslaw Swierczynski +# Contributor: Nicolai Lissner + +pkgname=dvdauthor +pkgver=0.7.2 +pkgrel=8 +pkgdesc="DVD authoring tools" +arch=('x86_64') +url="http://dvdauthor.sourceforge.net/; +license=('GPL') +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 611822, 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 2020-04-05 10:46:28 UTC (rev 611823) @@ -0,0 +1,74 @@ +--- dvdauthor/src/subgen-image.c 2014-01-21 00:12:37.0 +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 +-#include ++#include + #else + #include + #endif +@@ -176,18 +176,18 @@ + { + Image *im; + ImageInfo *ii; +-ExceptionInfo ei; ++ExceptionInfo *ei; + int x,y; + unsigned long magickver; + unsigned char amask; + +-GetExceptionInfo(); ++ei = AcquireExceptionInfo(); + ii=CloneImageInfo(NULL); + strcpy(ii->filename,s->fname); +-im=ReadImage(ii,); ++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; yrows; y++ ) { + char pdata[MAXX*4]; + +- if(!ExportImagePixels(im,0,y,im->columns,1,"RGBA",CharPixel,pdata,)) { +-fprintf(stderr,"ERR: Extracting row %d from %s (%s,%s)\n",y,s->fname,ei.reason,ei.description); +-CatchException(); +-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(); ++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 + }
[arch-commits] Commit in dvdauthor/repos (3 files)
Date: Thursday, November 7, 2019 @ 22:14:19 Author: arojas Revision: 524555 archrelease: copy trunk to community-staging-x86_64 Added: dvdauthor/repos/community-staging-x86_64/ dvdauthor/repos/community-staging-x86_64/PKGBUILD (from rev 524554, dvdauthor/trunk/PKGBUILD) dvdauthor/repos/community-staging-x86_64/dvdauthor-0.7.2-imagemagick7.patch (from rev 524554, dvdauthor/trunk/dvdauthor-0.7.2-imagemagick7.patch) + PKGBUILD | 39 ++ dvdauthor-0.7.2-imagemagick7.patch | 74 +++ 2 files changed, 113 insertions(+) Copied: dvdauthor/repos/community-staging-x86_64/PKGBUILD (from rev 524554, dvdauthor/trunk/PKGBUILD) === --- community-staging-x86_64/PKGBUILD (rev 0) +++ community-staging-x86_64/PKGBUILD 2019-11-07 22:14:19 UTC (rev 524555) @@ -0,0 +1,39 @@ +# Maintainer: Balló György +# Contributor: Giovanni Scafora +# Contributor: Travis Willard +# Contributor: Jaroslaw Swierczynski +# Contributor: Nicolai Lissner + +pkgname=dvdauthor +pkgver=0.7.2 +pkgrel=7 +pkgdesc="DVD authoring tools" +arch=('x86_64') +url="http://dvdauthor.sourceforge.net/; +license=('GPL') +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 524554, 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 2019-11-07 22:14:19 UTC (rev 524555) @@ -0,0 +1,74 @@ +--- dvdauthor/src/subgen-image.c 2014-01-21 00:12:37.0 +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 +-#include ++#include + #else + #include + #endif +@@ -176,18 +176,18 @@ + { + Image *im; + ImageInfo *ii; +-ExceptionInfo ei; ++ExceptionInfo *ei; + int x,y; + unsigned long magickver; + unsigned char amask; + +-GetExceptionInfo(); ++ei = AcquireExceptionInfo(); + ii=CloneImageInfo(NULL); + strcpy(ii->filename,s->fname); +-im=ReadImage(ii,); ++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; yrows; y++ ) { + char pdata[MAXX*4]; + +- if(!ExportImagePixels(im,0,y,im->columns,1,"RGBA",CharPixel,pdata,)) { +-fprintf(stderr,"ERR: Extracting row %d from %s (%s,%s)\n",y,s->fname,ei.reason,ei.description); +-CatchException(); +-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(); ++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 + }
[arch-commits] Commit in dvdauthor/repos (3 files)
Date: Thursday, October 31, 2019 @ 08:14:31 Author: arojas Revision: 521028 archrelease: copy trunk to community-staging-x86_64 Added: dvdauthor/repos/community-staging-x86_64/ dvdauthor/repos/community-staging-x86_64/PKGBUILD (from rev 521027, dvdauthor/trunk/PKGBUILD) dvdauthor/repos/community-staging-x86_64/dvdauthor-0.7.2-imagemagick7.patch (from rev 521027, dvdauthor/trunk/dvdauthor-0.7.2-imagemagick7.patch) + PKGBUILD | 39 ++ dvdauthor-0.7.2-imagemagick7.patch | 74 +++ 2 files changed, 113 insertions(+) Copied: dvdauthor/repos/community-staging-x86_64/PKGBUILD (from rev 521027, dvdauthor/trunk/PKGBUILD) === --- community-staging-x86_64/PKGBUILD (rev 0) +++ community-staging-x86_64/PKGBUILD 2019-10-31 08:14:31 UTC (rev 521028) @@ -0,0 +1,39 @@ +# Maintainer: Balló György +# Contributor: Giovanni Scafora +# Contributor: Travis Willard +# Contributor: Jaroslaw Swierczynski +# Contributor: Nicolai Lissner + +pkgname=dvdauthor +pkgver=0.7.2 +pkgrel=6 +pkgdesc="DVD authoring tools" +arch=('x86_64') +url="http://dvdauthor.sourceforge.net/; +license=('GPL') +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 521027, 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 2019-10-31 08:14:31 UTC (rev 521028) @@ -0,0 +1,74 @@ +--- dvdauthor/src/subgen-image.c 2014-01-21 00:12:37.0 +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 +-#include ++#include + #else + #include + #endif +@@ -176,18 +176,18 @@ + { + Image *im; + ImageInfo *ii; +-ExceptionInfo ei; ++ExceptionInfo *ei; + int x,y; + unsigned long magickver; + unsigned char amask; + +-GetExceptionInfo(); ++ei = AcquireExceptionInfo(); + ii=CloneImageInfo(NULL); + strcpy(ii->filename,s->fname); +-im=ReadImage(ii,); ++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; yrows; y++ ) { + char pdata[MAXX*4]; + +- if(!ExportImagePixels(im,0,y,im->columns,1,"RGBA",CharPixel,pdata,)) { +-fprintf(stderr,"ERR: Extracting row %d from %s (%s,%s)\n",y,s->fname,ei.reason,ei.description); +-CatchException(); +-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(); ++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 + }
[arch-commits] Commit in dvdauthor/repos (3 files)
Date: Saturday, May 12, 2018 @ 11:52:04 Author: arojas Revision: 321035 archrelease: copy trunk to community-staging-x86_64 Added: dvdauthor/repos/community-staging-x86_64/ dvdauthor/repos/community-staging-x86_64/PKGBUILD (from rev 321034, dvdauthor/trunk/PKGBUILD) dvdauthor/repos/community-staging-x86_64/dvdauthor-0.7.2-imagemagick7.patch (from rev 321034, dvdauthor/trunk/dvdauthor-0.7.2-imagemagick7.patch) + PKGBUILD | 41 +++ dvdauthor-0.7.2-imagemagick7.patch | 74 +++ 2 files changed, 115 insertions(+) Copied: dvdauthor/repos/community-staging-x86_64/PKGBUILD (from rev 321034, dvdauthor/trunk/PKGBUILD) === --- community-staging-x86_64/PKGBUILD (rev 0) +++ community-staging-x86_64/PKGBUILD 2018-05-12 11:52:04 UTC (rev 321035) @@ -0,0 +1,41 @@ +# $Id$ +# Maintainer: Balló György+# Contributor: Giovanni Scafora +# Contributor: Travis Willard +# Contributor: Jaroslaw Swierczynski +# Contributor: Nicolai Lissner + +pkgname=dvdauthor +pkgver=0.7.2 +pkgrel=5 +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' +'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 321034, 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 2018-05-12 11:52:04 UTC (rev 321035) @@ -0,0 +1,74 @@ +--- dvdauthor/src/subgen-image.c 2014-01-21 00:12:37.0 +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 +-#include ++#include + #else + #include + #endif +@@ -176,18 +176,18 @@ + { + Image *im; + ImageInfo *ii; +-ExceptionInfo ei; ++ExceptionInfo *ei; + int x,y; + unsigned long magickver; + unsigned char amask; + +-GetExceptionInfo(); ++ei = AcquireExceptionInfo(); + ii=CloneImageInfo(NULL); + strcpy(ii->filename,s->fname); +-im=ReadImage(ii,); ++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; yrows; y++ ) { + char pdata[MAXX*4]; + +- if(!ExportImagePixels(im,0,y,im->columns,1,"RGBA",CharPixel,pdata,)) { +-fprintf(stderr,"ERR: Extracting row %d from %s (%s,%s)\n",y,s->fname,ei.reason,ei.description); +-CatchException(); +-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(); ++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 + }
[arch-commits] Commit in dvdauthor/repos (3 files)
Date: Tuesday, September 13, 2011 @ 17:30:01 Author: eric Revision: 137984 db-move: moved dvdauthor from [testing] to [extra] (i686) Added: dvdauthor/repos/extra-i686/PKGBUILD (from rev 137983, dvdauthor/repos/testing-i686/PKGBUILD) Deleted: dvdauthor/repos/extra-i686/PKGBUILD dvdauthor/repos/testing-i686/ --+ PKGBUILD | 54 +- 1 file changed, 29 insertions(+), 25 deletions(-) Deleted: extra-i686/PKGBUILD === --- extra-i686/PKGBUILD 2011-09-13 21:08:13 UTC (rev 137983) +++ extra-i686/PKGBUILD 2011-09-13 21:30:01 UTC (rev 137984) @@ -1,25 +0,0 @@ -# $Id$ -# Maintainer: 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.0 -pkgrel=1 -pkgdesc=DVD authoring tools -arch=('i686' 'x86_64') -url=http://dvdauthor.sourceforge.net/; -license=('GPL') -depends=('libdvdread' 'imagemagick' 'libxml2' 'libpng' 'fribidi') -options=('!makeflags') -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('33a447fb98ab3293ac40f869eedc17ff') - -build() { - cd ${srcdir}/${pkgname} - ./configure --prefix=/usr \ - --sysconfdir=/etc || return 1 - make || return 1 - make DESTDIR=${pkgdir} install || return 1 -} Copied: dvdauthor/repos/extra-i686/PKGBUILD (from rev 137983, dvdauthor/repos/testing-i686/PKGBUILD) === --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2011-09-13 21:30:01 UTC (rev 137984) @@ -0,0 +1,29 @@ +# $Id$ +# Maintainer: 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.0 +pkgrel=2 +pkgdesc=DVD authoring tools +arch=('i686' 'x86_64') +url=http://dvdauthor.sourceforge.net/; +license=('GPL') +depends=('libdvdread' 'imagemagick' 'libxml2' 'libpng' 'fribidi') +options=('!makeflags') +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz) +md5sums=('33a447fb98ab3293ac40f869eedc17ff') + +build() { + cd ${srcdir}/${pkgname} + ./configure --prefix=/usr \ + --sysconfdir=/etc + make +} + +package() { + cd ${srcdir}/${pkgname} + make DESTDIR=${pkgdir} install +}
[arch-commits] Commit in dvdauthor/repos (3 files)
Date: Tuesday, September 13, 2011 @ 17:30:02 Author: eric Revision: 137985 db-move: moved dvdauthor from [testing] to [extra] (x86_64) Added: dvdauthor/repos/extra-x86_64/PKGBUILD (from rev 137983, dvdauthor/repos/testing-x86_64/PKGBUILD) Deleted: dvdauthor/repos/extra-x86_64/PKGBUILD dvdauthor/repos/testing-x86_64/ --+ PKGBUILD | 54 +- 1 file changed, 29 insertions(+), 25 deletions(-) Deleted: extra-x86_64/PKGBUILD === --- extra-x86_64/PKGBUILD 2011-09-13 21:30:01 UTC (rev 137984) +++ extra-x86_64/PKGBUILD 2011-09-13 21:30:02 UTC (rev 137985) @@ -1,25 +0,0 @@ -# $Id$ -# Maintainer: 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.0 -pkgrel=1 -pkgdesc=DVD authoring tools -arch=('i686' 'x86_64') -url=http://dvdauthor.sourceforge.net/; -license=('GPL') -depends=('libdvdread' 'imagemagick' 'libxml2' 'libpng' 'fribidi') -options=('!makeflags') -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('33a447fb98ab3293ac40f869eedc17ff') - -build() { - cd ${srcdir}/${pkgname} - ./configure --prefix=/usr \ - --sysconfdir=/etc || return 1 - make || return 1 - make DESTDIR=${pkgdir} install || return 1 -} Copied: dvdauthor/repos/extra-x86_64/PKGBUILD (from rev 137983, dvdauthor/repos/testing-x86_64/PKGBUILD) === --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2011-09-13 21:30:02 UTC (rev 137985) @@ -0,0 +1,29 @@ +# $Id$ +# Maintainer: 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.0 +pkgrel=2 +pkgdesc=DVD authoring tools +arch=('i686' 'x86_64') +url=http://dvdauthor.sourceforge.net/; +license=('GPL') +depends=('libdvdread' 'imagemagick' 'libxml2' 'libpng' 'fribidi') +options=('!makeflags') +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz) +md5sums=('33a447fb98ab3293ac40f869eedc17ff') + +build() { + cd ${srcdir}/${pkgname} + ./configure --prefix=/usr \ + --sysconfdir=/etc + make +} + +package() { + cd ${srcdir}/${pkgname} + make DESTDIR=${pkgdir} install +}
[arch-commits] Commit in dvdauthor/repos (3 files)
Date: Monday, September 12, 2011 @ 01:31:16 Author: eric Revision: 137861 db-move: moved dvdauthor from [staging] to [testing] (i686) Added: dvdauthor/repos/testing-i686/ dvdauthor/repos/testing-i686/PKGBUILD (from rev 137860, dvdauthor/repos/staging-i686/PKGBUILD) Deleted: dvdauthor/repos/staging-i686/ --+ PKGBUILD | 29 + 1 file changed, 29 insertions(+) Copied: dvdauthor/repos/testing-i686/PKGBUILD (from rev 137860, dvdauthor/repos/staging-i686/PKGBUILD) === --- testing-i686/PKGBUILD (rev 0) +++ testing-i686/PKGBUILD 2011-09-12 05:31:16 UTC (rev 137861) @@ -0,0 +1,29 @@ +# $Id$ +# Maintainer: 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.0 +pkgrel=2 +pkgdesc=DVD authoring tools +arch=('i686' 'x86_64') +url=http://dvdauthor.sourceforge.net/; +license=('GPL') +depends=('libdvdread' 'imagemagick' 'libxml2' 'libpng' 'fribidi') +options=('!makeflags') +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz) +md5sums=('33a447fb98ab3293ac40f869eedc17ff') + +build() { + cd ${srcdir}/${pkgname} + ./configure --prefix=/usr \ + --sysconfdir=/etc + make +} + +package() { + cd ${srcdir}/${pkgname} + make DESTDIR=${pkgdir} install +}
[arch-commits] Commit in dvdauthor/repos (3 files)
Date: Monday, September 12, 2011 @ 01:31:16 Author: eric Revision: 137862 db-move: moved dvdauthor from [staging] to [testing] (x86_64) Added: dvdauthor/repos/testing-x86_64/ dvdauthor/repos/testing-x86_64/PKGBUILD (from rev 137860, dvdauthor/repos/staging-x86_64/PKGBUILD) Deleted: dvdauthor/repos/staging-x86_64/ --+ PKGBUILD | 29 + 1 file changed, 29 insertions(+) Copied: dvdauthor/repos/testing-x86_64/PKGBUILD (from rev 137860, dvdauthor/repos/staging-x86_64/PKGBUILD) === --- testing-x86_64/PKGBUILD (rev 0) +++ testing-x86_64/PKGBUILD 2011-09-12 05:31:16 UTC (rev 137862) @@ -0,0 +1,29 @@ +# $Id$ +# Maintainer: 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.0 +pkgrel=2 +pkgdesc=DVD authoring tools +arch=('i686' 'x86_64') +url=http://dvdauthor.sourceforge.net/; +license=('GPL') +depends=('libdvdread' 'imagemagick' 'libxml2' 'libpng' 'fribidi') +options=('!makeflags') +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz) +md5sums=('33a447fb98ab3293ac40f869eedc17ff') + +build() { + cd ${srcdir}/${pkgname} + ./configure --prefix=/usr \ + --sysconfdir=/etc + make +} + +package() { + cd ${srcdir}/${pkgname} + make DESTDIR=${pkgdir} install +}