Attachment 218473 Details for Bug 240270 – svn diff from /usr/ports/multimedia/dvdauthor

[patch] svn diff from /usr/ports/multimedia/dvdauthor

dvdauthor.svn.diff (text/plain), 2.33 KB, created by Chad Jacob Milios on 2020-10-02 18:38:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chad Jacob Milios

Created: 2020-10-02 18:38:43 UTC

Size: 2.33 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 550887)
>+++ Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	dvdauthor
> PORTVERSION=	0.7.2
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	multimedia
> MASTER_SITES=	SF/${PORTNAME}
> 
>@@ -39,6 +39,7 @@
> PAL_DESC=	Default video format PAL
> 
> IMAGEMAGICK_LIB_DEPENDS=	libMagick++-6.so:graphics/ImageMagick6
>+IMAGEMAGICK_CFLAGS!=		pkg-config --cflags --libs MagickWand-6
> 
> NTSC_CONFIGURE_ON=	--enable-default-video-format=NTSC
> PAL_CONFIGURE_ON=	--enable-default-video-format=PAL
>Index: files/patch-src_subgen-image.c
>===================================================================
>--- files/patch-src_subgen-image.c	(nonexistent)
>+++ files/patch-src_subgen-image.c	(working copy)
>@@ -0,0 +1,46 @@
>+--- 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
>+ }
>
>Property changes on: files/patch-src_subgen-image.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 240270: 207094 | 207189 | 207190 | 218457 | 218473 | 221267 | 221291 | 221313 | 221356 | 221363