Hello community, here is the log from the commit of package dvdauthor for openSUSE:Leap:15.2 checked in at 2020-05-18 11:01:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/dvdauthor (Old) and /work/SRC/openSUSE:Leap:15.2/.dvdauthor.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dvdauthor" Mon May 18 11:01:09 2020 rev:10 rq:806769 version:0.7.2 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/dvdauthor/dvdauthor.changes 2020-01-15 14:53:21.441520576 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.dvdauthor.new.2738/dvdauthor.changes 2020-05-18 11:01:10.322857216 +0200 @@ -1,0 +2,9 @@ +Sun Apr 19 21:09:27 CEST 2020 - [email protected] + +- Revert to ImageMagick from GraphicsMagick due to the spumux error + (boo#1169848) +- Fix the build with ImageMagick 7, a downstream patch taken from + Arch linux package: + dvdauthor-0.7.2-imagemagick7.patch + +------------------------------------------------------------------- New: ---- dvdauthor-0.7.2-imagemagick7.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dvdauthor.spec ++++++ --- /var/tmp/diff_new_pack.CmR94p/_old 2020-05-18 11:01:10.686857969 +0200 +++ /var/tmp/diff_new_pack.CmR94p/_new 2020-05-18 11:01:10.686857969 +0200 @@ -1,7 +1,7 @@ # # spec file for package dvdauthor # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -20,14 +20,14 @@ Version: 0.7.2 Release: 0 Summary: Low-level DVD Authoring Tools -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Productivity/Multimedia/Video/Editors and Convertors Url: http://dvdauthor.sourceforge.net/ Source0: https://github.com/ldo/dvdauthor/archive/%{version}.tar.gz#/dvdauthor-%{version}.tar.gz #PATCH-FIX-UPSTREAM dvdauthor-0.7.0_glibc-2.20.patch [email protected] -- Fix build with glibc-2.20 Patch0: dvdauthor-0.7.0_glibc-2.20.patch -# -#Patch1: dvdauthor-imagemagick7.patch +Patch1: dvdauthor-0.7.2-imagemagick7.patch +BuildRequires: ImageMagick-devel BuildRequires: bison BuildRequires: docbook-utils BuildRequires: flex @@ -41,7 +41,6 @@ BuildRequires: texlive-footmisc BuildRequires: texlive-koma-script BuildRequires: texlive-luatexbase -BuildRequires: GraphicsMagick-devel BuildRequires: pkgconfig(dvdread) BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(fribidi) @@ -60,7 +59,7 @@ %prep %setup -q %patch0 -#%%patch1 +%patch1 -p1 %build %if 1 == 0 @@ -70,8 +69,8 @@ export CXX=g++-7 %endif ./bootstrap -export MAGICK_CFLAGS=`GraphicsMagick-config --cppflags` -export CFLAGS="%{optflags} $MAGICK_CFLAGS" +# export MAGICK_CFLAGS=`ImageMagick-config --cppflags` +# export CFLAGS="%{optflags} $MAGICK_CFLAGS" export LDFLAGS="$LDFLAGS -Wl,-z -Wl,noexecstack" %configure make %{?_smp_mflags} ++++++ dvdauthor-0.7.2-imagemagick7.patch ++++++ --- 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 }
