Attachment #218457 for bug #240270

Lines 3-9 Link Here

(-)Makefile (-1 / +3 lines)
3		3
4	PORTNAME= dvdauthor	4	PORTNAME= dvdauthor
5	PORTVERSION= 0.7.2	5	PORTVERSION= 0.7.2
6	PORTREVISION= 2	6	PORTREVISION= 3
7	CATEGORIES= multimedia	7	CATEGORIES= multimedia
8	MASTER_SITES= SF/${PORTNAME}	8	MASTER_SITES= SF/${PORTNAME}
9		9
Lines 39-44 Link Here
39	PAL_DESC= Default video format PAL	39	PAL_DESC= Default video format PAL
40		40
41	IMAGEMAGICK_LIB_DEPENDS= libMagick++-6.so:graphics/ImageMagick6	41	IMAGEMAGICK_LIB_DEPENDS= libMagick++-6.so:graphics/ImageMagick6
		42	IMAGEMAGICK_CFLAGS= -I/usr/local/include/ImageMagick-6 -fopenmp -DMAGICKCORE_HDRI_ENABLE=1 \
		43	-DMAGICKCORE_QUANTUM_DEPTH=16 -L/usr/local/lib -lMagickWand-6 -lMagickCore-6
42		44
43	NTSC_CONFIGURE_ON= --enable-default-video-format=NTSC	45	NTSC_CONFIGURE_ON= --enable-default-video-format=NTSC
44	PAL_CONFIGURE_ON= --enable-default-video-format=PAL	46	PAL_CONFIGURE_ON= --enable-default-video-format=PAL




--- src/subgen-image.c.orig	2019-09-02 09:48:47 UTC
+++ src/subgen-image.c
@@ -28,7 +28,7 @@
 #include <fcntl.h>
 #include <math.h>
 
-#if defined(HAVE_MAGICK) || defined(HAVE_GMAGICK)
+#if defined(HAVE_MAGICK) 
 #include <stdarg.h>
 #include <magick/api.h>
 #else
@@ -163,7 +163,7 @@ static void createimage(pict *s, int w, 
       } /*if*/
   } /*createimage*/
 
-#if defined(HAVE_MAGICK) || defined(HAVE_GMAGICK)
+#if defined(HAVE_MAGICK) 
 // meaning of A in RGBA swapped in ImageMagick 6.0.0 and GraphicsMagick 1.3.8
 #if defined(HAVE_MAGICK)
 #define XMAGICK_NEW_RGBA_MINVER 0x600
@@ -348,7 +348,7 @@ static int read_pic(stinfo *s, pict *p)
       {
         if (!p->fname)
             return 0;
-#if defined(HAVE_MAGICK) || defined(HAVE_GMAGICK)
+#if defined(HAVE_MAGICK) 
         r = read_magick(p);
 #else
         r = read_png(p);
@@ -1097,14 +1097,14 @@ bool process_subtitle(stinfo *s)
 
 void image_init()
 {
-#if defined(HAVE_MAGICK) || defined(HAVE_GMAGICK)
+#if defined(HAVE_MAGICK) 
     InitializeMagick(NULL);
 #endif
 }
 
 void image_shutdown()
 {
-#if defined(HAVE_MAGICK) || defined(HAVE_GMAGICK)
+#if defined(HAVE_MAGICK) 
     DestroyMagick();
 #endif
 }

Return to bug 240270

Line 0 Link Here

(-)files/patch-src_subgen-image.c (+46 lines)
	1	--- src/subgen-image.c.orig 2019-09-02 09:48:47 UTC
	2	+++ src/subgen-image.c
	3	@@ -28,7 +28,7 @@
	4	#include <fcntl.h>
	5	#include <math.h>
	6
	7	-#if defined(HAVE_MAGICK) \|\| defined(HAVE_GMAGICK)
	8	+#if defined(HAVE_MAGICK)
	9	#include <stdarg.h>
	10	#include <magick/api.h>
	11	#else
	12	@@ -163,7 +163,7 @@ static void createimage(pict *s, int w,
	13	} /if/
	14	} /createimage/
	15
	16	-#if defined(HAVE_MAGICK) \|\| defined(HAVE_GMAGICK)
	17	+#if defined(HAVE_MAGICK)
	18	// meaning of A in RGBA swapped in ImageMagick 6.0.0 and GraphicsMagick 1.3.8
	19	#if defined(HAVE_MAGICK)
	20	#define XMAGICK_NEW_RGBA_MINVER 0x600
	21	@@ -348,7 +348,7 @@ static int read_pic(stinfo s, pict p)
	22	{
	23	if (!p->fname)
	24	return 0;
	25	-#if defined(HAVE_MAGICK) \|\| defined(HAVE_GMAGICK)
	26	+#if defined(HAVE_MAGICK)
	27	r = read_magick(p);
	28	#else
	29	r = read_png(p);
	30	@@ -1097,14 +1097,14 @@ bool process_subtitle(stinfo *s)
	31
	32	void image_init()
	33	{
	34	-#if defined(HAVE_MAGICK) \|\| defined(HAVE_GMAGICK)
	35	+#if defined(HAVE_MAGICK)
	36	InitializeMagick(NULL);
	37	#endif
	38	}
	39
	40	void image_shutdown()
	41	{
	42	-#if defined(HAVE_MAGICK) \|\| defined(HAVE_GMAGICK)
	43	+#if defined(HAVE_MAGICK)
	44	DestroyMagick();
	45	#endif
	46	}