Attachment 50966 Details for Bug 77539 – dvdauthor.patch

[patch] dvdauthor.patch

dvdauthor.patch (text/plain), 4.01 KB, created by oz on 2005-02-15 01:50:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: oz

Created: 2005-02-15 01:50:09 UTC

Size: 4.01 KB

patch

obsolete

>diff -ruN dvdauthor.orig/Makefile dvdauthor/Makefile
>--- dvdauthor.orig/Makefile	Mon Feb 14 18:39:21 2005
>+++ dvdauthor/Makefile	Mon Feb 14 18:36:49 2005
>@@ -6,8 +6,7 @@
> #
> 
> PORTNAME=	dvdauthor
>-PORTVERSION=	0.6.10
>-PORTREVISION=	3
>+PORTVERSION=	0.6.11
> CATEGORIES=	multimedia
> MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
> MASTER_SITE_SUBDIR=	${PORTNAME}
>@@ -48,6 +47,7 @@
> .endif
> .if defined(WITH_ICONV)
> USE_ICONV=	yes
>+CONFIGURE_ENV+=	CFLAGS="-DICONV_CONV=yes"
> .endif
> .if defined(WITH_IMAGEMAGICK)
> LIB_DEPENDS+=	Magick.7:${PORTSDIR}/graphics/ImageMagick
>@@ -78,11 +78,6 @@
> 	${MKDIR} ${PREFIX}/share/doc/dvdauthor
> 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/dvdauthor
> 	${INSTALL_DATA} ${FILESDIR}/README.FreeBSD ${PREFIX}/share/doc/dvdauthor
>-	${INSTALL_DATA} ${WRKSRC}/lib.txt ${PREFIX}/share/doc/dvdauthor
>-	${INSTALL_DATA} ${WRKSRC}/menu.txt ${PREFIX}/share/doc/dvdauthor
>-	for i in dvdauthor ex-title examples index languages manpages spumux; do \
>-		${INSTALL_DATA} ${WRKSRC}/doc/$$i.html ${PREFIX}/share/doc/dvdauthor; \
>-	done
> .endif
> 
> .include <bsd.port.post.mk>
>diff -ruN dvdauthor.orig/distinfo dvdauthor/distinfo
>--- dvdauthor.orig/distinfo	Mon Feb 14 18:39:21 2005
>+++ dvdauthor/distinfo	Mon Feb 14 18:03:27 2005
>@@ -1,2 +1,2 @@
>-MD5 (dvdauthor-0.6.10.tar.gz) = e98243cd2a12bd723680dd49536f7318
>-SIZE (dvdauthor-0.6.10.tar.gz) = 240010
>+MD5 (dvdauthor-0.6.11.tar.gz) = d2c45879e4cfb95d410bf603af891e07
>+SIZE (dvdauthor-0.6.11.tar.gz) = 288452
>diff -ruN dvdauthor.orig/files/patch-Makefile.in dvdauthor/files/patch-Makefile.in
>--- dvdauthor.orig/files/patch-Makefile.in	Mon Feb 14 18:39:21 2005
>+++ dvdauthor/files/patch-Makefile.in	Wed Dec 31 17:00:00 1969
>@@ -1,10 +0,0 @@
>---- Makefile.in.orig	Thu Jan 15 20:42:47 2004
>-+++ Makefile.in	Tue Jan 20 17:24:46 2004
>-@@ -13,6 +13,7 @@
>- FLEX=flex
>- 
>- CPPFLAGS = -DSYSCONFDIR="\"$(sysconfdir)\""
>-+LDFLAGS += -L@libdir@
>- LIBS = @LIBS@ @LIBICONV@
>- XML_LIBS = @XML_LIBS@
>- MAGICK_LIBS = @MAGICK_LIBS@
>diff -ruN dvdauthor.orig/files/patch-dvdvob.c dvdauthor/files/patch-dvdvob.c
>--- dvdauthor.orig/files/patch-dvdvob.c	Mon Feb 14 18:39:21 2005
>+++ dvdauthor/files/patch-dvdvob.c	Wed Dec 31 17:00:00 1969
>@@ -1,11 +0,0 @@
>---- src/dvdvob.c.orig	Sun Mar 14 22:13:26 2004
>-+++ src/dvdvob.c	Wed Aug 11 19:52:52 2004
>-@@ -1148,7 +1148,7 @@
>-                         printpts(pts1);
>-                         fprintf(stderr,"\n");
>-                         ach->audpts[ach->numaudpts-1].pts[1]=pts0;
>--                    noshow:
>-+                    noshow:;
>-                     }
>-                     ach->audpts[ach->numaudpts].pts[0]=pts0;
>-                     ach->audpts[ach->numaudpts].pts[1]=pts1;
>diff -ruN dvdauthor.orig/files/patch-readxml.c dvdauthor/files/patch-readxml.c
>--- dvdauthor.orig/files/patch-readxml.c	Mon Feb 14 18:39:21 2005
>+++ dvdauthor/files/patch-readxml.c	Wed Dec 31 17:00:00 1969
>@@ -1,21 +0,0 @@
>---- src/readxml.c.orig	Fri Mar 12 23:57:39 2004
>-+++ src/readxml.c	Sun Dec  5 20:19:28 2004
>-@@ -221,13 +221,13 @@
>- char *utf8tolocal(const char *in)
>- {
>-     iconv_t c=get_conv();
>--    int inlen=strlen(in);
>--    int outlen=inlen*5;
>-+    size_t inlen=strlen(in);
>-+    size_t outlen=inlen*5;
>-     char *r=malloc(outlen+1);
>-     char *out=r;
>--    int v;
>-+    size_t v;
>- 
>--    v=iconv(c,ICONV_CAST &in,&inlen,&out,&outlen);
>-+    v=iconv(c,&in,&inlen,&out,&outlen);
>-     if(v==-1) {
>-         fprintf(stderr,"ERR:  Cannot convert UTF8 string '%s': %s\n",in,strerror(errno));
>-         exit(1);
>-
>diff -ruN dvdauthor.orig/files/patch-subgen-image.c dvdauthor/files/patch-subgen-image.c
>--- dvdauthor.orig/files/patch-subgen-image.c	Mon Feb 14 18:39:21 2005
>+++ dvdauthor/files/patch-subgen-image.c	Wed Dec 31 17:00:00 1969
>@@ -1,11 +0,0 @@
>---- src/subgen-image.c.orig     Sun Dec 19 22:38:27 2004
>-+++ src/subgen-image.c  Sun Dec 19 22:38:44 2004
>-@@ -177,7 +177,7 @@
>-             p.r=pdata[x*4];
>-             p.g=pdata[x*4+1];
>-             p.b=pdata[x*4+2];
>--            p.t=255-pdata[x*4+3];
>-+            p.t=pdata[x*4+3];
>-             putpixel(s,y*s->width+x,&p);
>-         }
>-     }

Actions: View | Diff

Attachments on bug 77539: 50966